Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix windows launch scripts #13

Merged
merged 1 commit into from
Nov 11, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix filling classpath with jars for bat files
All *.jar files found in %DEPENDENCYFINDER_HOME%\lib\
will be added to the classpath parameter.
  • Loading branch information
GenZmeY committed Oct 31, 2024

Verified

This commit was signed with the committer’s verified signature.
stgraber Stéphane Graber
commit 38f43712902017d44dbe452e44b0d9db61d4eced
9 changes: 7 additions & 2 deletions bin/DependencyFinder.bat
Original file line number Diff line number Diff line change
@@ -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
7 changes: 6 additions & 1 deletion bin/OOMetrics.bat
Original file line number Diff line number Diff line change
@@ -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
9 changes: 7 additions & 2 deletions bin/OOMetricsGUI.bat
Original file line number Diff line number Diff line change
@@ -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
7 changes: 6 additions & 1 deletion bin/bat.cli.template.txt
Original file line number Diff line number Diff line change
@@ -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
7 changes: 6 additions & 1 deletion bin/bat.reporter.template.txt
Original file line number Diff line number Diff line change
@@ -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
Loading