Merge branch 'develop'

Author: laksono

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2021, Rice University
+Copyright (c) 2022, Rice University
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

build.sh

@@ -56,15 +56,23 @@ if [ "$JAVA_MAJOR_VERSION" -lt "$jvm_required" ]; then
 fi
 
 show_help(){
-	echo "Syntax: $0 [-options]"
+	echo "Syntax: $0 [-options] [commands]"
 	echo "Options: "
-	echo "-c check to create a package without generating the release number"
+	echo "-c create a package and generate the release number"
 	echo "-n (Mac only) notarize the package"
 	echo "-r <release_number> specify the release number"
+  	echo "Commands:"
+	echo " clean : remove objects and temporary files"
 	exit
 }
 
-CHECK=0
+clean_up() {
+	mvn clean
+	rm -f scripts/hpcviewer_launcher.sh
+	exit
+}
+
+CHECK=1
 #------------------------------------------------------------
 # start to build
 #------------------------------------------------------------
@@ -77,8 +85,12 @@ do
 key="$1"
 
 case $key in
+    clean)
+    clean_up
+    shift # past argument
+    ;;
     -c|--check)
-    CHECK=1
+    CHECK=0
     shift # past argument
     ;;
     -h|--help)
@@ -114,21 +126,32 @@ name="hpcviewer"
 sh_file="scripts/${name}.sh"
 launcher_name="${name}_launcher.sh"
 launcher="scripts/${launcher_name}"
+RELEASE_FILE="edu.rice.cs.hpcviewer.ui/release.txt"
+OS=`uname`
 
-if [ "$CHECK" == "0" ]; then
-    # create the release number
-    VERSION="Release ${RELEASE}. Commit $GITC" 
-    echo "$VERSION" > edu.rice.cs.hpcviewer.ui/release.txt
-
-    # insert the release number to the launcher script:
-    # first, copy the launcher script
-    # second, replace the release variable with the current version
+# insert the release number to the launcher script:
+# first, copy the launcher script
+# second, replace the release variable with the current version
 
-    cp -f "$sh_file" "$launcher" \
+cp -f "$sh_file" "$launcher" \
        || die "unable to copy files"
 
-    sed -i "s/__VERSION__/$VERSION/g" $launcher
+if [ "$CHECK" == "0" ]; then
+    # create the release number: the current month and the commit hash
+    # users may don't care with the hash, but it's important for debugging
+    VERSION="Release ${RELEASE}. Commit $GITC" 
+    echo "$VERSION" > ${RELEASE_FILE}
+else
+    VERSION=`cat $RELEASE_FILE`   	    
+fi
+
+if [[ "$OS" == "Darwin" ]]; then 
+    sed -i '' "s/__VERSION__/\"$VERSION\"/g" $launcher
+else
+    sed -i "s/__VERSION__/\"$VERSION\"/g" $launcher
 fi
+
+# This is not necessary: removing old release files
 rm -rf hpcviewer-${RELEASE}*
 
 #
@@ -238,7 +261,6 @@ repackage_mac $input $output
 ###################################################################
 # special treatement for mac OS
 ###################################################################
-OS=`uname`
 if [[ "$OS" == "Darwin" && "$NOTARIZE" == "1" ]]; then 
         macPkgs="hpcviewer-${RELEASE}-macosx.cocoa.x86_64.zip"
 	macos/notarize.sh $macPkgs
@@ -248,6 +270,10 @@ if [[ "$OS" == "Darwin" && "$NOTARIZE" == "1" ]]; then
 fi
 
 
+###################################################################
+# packaging the hpcdata
+###################################################################
+
 echo "=================================="
 echo " Done" 
 echo "=================================="

edu.rice.cs.hpcapp/.classpath

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

edu.rice.cs.hpcdata.test/.gitignore renamed to edu.rice.cs.hpcapp/.gitignore

@@ -0,0 +1,7 @@
+<extensions>
+  <extension>
+    <groupId>org.eclipse.tycho.extras</groupId>
+    <artifactId>tycho-pomless</artifactId>
+    <version>2.2.0</version>
+  </extension>
+</extensions>

edu.rice.cs.hpcapp/.mvn/extensions.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>edu.rice.cs.hpcdata.test</name>
+	<name>edu.rice.cs.hpcapp</name>
 	<comment></comment>
 	<projects>
 	</projects>

edu.rice.cs.hpcdata.test/.project renamed to edu.rice.cs.hpcapp/.project

@@ -0,0 +1 @@
+/org.eclipse.jdt.core.prefs

edu.rice.cs.hpcapp/.settings/.gitignore

@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: hpcapp
+Bundle-SymbolicName: edu.rice.cs.hpcapp
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: Rice University
+Automatic-Module-Name: edu.rice.cs.hpcapp
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Require-Bundle: edu.rice.cs.hpcdata,
+ edu.rice.cs.hpcdata.merge

edu.rice.cs.hpcapp/META-INF/MANIFEST.MF

@@ -0,0 +1,66 @@
+#!/bin/bash
+
+# libraries and jar needed to run hpcapp program
+# if hpcdata requires more jar, need to include in this variable manually
+# Notes: Please do not specify the version number of the jar file to keep portability
+#	 across different versions
+
+ROOT="../.."
+TEMP="jars"
+POSITIONAL=()
+
+show_help(){
+	echo "$0 [options] [commands]"
+	echo "-h,--help   show this help"
+	echo "clean       remove the temporary files"
+	exit 0
+}
+
+clean_up() {
+    	rm -rf $TEMP
+	exit 0
+}
+
+while [[ $# -gt 0 ]]
+do
+key="$1"
+
+case $key in
+    clean)
+	clean_up
+    	;;
+    -h|--help)
+	show_help
+	shift
+	;;
+esac
+done
+
+set -- "${POSITIONAL[@]}" # restore positional parameters
+
+FILES="edu.rice.cs.hpcviewer.product/target/repository/plugins/ca.odell.glazedlists*.jar \
+	edu.rice.cs.hpcviewer.product/target/repository/plugins/org.eclipse.collections*.jar \
+	externals/graphbuilder/target/com.graphbuilder-*.jar \
+	edu.rice.cs.hpcdata/target/edu.rice.cs.hpcdata-*.jar \
+	edu.rice.cs.hpcdata.merge/target/edu.rice.cs.hpcdata.merge-*.jar \
+	edu.rice.cs.hpcapp/target/edu.rice.cs.hpcapp-*.jar"
+
+rm -rf ${TEMP}
+mkdir ${TEMP}
+
+for f in ${FILES}; do
+	JAR="${ROOT}/${f}"
+	if [ -r ${JAR} ]; then 
+		BASE=`basename $JAR`
+		CMD="cp $JAR ${TEMP}/${BASE}"
+		echo $CMD
+		${CMD}
+	else
+		echo "File not found: ${JAR}"
+		exit 1
+	fi
+done
+echo "tar the script and jar files..."
+tar czf hpcdata.tgz  hpcdata.sh ${TEMP}
+echo "output: "
+ls -l *.tgz