[jsword-svn] r1327 - in trunk: bibledesktop common

[dmsmith at www.crosswire.org]

Author: dmsmith
Date: 2007-05-17 05:50:11 -0700 (Thu, 17 May 2007)
New Revision: 1327

Modified:
   trunk/bibledesktop/build.xml
   trunk/common/core.xml
Log:
Work on building a Mac installer every night.

Modified: trunk/bibledesktop/build.xml
===================================================================
--- trunk/bibledesktop/build.xml	2007-05-17 11:24:51 UTC (rev 1326)
+++ trunk/bibledesktop/build.xml	2007-05-17 12:50:11 UTC (rev 1327)
@@ -59,7 +59,8 @@
 
     <!-- Create a flag file used to determine whether the set of jars needs to be signed -->
     <touch file="${target.root}/.flagfile"/>
-    <!-- Copy the files needed for the distribution -->
+
+  	<!-- Copy the files needed for the distribution -->
     <mkdir dir="${jnlp.uninstalled}"/>
     <copy todir="${jnlp.uninstalled}"
           preservelastmodified="true">
@@ -67,7 +68,7 @@
       <fileset dir="${source.etc}/jnlp">
         <include name="bibledesktop.jnlp"/>
         <include name="*.gif"/>
-	    </fileset>
+	  </fileset>
       <fileset dir="${source.etc}/bin"/>
       <fileset dir="${source.etc}/installer">
         <include name="bibledesktop.exe"/>
@@ -114,6 +115,31 @@
         <exclude name="**/*.jnlp"/>
       </fileset>
     </copy>
+
+	<!--
+		Prepare the Mac distribution.
+		Use the unsigned jars to minimize space.
+	-->
+    <mkdir dir="${jnlp.installed}/BibleDesktop.app"/>
+	<copy todir="${jnlp.installed}/BibleDesktop.app">
+      <fileset dir="${source.etc}/installer/macosx/BibleDesktop.app">
+		<exclude name="**/.DS_Store"/>
+		<exclude name="**/.svn"/>
+	  </fileset>
+    </copy>
+	<!-- copy does not preserve execution privs. So we reset it -->
+    <chmod perm="a+x" file="${jnlp.installed}/BibleDesktop.app/Contents/MacOS/JavaApplicationStub"/>
+
+	<copy todir="${jnlp.installed}/BibleDesktop.app/Contents/Resources/Java">
+      <fileset dir="${target.jar}">
+        <patternset refid="internal.built.jars"/>
+        <patternset refid="external.runtime.jars"/>
+	  </fileset>
+    </copy>
+
+	<zip destfile="${jnlp.installed}/BibleDesktop.app.zip" update="true">
+      <zipfileset dir="${jnlp.installed}/BibleDesktop.app" prefix="BibleDesktop.app"/>
+	</zip>
   </target>
 
   <target name="install.check">

Modified: trunk/common/core.xml
===================================================================
--- trunk/common/core.xml	2007-05-17 11:24:51 UTC (rev 1326)
+++ trunk/common/core.xml	2007-05-17 12:50:11 UTC (rev 1327)
@@ -34,6 +34,18 @@
   <property name="verbose.copy"    value="false"/>
 
   <!--=======================================================================
+    == These jars are built by the various JSword projects.
+    == It excludes jsword-common-aqua which is treated as an external jar.
+    =========================================================================-->
+  <patternset id="internal.built.jars">
+    <include name="**/bibledesktop-${release.version}.jar"/>
+    <include name="**/jsword-${release.version}.jar"/>
+    <include name="**/jsword-common-${release.version}.jar"/>
+    <include name="**/jsword-common-swing-${release.version}.jar"/>
+    <include name="**/jsword-${release.version}.jar"/>
+  </patternset>
+
+  <!--=======================================================================
     == These jars are necessary for Bible Desktop to be compiled and run.
     == The version numbers in jar files is replaced w/ *.
     == This way we can upgrade without impacting this ant build file.
@@ -44,18 +56,20 @@
     <include name="**/commons-httpclient-*.jar"/>
     <include name="**/commons-logging-*.jar"/>
     <include name="**/commons-net-*.jar"/>
-    <include name="**/lucene-*.jar"/>
-    <include name="**/activation.jar"/>
+    <include name="**/lucene-core-*.jar"/>
     <include name="**/jlfgr-*.jar"/>
     <include name="**/jsword-common-aqua-*.jar"/>
+    <include name="**/javatar-*/*.jar"/>
+  	<!--
+    <include name="**/activation.jar"/>
+    <include name="**/servlet.jar"/>
     <include name="**/rome-*.jar"/>
     <include name="**/xmlrpc-*.jar"/>
     <include name="**/gnu-regexp-*.jar"/>
     <include name="**/werx-*.jar"/>
     <include name="**/blogapps-*.jar"/>
     <include name="**/kafenio-*/*.jar"/>
-    <include name="**/servlet.jar"/>
-    <include name="**/javatar-*/*.jar"/>
+    -->
   </patternset>
 
   <!--=======================================================================