Changeset 12405

Timestamp:

01/28/10 08:49:36 (11 years ago)

Author:

Mark Evenson

Message:

Don't invoke the entire ABCL runtime just to get the version number during compilation.

Location:

trunk/abcl

Files:

• build.xml (modified) (1 diff)
• src/org/armedbear/lisp/Version.java (modified) (1 diff)

trunk/abcl/build.xml

@@ -271 +271 @@
     <property name="abcl.version.path"
         value="${build.classes.dir}/org/armedbear/lisp/version"/>
-    <target name="abcl.stamp.version" depends="abcl.compile"  unless="abcl.compile.lisp.skip">
-      <!-- Determine which ABCL version we have just built by parsing
-           the output of LISP-IMPLEMENTATION-VERSION. -->
-      <!-- TODO As an optimization, we could possibly compare the timestamp
-      of 'abcl.version.path' vs. org.armedbear.lisp.Version -->
+    <target name="abcl.stamp.version" depends="abcl.compile.java"  >
       <java fork="true"
       classpath="${build.classes.dir}"
       outputproperty="abcl.version"
-      classname="org.armedbear.lisp.Main"
-            logerror="yes"> <!-- Don't catch stderr output -->
-        <jvmarg value="-Dabcl.home=${abcl.home.dir}"/>
-  <arg value="--noinit"/>
-  <arg value="--noinform"/>
-  <arg value="--eval"/>
-  <arg value="(progn (format t (lisp-implementation-version)) (finish-output) (quit))"/>
-      </java>
-
-      <echo>Built ABCL version: ${abcl.version}</echo>
+      classname="org.armedbear.lisp.Version"
+            logerror="yes"/> <!-- Don't catch stderr output -->
+
+      <echo>ABCL version: ${abcl.version}</echo>
       <mkdir dir="${abcl.version.path}/.."/>
       <echo message="${abcl.version}" file="${abcl.version.path}"/> 

trunk/abcl/src/org/armedbear/lisp/Version.java

@@ -44 +44 @@
     return "0.19.0-dev";
   }
+  
+  public static void main(String args[]) {
+    System.out.println(Version.getVersion());
+  }
 }