From 918af3dca86ea73828f985e6a15cf607b8ebcf42 Mon Sep 17 00:00:00 2001
From: "Andreas L. Delmelle" <adelmelle@apache.org>
Date: Fri, 19 Sep 2008 17:01:03 +0000
Subject: [PATCH] Bugzilla 45842: Use FOP_OPTS environment variable in fop.bat
 and fop.cmd (patch submitted by Carsten Siedentop)

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@697152 13f79535-47bb-0310-9956-ffa450edef68
---
 fop.bat    | 2 +-
 fop.cmd    | 2 +-
 status.xml | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/fop.bat b/fop.bat
index a01c5ddb7..640ec56d2 100644
--- a/fop.bat
+++ b/fop.bat
@@ -81,4 +81,4 @@ if "%JAVACMD%" == "" set JAVACMD=java
 
 :runFop
 rem ECHO "%JAVACMD%"
-"%JAVACMD%" %JAVAOPTS% %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%
+"%JAVACMD%" %JAVAOPTS% %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" %FOP_OPTS% org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%
diff --git a/fop.cmd b/fop.cmd
index 554b80795..b8bfb2096 100644
--- a/fop.cmd
+++ b/fop.cmd
@@ -70,6 +70,6 @@ if "%JAVACMD%" == "" set JAVACMD=java
 
 :runFop
 rem echo "%JAVACMD%" %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%
-"%JAVACMD%" %JAVAOPTS% %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%
+"%JAVACMD%" %JAVAOPTS% %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" %FOP_OPTS% org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%
 
 ENDLOCAL
diff --git a/status.xml b/status.xml
index 50fc66b0a..474267b77 100644
--- 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.
-- 
2.39.5