Author: helder
Date: Mon Jul 30 00:54:15 2012
New Revision: 1366972
URL: http://svn.apache.org/viewvc?rev=1366972&view=rev
Log:
Bug fix:
Fix quoting in Windows-related build infrastructure
(affecting at least paths related with JAVA_HOME and FORREST_HOME);
(allows setting required environment variables more naturally - without
using 8.3 filenames or quotes);
(eases using JDK 6 and above, as the default install directory is now
within %ProgramFiles%).
Modified:
xmlgraphics/batik/trunk/build.bat
xmlgraphics/batik/trunk/build.xml
xmlgraphics/batik/trunk/contrib/rasterizertask/build.bat
Modified: xmlgraphics/batik/trunk/build.bat
URL:
http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/build.bat?rev=1366972&r1=1366971&r2=1366972&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/build.bat (original)
+++ xmlgraphics/batik/trunk/build.bat Mon Jul 30 00:54:15 2012
@@ -33,18 +33,18 @@ if not "%ANT_HOME%" == "" goto gotAntHom
:: ----- Set Up The Runtime Classpath -----------------------------------------
-set
CP="%JAVA_HOME%"\lib\tools.jar;.\lib\build\ant-1.6.5.jar;.\lib\build\ant-launcher-1.6.5.jar;.\lib\build\crimson-1.1.3.jar
+set
CP="%JAVA_HOME%\lib\tools.jar";.\lib\build\ant-1.6.5.jar;.\lib\build\ant-launcher-1.6.5.jar;.\lib\build\crimson-1.1.3.jar
:: If Forrest is present, add the ForrestBot dependency jars to the classpath.
if "%FORREST_HOME%" == "" goto forrestNotPresent
-for %%f in ("%FORREST_HOME%"\tools\forrestbot\lib\*.jar) do set CP=%CP%;%%f
+for %%f in ("%FORREST_HOME%\tools\forrestbot\lib\*.jar") do set CP=%CP%;"%%f"
:forrestNotPresent
:: ----- Execute The Requested Build ------------------------------------------
-echo "%JAVA_HOME%"\bin\java.exe %ANT_OPTS% -classpath %CP%
org.apache.tools.ant.Main -emacs -Dant.home=. %1 -Dargs="%2 %3 %4 %5 %6 %7 %8
%9"
-"%JAVA_HOME%"\bin\java.exe %ANT_OPTS% -classpath %CP%
org.apache.tools.ant.Main -emacs -Dant.home=. %1 -Dargs="%2 %3 %4 %5 %6 %7 %8
%9"
+echo "%JAVA_HOME%\bin\java.exe" %ANT_OPTS% -classpath %CP%
org.apache.tools.ant.Main -emacs -Dant.home=. %1 -Dargs="%2 %3 %4 %5 %6 %7 %8
%9"
+"%JAVA_HOME%\bin\java.exe" %ANT_OPTS% -classpath %CP%
org.apache.tools.ant.Main -emacs -Dant.home=. %1 -Dargs="%2 %3 %4 %5 %6 %7 %8
%9"
:: ----- Cleanup the environment ----------------------------------------------
Modified: xmlgraphics/batik/trunk/build.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/build.xml?rev=1366972&r1=1366971&r2=1366972&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/build.xml (original)
+++ xmlgraphics/batik/trunk/build.xml Mon Jul 30 00:54:15 2012
@@ -222,7 +222,7 @@ To display the available targets type:
<os family="windows"/>
</condition>
- <condition property="forrest.args" value="/c
${env.FORREST_HOME}\bin\forrest.bat" else="">
+ <condition property="forrest.args" value="/c
"${env.FORREST_HOME}\bin\forrest.bat"" else="">
<os family="windows"/>
</condition>
Modified: xmlgraphics/batik/trunk/contrib/rasterizertask/build.bat
URL:
http://svn.apache.org/viewvc/xmlgraphics/batik/trunk/contrib/rasterizertask/build.bat?rev=1366972&r1=1366971&r2=1366972&view=diff
==============================================================================
--- xmlgraphics/batik/trunk/contrib/rasterizertask/build.bat (original)
+++ xmlgraphics/batik/trunk/contrib/rasterizertask/build.bat Mon Jul 30
00:54:15 2012
@@ -37,13 +37,13 @@ SET BATIK_HOME=.\..\..
:: ----- Set up classpath ---------------------------------------------------
-SET
CP=%JAVA_HOME%\lib\tools.jar;%ANT_HOME%\lib\build\ant-1.6.5.jar;%ANT_HOME%\lib\build\ant-launcher-1.6.5.jar;%BATIK_HOME%\lib\build\crimson-1.1.3.jar
+SET
CP="%JAVA_HOME%\lib\tools.jar";"%ANT_HOME%\lib\build\ant-1.6.5.jar";"%ANT_HOME%\lib\build\ant-launcher-1.6.5.jar";"%BATIK_HOME%\lib\build\crimson-1.1.3.jar"
SET CP=%CP%;%BATIK_HOME%\classes
:: ----- Execute ------------------------------------------------------------
-%JAVA_HOME%\bin\java.exe %ANT_OPTS% -classpath %CP% org.apache.tools.ant.Main
-Dant.home=%ANT_HOME% %1 -Dargs="%2 %3 %4 %5 %6 %7 %8 %9"
+"%JAVA_HOME%\bin\java.exe" %ANT_OPTS% -classpath %CP%
org.apache.tools.ant.Main -Dant.home=%ANT_HOME% %1 -Dargs="%2 %3 %4 %5 %6 %7 %8
%9"
:: ----- Cleanup the environment --------------------------------------------
