From a2b87ed34778932f6361302f607b9f1599a955bc Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Tue, 15 Feb 2011 04:01:30 +0000
Subject: [PATCH] add pack200 to promote script
---
releng.control/process-artifacts.xml | 25 +++++++++++++++++++++++++
releng.control/promote.sh | 19 +++++++++++++++++++
releng.control/runAntRunner.sh | 23 ++++++++++-------------
3 files changed, 54 insertions(+), 13 deletions(-)
create mode 100644 releng.control/process-artifacts.xml
diff --git a/releng.control/process-artifacts.xml b/releng.control/process-artifacts.xml
new file mode 100644
index 000000000..b151703dd
--- /dev/null
+++ b/releng.control/process-artifacts.xml
@@ -0,0 +1,25 @@
+<project
+ default="processArtifacts"
+ basedir=".">
+ <target
+ name="processArtifacts">
+
+ <!-- normally, caller would set repoDirLocation, but for local operation, can hard code here -->
+ <property
+ name="repoDirLocation"
+ value="/shared/webtools/committers/wtp-R3.3.0-I/20101209114749/S-3.3.0M4-20101209114749/repository"/>
+ <p2.process.artifacts
+ pack="true"
+ repositoryPath="file:/${repoDirLocation}"/>
+
+ <!-- clean up some unnecessary files -->
+ <delete
+ failonerror="false">
+ <fileset
+ dir="${repoDirLocation}"
+ includes="artifacts.jar.pack.gz, content.jar.pack.gz, site.xml"/>
+ </delete>
+
+ </target>
+</project>
+
diff --git a/releng.control/promote.sh b/releng.control/promote.sh
index 5b7732615..352f58a3a 100755
--- a/releng.control/promote.sh
+++ b/releng.control/promote.sh
@@ -148,6 +148,25 @@ echo "Drop directory: ${dropDirName}"
FROMDIR=${mostRecentDir}/${dropDirName}
+#run pack200 (and, recompute checksums) before literally promoting
+
+ repoDirLocation=$FROMDIR/repository
+ if [[ -d "${repoDirLocation}" ]]
+ then
+ ${RELENG_CONTROL}/runAntRunner.sh process-artifacts.xml -DrepoDirLocation="${repoDirLocation}"
+ else
+ echo "WARNING: expected code repo directory does not exist: $repoDirLocation";
+ fi
+
+ repoDirLocation=$FROMDIR/repositoryunittests
+ if [[ -d "${repoDirLocation}" ]]
+ then
+ ${RELENG_CONTROL}/runAntRunner.sh process-artifacts.xml -DrepoDirLocation="${repoDirLocation}"
+ else
+ echo "WARNING: expected code repo directory does not exist: $repoDirLocation";
+ fi
+
+
if [ "patches" == $distribution ]
then
TODIR=${DOWNLOAD_ROOT}/webtools/patches/drops/${buildBranch}/
diff --git a/releng.control/runAntRunner.sh b/releng.control/runAntRunner.sh
index 83946c6af..48a01ab9d 100644
--- a/releng.control/runAntRunner.sh
+++ b/releng.control/runAntRunner.sh
@@ -5,20 +5,17 @@
devworkspace=~/workspace-antRunner
BUILDFILE=$1
-PROP1=$2
-PROP2=$3
-
-echo "BUILDFILE: $BUILDFILE"
-echo "PROP1: $PROP1"
-echo "PROP2: $PROP2"
-
-
-if [ -e $BUILDFILE ]
+if [ -e $BUILDFILE ]
then
BUILDFILESTR=" -file $BUILDFILE"
-fi
+ shift
+fi
+
+extraArgs="$@"
+
+echo "BUILDFILE: $BUILDFILE"
+echo "extraArgs: ${extraArgs}"
-echo "BUILDFILESTR: $BUILDFILESTR"
# remember to leave no slashes on filename in source command,
# (the commonVariations.shsource file, that is)
@@ -34,9 +31,9 @@ export JAVA_HOME=${JAVA_5_HOME}
devJRE=$JAVA_HOME/jre/bin/java
-ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=x86"
+ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=x86 ${extraArgs}"
-devArgs="$ibmDevArgs $PROP1 $PROP2"
+devArgs=$ibmDevArgs
echo dev: $0
echo
--
GitLab