[Xulu-commits] r19 - in trunk: . defaults dist

[scm-commit@wald.intevation.org]

Author: mojays
Date: 2009-03-02 15:56:39 +0100 (Mon, 02 Mar 2009)
New Revision: 19

Modified:
   trunk/build.xml
   trunk/defaults/.classpath
   trunk/dist/xulu-doc.zip
   trunk/dist/xulu-src.zip
   trunk/dist/xulu.jar
Log:
build.xml: new option "extJar" to create an extended JAR (including resource/icons and /resource/locales)


Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2009-02-28 14:17:27 UTC (rev 18)
+++ trunk/build.xml	2009-03-02 14:56:39 UTC (rev 19)
@@ -3,12 +3,15 @@
 
      Option "jar"     -> a JAR from the existing binaries expected in folder
                          "classes" plus a ZIP of the JAR
+     Option "extJar"  -> Option "jar"
+                         + folder "resource/icons" in JAR
+                         + folder "resource/locales" in JAR
      Option "src"     -> a ZIP of the source code in folder "src"
      Option "javadoc" -> a JavaDoc in folder "javadoc" plus a ZIP of
                          this folder
      Option "all"     -> all of the upper mentioned options
      Option "basic"   -> only "jar" and "src"
-     
+          
      The default option is "basic"
 -->
 <project default="basic" basedir=".">
@@ -29,6 +32,10 @@
 	<property name="DIR.CLASSES"      value="classes"/>
     <property name="FILE.JAR"         value="${DEST.DIR}/${PROJECT.PREFIX}.jar"/>
 	<property name="FILE.JAR.ZIP"     value="${FILE.JAR}.zip"/>
+	<!-- Informations for extended JAR -->
+    <property name="FILE.EXT.JAR"     value="${DEST.DIR}/${PROJECT.PREFIX}-ext.jar"/>
+	<property name="DIR.RESOURCE"     value="resource"/>
+
 	
 	<!-- Destination for JavaDoc and its ZIP -->
 	<property name="DIR.JAVADOC"      value="javadoc"/>
@@ -70,6 +77,27 @@
 		</zip>
 	</target>
 	
+	<!-- ##############  Create an extended JAR from "classes" ############## -->
+	<!-- ## besides the classes, this JAR includes the XULU folders
+	     ##  - resource/icons
+	     ##  - resource/locales
+	     #################################################################### -->
+	<target name="extJar">
+		<!-- Create JAR and source ZIP -->
+		<antcall target="jar"/>
+		<!-- Copy JAR to "..-ext.jar" -->
+		<copy file="${FILE.JAR}" tofile="${FILE.EXT.JAR}" overwrite="true" />
+		<!-- Update the JAR with the extended folders -->
+		<jar destfile="${FILE.EXT.JAR}" update="true" index="false" level="8" duplicate="preserve">
+			<fileset dir="${DIR.RESOURCE}">
+				<exclude name="unused**" />
+				<exclude name="**/.svn" />
+				<exclude name="**/*.xcf" />
+				<exclude name="**/Thumbs.db" />
+			</fileset>
+		</jar>
+	</target>
+
 	<!-- ##############  Create a ZIP from "src" folder  ############## -->
 	<target name="src">
 		<!-- Create a ZIP from "src" folder -->

Modified: trunk/defaults/.classpath
===================================================================
--- trunk/defaults/.classpath	2009-02-28 14:17:27 UTC (rev 18)
+++ trunk/defaults/.classpath	2009-03-02 14:56:39 UTC (rev 19)
@@ -44,5 +44,10 @@
 	<classpathentry kind="lib" path="lib/log4j-1.2.14/log4j-1.2.14.jar"/>
 	<classpathentry kind="lib" path="lib/jini/lib/tools.jar"/>
 	<classpathentry kind="lib" path="lib/jini/lib/jini-ext.jar"/>
+	<classpathentry kind="lib" path="lib/jai-1_1_3/lib/clibwrapper_jiio.jar"/>
+	<classpathentry kind="lib" path="lib/jai-1_1_3/lib/jai_codec.jar"/>
+	<classpathentry kind="lib" path="lib/jai-1_1_3/lib/jai_core.jar"/>
+	<classpathentry kind="lib" path="lib/jai-1_1_3/lib/jai_imageio.jar"/>
+	<classpathentry kind="lib" path="lib/jai-1_1_3/lib/mlibwrapper_jai.jar"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>

Modified: trunk/dist/xulu-doc.zip
===================================================================
(Binary files differ)

Modified: trunk/dist/xulu-src.zip
===================================================================
(Binary files differ)

Modified: trunk/dist/xulu.jar
===================================================================
(Binary files differ)