Changeset 12026

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:

• abcl.bat.in (modified) (1 diff)
• abcl.in (modified) (1 diff)
• build.xml (modified) (3 diffs)

trunk/abcl/abcl.bat.in

@@ -1 @@
-@"@JAVA@" @ABCL_JAVA_OPTIONS@ -jar "@ABCL_CLASSPATH@" %1 %2 %3 %4 %5 %6 %7 %8 %9
+@"@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

@@ -20 +20 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-exec @JAVA@ @ABCL_JAVA_OPTIONS@ -jar @ABCL_CLASSPATH@ "$@"
+exec @JAVA@ @ABCL_JAVA_OPTIONS@ \
+  -cp  @ABCL_CLASSPATH@ \
+  org.armedbear.lisp.Main \
+  "$@"
+

trunk/abcl/build.xml

@@ -183 +183 @@
          Ant 'uptodate' task to check if we need to compile the system
          fasls.  Highly inter-dependent with the behavior specified in
-         'compile-system.lisp'.-->
+         'compile-system.lisp', i.e. files not listed in
+         there should NOT occur here. -->
     <patternset id="abcl.source.lisp.fasls">
       <patternset refid="abcl.source.lisp"/>
-      <exclude name="org/armedbear/lisp/tests/*.lisp"/>
+      <exclude name="org/armedbear/lisp/scripting/**/*.lisp"/>
       <exclude name="org/armedbear/lisp/boot.lisp"/>
       <exclude name="org/armedbear/lisp/emacs.lisp"/>
@@ -302 +303 @@
       value="${java.path}"/>
     <filter token="ABCL_JAVA_OPTIONS" 
-      value= "${java.options}"/>
-    <filter token="ABCL_LIBPATH" 
-      value="${basedir}/src/org/armedbear/lisp/libabcl.so"/>
-    <filter token="ABCL_CLASSPATH" 
+      value="${java.options}"/>
+    <filter token="ABCL_CLASSPATH"
       value="${toString:abcl.runtime.classpath}"/>
   </filterset>
@@ -333 +332 @@
       value="-agentlib:jdwp=transport=dt_socket,address=6789,server=y"/>
       </java>
+      <echo>JPDA listening on localhost:6789</echo>
     </target>