From e8c219c8df4131dbdc01f50703b0a7d2ae4c727d Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Tue, 15 Feb 2011 06:23:08 +0000
Subject: [PATCH] addProperties function to promote script
---
releng.control/addRepoProperties.sh | 2 +-
releng.control/install-relengTools.sh | 8 ++------
releng.control/runAntRunner.sh | 7 +------
3 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/releng.control/addRepoProperties.sh b/releng.control/addRepoProperties.sh
index 6fa8bca4e..20e15afc1 100644
--- a/releng.control/addRepoProperties.sh
+++ b/releng.control/addRepoProperties.sh
@@ -27,7 +27,7 @@ ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=x86"
#BUILD_BRANCH=R3.3.0
#BUILD_ID=S-3.3.0M4-20101209114749
#STATS_TAG_SUFFIX=_indigo_M4
-$STATS_TAG_VERSIONINDICATOR=/indigo
+#STATS_TAG_VERSIONINDICATOR=/indigo
REPO=$1
BUILD_BRANCH=$2
diff --git a/releng.control/install-relengTools.sh b/releng.control/install-relengTools.sh
index 6ed20ee1f..33592a4a8 100644
--- a/releng.control/install-relengTools.sh
+++ b/releng.control/install-relengTools.sh
@@ -23,14 +23,10 @@ ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=x86"
devArgs=$ibmDevArgs
echo "dev: " $0
-echo
echo "devworkspace: " $devworkspace
-echo
echo "devJRE: " $devJRE
echo "OTHER_ARGS: " ${OTHER_ARGS}
+#$devJRE -version
echo
-$devJRE -version
-echo
-
-${ECLIPSE_EXE} -nosplash -console -data $devworkspace -application ${APP_NAME} ${OTHER_ARGS} -vm $devJRE -vmargs $devArgs
+${ECLIPSE_EXE} --launcher.suppressErrors -nosplash -console -data $devworkspace -application ${APP_NAME} ${OTHER_ARGS} -vm $devJRE -vmargs $devArgs
diff --git a/releng.control/runAntRunner.sh b/releng.control/runAntRunner.sh
index 0ebf3cc2f..b05727c39 100644
--- a/releng.control/runAntRunner.sh
+++ b/releng.control/runAntRunner.sh
@@ -28,7 +28,6 @@ fi
export JAVA_HOME=${JAVA_5_HOME}
-
devJRE=$JAVA_HOME/jre/bin/java
ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=x86 ${extraArgs}"
@@ -36,13 +35,9 @@ ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=x86 ${ex
devArgs=$ibmDevArgs
echo dev: $0
-echo
echo devworkspace: $devworkspace
-echo
echo devJRE: $devJRE
-$devJRE -version
+#$devJRE -version
echo
${ECLIPSE_EXE} --launcher.suppressErrors -nosplash -console -data $devworkspace -application org.eclipse.ant.core.antRunner $BUILDFILESTR -vm $devJRE -vmargs $devArgs
-
-
--
GitLab