Changeset 12684


Ignore:
Timestamp:
05/15/10 16:33:15 (12 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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/0.20.x/abcl/abcl.properties.in

    r12543 r12684  
    1212# java.options sets the Java options in the abcl wrapper scripts
    1313#java.options=-Xmx1g
     14
     15# Additional site specific startup code to be merged in 'system.lisp'
     16#abcl.startup.file=${basedir}/startup.lisp
  • branches/0.20.x/abcl/build.xml

    r12659 r12684  
    102102      <echo>Compiled ABCL with Java version: ${java.version}</echo>
    103103    </target>
    104    
     104
    105105    <target name="abcl.clean.maybe" unless="abcl.build.incremental">
    106106      <echo>Cleaning all intermediate compilation artifacts.</echo>
     
    224224          location="${build.classes.dir}/org/armedbear/lisp/"/>
    225225    <pathconvert dirsep="/" property="abcl.lisp.output" refid="abcl.lisp.output.path"/>
     226
     227    <property name="system.lisp.file"
     228              value="${build.classes.dir}/org/armedbear/lisp/system.lisp"/>
    226229   
    227230    <target name="abcl.compile.lisp"
    228       depends="abcl.copy.lisp,abcl.compile.java,abcl.fasls.uptodate"
     231      depends="abcl.copy.lisp,abcl.compile.java,abcl.system.update.maybe,abcl.fasls.uptodate"
    229232      unless="abcl.fasls.uptodate.p">
    230233      <echo>
     
    242245        <arg value="(setf *load-verbose* t)"/>
    243246      </java>
     247      <concat destfile="${system.lisp.file}" append="true">
     248        <fileset file="${abcl.startup.file}"/>
     249      </concat>
    244250    </target>
    245251
     
    270276      <exec executable="hostname" outputproperty="abcl.hostname"/>
    271277      <echo>abcl.hostname: ${abcl.hostname}</echo>
     278    </target>
     279
     280    <target name="abcl.system.uptodate">
     281      <uptodate property="abcl.system.needs-update.p"
     282                srcfile="${system.lisp.file}"
     283                targetfile="${abcl.startup.file}"/>
     284    </target>
     285   
     286    <target name="abcl.system.update.maybe" depends="abcl.system.uptodate" if="abcl.system.needs-update.p">
     287      <touch file="${src.dir}/org/armedbear/lisp/compile-system.lisp"/>
    272288    </target>
    273289
Note: See TracChangeset for help on using the changeset viewer.