updated venice devel scripts

jlangch · Dec 4, 2024 · e6da2bf · e6da2bf
1 parent fdb7b9b
commit e6da2bf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/main/resources/com/github/jlangch/venice/setup/venice.sh b/src/main/resources/com/github/jlangch/venice/setup/venice.sh
@@ -1,10 +1,10 @@
 ###############################################################################
 # Venice shell                                                                #
 # ----------------------------------------------------------------------------#
-# Starts a Venice shell (custom REPL), loads 'venice.venice' and runs it.     #
+# Starts a Venice shell (REPL), loads 'venice.venice' and runs it.            #
 #                                                                             #
 # Layout:                                                                     #
-#    VENICE_SHELL_HOME                                                        #
+#    REPL_HOME                                                                #
 #      +--libs                                                                #
 #      |   +-- venice-x.y.z.jar                                               #
 #      |   +-- jansi-2.4.1.jar                                                #
@@ -16,6 +16,8 @@ export VENICE_SHELL_HOME=/Users/juerg/Desktop/scripts
 export VENICE_PROJECT_HOME=/Users/juerg/Documents/workspace-omni/venice
 export VENICE_REPL_HOME=/Users/juerg/Desktop/venice
 
+export VENICE_JAVA_HOME=${JAVA_8_HOME}
+
 
 if [ ! -d ${VENICE_SHELL_HOME} ]; then
   echo
@@ -33,9 +35,9 @@ if [ ! -d ${VENICE_SHELL_HOME}/libs ]; then
   exit 1
 fi
 
-if [ ! -d ${JAVA_8_HOME} ]; then
+if [ ! -d ${VENICE_JAVA_HOME} ]; then
   echo
-  echo "Error: The Java 8 home dir ${JAVA_8_HOME} does not exist!"
+  echo "Error: The Java home dir ${VENICE_JAVA_HOME} does not exist!"
   echo
   read -p "Press any key to exit..." -n 1 -s
   exit 1
@@ -45,7 +47,7 @@ fi
 cd ${VENICE_SHELL_HOME}
 
 
-${JAVA_8_HOME}/bin/java \
+${VENICE_JAVA_HOME}/bin/java \
   -server \
   -cp "libs:libs/*" com.github.jlangch.venice.Launcher \
   -Xmx2G \

diff --git a/src/main/resources/com/github/jlangch/venice/setup/venice.venice b/src/main/resources/com/github/jlangch/venice/setup/venice.venice
@@ -71,6 +71,7 @@
 ;; Java 8 is mandatory for "./gradlew eclipse", the Eclipse Venice project must
 ;; be based on Java 8!
 (defonce java-8-home (str/strip-end (system-env :JAVA_8_HOME) "/"))
+(defonce java-17-home (str/strip-end (system-env :JAVA_17_HOME) "/"))
 (defonce java-home java-8-home)
 
 (defonce cmd-line-prompt (str "vshell> "))
@@ -214,7 +215,7 @@
        Working dir:      ~(io/user-dir)
        Project home:     ~{proj-home}
        Build Java 8:     ~{java-8-home}
-       Build Java 11:    ~{java-11-home}
+       Build Java 17:    ~{java-17-home}
        Color theme:      ~(repl/color-theme)
        Terminal:         [~(repl/term-cols) x ~(repl/term-rows)]