Author: pbr
Date: 2007-10-24 13:20:12 -0700 (Wed, 24 Oct 2007)
New Revision: 6994
Modified:
openlaszlo/branches/wafflecone/WEB-INF/lps/server/bin/lzc.bat
openlaszlo/branches/wafflecone/WEB-INF/lps/server/bin/lzdc.bat
openlaszlo/branches/wafflecone/WEB-INF/lps/server/bin/lzmc.bat
Log:
Change 20071024-Philip-4 by [EMAIL PROTECTED] on 2007-10-24 14:28:49 EDT
in /cygdrive/f/laszlo/svn/src/svn/openlaszlo/branches/wafflecone
for http://svn.openlaszlo.org/openlaszlo/branches/wafflecone
Summary: Pass arguments intact to Windows scripts
New Features:
Bugs Fixed: LPP-4142, LPP-2593, LPP-1636
Technical Reviewer: ptw
QA Reviewer: (pending)
Doc Reviewer: (pending)
Documentation:
Release Notes:
Details:
Merge r6736 from trunk to wafflecone.
Arguments were not being transferred intact to java. The old scripts used
%1,%2,... to refer to arguments. However, Windows thinks that
--runtime=swf7 is two argument, "--runtime" and "swf7". The only fix I found is
to pass the arguments intact using %*.
I verified that these files are identical between trunk and wafflecone.
Tests:
lzc,lzdc,lzmc pass arguments the same way. Tested on lzc. From the windows
command prompt:
- lzc --runtime=swf8 testfile.lzx
This command should product a file testfile.lzr=swf8.swf
- lzc "--runtime=swf8" testfile.lzx
This should work the same as the first case. This makes sure that people that
are already escaping the argument can continue to do so.
Files:
M WEB-INF/lps/server/bin/lzc.bat
M WEB-INF/lps/server/bin/lzdc.bat
M WEB-INF/lps/server/bin/lzmc.bat
Changeset: http://svn.openlaszlo.org/openlaszlo/patches/20071024-Philip-4.tar
Modified: openlaszlo/branches/wafflecone/WEB-INF/lps/server/bin/lzc.bat
===================================================================
--- openlaszlo/branches/wafflecone/WEB-INF/lps/server/bin/lzc.bat
2007-10-24 20:09:32 UTC (rev 6993)
+++ openlaszlo/branches/wafflecone/WEB-INF/lps/server/bin/lzc.bat
2007-10-24 20:20:12 UTC (rev 6994)
@@ -3,7 +3,7 @@
REM lzc.bat - Bash script to run laszlo compiler.
REM
REM * R_LZ_COPYRIGHT_BEGIN ***************************************************
-REM * Copyright 2001-2005 Laszlo Systems, Inc. All Rights Reserved. *
+REM * Copyright 2001-2007 Laszlo Systems, Inc. All Rights Reserved. *
REM * Use is subject to license terms. *
REM * R_LZ_COPYRIGHT_END *****************************************************
@@ -11,5 +11,5 @@
set CLASSPATH_SAVE=%CLASSPATH%
set CLASSPATH=%LZCP%
-%JAVA_HOME%\bin\java %JAVA_OPTS% -DLPS_HOME="%LPS_HOME%"
org.openlaszlo.compiler.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
+"%JAVA_HOME%\bin\java" %JAVA_OPTS% -DLPS_HOME="%LPS_HOME%"
org.openlaszlo.compiler.Main %*
set CLASSPATH=%CLASSPATH_SAVE%
Modified: openlaszlo/branches/wafflecone/WEB-INF/lps/server/bin/lzdc.bat
===================================================================
--- openlaszlo/branches/wafflecone/WEB-INF/lps/server/bin/lzdc.bat
2007-10-24 20:09:32 UTC (rev 6993)
+++ openlaszlo/branches/wafflecone/WEB-INF/lps/server/bin/lzdc.bat
2007-10-24 20:20:12 UTC (rev 6994)
@@ -3,7 +3,7 @@
REM lzc.bat - Bash script to run laszlo compiler.
REM
REM * R_LZ_COPYRIGHT_BEGIN ***************************************************
-REM * Copyright 2001-2005 Laszlo Systems, Inc. All Rights Reserved. *
+REM * Copyright 2001-2007 Laszlo Systems, Inc. All Rights Reserved. *
REM * Use is subject to license terms. *
REM * R_LZ_COPYRIGHT_END *****************************************************
@@ -11,5 +11,5 @@
set CLASSPATH_SAVE=%CLASSPATH%
set CLASSPATH=%LZCP%
-%JAVA_HOME%\bin\java %JAVA_OPTS% -DLPS_HOME="%LPS_HOME%"
org.openlaszlo.xml.internal.Main %1 %2 %3 %4 %5 %6 %7 %8 %9 %a%
+"%JAVA_HOME%\bin\java" %JAVA_OPTS% -DLPS_HOME="%LPS_HOME%"
org.openlaszlo.xml.internal.Main %* %a%
set CLASSPATH=%CLASSPATH_SAVE%
Modified: openlaszlo/branches/wafflecone/WEB-INF/lps/server/bin/lzmc.bat
===================================================================
--- openlaszlo/branches/wafflecone/WEB-INF/lps/server/bin/lzmc.bat
2007-10-24 20:09:32 UTC (rev 6993)
+++ openlaszlo/branches/wafflecone/WEB-INF/lps/server/bin/lzmc.bat
2007-10-24 20:20:12 UTC (rev 6994)
@@ -3,7 +3,7 @@
REM lzc.bat - Bash script to run laszlo compiler.
REM
REM * R_LZ_COPYRIGHT_BEGIN ***************************************************
-REM * Copyright 2001-2005 Laszlo Systems, Inc. All Rights Reserved. *
+REM * Copyright 2001-2007 Laszlo Systems, Inc. All Rights Reserved. *
REM * Use is subject to license terms. *
REM * R_LZ_COPYRIGHT_END *****************************************************
@@ -11,5 +11,5 @@
set CLASSPATH_SAVE=%CLASSPATH%
set CLASSPATH=%LZCP%
-%JAVA_HOME%\bin\java %JAVA_OPTS% -DLPS_HOME="%LPS_HOME%"
org.openlaszlo.media.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
+"%JAVA_HOME%\bin\java" %JAVA_OPTS% -DLPS_HOME="%LPS_HOME%"
org.openlaszlo.media.Main %*
set CLASSPATH=%CLASSPATH_SAVE%
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
