Changeset 15082

Timestamp:

06/11/17 10:44:37 (6 years ago)

Author:

Mark Evenson

Message:

Fix the Ant build; redid source distribution with this change

Location:

trunk/abcl

Files:

• build.xml (modified) (4 diffs)
• etc/ant/build-snapshot.xml (modified) (2 diffs)

trunk/abcl/build.xml

@@ -218 +218 @@
       <include name="build.xml"/>
       <include name="abcl.properties.in"/> <!--TODO: massage into abcl.properties at build-time -->
-      <include name="abcl.bat"/>
+      <include name="abcl.in"/>
       <include name="abcl.bat.in"/>
+      <include name="etc/ant/*.xml"/>
     </patternset>
 
@@ -509 +510 @@
     </target>
 
-    <target name="abcl-aio.jar" depends="abcl.compile,abcl.version">
+    <target name="abcl-aio.jar" depends="abcl.compile,abcl.stamp">
       <mkdir dir="${dist.dir}"/>
       <jar destfile="${abcl-aio.jar.path}"
@@ -766 +767 @@
       <include name="customizations.lisp.in"/>
 
+      <include name="etc/ant/*.xml"/>
+
     </patternset>
 
@@ -777 +780 @@
     </patternset>
 
-    <target name="abcl.source.prepare" depends="abcl.stamp.version">
+    <target name="abcl.source.prepare" depends="abcl.stamp">
       <property name="abcl.build.src.dir"
                 value="${build.dir}/abcl-src-${abcl.version}"/>

trunk/abcl/etc/ant/build-snapshot.xml

@@ -2 +2 @@
 
 <target name="abcl.snapshot" 
-        depends="abcl.release,abcl.diagnostic,abcl.version,abcl"
+        depends="abcl.release,abcl.diagnostic,abcl"
         description="Introspect and dump the current build and
   (presumed ) runtime targets as binary executable JVM objects.">
@@ -22 +22 @@
 </target>
 
-<target name="abcl.version" depends="abcl.stamp,abcl.version.hg"/>
+<!-- <target name="abcl.version" depends="abcl.stamp,abcl.version.hg"/> -->
 
 <!-- Introspect for other versioning systems if we haven't determined an upstream SVN version -->