Rename fop.cmd to fop.bat and let fop.cmd call fop.bat

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

diff --git a/fop.bat b/fop.bat
new file mode 100644 (file)
index 0000000..3a0538d
--- /dev/null
+++ b/fop.bat
@@ -0,0 +1,75 @@
+@ECHO OFF\r
+REM  Licensed to the Apache Software Foundation (ASF) under one or more\r
+REM  contributor license agreements.  See the NOTICE file distributed with\r
+REM  this work for additional information regarding copyright ownership.\r
+REM  The ASF licenses this file to You under the Apache License, Version 2.0\r
+REM  (the "License"); you may not use this file except in compliance with\r
+REM  the License.  You may obtain a copy of the License at\r
+REM\r
+REM      http://www.apache.org/licenses/LICENSE-2.0\r
+REM\r
+REM  Unless required by applicable law or agreed to in writing, software\r
+REM  distributed under the License is distributed on an "AS IS" BASIS,\r
+REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+REM  See the License for the specific language governing permissions and\r
+REM  limitations under the License.\r
+REM  $Id$\r
+\r
+SETLOCAL ENABLEDELAYEDEXPANSION\r
+\r
+rem %~dp0 is the expanded pathname of the current script under NT\r
+set LOCAL_FOP_HOME=\r
+if "%OS%"=="Windows_NT" set LOCAL_FOP_HOME="%~dp0"\r
+\r
+rem Code from Apache Ant project\r
+rem Slurp the command line arguments. This loop allows for an unlimited number\r
+rem of arguments (up to the command line limit, anyway).\r
+rem Could also do a "shift" and "%*" for all params, but apparently doesn't work \r
+rem with Win9x.\r
+set FOP_CMD_LINE_ARGS=%1\r
+if ""%1""=="""" goto doneStart\r
+shift\r
+:setupArgs\r
+if ""%1""=="""" goto doneStart\r
+set FOP_CMD_LINE_ARGS=%FOP_CMD_LINE_ARGS% %1\r
+shift\r
+goto setupArgs\r
+rem This label provides a place for the argument list loop to break out \r
+rem and for NT handling to skip to.\r
+:doneStart\r
+\r
+set LOGCHOICE=\r
+rem The default commons logger for JDK1.4 is JDK1.4Logger.\r
+rem To use a different logger, uncomment the one desired below\r
+rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog\r
+rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog\r
+rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger\r
+\r
+set LOGLEVEL=\r
+rem Logging levels\r
+rem Below option is only if you are using SimpleLog instead of the default JDK1.4 Logger.\r
+rem To set logging levels for JDK 1.4 Logger, edit the %JAVA_HOME%\JRE\LIB\logging.properties \r
+rem file instead.\r
+rem Possible SimpleLog values:  "trace", "debug", "info" (default), "warn", "error", or "fatal".\r
+rem set LOGLEVEL=-Dorg.apache.commons.logging.simplelog.defaultlog=INFO\r
+\r
+set LIBDIR=%LOCAL_FOP_HOME%lib\r
+\r
+set LOCALCLASSPATH=%FOP_HYPHENATION_PATH%\r
+for %%l in (%LOCAL_FOP_HOME%build\*.jar %LIBDIR%\*.jar) do set LOCALCLASSPATH=!LOCALCLASSPATH!;%%l\r
+\r
+set JAVAOPTS=-Denv.windir=%WINDIR%\r
+\r
+if "%JAVA_HOME%" == "" goto noJavaHome\r
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome\r
+if "%JAVACMD%" == "" set JAVACMD=%JAVA_HOME%\bin\java\r
+goto runFop\r
+\r
+:noJavaHome\r
+if "%JAVACMD%" == "" set JAVACMD=java\r
+\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%" %FOP_OPTS% org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%\r
+\r
+ENDLOCAL\r

diff --git a/fop.cmd b/fop.cmd
index 3a0538d5ee0be92c7afbdbb2e32901f081775371..33f164c53e166f00080903077eb7be183da5515b 100644 (file)
--- a/fop.cmd
+++ b/fop.cmd
@@ -15,17 +15,7 @@ REM  See the License for the specific language governing permissions and
 REM  limitations under the License.\r
 REM  $Id$\r
 \r
-SETLOCAL ENABLEDELAYEDEXPANSION\r
-\r
-rem %~dp0 is the expanded pathname of the current script under NT\r
-set LOCAL_FOP_HOME=\r
-if "%OS%"=="Windows_NT" set LOCAL_FOP_HOME="%~dp0"\r
-\r
-rem Code from Apache Ant project\r
-rem Slurp the command line arguments. This loop allows for an unlimited number\r
-rem of arguments (up to the command line limit, anyway).\r
-rem Could also do a "shift" and "%*" for all params, but apparently doesn't work \r
-rem with Win9x.\r
+set LOCAL_FOP_HOME=%~dp0\r
 set FOP_CMD_LINE_ARGS=%1\r
 if ""%1""=="""" goto doneStart\r
 shift\r
@@ -35,41 +25,7 @@ set FOP_CMD_LINE_ARGS=%FOP_CMD_LINE_ARGS% %1
 shift\r
 goto setupArgs\r
 rem This label provides a place for the argument list loop to break out \r
-rem and for NT handling to skip to.\r
 :doneStart\r
 \r
-set LOGCHOICE=\r
-rem The default commons logger for JDK1.4 is JDK1.4Logger.\r
-rem To use a different logger, uncomment the one desired below\r
-rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog\r
-rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog\r
-rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger\r
-\r
-set LOGLEVEL=\r
-rem Logging levels\r
-rem Below option is only if you are using SimpleLog instead of the default JDK1.4 Logger.\r
-rem To set logging levels for JDK 1.4 Logger, edit the %JAVA_HOME%\JRE\LIB\logging.properties \r
-rem file instead.\r
-rem Possible SimpleLog values:  "trace", "debug", "info" (default), "warn", "error", or "fatal".\r
-rem set LOGLEVEL=-Dorg.apache.commons.logging.simplelog.defaultlog=INFO\r
-\r
-set LIBDIR=%LOCAL_FOP_HOME%lib\r
-\r
-set LOCALCLASSPATH=%FOP_HYPHENATION_PATH%\r
-for %%l in (%LOCAL_FOP_HOME%build\*.jar %LIBDIR%\*.jar) do set LOCALCLASSPATH=!LOCALCLASSPATH!;%%l\r
-\r
-set JAVAOPTS=-Denv.windir=%WINDIR%\r
-\r
-if "%JAVA_HOME%" == "" goto noJavaHome\r
-if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome\r
-if "%JAVACMD%" == "" set JAVACMD=%JAVA_HOME%\bin\java\r
-goto runFop\r
-\r
-:noJavaHome\r
-if "%JAVACMD%" == "" set JAVACMD=java\r
-\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%" %FOP_OPTS% org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%\r
+call %LOCAL_FOP_HOME%\fop.bat %FOP_CMD_LINE_ARGS%\r
 \r
-ENDLOCAL\r