Changeset 12684 for branches/0.20.x

Timestamp:

05/15/10 16:33:15 (14 years ago)

Author:

Mark Evenson

Message:

Backport r1267[14]: Site specific initialization code can be named by 'abcl.startup.file'.

Builds of ABCL can now be customized with "site specific" startup code
by setting the Ant property 'abcl.startup.file' to the path of a file
containing the custom code. This code is merged into 'system.lisp'
which is loaded during the boot process.

Location:

branches/0.20.x/abcl

Files:

• abcl.properties.in (modified) (1 diff)
• build.xml (modified) (4 diffs)

branches/0.20.x/abcl/abcl.properties.in

@@ -12 +12 @@
 # java.options sets the Java options in the abcl wrapper scripts
 #java.options=-Xmx1g
+
+# Additional site specific startup code to be merged in 'system.lisp'
+#abcl.startup.file=${basedir}/startup.lisp

branches/0.20.x/abcl/build.xml

@@ -102 +102 @@
       <echo>Compiled ABCL with Java version: ${java.version}</echo>
     </target>
-    
+
     <target name="abcl.clean.maybe" unless="abcl.build.incremental">
       <echo>Cleaning all intermediate compilation artifacts.</echo>
@@ -224 +224 @@
           location="${build.classes.dir}/org/armedbear/lisp/"/>
     <pathconvert dirsep="/" property="abcl.lisp.output" refid="abcl.lisp.output.path"/>
+
+    <property name="system.lisp.file" 
+              value="${build.classes.dir}/org/armedbear/lisp/system.lisp"/>
     
     <target name="abcl.compile.lisp" 
-      depends="abcl.copy.lisp,abcl.compile.java,abcl.fasls.uptodate"
+      depends="abcl.copy.lisp,abcl.compile.java,abcl.system.update.maybe,abcl.fasls.uptodate"
       unless="abcl.fasls.uptodate.p">
       <echo>
@@ -242 +245 @@
         <arg value="(setf *load-verbose* t)"/>
       </java>
+      <concat destfile="${system.lisp.file}" append="true">
+        <fileset file="${abcl.startup.file}"/>
+      </concat>
     </target>
 
@@ -270 +276 @@
       <exec executable="hostname" outputproperty="abcl.hostname"/>
       <echo>abcl.hostname: ${abcl.hostname}</echo>
+    </target>
+
+    <target name="abcl.system.uptodate">
+      <uptodate property="abcl.system.needs-update.p" 
+                srcfile="${system.lisp.file}"
+                targetfile="${abcl.startup.file}"/>
+    </target>
+    
+    <target name="abcl.system.update.maybe" depends="abcl.system.uptodate" if="abcl.system.needs-update.p">
+      <touch file="${src.dir}/org/armedbear/lisp/compile-system.lisp"/>
     </target>