From a1710cfc4a2ffaf2e062a00b60742320d928147f Mon Sep 17 00:00:00 2001
From: "Barbara B. Frosik" <bfrosik@aps.anl.gov>
Date: Wed, 26 Aug 2015 20:35:22 +0000
Subject: [PATCH] updated expSync tools to include java 7
---
tools/ExperimentSynchronizer/install_expSync.sh | 14 ++++++++++----
tools/ExperimentSynchronizer/run_expSync.sh | 2 +-
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/tools/ExperimentSynchronizer/install_expSync.sh b/tools/ExperimentSynchronizer/install_expSync.sh
index 084da687..f8ffbf6e 100644
--- a/tools/ExperimentSynchronizer/install_expSync.sh
+++ b/tools/ExperimentSynchronizer/install_expSync.sh
@@ -1,19 +1,25 @@
#!/bin/sh
-DM_SVN_URL_EXP_SYNC=https://subversion.xray.aps.anl.gov/DataManagement/trunk/tools/ExperimentSynchronizer
+DM_SVN_URL=https://subversion.xray.aps.anl.gov/DataManagement
execute() {
echo "Executing: $@"
eval "$@"
}
-execute svn export $DM_SVN_URL_EXP_SYNC ExperimentSynchronizer
+# load tools
+execute svn export $DM_SVN_URL_EXP_SYNC/trunk/tools/ExperimentSynchronizer ExperimentSynchronizer
EXPSYNC_DIR=ExperimentSynchronizer
+cd $EXPSYNC_DIR/lib
-cd $EXPSYNC_DIR
+# load java 7
+execute svn export $DM_SVN_URL/support/src/jdk-7u51-linux-x64.tar.gz
+JAVA_VERSION=7u51
+tar zxf jdk-${JAVA_VERSION}*.tar.gz
+cd $EXPSYNC_DIR
mkdir bin
-execute javac -classpath lib/*:resources/* -d bin/ src/gov/anl/dm/esafsync/*.java src/gov/anl/dm/esafsync/serviceconn/*.java
+execute lib/javac -classpath lib/*:resources/* -d bin/ src/gov/anl/dm/esafsync/*.java src/gov/anl/dm/esafsync/serviceconn/*.java
mkdir target
execute jar cfm target/ExperimentSynchronizer.jar manifest.txt -C bin/ .
diff --git a/tools/ExperimentSynchronizer/run_expSync.sh b/tools/ExperimentSynchronizer/run_expSync.sh
index a2843259..5beaefb6 100644
--- a/tools/ExperimentSynchronizer/run_expSync.sh
+++ b/tools/ExperimentSynchronizer/run_expSync.sh
@@ -4,5 +4,5 @@ execute() {
}
cd ExperimentSynchronizer
-execute java -jar target/ExperimentSynchronizer.jar resources/config.properties
+execute lib/java -jar target/ExperimentSynchronizer.jar resources/config.properties
--
GitLab