<target name="test-package" depends="init" description="used for testing build.xml">
<echo>Creating package for Mac platform.</echo>
<var name="package-platform" value="mac" />
- <!-- TODO: on Mac Leopard, we should not use -XstartOnFirstThread -->
<var name="eclipse-launch-vmargs" value="-XstartOnFirstThread -Xms128M -Xmx512M" />
<antcall target="add-platform-specific-files" inheritAll="true" inheritRefs="true" />
<delete file="${result-path}/eclipse-test" followsymlinks="false" />
<!-- Create Output Directory Hierarchy -->
<mkdir dir="${output-dir}/WebContent" />
- <mkdir dir="${output-dir}/WebContent/lib" />
+ <mkdir dir="${output-dir}/WebContent/demo" />
<mkdir dir="${output-dir}/WebContent/doc" />
<mkdir dir="${output-dir}/WebContent/doc/manual" />
<mkdir dir="${output-dir}/WebContent/doc/api" />
<copy todir="${output-dir}">
<fileset dir="build/package">
<include name="start-demo.bat" />
- <include name="start-demo.txt" />
</fileset>
</copy>
</then>
<copy todir="${output-dir}">
<fileset dir="build/package">
<include name="start-demo.sh" />
- <include name="start-demo.txt" />
</fileset>
</copy>
<chmod file="${output-dir}/start-demo.sh" perm="ugo+x" />
<then>
<copy todir="${output-dir}">
<fileset dir="build/package">
- <include name="Start IT Mill Toolkit.app" />
+ <include name="Start IT Mill Toolkit.app/**/*" />
<include name="start-demo.sh" />
- <include name="start-demo.txt" />
<include name=".VolumeIcon.icns" />
- <include name=".DS_Store" />
+ <!-- TODO: <include name=".DS_Store" /> -->
</fileset>
</copy>
- <!-- TODO: this does not work, why? -->
<chmod file="${output-dir}/start-demo.sh" perm="ugo+x" />
</then>
</if>
</copy>
<!-- copy 3rd part libraries used by demo -->
- <copy todir="${output-dir}/WebContent/lib/demo">
+ <copy todir="${output-dir}/WebContent/demo/lib">
<fileset dir="lib">
<include name="reservr/**/*" />
</fileset>
</copy>
- <copy todir="${output-dir}/WebContent/lib">
+ <copy todir="${output-dir}/WebContent/demo/lib">
<fileset dir="lib">
<include name="jetty/**/*" />
</fileset>
<pathelement location="${gwt-dir}/${platform}/${lib-gwt-dev}" />
<pathelement location="${result-path}/src" />
<!-- demo jars -->
- <pathelement location="${output-dir}/WebContent/lib/demo/reservr/googlemaps_gwt.jar" />
+ <pathelement location="${output-dir}/WebContent/demo/lib/reservr/googlemaps_gwt.jar" />
<!-- demo widgetset sources -->
<pathelement path="${output-dir}/WebContent/WEB-INF/src" />
</classpath>
<target name="libs" depends="compile-java, compile-client-side">
<echo>Creating libs (server-side)</echo>
<!-- Create Toolkit JAR -->
- <jar jarfile="${output-dir}/WebContent/lib/${lib-jar-name}" compress="true">
+ <jar jarfile="${output-dir}/WebContent/WEB-INF/lib/${lib-jar-name}" compress="true">
<fileset dir="${result-path}/classes">
<patternset>
<exclude name="${toolkit-package}/demo/**" />
</fileset>
</copy>
- <!-- TODO remove WebContent/lib? -->
- <echo>Adding (duplicating) Toolkit JAR to WebContent/WEB-INF/lib</echo>
- <copy todir="${output-dir}/WebContent/WEB-INF/lib">
- <fileset dir="${output-dir}/WebContent/lib">
- <include name="${lib-jar-name}" />
- </fileset>
- </copy>
-
<echo>Adding source for demo</echo>
<copy todir="${output-dir}/WebContent/WEB-INF/src">
<fileset dir="${result-path}/src">
-->
<echo>Building WAR</echo>
- <war warfile="${output-dir}/lib/${product-file}.war" webxml="build/package/WebContent/WEB-INF/web.xml">
+ <war warfile="${output-dir}/${product-file}.war" webxml="build/package/WebContent/WEB-INF/web.xml">
<fileset dir="${output-dir}/WebContent">
<exclude name="WEB-INF/web.xml" />
<include name="**/*" />
</fileset>
- <lib dir="${output-dir}/WebContent/lib">
+ <lib dir="${output-dir}/WebContent/WEB-INF/lib">
<include name="${lib-jar-name}" />
</lib>
</war>