From 38f43712902017d44dbe452e44b0d9db61d4eced Mon Sep 17 00:00:00 2001 From: GenZmeY Date: Thu, 31 Oct 2024 19:27:30 +0300 Subject: [PATCH] Fix filling classpath with jars for bat files All *.jar files found in %DEPENDENCYFINDER_HOME%\lib\ will be added to the classpath parameter. --- bin/DependencyFinder.bat | 9 +++++++-- bin/OOMetrics.bat | 7 ++++++- bin/OOMetricsGUI.bat | 9 +++++++-- bin/bat.cli.template.txt | 7 ++++++- bin/bat.reporter.template.txt | 7 ++++++- 5 files changed, 32 insertions(+), 7 deletions(-) diff --git a/bin/DependencyFinder.bat b/bin/DependencyFinder.bat index 8995dccf..86058dbb 100644 --- a/bin/DependencyFinder.bat +++ b/bin/DependencyFinder.bat @@ -65,11 +65,16 @@ goto setupArgs rem This label provides a place for the argument list loop to break out rem and for NT handling to skip to. +set DEPENDENCYFINDER_CLASSPATH= + +SETLOCAL ENABLEDELAYEDEXPANSION +for %%j in (%DEPENDENCYFINDER_HOME%\lib\*.jar) do set DEPENDENCYFINDER_CLASSPATH=!DEPENDENCYFINDER_CLASSPATH!;%%j + if "%DEPENDENCYFINDER_CONSOLE%"=="" goto noConsole -"%JAVA_HOME%\bin\java" %DEPENDENCYFINDER_OPTS% -classpath "%DEPENDENCYFINDER_HOME%\classes;%DEPENDENCYFINDER_HOME%\lib\DependencyFinder.jar;%DEPENDENCYFINDER_HOME%\lib\jakarta-oro.jar;%DEPENDENCYFINDER_HOME%\lib\log4j.jar" com.jeantessier.dependencyfinder.gui.DependencyFinder %DEPENDENCYFINDER_CMD_LINE_ARGS% +"%JAVA_HOME%\bin\java" %DEPENDENCYFINDER_OPTS% -classpath "%DEPENDENCYFINDER_HOME%\classes;%DEPENDENCYFINDER_CLASSPATH%" com.jeantessier.dependencyfinder.gui.DependencyFinder %DEPENDENCYFINDER_CMD_LINE_ARGS% goto doneRun :noConsole -start "Dependency Finder" "%JAVA_HOME%\bin\javaw" %DEPENDENCYFINDER_OPTS% -classpath "%DEPENDENCYFINDER_HOME%\classes;%DEPENDENCYFINDER_HOME%\lib\DependencyFinder.jar;%DEPENDENCYFINDER_HOME%\lib\jakarta-oro.jar;%DEPENDENCYFINDER_HOME%\lib\log4j.jar" com.jeantessier.dependencyfinder.gui.DependencyFinder %DEPENDENCYFINDER_CMD_LINE_ARGS% +start "Dependency Finder" "%JAVA_HOME%\bin\javaw" %DEPENDENCYFINDER_OPTS% -classpath "%DEPENDENCYFINDER_HOME%\classes;%DEPENDENCYFINDER_CLASSPATH%" com.jeantessier.dependencyfinder.gui.DependencyFinder %DEPENDENCYFINDER_CMD_LINE_ARGS% :doneRun if not "%OS%"=="Windows_NT" goto mainEnd diff --git a/bin/OOMetrics.bat b/bin/OOMetrics.bat index a25db150..9a426419 100644 --- a/bin/OOMetrics.bat +++ b/bin/OOMetrics.bat @@ -65,7 +65,12 @@ goto setupArgs rem This label provides a place for the argument list loop to break out rem and for NT handling to skip to. -"%JAVA_HOME%\bin\java" %DEPENDENCYFINDER_OPTS% -classpath "%DEPENDENCYFINDER_HOME%\classes;%DEPENDENCYFINDER_HOME%\lib\DependencyFinder.jar;%DEPENDENCYFINDER_HOME%\lib\jakarta-oro.jar;%DEPENDENCYFINDER_HOME%\lib\log4j.jar" com.jeantessier.dependencyfinder.cli.OOMetrics -default-configuration "%DEPENDENCYFINDER_HOME%\etc\MetricsConfig.xml" %DEPENDENCYFINDER_CMD_LINE_ARGS% +set DEPENDENCYFINDER_CLASSPATH= + +SETLOCAL ENABLEDELAYEDEXPANSION +for %%j in (%DEPENDENCYFINDER_HOME%\lib\*.jar) do set DEPENDENCYFINDER_CLASSPATH=!DEPENDENCYFINDER_CLASSPATH!;%%j + +"%JAVA_HOME%\bin\java" %DEPENDENCYFINDER_OPTS% -classpath "%DEPENDENCYFINDER_HOME%\classes;%DEPENDENCYFINDER_CLASSPATH%" com.jeantessier.dependencyfinder.cli.OOMetrics -default-configuration "%DEPENDENCYFINDER_HOME%\etc\MetricsConfig.xml" %DEPENDENCYFINDER_CMD_LINE_ARGS% if not "%OS%"=="Windows_NT" goto mainEnd :winNTend diff --git a/bin/OOMetricsGUI.bat b/bin/OOMetricsGUI.bat index 3785e843..a6cb646a 100644 --- a/bin/OOMetricsGUI.bat +++ b/bin/OOMetricsGUI.bat @@ -65,11 +65,16 @@ goto setupArgs rem This label provides a place for the argument list loop to break out rem and for NT handling to skip to. +set DEPENDENCYFINDER_CLASSPATH= + +SETLOCAL ENABLEDELAYEDEXPANSION +for %%j in (%DEPENDENCYFINDER_HOME%\lib\*.jar) do set DEPENDENCYFINDER_CLASSPATH=!DEPENDENCYFINDER_CLASSPATH!;%%j + if "%DEPENDENCYFINDER_CONSOLE%"=="" goto noConsole -"%JAVA_HOME%\bin\java" %DEPENDENCYFINDER_OPTS% -classpath "%DEPENDENCYFINDER_HOME%\classes;%DEPENDENCYFINDER_HOME%\lib\DependencyFinder.jar;%DEPENDENCYFINDER_HOME%\lib\jakarta-oro.jar;%DEPENDENCYFINDER_HOME%\lib\log4j.jar" com.jeantessier.dependencyfinder.gui.OOMetrics -default-configuration "%DEPENDENCYFINDER_HOME%\etc\MetricsConfig.xml" %DEPENDENCYFINDER_CMD_LINE_ARGS% +"%JAVA_HOME%\bin\java" %DEPENDENCYFINDER_OPTS% -classpath "%DEPENDENCYFINDER_HOME%\classes;%DEPENDENCYFINDER_CLASSPATH%" com.jeantessier.dependencyfinder.gui.OOMetrics -default-configuration "%DEPENDENCYFINDER_HOME%\etc\MetricsConfig.xml" %DEPENDENCYFINDER_CMD_LINE_ARGS% goto doneRun :noConsole -start "OO Metrics" "%JAVA_HOME%\bin\javaw" %DEPENDENCYFINDER_OPTS% -classpath "%DEPENDENCYFINDER_HOME%\classes;%DEPENDENCYFINDER_HOME%\lib\DependencyFinder.jar;%DEPENDENCYFINDER_HOME%\lib\jakarta-oro.jar;%DEPENDENCYFINDER_HOME%\lib\log4j.jar" com.jeantessier.dependencyfinder.gui.OOMetrics -default-configuration "%DEPENDENCYFINDER_HOME%\etc\MetricsConfig.xml" %DEPENDENCYFINDER_CMD_LINE_ARGS% +start "OO Metrics" "%JAVA_HOME%\bin\javaw" %DEPENDENCYFINDER_OPTS% -classpath "%DEPENDENCYFINDER_HOME%\classes;%DEPENDENCYFINDER_CLASSPATH%" com.jeantessier.dependencyfinder.gui.OOMetrics -default-configuration "%DEPENDENCYFINDER_HOME%\etc\MetricsConfig.xml" %DEPENDENCYFINDER_CMD_LINE_ARGS% :doneRun if not "%OS%"=="Windows_NT" goto mainEnd diff --git a/bin/bat.cli.template.txt b/bin/bat.cli.template.txt index d1e8d35a..facc8932 100644 --- a/bin/bat.cli.template.txt +++ b/bin/bat.cli.template.txt @@ -65,7 +65,12 @@ goto setupArgs rem This label provides a place for the argument list loop to break out rem and for NT handling to skip to. -"%JAVA_HOME%\bin\java" %DEPENDENCYFINDER_OPTS% -classpath "%DEPENDENCYFINDER_HOME%\classes;%DEPENDENCYFINDER_HOME%\lib\DependencyFinder.jar;%DEPENDENCYFINDER_HOME%\lib\jakarta-oro.jar;%DEPENDENCYFINDER_HOME%\lib\log4j.jar;%CLASSPATH%" com.jeantessier.dependencyfinder.cli.##COMMAND## %DEPENDENCYFINDER_CMD_LINE_ARGS% +set DEPENDENCYFINDER_CLASSPATH= + +SETLOCAL ENABLEDELAYEDEXPANSION +for %%j in (%DEPENDENCYFINDER_HOME%\lib\*.jar) do set DEPENDENCYFINDER_CLASSPATH=!DEPENDENCYFINDER_CLASSPATH!;%%j + +"%JAVA_HOME%\bin\java" %DEPENDENCYFINDER_OPTS% -classpath "%DEPENDENCYFINDER_HOME%\classes;%DEPENDENCYFINDER_CLASSPATH%;%CLASSPATH%" com.jeantessier.dependencyfinder.cli.##COMMAND## %DEPENDENCYFINDER_CMD_LINE_ARGS% if not "%OS%"=="Windows_NT" goto mainEnd :winNTend diff --git a/bin/bat.reporter.template.txt b/bin/bat.reporter.template.txt index a024686f..ffaf56cc 100644 --- a/bin/bat.reporter.template.txt +++ b/bin/bat.reporter.template.txt @@ -65,7 +65,12 @@ goto setupArgs rem This label provides a place for the argument list loop to break out rem and for NT handling to skip to. -"%JAVA_HOME%\bin\java" %DEPENDENCYFINDER_OPTS% -classpath "%DEPENDENCYFINDER_HOME%\classes;%DEPENDENCYFINDER_HOME%\lib\DependencyFinder.jar;%DEPENDENCYFINDER_HOME%\lib\jakarta-oro.jar;%DEPENDENCYFINDER_HOME%\lib\log4j.jar" com.jeantessier.dependencyfinder.cli.DependencyReporter -##COMMAND## %DEPENDENCYFINDER_CMD_LINE_ARGS% +set DEPENDENCYFINDER_CLASSPATH= + +SETLOCAL ENABLEDELAYEDEXPANSION +for %%j in (%DEPENDENCYFINDER_HOME%\lib\*.jar) do set DEPENDENCYFINDER_CLASSPATH=!DEPENDENCYFINDER_CLASSPATH!;%%j + +"%JAVA_HOME%\bin\java" %DEPENDENCYFINDER_OPTS% -classpath "%DEPENDENCYFINDER_HOME%\classes;%DEPENDENCYFINDER_CLASSPATH%" com.jeantessier.dependencyfinder.cli.DependencyReporter -##COMMAND## %DEPENDENCYFINDER_CMD_LINE_ARGS% if not "%OS%"=="Windows_NT" goto mainEnd :winNTend