Changeset 12291

Timestamp:

12/06/09 12:07:23 (14 years ago)

Author:

Mark Evenson

Message:

Ant-based build process now records FASL source locations correctly.

Now we no longer copy the Lisp system sources to the build directory,
instead directly referring to the actual source location. As a
result, the FASLs now correctly record the location of the system
source files. This makes using SLIME to edit system source a lot
saner.

Specifying the JVM property 'abcl.home' now overrides the dynamic
lookup for 'boot.lisp' on the classpath of org.armedbear.lisp.Lisp for
setting the EXT::*LISP-HOME* property.

Location:

trunk/abcl

Files:

• build.xml (modified) (6 diffs)
• src/org/armedbear/lisp/Site.java (modified) (2 diffs)

trunk/abcl/build.xml

@@ -182 +182 @@
       <copy todir="${build.classes.dir}" preservelastmodified="yes">
   <fileset dir="${src.dir}">
-    <patternset refid="abcl.source.lisp"/>
+          <patternset refid="abcl.source.lisp.dist"/>
   </fileset>
       </copy>
@@ -203 +203 @@
     <target name="abcl.fasls.uptodate">
       <uptodate property="abcl.fasls.uptodate.p" value="true">
-  <srcfiles dir="${build.classes.dir}">
+  <srcfiles dir="${src.dir}">
     <patternset refid="abcl.source.lisp.fasls"/>
   </srcfiles>
-  <mapper type="glob" from="*.lisp" to="*.abcl"/>
+  <mapper type="glob" from="*.lisp" to="${build.classes.dir}/*.abcl"/>
       </uptodate>
     </target>
@@ -217 +217 @@
       failonerror="true"
       classname="org.armedbear.lisp.Main">
+        <jvmarg value="-Dabcl.home=${abcl.home.dir}"/>
   <arg value="--noinit"/>
   <arg value="--eval"/>
-  <arg value="(compile-system :zip nil :quit t)"/>
+  <arg value="(compile-system :zip nil :quit t :output-path (symbol-name (quote ${build.classes.dir}/org/armedbear/lisp/)))"/>
       </java>
     </target>
@@ -230 +231 @@
     </target>
 
+    <property name="abcl.home.dir"
+              value="${src.dir}/org/armedbear/lisp/"/>
     <property name="abcl.version.path"
         value="${build.classes.dir}/org/armedbear/lisp/version"/>
@@ -241 +244 @@
       outputproperty="abcl.version"
       classname="org.armedbear.lisp.Main"
-        logerror="yes"> <!-- Don't catch stderr output -->
+            logerror="yes"> <!-- Don't catch stderr output -->
+        <jvmarg value="-Dabcl.home=${abcl.home.dir}"/>
   <arg value="--noinit"/>
   <arg value="--noinform"/>
@@ -259 +263 @@
 
     <target name="abcl.jar.uptodate" depends="abcl.compile">
-      <uptodate property="abcl.jar.uptodate.p" targetfile="${abcl.jar.path}">
-  <srcfiles dir="${build.classes.dir}">
-    <patternset refid="abcl.objects"/>
-  </srcfiles>
+      <uptodate property="abcl.jar.upttodate.p" targetfile="${abcl.jar.path}">
+        <srcfiles dir="${build.classes.dir}">
+          <patternset refid="abcl.objects"/>
+        </srcfiles>
       </uptodate>
     </target>

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

@@ -40 +40 @@
 import java.net.URLDecoder;
 
+
 public final class Site
 {
@@ -45 +46 @@
 
     static {
-        String lispHome = null;
-        URL url = Lisp.class.getResource("boot.lisp");
-        if (url != null) {
-            String protocol = url.getProtocol();
-            if (protocol != null && protocol.equals("file")) {
-                String path = url.getPath();
-                try {
-                    path = URLDecoder.decode(path, "UTF-8");
-                }
-                catch (java.io.UnsupportedEncodingException uee) {
-                    // can't happen: Java implementations are required to
-                    // support UTF-8
-                }
-                int index = path.lastIndexOf('/');
-                if (index >= 0) {
-                    lispHome = path.substring(0, index + 1);
-                    if (Utilities.isPlatformWindows) {
-                        if (lispHome.length() > 0 && lispHome.charAt(0) == '/')
-                            lispHome = lispHome.substring(1);
+        String lispHome = System.getProperty("abcl.home");
+        if (lispHome == null) {
+            URL url = Lisp.class.getResource("boot.lisp");
+            if (url != null) {
+                String protocol = url.getProtocol();
+                if (protocol != null && protocol.equals("file")) {
+                    String path = url.getPath();
+                    try {
+                        path = URLDecoder.decode(path, "UTF-8");
+                    }
+                    catch (java.io.UnsupportedEncodingException uee) {
+                        // can't happen: Java implementations are required to
+                        // support UTF-8
+                    }
+                    int index = path.lastIndexOf('/');
+                    if (index >= 0) {
+                        lispHome = path.substring(0, index + 1);
+                        if (Utilities.isPlatformWindows) {
+                            if (lispHome.length() > 0 && lispHome.charAt(0) == '/')
+                                lispHome = lispHome.substring(1);
+                        }
                     }
                 }
             }
-        } else
-            lispHome = System.getProperty("abcl.home");
+        }
         LISP_HOME = lispHome;
     }