From 9007a1b98532ef478858b0c65c316899287e8d10 Mon Sep 17 00:00:00 2001
From: ribeaudc <ribeaudc>
Date: Wed, 13 Aug 2008 14:34:01 +0000
Subject: [PATCH] change: - Allow sub-version.
SVN: 7901
---
openbis/source/bash/sprint_install.sh | 4 ++--
openbis/source/bash/tag_and_build.sh | 21 +++++++++++++--------
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/openbis/source/bash/sprint_install.sh b/openbis/source/bash/sprint_install.sh
index 1d4caaffac3..796da6d1108 100755
--- a/openbis/source/bash/sprint_install.sh
+++ b/openbis/source/bash/sprint_install.sh
@@ -27,13 +27,13 @@ rm sprint
mkdir sprint-$VER
ln -s sprint-$VER sprint
cd sprint
-unzip ../openBIS-server-S$VER-*
+unzip ../openBIS-server-S$VER*
cd openBIS-server
./install.sh $PWD ../../service.properties
echo Installing download server...
cd ..
-unzip ../download-server-S$VER-*
+unzip ../download-server-S$VER*
cd download-server
cp ~/old/sprint-$PREV_VER/download-server/etc/service.properties etc/
chmod 700 download-service.sh
diff --git a/openbis/source/bash/tag_and_build.sh b/openbis/source/bash/tag_and_build.sh
index 7d43e69968e..7155f88bf82 100755
--- a/openbis/source/bash/tag_and_build.sh
+++ b/openbis/source/bash/tag_and_build.sh
@@ -6,30 +6,35 @@
# and 'cisd-vesuvio.ethz.ch'. This is typically configured in the SSH config file.
if [ $# -lt 1 ]; then
- echo "Usage: $0 <sprint number>"
+ echo "Usage: $0 <sprint number> [subversion]"
exit 1
fi
TODAY=`date "+%Y-%m-%d"`
VER=$1
-FULL_VER=S$VER.0
+if [ $2 ]; then
+ SUBVER=$2
+else
+ SUBVER=0
+fi
+FULL_VER=S$VER.$SUBVER
SPRINT_SERVER=sprint-openbis.ethz.ch
CISD_SERVER=cisd-vesuvio.ethz.ch
svn checkout svn+ssh://source.systemsx.ch/repos/cisd/build_resources/trunk build_resources
cd build_resources
-echo Tagging openBIS to S$VER...
-./tag_sprint.sh openbis S$VER
+echo Tagging openBIS to $FULL_VER...
+./tag_sprint.sh openbis $FULL_VER
echo Building openBIS...
-./build.sh openbis S$VER
+./build.sh openbis $FULL_VER
-echo Copying new openBIS components to '$CISD_SERVER'...
+echo Copying new openBIS components to \'$CISD_SERVER\'...
OPENBIS_PATH=/localhome/cisd/sprint_builds/openBIS
SPRINT_DIR=$OPENBIS_PATH/$TODAY-$FULL_VER
-echo "mkdir -p $SPRINT_DIR" | ssh -T hal
+echo "mkdir -p $SPRINT_DIR" | ssh -T $CISD_SERVER
scp *.zip $CISD_SERVER:$SPRINT_DIR
-echo Copying new openBIS components to '$SPRINT_SERVER'...
+echo Copying new openBIS components to \'$SPRINT_SERVER\'...
scp openBIS-server-*.zip $SPRINT_SERVER:.
scp download-server-*.zip $SPRINT_SERVER:.
--
GitLab