diff --git a/Java/scripts/filelist b/Java/scripts/filelist index a83fc3d..455d98e 100644 --- a/Java/scripts/filelist +++ b/Java/scripts/filelist @@ -2,5 +2,6 @@ build.sh clean.sh commit.sh jar.sh +release.sh update.sh version_info diff --git a/Java/scripts/jar.sh b/Java/scripts/jar.sh index 0429513..e9904f9 100755 --- a/Java/scripts/jar.sh +++ b/Java/scripts/jar.sh @@ -5,7 +5,7 @@ rm -Rf bin/* javac -source ${SOURCE_VERSION} -target ${TARGET_VERSION} -Xlint:unchecked -cp ${CLASS_PATH} -d ${OUT_DIR} ${PROJECT_DIR}/${PROJECT_NAME}.java printf "\n\n\nGenerating Manifest...\n\n" touch manifest -echo "Main-Class: ${MAIN_CLASS}" >> manifest +echo "Main-Class: ${MAIN_CLASS}" > manifest printf "\n\n\nCreating Jar...\n\n" ORIGINAL_LOC=$(pwd) cd ${OUT_DIR} diff --git a/Java/scripts/md5 b/Java/scripts/md5 index bb150cd..7439c4b 100644 --- a/Java/scripts/md5 +++ b/Java/scripts/md5 @@ -1,5 +1,6 @@ build.sh:293285766098a4e3d4d708e58a69de82 - clean.sh:668a2f9b568c55f6a044a509315032f6 - commit.sh:5e4448db9ad48e72ec3a1ff4f5763b41 - -jar.sh:95faf6377e8d9e2f486bdd0860f604f0 - +jar.sh:2f59229fcaf02779bfaa43144f3be66f - +release.sh:b1b62203411b18d0fec1db3dc2e5a061 - update.sh:3be721658983183efa395984acd96b03 - diff --git a/Java/scripts/release.sh b/Java/scripts/release.sh new file mode 100644 index 0000000..0f7389c --- /dev/null +++ b/Java/scripts/release.sh @@ -0,0 +1,14 @@ +#Creates a zip file containing all project contents. +#Java +source ${LANGUAGE}/scripts/version_info +TARGET_FILE="${PROJECT_NAME}_${RELEASE_VERSION}.zip" +FILES=$(cat ${LANGUAGE}/scripts/.package.files) +echo "Creating Package $TARGET_FILE..." +for f in $FILES +do + zip -ur $TARGET_FILE $f +done +echo "Complete!" +echo "" +echo "" +echo "" \ No newline at end of file diff --git a/Java/scripts/version_info b/Java/scripts/version_info index 7c8f21c..719f74f 100644 --- a/Java/scripts/version_info +++ b/Java/scripts/version_info @@ -1,2 +1,3 @@ export SOURCE_VERSION="8" -export TARGET_VERSION="8" \ No newline at end of file +export TARGET_VERSION="8" +export RELEASE_VERSION="0.0a" \ No newline at end of file diff --git a/utils/define.sh b/utils/define.sh index 1dc7f41..214fc50 100755 --- a/utils/define.sh +++ b/utils/define.sh @@ -8,7 +8,7 @@ function define() { eval export "$1"='$value' } -if [[ $(pwd) != *"SigScript" && $AUTO_UPDATE = "true" ]]; then +if [[ $(pwd) != *"SigScript" && $AUTO_UPDATE = "true" && $1 != "update" ]]; then source utils/search.sh find . -type f -name md5 -delete diff --git a/utils/main.sh b/utils/main.sh index 62ec20d..d299d6b 100644 --- a/utils/main.sh +++ b/utils/main.sh @@ -16,7 +16,7 @@ if [ -z "$1" ] FILES=$(ls -1A ./$LANGUAGE/scripts 2>/dev/null | sed -e 's/\.sh$//' | sed -e 's/^/ /') for f in $FILES do - if [ $f != "md5" ] && [ $f != "version_info" ] && [ $f != "filelist" ]; then + if [ -f "./$LANGUAGE/scripts/$f.sh" ]; then DESC="$(head -n1 ./$LANGUAGE/scripts/$f.sh)" printf "\n\t%-15s%-65s" $f "${DESC:1}" fi diff --git a/utils/md5 b/utils/md5 index 2f738cd..baa339d 100644 --- a/utils/md5 +++ b/utils/md5 @@ -1,4 +1,4 @@ -define.sh:cf246587e7509edd9283cb8e8e4b26cf - -main.sh:afdc55cbdd992bf2a7e21ed79a773d8f - -search.sh:248d94cca6eeb92c384e9c49c9d0f4a9 - +define.sh:3ecab0dffe2adfb950f3eb7c7061b750 - +main.sh:d3d1bd0b56d8114eb7479964227f8576 - +search.sh:81d08f5ff48e8a44b5f68387d426da05 - .updateDirectories:0ede00461e947494545e694040787b3f - diff --git a/utils/search.sh b/utils/search.sh index 7342b97..99a69b3 100644 --- a/utils/search.sh +++ b/utils/search.sh @@ -8,7 +8,7 @@ function search() { search $1$g/ else echo "$1$g is a file" - if [ $g != "md5" ] && [ $g != "filelist" ]; then + if [ $g != "md5" ] && [ $g != "filelist" ] && [ $g != ".package.files" ]; then if [ $g != ".coauthors" ] && [ $g != "version_info" ]; then SUM=$(md5sum < $1$g) echo "$g:$SUM" >> $1md5 @@ -38,7 +38,7 @@ function check() { IFS=':' read -ra split <<< $line g="${split[0]}" echo "LINE -- $g" - if [ "$g" != "md5" ] && [ "$g" != "filelist" ]; then + if [ "$g" != "md5" ] && [ "$g" != "filelist" ] && [ "$g" != ".package.files" ]; then if [ -f $1$g ]; then if [ "$g" != ".coauthors" ] && [ "$g" != "version_info" ]; then @@ -72,7 +72,7 @@ function check() { IFS=':' read -ra split <<< $line g="${split[0]}" echo "LINE -- $g" - if [ "$g" != "md5" ] && [ "$g" != "filelist" ]; then + if [ "$g" != "md5" ] && [ "$g" != "filelist" ] && [ "$g" != ".package.files" ]; then if [ -f $1$g ]; then if [ "$g" != ".coauthors" ] && [ "$g" != "version_info" ]; then