Skip to content
Snippets Groups Projects
Commit a2b87ed3 authored by david_williams's avatar david_williams
Browse files

add pack200 to promote script

parent 5d2f281f
No related branches found
No related tags found
No related merge requests found
<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>
......@@ -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}/
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment