Bugzilla 45842: Use FOP_OPTS environment variable in fop.bat and fop.cmd (patch submi...

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@697152 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/fop.bat b/fop.bat
index a01c5ddb7e735254eb203fa2a1ba6a5cb011db8e..640ec56d286de073260c1b46f0d4266761b3d10a 100644 (file)
--- a/fop.bat
+++ b/fop.bat
@@ -81,4 +81,4 @@ if "%JAVACMD%" == "" set JAVACMD=java
 \r
 :runFop\r
 rem ECHO "%JAVACMD%"\r
-"%JAVACMD%" %JAVAOPTS% %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%\r
+"%JAVACMD%" %JAVAOPTS% %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" %FOP_OPTS% org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%\r

diff --git a/fop.cmd b/fop.cmd
index 554b8079565b2e31bcdbc13a64f365e8ea3eb8b7..b8bfb2096da7e86a14ab600b0a772bbc430cf9e9 100644 (file)
--- a/fop.cmd
+++ b/fop.cmd
@@ -70,6 +70,6 @@ if "%JAVACMD%" == "" set JAVACMD=java
 \r
 :runFop\r
 rem echo "%JAVACMD%" %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%\r
-"%JAVACMD%" %JAVAOPTS% %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%\r
+"%JAVACMD%" %JAVAOPTS% %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" %FOP_OPTS% org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%\r
 \r
 ENDLOCAL\r

diff --git a/status.xml b/status.xml
index 50fc66b0a37848837d16a5197c8b520dd87e31a2..474267b77af28e7f741df06400b73576d4603c7c 100644 (file)
--- a/status.xml
+++ b/status.xml
@@ -53,6 +53,9 @@
 
   <changes>
     <release version="FOP Trunk" date="TBD">
+      <action context="Code" dev="AD" type="fix" fixes-bug="45842" due-to="Carsten Siedentop">
+        Make fop.bat and fop.cmd use the %FOP_OPTS% environment variable.
+      </action>
       <action context="Renderers" dev="JM" type="add" fixes-bug="45795">
         PDF Output: Added support for handling 16-bit alpha channel. They are currently
         converted to 8 bits.