[jsword-svn] r1430 - in trunk: bibledesktop common jsword-web

[dmsmith at www.crosswire.org]

Author: dmsmith
Date: 2007-06-22 12:00:55 -0700 (Fri, 22 Jun 2007)
New Revision: 1430

Modified:
   trunk/bibledesktop/build.xml
   trunk/common/core.xml
   trunk/jsword-web/build.xml
Log:
build improvements.

Modified: trunk/bibledesktop/build.xml
===================================================================
--- trunk/bibledesktop/build.xml	2007-06-22 17:37:41 UTC (rev 1429)
+++ trunk/bibledesktop/build.xml	2007-06-22 19:00:55 UTC (rev 1430)
@@ -72,29 +72,25 @@
     <delete file="${target.installed}/Info.plist"/>
 
     <!-- sign the jars to a temporary location so they can be reused -->
-    <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="bibledesktop-${release.version}.jar"/>
-    <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="jsword-common-${release.version}.jar"/>
-    <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="jsword-common-swing-${release.version}.jar"/>
-    <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="jsword-${release.version}.jar"/>
-    <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="jsword-common-aqua-1.0.6.jar"/>
-    <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="commons-codec-1.3.jar"/>
-    <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="commons-httpclient-3.0.1.jar"/>
-    <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="commons-logging-1.1.jar"/>
-    <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="commons-net-1.4.1.jar"/>
-    <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="jdom-1.0.jar"/>
-    <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="javatar-2.5.jar"/>
-    <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="jlfgr-1_0.jar"/>
-    <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="lucene-core-2.2.0.jar"/>
-  	<!--
-    <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="blogapps-1.0.jar"/>
-    <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="gnu-regexp-1.1.4.jar"/>
-    <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="kafenio-0.8.5.jar"/>
-    <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="kafenio-config-0.8.5.jar"/>
-    <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="kafenio-icons-0.8.5.jar"/>
-    <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="rome-0.7.jar"/>
-    <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="werx-051405.jar"/>
-    <jar.sign srcdir="${target.jar}" destdir="${target.installed}" jar="xmlrpc-2.0.1.jar"/>
-    -->
+  	<copy todir="${target.installed}" preservelastmodified="true">
+      <fileset dir="${target.jar}">
+        <patternset refid="external.runtime.jars"/>
+        <patternset refid="internal.built.jars"/>
+      </fileset>
+    </copy> 		
+    <signjar
+          storepass="${keystore.pswd}"
+          alias="${keystore.alias}"
+          keystore="${keystore.file}"
+    	  preservelastmodified="true"
+          lazy="true">
+      <path>
+      	<fileset dir="${target.installed}">
+          <patternset refid="external.runtime.jars"/>
+          <patternset refid="internal.built.jars"/>
+        </fileset>
+      </path>
+    </signjar>
 
     <!-- Create a flag file used to determine whether the set of jars needs to be signed -->
     <touch file="${target.root}/.flagfile"/>

Modified: trunk/common/core.xml
===================================================================
--- trunk/common/core.xml	2007-06-22 17:37:41 UTC (rev 1429)
+++ trunk/common/core.xml	2007-06-22 19:00:55 UTC (rev 1430)
@@ -400,26 +400,6 @@
   </target>
 
   <!--=======================================================================
-    == This is merely syntatic sugar.
-    == Calls signjar for one jar file.
-    =========================================================================-->
-  <macrodef name="jar.sign" description="Signs a jar">
-    <attribute name="jar"/>
-    <attribute name="srcdir"/>
-    <attribute name="destdir"/>
-    <sequential>
-      <mkdir dir="@{destdir}"/>
-      <signjar
-            storepass="${keystore.pswd}"
-            alias="${keystore.alias}"
-            keystore="${keystore.file}"
-            keypass="${keystore.pswd}"
-            jar="@{srcdir}/@{jar}"
-            signedjar="@{destdir}/@{jar}"/>
-    </sequential>
-  </macrodef>
-
-  <!--=======================================================================
     == A keystore is needed to sign jars.
     == It does not need to be build very often and can be shared.
     =========================================================================-->

Modified: trunk/jsword-web/build.xml
===================================================================
--- trunk/jsword-web/build.xml	2007-06-22 17:37:41 UTC (rev 1429)
+++ trunk/jsword-web/build.xml	2007-06-22 19:00:55 UTC (rev 1430)
@@ -44,16 +44,6 @@
     <pathelement path="../bibledesktop/${target.classes}"/>
     <pathelement path="../jsword-web/${target.classes}"/>
   </path>
-  <patternset id="pattern.allclasses">
-    <include name="common/${target.classes}/**/*.class"/>
-    <include name="common-swing/${target.classes}/**/*.class"/>
-    <include name="jsword/${target.classes}/**/*.class"/>
-    <include name="bibledesktop/${target.classes}/**/*.class"/>
-    <include name="jsword-web/${target.classes}/**/*.class"/>
-  </patternset>
-  <fileset id="fileset.allclasses" dir="..">
-    <patternset refid="pattern.allclasses"/>
-  </fileset>
 
   <property name="support.tools" value="../jsword-support/tools"/>
   <import file="${support.tools}/checkstyle/build.xml"/>
@@ -89,8 +79,7 @@
   </target>
 
   <!--=======================================================================-->
-  <!-- <target name="tools" depends="java2html,checkstyle,javancss,findbugs,pmd,cpd,jdepend"/> -->
-  <target name="tools" depends="checkstyle,findbugs,pmd,cpd,jdepend"/>
+  <target name="tools" depends="java2html,checkstyle,javancss,findbugs,pmd,cpd,jdepend"/>
 
   <!--=======================================================================-->
   <target name="install"
@@ -107,7 +96,7 @@
   <target name="install.check">
     <uptodate property="release.uptodate"
         targetfile="${target.root}/.flagfile">
-      <srcfiles dir="${target.web}/WEB-INF/lib" includes="*"/>
+      <srcfiles dir="${target.jar}" includes="*"/>
     </uptodate>
     <echo message="release.uptodate result: ${release.uptodate}"/>
   </target>
@@ -197,12 +186,12 @@
     </tar>
     <!-- binary packages -->
     <zip zipfile="${directory}/jsword-${version}-bin.zip">
-      <zipfileset prefix="jsword-${version}" dir="${target.installed}"/>
+      <zipfileset prefix="jsword-${version}" dir="${target.installed}" excludes="BibleDesktop.app.zip"/>
     </zip>
     <tar tarfile="${directory}/jsword-${version}-bin.tar.gz" compression="gzip">
-      <tarfileset prefix="jsword-${version}" dir="${target.installed}"/>
+      <tarfileset prefix="jsword-${version}" dir="${target.installed}" excludes="BibleDesktop.app.zip"/>
     </tar>
-    <!-- documentation packages -->
+  	<!-- documentation packages -->
     <zip zipfile="${directory}/jsword-${version}-doc.zip">
       <zipfileset prefix="jsword-${version}" dir="${target.web}/api"/>
     </zip>