Author: bback
Date: 2006-03-16 18:01:43 +0000 (Thu, 16 Mar 2006)
New Revision: 8265
Modified:
trunk/apps/frost-0.7/build.xml
Log:
fixed broken build :)
Modified: trunk/apps/frost-0.7/build.xml
===================================================================
--- trunk/apps/frost-0.7/build.xml 2006-03-16 06:41:09 UTC (rev 8264)
+++ trunk/apps/frost-0.7/build.xml 2006-03-16 18:01:43 UTC (rev 8265)
@@ -100,6 +100,15 @@
<mkdir dir="${build.classes.skinlfFixLib}"/>
<mkdir dir="${build.classes.datechooser}"/>
+ <javac srcdir="${src.dir}"
+ destdir="${build.classes}"
+ encoding="UTF8"
+ debug="${debug}" debuglevel="${debuglevel}"
deprecation="${deprecation}"
+ verbose="${verbose}" optimize="${optimize}"
+ source="${source}" target="${target}">
+ <classpath refid="classpath" />
+ </javac>
+
<javac srcdir="${src.dir.datechooser}"
destdir="${build.classes.datechooser}"
debug="${debug}" debuglevel="${debuglevel}"
deprecation="${deprecation}"
@@ -112,15 +121,6 @@
</fileset>
</copy>
- <javac srcdir="${src.dir}"
- destdir="${build.classes}"
- encoding="UTF8"
- debug="${debug}" debuglevel="${debuglevel}"
deprecation="${deprecation}"
- verbose="${verbose}" optimize="${optimize}"
- source="${source}" target="${target}">
- <classpath refid="classpath" />
- </javac>
-
<javac srcdir="${src.dir.skinlfFixLib}"
destdir="${build.classes.skinlfFixLib}"
debug="${debug}" debuglevel="${debuglevel}"
deprecation="${deprecation}"
@@ -152,6 +152,23 @@
file="${src.dir}/frost.manifest"
todir="${dist.dir}"
filtering="true"/>
+
+ <mkdir dir="${dist.dir}/lib"/>
+
+ <delete quiet="true" file="${dist.dir}/lib/skinlfFix.jar"/>
+ <jar jarfile="${dist.dir}/lib/skinlfFix.jar">
+ <fileset dir="${build.classes.skinlfFixLib}">
+ <include name="**/*.class"/>
+ </fileset>
+ </jar>
+
+ <delete quiet="true" file="${dist.dir}/lib/datechooser.jar"/>
+ <jar jarfile="${dist.dir}/lib/datechooser.jar">
+ <fileset dir="${build.classes.datechooser}">
+ <include name="**/*.class"/>
+ <include name="**/*.properties"/>
+ </fileset>
+ </jar>
<!-- Build the jar file. -->
<jar jarfile="${dist.dir}/${jarName}"
@@ -165,25 +182,9 @@
</jar>
<delete quiet="true" file="${dist.dir}/frost.manifest"/>
-
- <delete quiet="true" file="${dist.dir}/lib/skinlfFix.jar"/>
- <mkdir dir="${dist.dir}/lib"/>
- <jar jarfile="${dist.dir}/lib/skinlfFix.jar">
- <fileset dir="${build.classes.skinlfFixLib}">
- <include name="**/*.class"/>
- </fileset>
- </jar>
- </target>
- <delete quiet="true" file="${dist.dir}/lib/datechooser.jar"/>
- <mkdir dir="${dist.dir}/lib"/>
- <jar jarfile="${dist.dir}/lib/datechooser.jar">
- <fileset dir="${build.classes.datechooser}">
- <include name="**/*.class"/>
- <include name="**/*.properties"/>
- </fileset>
- </jar>
-
+ </target>
+
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<!-- Prepare the distribution (zip, source zip and jar)
-->
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
