Changeset 12026


Ignore:
Timestamp:
07/02/09 13:54:00 (14 years ago)
Author:
Mark Evenson
Message:

Restore use of 'additional.jars' Ant build property to include additional jars at runtime.

'-cp' and '-jar' are mutually incompatible options to invoking the
JVM, although not documented consistently as such. We restore the
previous wrapper scripts to restore the usage of the Ant build
property 'additional.jars' to include additional JAR files at runtime.

Fix Ant uptodate target by excluding org/armedbear/scripting//*.lisp
files from abcl.source.lisp.fasls. Essentially this patternset has to
match the files compiled by compile-system.lisp, or you will end up
invoking the Lisp compilation process each time.

Location:
trunk/abcl
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/abcl.bat.in

    r11752 r12026  
    1 @"@JAVA@" @ABCL_JAVA_OPTIONS@ -jar "@ABCL_CLASSPATH@" %1 %2 %3 %4 %5 %6 %7 %8 %9
     1@"@JAVA@" @ABCL_JAVA_OPTIONS@ @ABCL_JAVA_OPTIONS@ -cp @ABCL_CLASSPATH@  org.armedbear.lisp.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
  • trunk/abcl/abcl.in

    r11752 r12026  
    2020# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    2121
    22 exec @JAVA@ @ABCL_JAVA_OPTIONS@ -jar @ABCL_CLASSPATH@ "$@"
     22exec @JAVA@ @ABCL_JAVA_OPTIONS@ \
     23  -cp  @ABCL_CLASSPATH@ \
     24  org.armedbear.lisp.Main \
     25  "$@"
     26
  • trunk/abcl/build.xml

    r12025 r12026  
    183183         Ant 'uptodate' task to check if we need to compile the system
    184184         fasls.  Highly inter-dependent with the behavior specified in
    185          'compile-system.lisp'.-->
     185         'compile-system.lisp', i.e. files not listed in
     186         there should NOT occur here. -->
    186187    <patternset id="abcl.source.lisp.fasls">
    187188      <patternset refid="abcl.source.lisp"/>
    188       <exclude name="org/armedbear/lisp/tests/*.lisp"/>
     189      <exclude name="org/armedbear/lisp/scripting/**/*.lisp"/>
    189190      <exclude name="org/armedbear/lisp/boot.lisp"/>
    190191      <exclude name="org/armedbear/lisp/emacs.lisp"/>
     
    302303      value="${java.path}"/>
    303304    <filter token="ABCL_JAVA_OPTIONS"
    304       value= "${java.options}"/>
    305     <filter token="ABCL_LIBPATH"
    306       value="${basedir}/src/org/armedbear/lisp/libabcl.so"/>
    307     <filter token="ABCL_CLASSPATH"
     305      value="${java.options}"/>
     306    <filter token="ABCL_CLASSPATH"
    308307      value="${toString:abcl.runtime.classpath}"/>
    309308  </filterset>
     
    333332      value="-agentlib:jdwp=transport=dt_socket,address=6789,server=y"/>
    334333      </java>
     334      <echo>JPDA listening on localhost:6789</echo>
    335335    </target>
    336336
Note: See TracChangeset for help on using the changeset viewer.