From f66cc3daf14c3832198eda2a13d3611c366e7cb4 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Tue, 15 Feb 2011 05:57:27 +0000
Subject: [PATCH] add pack200 to promote script
---
releng.control/addRepoProperties.sh | 4 +---
releng.control/install-relengTools.sh | 15 ++++++++++-----
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/releng.control/addRepoProperties.sh b/releng.control/addRepoProperties.sh
index 16bde084a..6842b4d12 100644
--- a/releng.control/addRepoProperties.sh
+++ b/releng.control/addRepoProperties.sh
@@ -17,7 +17,6 @@ then
fi
export JAVA_HOME=${JAVA_6_HOME}
-
devJRE=$JAVA_HOME/jre/bin/java
ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=x86"
@@ -77,7 +76,6 @@ echo "APP_NAME: " $APP_NAME
$devJRE -version
echo
-ECLIPSE_INSTALL=/shared/webtools/apps/eclipse361/eclipse
-$ECLIPSE_INSTALL/eclipse -debug -nosplash -consolelog -console -data $devworkspace --launcher.suppressErrors -application ${APP_NAME} ${OTHER_ARGS} -vm $devJRE -vmargs $devArgs
+${ECLIPSE_EXE} -debug -nosplash -consolelog -console -data $devworkspace --launcher.suppressErrors -application ${APP_NAME} ${OTHER_ARGS} -vm $devJRE -vmargs $devArgs
diff --git a/releng.control/install-relengTools.sh b/releng.control/install-relengTools.sh
index 538b9349d..6ed20ee1f 100644
--- a/releng.control/install-relengTools.sh
+++ b/releng.control/install-relengTools.sh
@@ -6,8 +6,15 @@ OTHER_ARGS="-metadataRepository http://download.eclipse.org/webtools/releng/repo
devworkspace=~/workspace-addRepoProperties
-JAVA_5_HOME=/shared/webtools/apps/ibm-java2-sdk-5.0-12.1-linux-i386
-JAVA_6_HOME=/shared/webtools/apps/ibm-java-sdk-6.0-8.1-linux-i386
+# remember to leave no slashes on filename in source command,
+# (the commonVariations.shsource file, that is)
+# so that users path is used to find it (first)
+if [ -z $BUILD_INITIALIZED ]
+then
+ source commonVariations.shsource
+ source ${RELENG_CONTROL}/commonComputedVariables.shsource
+fi
+
export JAVA_HOME=${JAVA_6_HOME}
devJRE=$JAVA_HOME/jre/bin/java
@@ -25,7 +32,5 @@ echo
$devJRE -version
echo
-ECLIPSE_INSTALL=/shared/webtools/apps/eclipse361/eclipse
-
-$ECLIPSE_INSTALL/eclipse -nosplash -console -data $devworkspace -application ${APP_NAME} ${OTHER_ARGS} -vm $devJRE -vmargs $devArgs
+${ECLIPSE_EXE} -nosplash -console -data $devworkspace -application ${APP_NAME} ${OTHER_ARGS} -vm $devJRE -vmargs $devArgs
--
GitLab