[Armedbear-cvs] r14673 - branches/1.3.1

[mevenson at common-lisp.net]

Author: mevenson
Date: Thu Apr 17 10:39:58 2014
New Revision: 14673

Log:
Backport r14662:  Place JVM options after classpath specification.

Under Windows (at least), one has to specifiy "-Djava.library.path=something"
after the -classpath option for it to have any effect.

Modified:
   branches/1.3.1/abcl.bat.in
   branches/1.3.1/abcl.in

Modified: branches/1.3.1/abcl.bat.in
==============================================================================
--- branches/1.3.1/abcl.bat.in	Thu Apr 17 10:39:12 2014	(r14672)
+++ branches/1.3.1/abcl.bat.in	Thu Apr 17 10:39:58 2014	(r14673)
@@ -1 +1 @@
-@"@JAVA@" @ABCL_JAVA_OPTIONS@ -cp "@ABCL_CLASSPATH@";"%CLASSPATH%"  org.armedbear.lisp.Main %1 %2 %3 %4 %5 %6 %7 %8 %9 
+@"@JAVA@" -cp "@ABCL_CLASSPATH@";"%CLASSPATH%" @ABCL_JAVA_OPTIONS@ org.armedbear.lisp.Main %1 %2 %3 %4 %5 %6 %7 %8 %9 

Modified: branches/1.3.1/abcl.in
==============================================================================
--- branches/1.3.1/abcl.in	Thu Apr 17 10:39:12 2014	(r14672)
+++ branches/1.3.1/abcl.in	Thu Apr 17 10:39:58 2014	(r14673)
@@ -19,8 +19,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-exec @JAVA@ @ABCL_JAVA_OPTIONS@ \
+exec @JAVA@ \
   -cp  @ABCL_CLASSPATH@:"$CLASSPATH" \
+  @ABCL_JAVA_OPTIONS@ \
   org.armedbear.lisp.Main \
   "$@"