[sword-svn] r120 - trunk

[Apache]

Author: 
Date: 2007-05-01 03:29:03 -0700 (Tue, 01 May 2007)
New Revision: 120

Modified:
   trunk/Makefile
   trunk/build.xml
   trunk/genfcmobile.sh
Log:
Cleaned up build scripts a bit


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-05-01 09:50:57 UTC (rev 119)
+++ trunk/Makefile	2007-05-01 10:29:03 UTC (rev 120)
@@ -1,7 +1,7 @@
 all:
 	ant -emacs
 
-clean: zipclean
+clean: zipclean mobileclean
 	ant clean
 
 serverinstallzip: zipclean
@@ -23,5 +23,9 @@
 	cp -f FlashCards/lessons.jar /home/flashcards/html/webstart/
 
 mobile: 
+	JAVA_HOME=/usr/java/j2sdk1.4.2_05 ant -f build.micro1.xml
 	./genfcmobile.sh
 
+mobileclean:
+	rm -rf microbuild
+	rm -rf fcMobilePackage*

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2007-05-01 09:50:57 UTC (rev 119)
+++ trunk/build.xml	2007-05-01 10:29:03 UTC (rev 120)
@@ -72,7 +72,7 @@
     == where project is replaced with the name of the project.
     == This jar is built to the target.install directory.
     =========================================================================-->
-  <target name="build" depends="compile, resource, jar.check, keygen, microcompile" 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}"/>

Modified: trunk/genfcmobile.sh
===================================================================
--- trunk/genfcmobile.sh	2007-05-01 09:50:57 UTC (rev 119)
+++ trunk/genfcmobile.sh	2007-05-01 10:29:03 UTC (rev 120)
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+JAVA_HOME=/usr/java/j2sdk1.4.2_05
 WORKDIR=fcMobilePackage.$$
 
 echo setting up workspace at $WORKDIR
@@ -11,7 +12,7 @@
 cd $WORKDIR
 
 echo unjarring lessons
-jar -xfv lessons.jar
+jar -xf lessons.jar
 
 #so we don't find when we run flashcards, below
 mv lessons lessons.orig
@@ -22,9 +23,9 @@
 <a href="/fc/FlashcardsMobile.jad">Flashcards - Hebrew</a><br/>
 <a href="/fc/oldphone/FlashcardsMobile.jad">Flashcards(old phones) - Hebrew</a><br/>
 <a href="/fc/test/FlashcardsMobile.jad">Flashcards - Phone Test</a><br/>
+Other Lessons:<br/>
 !
 
-echo generating pre-rendered images
 
 for i in `cd lessons.orig; ls`
 do
@@ -42,6 +43,7 @@
 #yeah, I know, it outputs to $HOME/.flashcards, lame.  FIXME
   rm -rf ~/.flashcards/lessons/$i/images
   jar cf lessons.jar lessons
+  echo generating pre-rendered images for \[$i\]
   java -cp flashcards.jar org.crosswire.flashcards.LessonManager -genImages
   mv ~/.flashcards/lessons/$i/images lessons/$i/
   mv lessons res/