[sword-svn] r66 - in trunk: . app/webstart

[Apache]

Author: 
Date: 2004-09-28 19:37:09 -0700 (Tue, 28 Sep 2004)
New Revision: 66

Modified:
   trunk/app/webstart/Flashcards.jnlp
   trunk/build.xml
Log:
split out lessons into its own jar

Modified: trunk/app/webstart/Flashcards.jnlp
===================================================================
--- trunk/app/webstart/Flashcards.jnlp	2004-09-27 06:40:33 UTC (rev 65)
+++ trunk/app/webstart/Flashcards.jnlp	2004-09-29 02:37:09 UTC (rev 66)
@@ -29,6 +29,7 @@
   <resources>
     <j2se version="1.4+"/>
     <jar href="flashcards.jar"/>
+    <jar href="lessons.jar"/>
     <!-- if on the Apple Mac, make it play well -->
     <property name="apple.laf.useScreenMenuBar" value="true"/>
     <property name="com.apple.mrj.application.apple.menu.about.name" value="Flashcards"/>

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2004-09-27 06:40:33 UTC (rev 65)
+++ trunk/build.xml	2004-09-29 02:37:09 UTC (rev 66)
@@ -70,15 +70,14 @@
     == where project is replaced with the name of the project.
     == This jar is built to the target.install directory.
     =========================================================================-->
-  <target name="build" depends="compile, jar.check, keygen" unless="jar.uptodate" description="Run a full build">
+  <target name="build" depends="compile, resource, jar.check, keygen" unless="jar.uptodate" description="Run a full build">
     <mkdir dir="${target.install}"/>
     <jar jarfile="${target.install}/${ant.project.name}.jar" manifest="${target.classes}/org/crosswire/flashcards/flashcards.manifest">
       <fileset dir="${target.classes}"/>
-      <fileset dir="${source.root}" includes="lessons/**/*"/>
     </jar>
     <copy todir="${target.install}">
       <fileset dir="${source.root}/app/webstart">
-        <include name="FlashCards.jnlp"/>
+        <include name="Flashcards.jnlp"/>
         <include name="*.gif"/>
       </fileset>
     </copy>
@@ -94,10 +93,28 @@
     <uptodate property="jar.uptodate"
         targetfile="${target.install}/${ant.project.name}.jar">
       <srcfiles dir="${target.classes}"/>
-      <srcfiles dir="${source.res}"/>
     </uptodate>
   </target>
 
+  <target name="resource" depends="resource.check, keygen" unless="resource.uptodate" description="Run a full build">
+    <mkdir dir="${target.install}"/>
+    <jar jarfile="${target.install}/lessons.jar">
+      <fileset dir="${source.root}" includes="lessons/**/*"/>
+    </jar>
+    <signjar
+          storepass="${keystore.pswd}"
+          alias="${keystore.alias}"
+          keystore="${keystore.file}"
+          keypass="${keystore.pswd}"
+          jar="${target.install}/lessons.jar"/>
+  </target>
+  <target name="resource.check">
+    <uptodate property="resource.uptodate"
+        targetfile="${target.install}/lessons.jar">
+      <srcfiles dir="${source.res}/lessons"/>
+    </uptodate>
+  </target>
+
   <!--=======================================================================
     == Compile all the java files under source.path into class files.
     == Make sure that all the resources in those directories make it over too.
@@ -105,10 +122,10 @@
   <target name="compile" description="Compile the source">
     <mkdir dir="${target.classes}"/>
     <javac debug="on"
+           srcdir="${source.java}"
            includes="**/*.java"
            destdir="${target.classes}"
            source="1.4">
-      <src refid="source.path"/>
       <exclude name="**/migrate/*"/>
     </javac>
     <!-- Copy the resources to the proper org/crosswire directory.