Fixed packaging according new style.

svn changeset:3098/svn branch:trunk

diff --git a/WebContent/index.html b/WebContent/index.html
index c6394c50eac41fe86b97a646201c4a192742a309..1a0faaa29e7a8464a35506d08a64a1867507fac7 100644 (file)
--- a/WebContent/index.html
+++ b/WebContent/index.html
@@ -10,7 +10,7 @@
                <script type="text/javascript">
                
                window.onload = function() {
-                       itm     ill.init();
+                       itmill.init();
                }
                
                var itmill = function() {
@@ -139,7 +139,7 @@
                        <div id="demos">
                                <h2>Demos</h2>
                                <ul id="demo-buttons">
-                                       <li id="feature-browser"><a href="FeaturesApplication/">Feature browser</a></li>
+                                       <li id="feature-browser"><a href="FeatureBrowser/">Feature browser</a></li>
                                        <li id="notifications"><a href="NotificationDemo/">Notifications</a></li>
                                        <li id="reservr"><a href="reservr.html">Reservation application</a></li>
                                        <li id="windowed-demos"><a href="WindowedDemos">Windowed demos</a></li>

diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html
index acd2f6a0ae1294e1760868d0a89aac299986325a..780e19fd839431b4a93c7f87a53555e018815b29 100644 (file)
--- a/WebContent/release-notes.html
+++ b/WebContent/release-notes.html
@@ -30,7 +30,7 @@ This document is under construction.</p>
 <p>
 
 <br />
-<h4>Known issues in this Release (<version></version>)</h4>
+<h4>Known issues in <version></version></h4>
 IE = Internet Explorer, FF = Firefox, SA = Safari, OP = Opera
 <br/>
 Starting any demo may take long time (5 seconds) on some environments. Should not affect on "real" environments.

diff --git a/build/build.xml b/build/build.xml
index 8974d7b043bb0bdb8054c55a2486525e84e1c386..c65b17bdf0992b8c5f91fe033d547326fb140fcc 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -60,11 +60,16 @@
                        <arg line="${output-dir}" />
                        <arg line="${result-path}/eclipse-test" />
                </exec>
+               <!--
                <exec executable="ln" failonerror="false">
                        <arg line="-s" />
                        <arg line="${gwt-dir}/${package-platform}" />
                        <arg line="${output-dir}/gwt" />
                </exec>
+               -->
+               <!--
+               <antcall target="create-mac-diskimage" inheritAll="true" inheritRefs="true" />
+               -->
        </target>
 
        <!-- Clean results - - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -108,8 +113,6 @@
 
                <echo>We are on ${platform} platform, using ${gwt-dir}/${platform}/${lib-gwt-dev}.</echo>
 
-
-
                <!-- Destination files -->
                <property name="lib-jar-name" value="${product-file}-${version}.jar" />
                <property name="demo-war-name" value="${product-file}-demo-${version}.war" />
@@ -202,7 +205,7 @@
                        </tarfileset>
                </tar>
                <!-- TODO: remove me: DISABLE for speed -->
-               <antcall target="create-mac-diskimage" inheritAll="true" inheritRefs="true" />
+               <!-- <antcall target="create-mac-diskimage" inheritAll="true" inheritRefs="true" /> -->
        </target>
 
        <target name="internal-package-mac_leopard">
@@ -224,7 +227,7 @@
                        </tarfileset>
                </tar>
                <!-- TODO: remove me: DISABLE for speed -->
-               <antcall target="create-mac-diskimage" inheritAll="true" inheritRefs="true" />
+               <!-- <antcall target="create-mac-diskimage" inheritAll="true" inheritRefs="true" /> -->
        </target>
 
        <target name="create-mac-diskimage">
@@ -272,7 +275,7 @@
                                        <arg line='${mount.dir}' />
                                </exec>
                                <!-- set executable bit -->
-                               <chmod file="${mount.dir}/start-demo.sh" perm="ugo+x" />
+                               <chmod file="${mount.dir}/start.sh" perm="ugo+x" />
                                <!-- close image -->
                                <exec executable="hdiutil" failonerror="true">
                                        <arg line='detach ${mount.dir}/' />
@@ -297,13 +300,13 @@
                <echo>Adding platform specific files for ${package-platform}</echo>
                <delete includeemptydirs="true" defaultexcludes="false">
                        <fileset dir="${output-dir}">
-                               <include name="start-demo.*" />
-                               <include name=".project" />
-                               <include name=".classpath" />
+                               <include name=".*" />
                                <include name="*.launch" />
+                               <include name="*.txt" />
                                <include name="build-widgetsets.xml" />
                        </fileset>
                </delete>
+               <copy file="build/package/${package-platform}-readme.txt" tofile="${output-dir}/readme.txt" />
                <copy todir="${output-dir}">
                        <filterchain>
                                <expandproperties />
@@ -350,7 +353,7 @@
                        <then>
                                <copy todir="${output-dir}">
                                        <fileset dir="build/package">
-                                               <include name="start-demo.bat" />
+                                               <include name="start.bat" />
                                        </fileset>
                                </copy>
                        </then>
@@ -360,10 +363,10 @@
                        <then>
                                <copy todir="${output-dir}">
                                        <fileset dir="build/package">
-                                               <include name="start-demo.sh" />
+                                               <include name="start.sh" />
                                        </fileset>
                                </copy>
-                               <chmod file="${output-dir}/start-demo.sh" perm="ugo+x" />
+                               <chmod file="${output-dir}/start.sh" perm="ugo+x" />
                        </then>
                </if>
                <if>
@@ -371,13 +374,29 @@
                        <then>
                                <copy todir="${output-dir}">
                                        <fileset dir="build/package">
-                                               <include name="Start IT Mill Toolkit.app/**/*" />
-                                               <include name="start-demo.sh" />
-                                               <include name=".VolumeIcon.icns" />
-                                               <!-- TODO: <include name=".DS_Store" /> -->
+                                               <include name="start.sh" />
                                        </fileset>
                                </copy>
-                               <chmod file="${output-dir}/start-demo.sh" perm="ugo+x" />
+                               <!-- must be done in native way, otherwise fails -->
+                               <!-- but again, ant just fails with any * or other special characters -->
+                               <!--
+                               <exec executable="cp" failonerror="true">
+                                       <arg line="-r" />
+                                       <arg line="build/package/Start*.app" />
+                                       <arg line="${output-dir}" />
+                               </exec>
+                               <exec executable="cp" failonerror="true">
+                                       <arg line="build/package/Icon*" />
+                                       <arg line="${output-dir}" />
+                               </exec>
+                               <exec executable="cp" failonerror="true">
+                                       <arg line="build/package/mac-DS_Store" />
+                                       <arg line="${output-dir}/.DS_Store" />
+                               </exec>
+                               -->
+                               <!-- <copy file="build/package/mac-DS_Store" tofile="${output-dir}/.DS_Store" /> -->
+                               <copy file="build/package/mac-VolumeIcon.icns" tofile="${output-dir}/.VolumeIcon.icns" />
+                               <chmod file="${output-dir}/start.sh" perm="ugo+x" />
                        </then>
                </if>
        </target>
@@ -496,6 +515,14 @@
                        </fileset>
                </copy>
 
+               <!-- Add package specific WebContent files from build/package/WebContent -->
+               <copy todir="${output-dir}/WebContent">
+                       <fileset dir="build/package/WebContent">
+                               <exclude name="**/.*" />
+                               <include name="**/*" />
+                       </fileset>
+               </copy>
+
        </target>
 
        <target name="compile-fileupload">
@@ -614,19 +641,9 @@
                        </fileset>
                </copy>
 
-               <!--
-               <echo>Adding javadocs</echo>
-               <copy todir="${output-dir}/WebContent/doc">
-                       <fileset dir="${output-dir}/doc">
-                               <include name="api/**/*" />
-                       </fileset>
-               </copy>
-               -->
-               
                <echo>Building WAR</echo>
-               <war warfile="${output-dir}/WebContent/demo/${product-file}.war" webxml="build/package/WebContent/WEB-INF/web.xml">
+               <war warfile="${output-dir}/WebContent/demo/${product-file}.war">
                        <fileset dir="${output-dir}/WebContent">
-                               <exclude name="WEB-INF/web.xml" />
                                <include name="**/*" />
                        </fileset>
                        <lib dir="${output-dir}/WebContent/WEB-INF/lib">
@@ -798,5 +815,4 @@
        <!-- java2html converter -->
        <taskdef name="java2html" classname="de.java2html.anttasks.Java2HtmlTask" classpath="build/lib/java2html.jar" />
 
-
 </project>

diff --git a/build/package/build-widgetsets.xml b/build/package/build-widgetsets.xml
index f854c075f4c1e8c801cd4337296091ad8b194319..7edaefd9b1a80d55a5cba53e95394595d657f3d9 100644 (file)
--- a/build/package/build-widgetsets.xml
+++ b/build/package/build-widgetsets.xml
@@ -102,7 +102,7 @@ See configure target to adjust this buildfile.
                        <arg value="com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet" />
                        <classpath>
                                <path refid="compile.classpath"/>
-                               <pathelement location="lib/demo/reservr/googlemaps_gwt.jar" />
+                               <pathelement location="WebContent/demo/lib/reservr/googlemaps_gwt.jar" />
                        </classpath>
                </java>
        </target>

diff --git a/build/package/mac-DS_Store b/build/package/mac-DS_Store
index 1498e48826ebe14cba48e9aa42b32d3785e0a395..b2de4bf44fa13039c07ab8ac218825ecf8db8eaa 100644 (file)
Binary files a/build/package/mac-DS_Store and b/build/package/mac-DS_Store differ

diff --git a/build/package/start.sh b/build/package/start.sh
index 36fbb95292344929a71eeb55a3e64cb29d876a3e..8c2afaa925f16854180152c6a66c266c1986c011 100644 (file)
--- a/build/package/start.sh
+++ b/build/package/start.sh
@@ -1,3 +1,7 @@
 #!/bin/sh
 
+if [ "$1" != "" ] ; then
+  cd $1
+fi
+
 java -cp WebContent/demo/lib/jetty/jetty-6.1.5.jar:WebContent/demo/lib/jetty/jetty-util-6.1.5.jar:WebContent/demo/lib/jetty/servlet-api-2.5-6.1.5.jar:WebContent/WEB-INF/classes com.itmill.toolkit.launcher.ITMillToolkitDesktopMode