[FOray-commit] SF.net SVN: foray: [7750] trunk/foray/scripts/build.xml

[<vic...@us...>]

Revision: 7750
Author:   victormote
Date:     2006-06-30 17:45:29 -0700 (Fri, 30 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7750&view=rev

Log Message:
-----------
Tag the jar file name with the word "subset" if it is not a full build.

Modified Paths:
--------------
    trunk/foray/scripts/build.xml
Modified: trunk/foray/scripts/build.xml
===================================================================
--- trunk/foray/scripts/build.xml	2006-07-01 00:15:18 UTC (rev 7749)
+++ trunk/foray/scripts/build.xml	2006-07-01 00:45:29 UTC (rev 7750)
@@ -46,10 +46,6 @@
     <property name="src.dir" value="${foray.home}/src"/>
     <property name="build.dir" value="${foray.home}/build"/>
     <property name="version" value="0.2b1"/>
-    <property name="module.jar.name" value="${name}-modules-${version}.jar"/>
-    <property name="module.jar.path" value="${build.dir}/${module.jar.name}"/>
-    <property name="app.jar.name" value="${name}-${version}.jar"/>
-    <property name="app.jar.path" value="${build.dir}/${app.jar.name}"/>
     <property name="build.javadoc.api" value="${build.dir}/javadoc/api"/>
     <property name="build.javadoc.full" value="${build.dir}/javadoc/full"/>
   </target>
@@ -84,8 +80,7 @@
   <!-- =================================================================== -->
   <!-- Compiles all modules                                                -->
   <!-- =================================================================== -->
-  <target name="all-modules" depends="prepare, pretty, ps, graphic,
-      mif, font, hyphen, text, pdf, fotree, areatree, pioneer, render, core"/>
+  <target name="all-modules" depends="app"/>
 
   <!-- =================================================================== -->
   <!-- Compiles all modules and packages them in a jar file                -->
@@ -98,8 +93,14 @@
   <!-- =================================================================== -->
   <target name="package" depends="module-list"
       description="Generates a jar file for whatever targets have been built.">
-    <echo message="Creating the jar file ${module.jar.name}"/>
 
+    <!-- If the "app" target has been run, file.subset = "". In all other
+    cases, we are creating some subset. -->
+    <property name="file.subset" value="-subset"/>
+    <property name="app.jar.name" value="${name}-${version}${file.subset}.jar"/>
+    <property name="app.jar.path" value="${build.dir}/${app.jar.name}"/>
+    <echo message="Creating the jar file ${app.jar.name}"/>
+
     <tstamp>
       <format property="ts" pattern="yyyyMMdd-HHmmss-z"/>
     </tstamp>
@@ -760,6 +761,20 @@
   </target>
 
   <!-- ===================================================================
+       Build the App module (unadvertised)
+       =================================================================== -->
+  <target name="app" depends="prepare, pretty, ps, graphic, mif, font, hyphen,
+      text, pdf, fotree, areatree, pioneer, render, core">
+    <property name="module.app" value=", app"/>
+    <property name="file.subset" value=""/>
+    <ant antfile="${foray.home}/foray-app/scripts/build.xml"
+        inheritall="false"
+        target="package">
+      <property name="foray.config" value="${foray.config}"/>
+    </ant>
+  </target>
+
+  <!-- ===================================================================
        Create list of modules built. This list is included in the jar
        manifest. (unadvertised)
        =================================================================== -->
@@ -783,6 +798,7 @@
     <property name="module.pioneer" value=""/>
     <property name="module.render" value=""/>
     <property name="module.core" value=""/>
+    <property name="module.app" value=""/>
 
     <!-- Subgroupings (for readability here only) -->
     <property name="module.list1"
@@ -793,10 +809,12 @@
       value="${module.pdf}${module.fotree}${module.areatree}${module.output}"/>
     <property name="module.list4"
       value="${module.layout}${module.pioneer}${module.render}${module.core}"/>
+    <property name="module.list5"
+      value="${module.app}"/>
 
     <!-- Now group them all together. -->
-    <property name="module.list"
-      value="${module.list1}${module.list2}${module.list3}${module.list4}"/>
+    <property name="module.list" value=
+"${module.list1}${module.list2}${module.list3}${module.list4}${module.list5}"/>
   </target>
 
 </project>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.