From 7b29a14e12832197b75200628292f007eea5c731 Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Sun, 11 Dec 2022 18:56:17 -0600 Subject: [PATCH] Don't include lib handling yet Co-authored-by: sigonasr2 --- Java/scripts/build.sh | 36 +++++++++++++----------------------- Java/scripts/md5 | 2 +- sig | 2 +- 3 files changed, 15 insertions(+), 25 deletions(-) diff --git a/Java/scripts/build.sh b/Java/scripts/build.sh index 2107b54..c5b6b67 100755 --- a/Java/scripts/build.sh +++ b/Java/scripts/build.sh @@ -1,27 +1,17 @@ #Builds and runs the project. #Java source ${LANGUAGE}/scripts/version_info -if javac -source ${SOURCE_VERSION} -target ${TARGET_VERSION} -Xlint:unchecked -cp ${CLASS_PATH} -d ${OUT_DIR} ${PROJECT_DIR}/*.java; then - printf "\n\n\nRunning Program...\n\n" - ORIGINAL_LOC=$(pwd) - cd lib - rm -Rf bin - mkdir bin - jar -xvf gluegen-rt-natives-linux-amd64.jar - jar -xvf gluegen-rt.jar - jar -xvf jogl-all.jar - jar -xvf jogl-all-natives-linux-amd64.jar - mv $(find . -type d -not -path "." -not -path "./bin" -not -name "lib") bin - cd .. - cd $OUT_DIR - if java ${CUSTOM_PARAMS} -cp .:../lib/bin/ -XX:+UseZGC -Djava.library.path="${LIBRARY_PATH}" ${MAIN_CLASS} "$@"; then - ${ORIGINAL_LOC}/${LANGUAGE}/scripts/clean.sh - exit - fi - if java ${CUSTOM_PARAMS} -cp .:../lib/bin/ -XX:+UnlockExperimentalVMOptions -XX:+UseZGC -Djava.library.path="${LIBRARY_PATH}" ${MAIN_CLASS} "$@"; then - ${ORIGINAL_LOC}/${LANGUAGE}/scripts/clean.sh - exit - fi - java ${CUSTOM_PARAMS} -cp .:../lib/bin/ -XX:+PrintCommandLineFlags -Djava.library.path="${LIBRARY_PATH}" ${MAIN_CLASS} "$@" +javac -source ${SOURCE_VERSION} -target ${TARGET_VERSION} -Xlint:unchecked -cp ${CLASS_PATH} -d ${OUT_DIR} ${PROJECT_DIR}/*.java +printf "\n\n\nRunning Program...\n\n" +ORIGINAL_LOC=$(pwd) +cd $OUT_DIR +if java ${CUSTOM_PARAMS} -cp .:../lib/bin/ -XX:+UseZGC -Djava.library.path="${LIBRARY_PATH}" ${MAIN_CLASS} "$@"; then ${ORIGINAL_LOC}/${LANGUAGE}/scripts/clean.sh -fi \ No newline at end of file + exit +fi +if java ${CUSTOM_PARAMS} -cp .:../lib/bin/ -XX:+UnlockExperimentalVMOptions -XX:+UseZGC -Djava.library.path="${LIBRARY_PATH}" ${MAIN_CLASS} "$@"; then + ${ORIGINAL_LOC}/${LANGUAGE}/scripts/clean.sh + exit +fi +java ${CUSTOM_PARAMS} -cp .:../lib/bin/ -XX:+PrintCommandLineFlags -Djava.library.path="${LIBRARY_PATH}" ${MAIN_CLASS} "$@" +${ORIGINAL_LOC}/${LANGUAGE}/scripts/clean.sh \ No newline at end of file diff --git a/Java/scripts/md5 b/Java/scripts/md5 index b2c3eed..865d0bc 100644 --- a/Java/scripts/md5 +++ b/Java/scripts/md5 @@ -1,5 +1,5 @@ build2.sh:b1c6b7c6b2eb19ba54be6824bda8805b - -build.sh:5df470d49036bf7565493739aeebeaa8 - +build.sh:b704fa9f7cec17d25c111866528b8165 - clean.sh:668a2f9b568c55f6a044a509315032f6 - commit.sh:5e4448db9ad48e72ec3a1ff4f5763b41 - jar2.sh:7977fc138ee5db798d08c34734f0be93 - diff --git a/sig b/sig index 9d5215b..d3faca6 100755 --- a/sig +++ b/sig @@ -1,5 +1,5 @@ #!/usr/bin/bash -export AUTO_UPDATE=false +export AUTO_UPDATE=true source utils/define.sh