Changeset 351 for trunk/build.xml

Timestamp:

10/08/08 10:39:43 (16 years ago)

Author:

bjn8

Message:

Fixed build issues with new expeditee packages.

File:

• trunk/build.xml (modified) (7 diffs)

trunk/build.xml

@@ -13 +13 @@
 <project name="Expeditee" default="fresh_dist_exp">
         
-        <property name="sourcelevel" value="1.5" />
-        <property name="targetlevel" value="1.5" />
+        <property name="sourcelevel" value="1.6" />
+        <property name="targetlevel" value="1.6" />
+        
+        <property name="resources.dir.apollo" location="resources_apollo" /> <!-- resources files for apollo -->
 
         <property name="src.dir.exp" location="src" /> <!-- source files for expeditee -->
@@ -21 +23 @@
         <property name="build.dir" location="bin" /> <!-- compiled class files directory -->
         
-        <property name="lib.dir.exp" location="releases/jars" /> <!-- external dependencies -->
+        <property name="lib.dir.exp" location="jars" /> <!-- external dependencies -->
         <property name="lib.dir.apollo" location="jars_apollo" /> <!-- external dependencies -->
         
@@ -27 +29 @@
         <property name="dist.dir.apollo" location="releases/apollo" /> <!-- Put the output jar file into the same directory as the others. The manifest file needs to be edited with relative dependencies if another directory structure is desired. -->
         
+        <property name="dist.filename.exp" value="Expeditee.jar" /> 
+        <property name="dist.filename.apollo" value="Apollo_jvm${targetlevel}${TODAY}.jar" />
         
-        <property name="dist.filename.exp" value="Expeditee.jar" /> 
-        <property name="dist.filename.apollo" value="Apollo_jvm${targetlevel}.jar" />
-                        
         <property name="manifest.path.exp"  value="makeFiles/Manifest.txt" />
-        <property name="manifest.path.apollo" value="${lib.dir.apollo}/dist_manifest.mf" />
-                
-        <property name="resources.dir.apollo" location="resources_apollo" /> <!-- resources files for apollo -->
-                
+        <property name="manifest.path.apollo" value="makeFiles/apollo_manifest.mf" />
 
         <path id="classpath.exp">
@@ -41 +39 @@
                 <fileset dir="${lib.dir.exp}">
                         <include name="*.jar" />
+                        <exclude name="jnmp2p.jar"/> <!-- This is a zero-sized file! Its totally invalid and will fail any builds - omitting !-->
+                        <exclude name="jxta.jar"/> <!-- Ditto !-->
                 </fileset>
         </path>
@@ -48 +48 @@
                 <fileset dir="${lib.dir.exp}">
                         <include name="*.jar" />
+                        <exclude name="jnmp2p.jar"/> <!-- This is a zero-sized file! Its totally invalid and will fail any builds - omitting !-->
+                        <exclude name="jxta.jar"/> <!-- Ditto !-->
                 </fileset>
                 <fileset dir="${lib.dir.apollo}">
@@ -82 +84 @@
                                 target="${targetlevel}" 
                                 compiler="modern" 
+                                excludes="org/expeditee/items/widgets/charts/**"
                                 listfiles="true">
                         <classpath refid="classpath.exp" />
@@ -113 +116 @@
         
         <target name="lazy_dist_apollo" depends="compile_apollo" description="Warning: Does not clean before compile.">
-          <jar destfile="${dist.dir.apollo}/${dist.filename.apollo}" manifest="${manifest.path.apollo}">
+                <jar destfile="${dist.dir.apollo}/${dist.filename.apollo}" manifest="${manifest.path.apollo}">
             <fileset dir="${build.dir}"/>
                         <fileset dir="${resources.dir.apollo}"/>
-      </jar>  
+        </jar>  
         </target>