Simplify scripts to rely on correct java binary being on path

Author: Nicolai Parlog

app-cds.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 set -e
-source executables.sh
 
 rm -rf app-cds
 mkdir app-cds
@@ -12,63 +11,63 @@ then
 fi
 
 printf "\n--- RUN WITHOUT CDS ---\n\n"
-time $java --enable-preview \
+time java --enable-preview \
 	-jar target/java-x.jar
 
 
 # Since Java 12, the JDK comes with an archive of the JDK classes
 # and so it makes no sense to create a new one
 #printf "\n--- RUN WITH CDS ---\n"
-#printf "\n > create archive for default JDK classes\n"
-#sudo $java -Xshare:dump
-#printf "\n > use default archive\n"
-#time $java --enable-preview -jar target/java-x.jar
-#printf "\n > non-archived classes\n"
-#$java --enable-preview \
+#printf "\n#Create archive for default JDK classes\n"
+#sudo java -Xshare:dump
+#printf "\n# Use default archive\n"
+#time java --enable-preview -jar target/java-x.jar
+#printf "\n# Non-archived classes\n"
+#java --enable-preview \
 #	-Xlog:class+load \
 #	-jar target/java-x.jar \
 #| grep -v "shared objects file"
 
 
 printf "\n--- RUN WITH APPLICATION CDS ---\n"
-printf "\n > record used classes\n"
-$java --enable-preview \
+printf "\n# Record used classes\n"
+java --enable-preview \
 	-XX:DumpLoadedClassList=app-cds/classes.lst \
 	-jar target/java-x.jar
 
-printf "\n > create archive for recorded classes\n"
-$java --enable-preview \
+printf "\n# Create archive for recorded classes\n"
+java --enable-preview \
 	-Xshare:dump \
 	-XX:SharedClassListFile=app-cds/classes.lst \
 	-XX:SharedArchiveFile=app-cds/app.jsa \
 	--class-path target/java-x.jar
 
-printf "\n > use created archive\n"
-time $java --enable-preview \
+printf "\n# Use created archive\n"
+time java --enable-preview \
 	-XX:SharedArchiveFile=app-cds/app.jsa \
 	-jar target/java-x.jar \
 
-printf "\n > non-archived classes\n"
-$java --enable-preview \
+printf "\n# Non-archived classes\n"
+java --enable-preview \
 	-XX:SharedArchiveFile=app-cds/app.jsa \
 	-Xlog:class+load \
 	-jar target/java-x.jar \
 | grep -v "shared objects file"
 
 
 printf "\n--- RUN WITH DYNAMIC APP CDS ---\n"
-printf "\n > run without CDS & create archive\n"
-time $java --enable-preview \
+printf "\n# Run without CDS & create archive\n"
+time java --enable-preview \
 	-XX:ArchiveClassesAtExit=app-cds/dyn.jsa \
 	-jar target/java-x.jar
 
-printf "\n > use created archive\n"
-time $java --enable-preview \
+printf "\n# Use created archive\n"
+time java --enable-preview \
 	-XX:SharedArchiveFile=app-cds/dyn.jsa \
 	-jar target/java-x.jar
 
-printf "\n > non-archived classes\n"
-$java --enable-preview \
+printf "\n# Non-archived classes\n"
+java --enable-preview \
 	-XX:SharedArchiveFile=app-cds/dyn.jsa \
 	-Xlog:class+load \
 	-jar target/java-x.jar \

echo

@@ -1,4 +1,12 @@
-#!/opt/jdk-11/bin/java --source 11
+#!/home/nipa/.sdkman/candidates/java/current/bin/java --source 11
+
+// To run this, update the path in the first line to point to your `java` binary,
+// then run `./echo` in your terminal. Nothing much will happen - for the full
+// story, run ...
+//
+//     cat echo-haiku.txt | ./echo
+//
+// ... with one of the command line flags `--sort` or `..reverse`.
 
 import java.io.BufferedReader;
 import java.io.IOException;

executables.sh

@@ -1,33 +1,29 @@
 #!/bin/bash
 set -e
-source executables.sh
 
 rm -rf target/mr
 mkdir -p target/mr/java-8-src
 mkdir -p target/mr/java-8
 mkdir -p target/mr/java-9-src
 mkdir -p target/mr/java-9
 
-echo "compile classes for Java 8"
+echo "# Compiling classes for Java 8"
 sed 's/VersionDependent8/VersionDependent/g' \
 	src/main/java/org/codefx/demo/java9/internal/multi_release/VersionDependent8.java \
 	> target/mr/java-8-src/VersionDependent.java
 sed 's/VersionDependent8/VersionDependent/g' \
 	src/main/java/org/codefx/demo/java9/internal/multi_release/Main.java \
 	> target/mr/java-8-src/Main.java
-$javac --release 8 -d target/mr/java-8 target/mr/java-8-src/*.java
+javac --release 8 -d target/mr/java-8 target/mr/java-8-src/*.java
 
-echo "compile classes for Java 9"
+echo "# Compiling classes for Java 9"
 sed 's/VersionDependent9/VersionDependent/g' \
 	src/main/java/org/codefx/demo/java9/internal/multi_release/VersionDependent9.java \
 	> target/mr/java-9-src/VersionDependent.java
-$javac --release 8 -d target/mr/java-9 target/mr/java-9-src/*.java
+javac --release 8 -d target/mr/java-9 target/mr/java-9-src/*.java
 
-echo "package"
-$jar --create --file target/mr/mr.jar -C target/mr/java-8 . --release 9 -C target/mr/java-9 .
+echo "# Packaging"
+jar --create --file target/mr/mr.jar -C target/mr/java-8 . --release 9 -C target/mr/java-9 .
 
-echo "run with Java 8:"
-java -cp target/mr/mr.jar org.codefx.demo.java9.internal.multi_release.Main
-
-echo "run with Java 9:"
-$java -cp target/mr/mr.jar org.codefx.demo.java9.internal.multi_release.Main
+echo "# Execute the following command with Java 8 and with Java 9+:"
+echo "java -cp target/mr/mr.jar org.codefx.demo.java9.internal.multi_release.Main"

multi-release.sh

@@ -1,33 +1,32 @@
 #!/bin/bash
 set -e
-source executables.sh
 
-echo " > creating clean directories"
+echo "# Creating clean directories"
 rm -rf target/logging/classes
 mkdir -p target/logging/classes
 rm -rf target/logging/mods
 mkdir -p target/logging/mods
 
-echo " > compiling and packaging logger"
+echo "# Compiling and packaging logger"
 mkdir target/logging/classes/org.codefx.demo.java9.logging
-$javac \
+javac \
 	-d target/logging/classes/org.codefx.demo.java9.logging \
 	src/platform_logging/java/org/codefx/demo/java9/api/platform_logging/logger/*.java
-$jar \
+jar \
 	-c \
 	--file target/logging/mods/org.codefx.demo.java9.logging.jar \
 	-C target/logging/classes/org.codefx.demo.java9.logging/ .
 
-echo " > compiling and packaging app"
+echo "# Compiling and packaging app"
 mkdir target/logging/classes/org.codefx.demo.java9.app
-$javac \
+javac \
 	-d target/logging/classes/org.codefx.demo.java9.app\
 	src/platform_logging/java/org/codefx/demo/java9/api/platform_logging/app/*.java
-$jar \
+jar \
 	-c \
 	--file target/logging/mods/org.codefx.demo.java9.app.jar \
 	--main-class org.codefx.demo.java9.api.platform_logging.app.LoggingApplication \
 	-C target/logging/classes/org.codefx.demo.java9.app/ .
 
-echo " > running App"
-$java -verbose:gc -p target/logging/mods -m org.codefx.demo.javaX.app
+echo "# Running App"
+java -verbose:gc -p target/logging/mods -m org.codefx.demo.javaX.app

platform-logging.sh

@@ -6,7 +6,7 @@
 public class VersionDependent8 {
 
 	public String version() {
-		return "Java 8 version";
+		return "Java 8";
 	}
 
 }

src/main/java/org/codefx/demo/java9/internal/multi_release/VersionDependent8.java

@@ -6,7 +6,7 @@
 public class VersionDependent9 {
 
 	public String version() {
-		return "Java 9 version";
+		return "Modern Java";
 	}
 
 }

src/main/java/org/codefx/demo/java9/internal/multi_release/VersionDependent9.java

@@ -1,13 +1,13 @@
 #!/bin/bash
-source executables.sh
+# no `set -e` to see expected errors
 
 echo -e "\n# COMPILING WITH OLD BOOL\n"
 
 rm -rf target/*
 cp \
 	src/switch_default/java/org/codefx/demo/java14/lang/switch_/OldBool.java \
 	src/switch_default/java/org/codefx/demo/java14/lang/switch_/Bool.java
-$javac \
+javac \
 	-d target/classes \
 	src/switch_default/java/org/codefx/demo/java14/lang/switch_/Switch.java \
 	src/switch_default/java/org/codefx/demo/java14/lang/switch_/Bool.java
@@ -16,13 +16,13 @@ rm src/switch_default/java/org/codefx/demo/java14/lang/switch_/Bool.java
 echo -e "\n# RUNNING WITH OLD BOOL\n"
 
 echo -e "# Argument: \"TRUE\""
-$java \
+java \
 	-cp target/classes \
 	--enable-preview \
 	org.codefx.demo.java14.lang.switch_.Switch \
 	TRUE
 echo -e "# Argument: \"FILE_NOT_FOUND\""
-$java \
+java \
 	-cp target/classes \
 	--enable-preview \
 	org.codefx.demo.java14.lang.switch_.Switch \
@@ -33,21 +33,21 @@ echo -e "\n# REPLACING OLD WITH NEW BOOL\n"
 cp \
 	src/switch_default/java/org/codefx/demo/java14/lang/switch_/NewBool.java \
 	src/switch_default/java/org/codefx/demo/java14/lang/switch_/Bool.java
-$javac \
+javac \
 	-d target/classes \
 	src/switch_default/java/org/codefx/demo/java14/lang/switch_/Bool.java
 rm src/switch_default/java/org/codefx/demo/java14/lang/switch_/Bool.java
 
 echo -e "# RUNNING WITH NEW BOOL\n"
 
 echo -e "# Argument: \"TRUE\""
-$java \
+java \
 	-cp target/classes \
 	--enable-preview \
 	org.codefx.demo.java14.lang.switch_.Switch \
 	TRUE
 echo -e "# Argument: \"FILE_NOT_FOUND\""
-$java \
+java \
 	-cp target/classes \
 	--enable-preview \
 	org.codefx.demo.java14.lang.switch_.Switch \