Merge branch 'develop'

Author: laksono

LICENSE

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

build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2002-2021, Rice University.
+# Copyright (c) 2002-2022, Rice University.
 # See the file edu.rice.cs.hpcviewer.ui/License.txt for details.
 #
 # Build hpcviewer and generate tar or zip files
@@ -58,9 +58,9 @@ fi
 show_help(){
 	echo "Syntax: $0 [-options] [commands]"
 	echo "Options: "
-	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 " -c              create a package and generate the release number"
+	echo " -n              (Mac only) notarize the package"
+	echo " -r <release>    specify the release number"
   	echo "Commands:"
 	echo " clean : remove objects and temporary files"
 	exit
@@ -69,6 +69,9 @@ show_help(){
 clean_up() {
 	mvn clean
 	rm -f scripts/hpcviewer_launcher.sh
+	cd edu.rice.cs.hpcdata.app/scripts/
+	./build.sh  clean
+	cd ../..
 	exit
 }
 
@@ -89,7 +92,7 @@ case $key in
     clean_up
     shift # past argument
     ;;
-    -c|--check)
+    -c|--create)
     CHECK=0
     shift # past argument
     ;;
@@ -274,8 +277,29 @@ fi
 # packaging the hpcdata
 ###################################################################
 
+echo "=================================="
+echo " Building hpcdata" 
+echo "=================================="
+
+cd edu.rice.cs.hpcdata.app/scripts
+./build.sh
+if [  -f hpcdata*.tgz ]; then
+	cp hpcdata*.tgz ../..
+else
+	echo "Fail to build hpcdata"
+fi
+
+cd ../..
+
+###################################################################
+# End
+###################################################################
+
 echo "=================================="
 echo " Done" 
 echo "=================================="
 
 ls -l hpcviewer-${RELEASE}-*
+if [  -f hpcdata*.tgz ]; then
+	ls -l hpcdata*
+fi

edu.rice.cs.hpcapp/src/edu/rice/cs/hpcapp/PrintData.java

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

edu.rice.cs.hpcapp/.classpath renamed to edu.rice.cs.hpcdata.app/.classpath

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

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

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# libraries and jar needed to run hpcapp program
+# libraries and jar needed to run hpcdata 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
@@ -11,16 +11,20 @@ POSITIONAL=()
 
 show_help(){
 	echo "$0 [options] [commands]"
-	echo "-h,--help   show this help"
-	echo "clean       remove the temporary files"
+	echo "-h,--help          Show this help"
+	echo "-r,--release <n>   Set the release number to <n>"
+	echo "clean              Remove the temporary files"
 	exit 0
 }
 
 clean_up() {
-    	rm -rf $TEMP
+    	rm -rf $TEMP LICENSE
 	exit 0
 }
 
+# default release number: yyyy.mm
+RELEASE=`date +"%Y.%m"`
+
 while [[ $# -gt 0 ]]
 do
 key="$1"
@@ -33,6 +37,11 @@ case $key in
 	show_help
 	shift
 	;;
+    -r|--release)
+     	RELEASE="$2"
+	shift
+	shift
+	;;
 esac
 done
 
@@ -43,7 +52,7 @@ FILES="edu.rice.cs.hpcviewer.product/target/repository/plugins/ca.odell.glazedli
 	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"
+	edu.rice.cs.hpcdata.app/target/edu.rice.cs.hpcdata.app-*.jar"
 
 rm -rf ${TEMP}
 mkdir ${TEMP}
@@ -61,6 +70,5 @@ for f in ${FILES}; do
 	fi
 done
 echo "tar the script and jar files..."
-tar czf hpcdata.tgz  hpcdata.sh ${TEMP}
-echo "output: "
-ls -l *.tgz
+cp ../../LICENSE .
+tar czf hpcdata-${RELEASE}.tgz  hpcdata.sh ${TEMP} LICENSE