From 141616a0379fd373b42644de7611b79af76167c1 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Wed, 17 Jan 2007 17:51:31 +0000 Subject: [PATCH] Switch builder to Eclipse 3.3 --- .../bin/doit_irsbuild.sh | 49 +++++++++++-------- .../org.eclipse.rse.build/bin/doit_nightly.sh | 10 ++-- .../bin/mkTestUpdates.sh | 16 +++--- 3 files changed, 42 insertions(+), 33 deletions(-) diff --git a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh b/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh index e553a98ccc9..0c3c41479ee 100755 --- a/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh +++ b/releng/org.eclipse.rse.build/bin/doit_irsbuild.sh @@ -1,6 +1,6 @@ #!/bin/sh #******************************************************************************* -# Copyright (c) 2006 Wind River Systems, Inc. +# Copyright (c) 2006, 2007 Wind River Systems, Inc. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -32,13 +32,15 @@ echo ${mydir} #export PATH=/shared/common/ibm-java2-ppc64-50/bin:$PATH #export PATH=/shared/webtools/apps/IBMJava2-ppc64-142/bin:$PATH #export PATH=/shared/webtools/apps/IBMJava2-ppc-142/bin:$PATH -export PATH=${HOME}/ws/IBMJava2-ppc-142/bin:$PATH +export PATH=${HOME}/ws2/IBMJava2-ppc-142/bin:$PATH #Get parameters +mapTag=HEAD buildType=$1 buildId=$2 case x$buildType in - xP|xN|xI|xS|xR|xM) ok=1 ;; + xP|xN|xI|xS|xR) ok=1 ;; + xM) mapTag=R1_0_maintenance ; ok=1 ;; *) ok=0 ;; esac if [ $ok != 1 ]; then @@ -62,26 +64,28 @@ fi echo "Updating builder from CVS..." cd org.eclipse.rse.build stamp=`date +'%Y%m%d-%H%M'` -log=$HOME/ws/log-${buildType}$stamp.txt +log=$HOME/ws2/log-${buildType}$stamp.txt touch $log cvs -q update -RPd >> $log 2>&1 daystamp=`date +'%Y%m%d*%H'` echo "Running the builder..." -./nightly.sh HEAD ${buildType} ${buildId} >> $log 2>&1 +./nightly.sh ${mapTag} ${buildType} ${buildId} >> $log 2>&1 tail -50 $log #update the main download and archive pages cd /home/data/httpd/download.eclipse.org/dsdp/tm/downloads cvs -q update -RPd >> $log 2>&1 +chgrp -R dsdp-tmadmin * cd /home/data/httpd/archive.eclipse.org/dsdp/tm/downloads cvs -q update -RPd >> $log 2>&1 +chgrp -R dsdp-tmadmin * #Fixup permissions and group id on download.eclpse.org (just to be safe) -#chmod -R g+w $HOME/ws/publish/${buildType}*${daystamp}* +#chmod -R g+w $HOME/ws2/publish/${buildType}*${daystamp}* #Check the publishing -cd $HOME/ws/publish +cd $HOME/ws2/publish cd ${buildType}*${daystamp}* FILES=`ls RSE-SDK-*.zip 2>/dev/null` echo "FILES=$FILES" @@ -99,21 +103,26 @@ if [ -f package.count -a "$FILES" != "" ]; then ${mydir}/batch_sign.sh `pwd` fi - #update the doc server - rm -f ../N.latest/RSE-SDK-*.zip - cp -f RSE-SDK-*.zip ../N.latest/RSE-SDK-latest.zip - #chmod g+w ../N.latest/RSE-SDK-latest.zip - #chgrp dsdp-tmadmin ../N.latest/RSE-SDK-latest.zip - - #Update the testUpdates sites - echo "Refreshing update site" - cd $HOME/downloads-tm/testUpdates/bin - ./mkTestUpdates.sh - #echo "Refreshing signedUpdates site" - #cd $HOME/downloads-tm/signedUpdates/bin - #./mkTestUpdates.sh + if [ ${buildType} != M ]; then + #update the doc server + rm -f ../N.latest/RSE-SDK-*.zip + cp -f RSE-SDK-*.zip ../N.latest/RSE-SDK-latest.zip + #chmod g+w ../N.latest/RSE-SDK-latest.zip + #chgrp dsdp-tmadmin ../N.latest/RSE-SDK-latest.zip + if [ ${buildType} != N ]; then + #Update the testUpdates sites + echo "Refreshing update site" + cd $HOME/downloads-tm/testUpdates/bin + ./mkTestUpdates.sh + #echo "Refreshing signedUpdates site" + #cd $HOME/downloads-tm/signedUpdates/bin + #./mkTestUpdates.sh + fi + fi + cd "$curdir" else echo "package.count missing, release seems failed" fi +chmod dsdp-tm-rse $log diff --git a/releng/org.eclipse.rse.build/bin/doit_nightly.sh b/releng/org.eclipse.rse.build/bin/doit_nightly.sh index 085d809c4b0..1e203cf8f0c 100755 --- a/releng/org.eclipse.rse.build/bin/doit_nightly.sh +++ b/releng/org.eclipse.rse.build/bin/doit_nightly.sh @@ -18,7 +18,7 @@ umask 22 #export PATH=/shared/common/ibm-java2-ppc64-50/bin:$PATH #export PATH=/shared/webtools/apps/IBMJava2-ppc64-142/bin:$PATH #export PATH=/shared/webtools/apps/IBMJava2-ppc-142/bin:$PATH -export PATH=${HOME}/ws/IBMJava2-ppc-142/bin:$PATH +export PATH=${HOME}/ws2/IBMJava2-ppc-142/bin:$PATH curdir=`pwd` @@ -37,7 +37,7 @@ fi echo "Updating builder from CVS..." cd org.eclipse.rse.build stamp=`date +'%Y%m%d-%H%M'` -log=$HOME/ws/log-N$stamp.txt +log=$HOME/ws2/log-N$stamp.txt touch $log cvs -q update -RPd >> $log 2>&1 daystamp=`date +'%Y%m%d-%H'` @@ -47,10 +47,10 @@ echo "Running the builder..." tail -50 $log #Fixup permissions and group id on download.eclpse.org (just to be safe) -#chmod -R g+w $HOME/ws/publish/N${daystamp}* +#chmod -R g+w $HOME/ws2/publish/N${daystamp}* #Copy latest SDK in order to give access to DOC server -cd $HOME/ws/publish +cd $HOME/ws2/publish FILES=`ls N${daystamp}*/RSE-SDK-N${daystamp}*.zip 2>/dev/null` echo "FILES=$FILES" if [ "$FILES" != "" ]; then @@ -61,6 +61,6 @@ if [ "$FILES" != "" ]; then fi #Cleanup old nightly builds (leave only last 5 in place) -cd $HOME/ws/publish +cd $HOME/ws2/publish ls -d N200* | sort | head -n-5 | xargs rm -rf diff --git a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh index 12347f4648f..80ad56dce13 100755 --- a/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh +++ b/releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh @@ -12,7 +12,7 @@ # Convert normal "site.xml" to "testUpdates" # # Prerequisites: -# - Eclipse 3.2 installed in $HOME/ws/eclipse +# - Eclipse 3.3Mx installed in $HOME/ws2/eclipse # - Java5 in the PATH or in /shared/common/ibm-java2-ppc64-50 curdir=`pwd` @@ -40,10 +40,10 @@ fi # get newest plugins and features: to be done manually on real update site if [ `basename $SITE` = testUpdates ]; then echo "Working on test update site" - REL=`ls $HOME/ws/working/package | sort | tail -1` + REL=`ls $HOME/ws2/working/package | sort | tail -1` if [ "$REL" != "" ]; then echo "Checking new Updates from $REL" - DIR="$HOME/ws/working/package/$REL/updates" + DIR="$HOME/ws2/working/package/$REL/updates" if [ -d "$DIR/features" ]; then echo "Copying new plugins and features from $DIR" rm -rf features @@ -67,12 +67,12 @@ if [ `basename $SITE` = testUpdates ]; then mv -f web/site.xsl.new web/site.xsl echo "Conditioning the site... $SITE" #java -Dorg.eclipse.update.jarprocessor.pack200=$mydir \ - # -jar $HOME/ws/eclipse/startup.jar \ + # -jar $HOME/ws2/eclipse/startup.jar \ # -application org.eclipse.update.core.siteOptimizer \ # -jarProcessor -outputDir $SITE \ # -processAll -repack $SITE java -Dorg.eclipse.update.jarprocessor.pack200=$mydir \ - $HOME/ws/jarprocessor/jarprocessor.jar \ + $HOME/ws2/jarprocessor/jarprocessor.jar \ -outputDir $SITE -processAll -repack $SITE elif [ `basename $SITE` = signedUpdates ]; then echo "Working on signed update site" @@ -227,17 +227,17 @@ done # See https://bugs.eclipse.org/bugs/show_bug.cgi?id=154069 echo "Packing the site... $SITE" #java -Dorg.eclipse.update.jarprocessor.pack200=$mydir \ -# -jar $HOME/ws/eclipse/startup.jar \ +# -jar $HOME/ws2/eclipse/startup.jar \ # -application org.eclipse.update.core.siteOptimizer \ # -jarProcessor -outputDir $SITE \ # -processAll -pack $SITE java -Dorg.eclipse.update.jarprocessor.pack200=$mydir \ - $HOME/ws/jarprocessor/jarprocessor.jar \ + $HOME/ws2/jarprocessor/jarprocessor.jar \ -outputDir $SITE -processAll -pack $SITE #Create the digest echo "Creating digest..." -java -jar $HOME/ws/eclipse/startup.jar \ +java -jar $HOME/ws2/eclipse/startup.jar \ -application org.eclipse.update.core.siteOptimizer \ -digestBuilder -digestOutputDir=$SITE \ -siteXML=$SITE/site.xml