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

1 files changed, 2 insertions, 46 deletions

diff --git a/fop.cmd b/fop.cmd
index 3a0538d5e..33f164c53 100644
--- 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.

 REM  $Id$

 

-SETLOCAL ENABLEDELAYEDEXPANSION

-

-rem %~dp0 is the expanded pathname of the current script under NT

-set LOCAL_FOP_HOME=

-if "%OS%"=="Windows_NT" set LOCAL_FOP_HOME="%~dp0"

-

-rem Code from Apache Ant project

-rem Slurp the command line arguments. This loop allows for an unlimited number

-rem of arguments (up to the command line limit, anyway).

-rem Could also do a "shift" and "%*" for all params, but apparently doesn't work 

-rem with Win9x.

+set LOCAL_FOP_HOME=%~dp0

 set FOP_CMD_LINE_ARGS=%1

 if ""%1""=="""" goto doneStart

 shift

@@ -35,41 +25,7 @@ set FOP_CMD_LINE_ARGS=%FOP_CMD_LINE_ARGS% %1
 shift

 goto setupArgs

 rem This label provides a place for the argument list loop to break out 

-rem and for NT handling to skip to.

 :doneStart

 

-set LOGCHOICE=

-rem The default commons logger for JDK1.4 is JDK1.4Logger.

-rem To use a different logger, uncomment the one desired below

-rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog

-rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog

-rem set LOGCHOICE=-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger

-

-set LOGLEVEL=

-rem Logging levels

-rem Below option is only if you are using SimpleLog instead of the default JDK1.4 Logger.

-rem To set logging levels for JDK 1.4 Logger, edit the %JAVA_HOME%\JRE\LIB\logging.properties 

-rem file instead.

-rem Possible SimpleLog values:  "trace", "debug", "info" (default), "warn", "error", or "fatal".

-rem set LOGLEVEL=-Dorg.apache.commons.logging.simplelog.defaultlog=INFO

-

-set LIBDIR=%LOCAL_FOP_HOME%lib

-

-set LOCALCLASSPATH=%FOP_HYPHENATION_PATH%

-for %%l in (%LOCAL_FOP_HOME%build\*.jar %LIBDIR%\*.jar) do set LOCALCLASSPATH=!LOCALCLASSPATH!;%%l

-

-set JAVAOPTS=-Denv.windir=%WINDIR%

-

-if "%JAVA_HOME%" == "" goto noJavaHome

-if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome

-if "%JAVACMD%" == "" set JAVACMD=%JAVA_HOME%\bin\java

-goto runFop

-

-:noJavaHome

-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%" %FOP_OPTS% org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%

+call %LOCAL_FOP_HOME%\fop.bat %FOP_CMD_LINE_ARGS%

 

-ENDLOCAL