From f8ec7e3c81dfc91031cda7caad482d99ab623d4b Mon Sep 17 00:00:00 2001 From: Justin Blank Date: Thu, 6 Jul 2023 23:41:48 +0100 Subject: [PATCH 1/3] Update to handle new location for built jar --- scripts/makeDemoLogFile.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makeDemoLogFile.sh b/scripts/makeDemoLogFile.sh index 11ed45fa..5f78d3e1 100755 --- a/scripts/makeDemoLogFile.sh +++ b/scripts/makeDemoLogFile.sh @@ -71,9 +71,9 @@ echo "VM Switches $REQUIRED_SWITCHES $OPTIONAL_SWITCHES" echo "Building example HotSpot log" if [ "$unamestr" = 'Darwin' ]; then - export CLASSPATH=../ui/target/jitwatch-ui-1.4.4-shaded-mac.jar + export CLASSPATH=../ui/target/jitwatch-ui-shaded-mac.jar else - export CLASSPATH=../ui/target/jitwatch-ui-1.4.4-shaded-linux.jar + export CLASSPATH=../ui/target/jitwatch-ui-shaded.jar fi "$JAVA_HOME/bin/java" $REQUIRED_SWITCHES $OPTIONAL_SWITCHES -cp "$CLASSPATH" org.adoptopenjdk.jitwatch.demo.MakeHotSpotLog 2>&1 >/dev/null From 806af2f92e4c88e54f35dbe2f0119c25fa1bb358 Mon Sep 17 00:00:00 2001 From: Justin Blank Date: Thu, 6 Jul 2023 23:42:14 +0100 Subject: [PATCH 2/3] Update to make readme reflect new location of makeDemoLogFile.sh --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 94acfd0f..9ca77e7b 100644 --- a/README.md +++ b/README.md @@ -21,4 +21,4 @@ For pre-JDK11 you will need to use a Java runtime that includes JavaFX.

Build an example HotSpot log

# Build the code and then run
-./makeDemoLogFile.sh
+cd scripts && ./makeDemoLogFile.sh From fe6f41b47cc4f7d4708485811d26aef6765e9845 Mon Sep 17 00:00:00 2001 From: Chris Newland Date: Fri, 7 Jul 2023 07:37:31 +0100 Subject: [PATCH 3/3] Update makeDemoLogFile.sh The jars no longer contain the OS name so I've removed the if-block. --- scripts/makeDemoLogFile.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/makeDemoLogFile.sh b/scripts/makeDemoLogFile.sh index 5f78d3e1..e7cadbd7 100755 --- a/scripts/makeDemoLogFile.sh +++ b/scripts/makeDemoLogFile.sh @@ -70,11 +70,7 @@ echo "VM Switches $REQUIRED_SWITCHES $OPTIONAL_SWITCHES" echo "Building example HotSpot log" -if [ "$unamestr" = 'Darwin' ]; then - export CLASSPATH=../ui/target/jitwatch-ui-shaded-mac.jar -else - export CLASSPATH=../ui/target/jitwatch-ui-shaded.jar -fi +export CLASSPATH=../ui/target/jitwatch-ui-shaded.jar "$JAVA_HOME/bin/java" $REQUIRED_SWITCHES $OPTIONAL_SWITCHES -cp "$CLASSPATH" org.adoptopenjdk.jitwatch.demo.MakeHotSpotLog 2>&1 >/dev/null echo "Done"