Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Pingel2011-08-08 12:58:30 -0400
committerSteffen Pingel2011-08-08 12:58:55 -0400
commit66cfc01a8cb23022267b7be5858b7c1f4158305a (patch)
treee763538741c4d7b20ca6545fda8952ca688b464d
parent5280501b4dbb7ef804688d54319e01f2591ad40e (diff)
downloadorg.eclipse.mylyn-66cfc01a8cb23022267b7be5858b7c1f4158305a.tar.gz
org.eclipse.mylyn-66cfc01a8cb23022267b7be5858b7c1f4158305a.tar.xz
org.eclipse.mylyn-66cfc01a8cb23022267b7be5858b7c1f4158305a.zip
made scripts executable and fixed version parsing
-rwxr-xr-x[-rw-r--r--]org.eclipse.mylyn.releng/bin/add-mirrors.sh0
-rwxr-xr-x[-rw-r--r--]org.eclipse.mylyn.releng/bin/create-api-profile.sh0
-rwxr-xr-x[-rw-r--r--]org.eclipse.mylyn.releng/bin/create-composite.sh0
-rwxr-xr-x[-rw-r--r--]org.eclipse.mylyn.releng/bin/generate-p2-metadata.sh0
-rwxr-xr-x[-rw-r--r--]org.eclipse.mylyn.releng/bin/promote-last-successful-build.sh0
-rwxr-xr-x[-rw-r--r--]org.eclipse.mylyn.releng/bin/promote-last-successful-incubator-build.sh0
-rwxr-xr-x[-rw-r--r--]org.eclipse.mylyn.releng/bin/set-fixed-versions.sh0
-rw-r--r--org.eclipse.mylyn.releng/bin/sign-update-site.sh165
-rwxr-xr-x[-rw-r--r--]org.eclipse.mylyn.releng/bin/update-metadata.sh2
-rwxr-xr-x[-rw-r--r--]org.eclipse.mylyn.releng/bin/update-versions.sh0
10 files changed, 1 insertions, 166 deletions
diff --git a/org.eclipse.mylyn.releng/bin/add-mirrors.sh b/org.eclipse.mylyn.releng/bin/add-mirrors.sh
index 9520d1b..9520d1b 100644..100755
--- a/org.eclipse.mylyn.releng/bin/add-mirrors.sh
+++ b/org.eclipse.mylyn.releng/bin/add-mirrors.sh
diff --git a/org.eclipse.mylyn.releng/bin/create-api-profile.sh b/org.eclipse.mylyn.releng/bin/create-api-profile.sh
index 0b5aeed..0b5aeed 100644..100755
--- a/org.eclipse.mylyn.releng/bin/create-api-profile.sh
+++ b/org.eclipse.mylyn.releng/bin/create-api-profile.sh
diff --git a/org.eclipse.mylyn.releng/bin/create-composite.sh b/org.eclipse.mylyn.releng/bin/create-composite.sh
index e088c9f..e088c9f 100644..100755
--- a/org.eclipse.mylyn.releng/bin/create-composite.sh
+++ b/org.eclipse.mylyn.releng/bin/create-composite.sh
diff --git a/org.eclipse.mylyn.releng/bin/generate-p2-metadata.sh b/org.eclipse.mylyn.releng/bin/generate-p2-metadata.sh
index 08ec9c1..08ec9c1 100644..100755
--- a/org.eclipse.mylyn.releng/bin/generate-p2-metadata.sh
+++ b/org.eclipse.mylyn.releng/bin/generate-p2-metadata.sh
diff --git a/org.eclipse.mylyn.releng/bin/promote-last-successful-build.sh b/org.eclipse.mylyn.releng/bin/promote-last-successful-build.sh
index 11a1c09..11a1c09 100644..100755
--- a/org.eclipse.mylyn.releng/bin/promote-last-successful-build.sh
+++ b/org.eclipse.mylyn.releng/bin/promote-last-successful-build.sh
diff --git a/org.eclipse.mylyn.releng/bin/promote-last-successful-incubator-build.sh b/org.eclipse.mylyn.releng/bin/promote-last-successful-incubator-build.sh
index f8533e3..f8533e3 100644..100755
--- a/org.eclipse.mylyn.releng/bin/promote-last-successful-incubator-build.sh
+++ b/org.eclipse.mylyn.releng/bin/promote-last-successful-incubator-build.sh
diff --git a/org.eclipse.mylyn.releng/bin/set-fixed-versions.sh b/org.eclipse.mylyn.releng/bin/set-fixed-versions.sh
index 177612e..177612e 100644..100755
--- a/org.eclipse.mylyn.releng/bin/set-fixed-versions.sh
+++ b/org.eclipse.mylyn.releng/bin/set-fixed-versions.sh
diff --git a/org.eclipse.mylyn.releng/bin/sign-update-site.sh b/org.eclipse.mylyn.releng/bin/sign-update-site.sh
deleted file mode 100644
index 5591fe6..0000000
--- a/org.eclipse.mylyn.releng/bin/sign-update-site.sh
+++ /dev/null
@@ -1,165 +0,0 @@
-#*******************************************************************************
-# Copyright (c) 2009 Tasktop Technologies and others.
-# 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
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Tasktop Technologies - initial API and implementation
-#*******************************************************************************
-#!/bin/bash -e
-
-help() {
- echo "usage: sign-update-site.sh major build"
- echo " local"
- exit 1
-}
-
-if [ $# -eq 0 ]
-then
- help
-fi
-
-if [ "$1" == "local" ]
-then
- BUILD_ROOT=$(cd $(dirname $0); pwd)
- source $BUILD_ROOT/local.sh
-else
- if [ $# -lt 2 ]
- then
- help
- fi
-
- MAJOR_VERSION=$1
- QUALIFIER=$2
-fi
-
-SRC=/home/data/httpd/download.eclipse.org/tools/mylyn/update-archive/$MAJOR_VERSION/$QUALIFIER
-DST=/opt/public/download-staging.priv/tools/mylyn
-OUT=$DST/output
-TMP=$DST/tmp/$MAJOR_VERSION.$QUALIFIER
-JAVA_HOME=/shared/tools/mylyn/tools/jdk
-ECLIPSE_HOME=/shared/tools/mylyn/eclipse
-
-unzip() {
- /bin/rm -R $TMP/$1 || true
- /bin/mkdir -p $TMP/$1
- if [ "$1" == "standard" ]
- then
- /usr/bin/unzip -d $TMP/$1 $SRC/mylyn-$MAJOR_VERSION.$QUALIFIER.zip
- else
- /usr/bin/unzip -d $TMP/$1 $SRC/mylyn-$MAJOR_VERSION.$QUALIFIER-$1.zip
- fi
-}
-
-rezip() {
- cd $TMP/$1
- echo Rezipping archive for $1, output is logged to $DST/sign.log
- if [ "$1" == "standard" ]
- then
- /usr/bin/zip $TMP/mylyn-$MAJOR_VERSION.$QUALIFIER.zip -r . >> $DST/sign.log
- else
- /usr/bin/zip $TMP/mylyn-$MAJOR_VERSION.$QUALIFIER-$1.zip -r . >> $DST/sign.log
- fi
-}
-
-pack() {
-DIR=$TMP/$1
-$JAVA_HOME/bin/java \
- -Xmx512m \
- -jar $ECLIPSE_HOME/plugins/org.eclipse.equinox.launcher_*.jar \
- -application org.eclipse.update.core.siteOptimizer \
- -jarProcessor -verbose -processAll -repack -pack \
- -digestBuilder -digestOutputDir=$DIR -siteXML=$DIR/site.xml \
- -outputDir $DIR $DIR
-
-echo Processing $DIR
-rm -f $DIR/artifacts.jar $DIR/content.jar
-$JAVA_HOME/bin/java \
- -Xmx512m \
- -jar $ECLIPSE_HOME/plugins/org.eclipse.equinox.launcher_*.jar \
- -application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
- -updateSite $DIR \
- -site file:$DIR/site.xml \
- -metadataRepository file:$DIR \
- -metadataRepositoryName "$2 "\
- -artifactRepository file:$DIR \
- -artifactRepositoryName "$2" \
- -compress \
- -reusePack200Files \
- -noDefaultIUs
-}
-
-fixpermissions() {
-DIR=$1
-/bin/chgrp -R mylynadmin $DIR
-/bin/chmod g+w -R $DIR
-/bin/chmod o+r -R $DIR
-/usr/bin/find $DIR -type d | xargs chmod +x
-}
-
-if [ ! -e $TMP ]
-then
-
- # extract site
-
- /bin/rm $TMP || true
- unzip standard
- #unzip extras
- unzip incubator
-
- echo Creating archive for signing, output is logged to $DST/sign.log
- /bin/rm $DST/mylyn.zip || true
- cd $TMP
- /usr/bin/find -name "org.eclipse*mylyn*.jar" | zip $DST/mylyn.zip -@ > $DST/sign.log
-
- # sign
-
- mkdir -p $OUT
- /bin/rm $OUT/mylyn.zip || true
- /usr/bin/sign $DST/mylyn.zip nomail $OUT
-fi
-
-I=0
-while [ $I -lt 30 ] && [ ! -e $OUT/mylyn.zip ]; do
- echo Waiting for $OUT/mylyn.zip
- sleep 45
- let I=I+1
-done
-
-if [ ! -e $OUT/mylyn.zip ]
-then
- echo
- echo Signing Failed: Timeout waiting for $OUT/mylyn.zip
- exit 1
-fi
-
-# repack site
-
-echo Unzipping signed files, output is logged to $DST/sign.log
-/usr/bin/unzip -o -d $TMP $OUT/mylyn.zip >> $DST/sign.log
-
-pack standard "Mylyn for Eclipse 3.5, 3.6 and 3.7"
-#pack extras "Mylyn Extras"
-pack incubator "Mylyn Incubator"
-
-fixpermissions $TMP
-
-rezip standard
-#rezip extras
-rezip incubator
-
-# republish
-
-/bin/mv $SRC $SRC-DELETE
-# other zip files are overridden here with signed versions
-mv $TMP/standard $TMP/e3.4
-/bin/cp -av $TMP $SRC
-# recover wikitext-standalone zip and other archives
-/bin/cp -v $SRC-DELETE/mylyn-wikitext-standalone-*.zip $SRC
-fixpermissions $SRC
-rm -R $SRC-DELETE
-
-# clean up
-/bin/rm -R $TMP || true
diff --git a/org.eclipse.mylyn.releng/bin/update-metadata.sh b/org.eclipse.mylyn.releng/bin/update-metadata.sh
index 6aa6914..356ac00 100644..100755
--- a/org.eclipse.mylyn.releng/bin/update-metadata.sh
+++ b/org.eclipse.mylyn.releng/bin/update-metadata.sh
@@ -10,7 +10,7 @@ for i in $(find -name site.xml); do
DIR=$(pwd)
DIR=${DIR##*drops/}
DIR=${DIR%%/*}
- if [ -z "$VERSION" ]; then
+ if [ -z "$DIR" ]; then
echo "Failed to determine version for $i. Exiting."
exit 1
fi
diff --git a/org.eclipse.mylyn.releng/bin/update-versions.sh b/org.eclipse.mylyn.releng/bin/update-versions.sh
index 1fc5af2..1fc5af2 100644..100755
--- a/org.eclipse.mylyn.releng/bin/update-versions.sh
+++ b/org.eclipse.mylyn.releng/bin/update-versions.sh

Back to the top