Modify to work with Git and GitHub

make_release.sh

@@ -1,66 +1,94 @@
 #!/bin/bash
 
+# CometVisu release creation script
+# (c) by Christian Mayer
+#
+# This script assumes that the GitHub repository already has a branch named "release-<VERSION>"
+
 VERSION="$1"
-USER="$2"
-PASS="$3"
 
-if [[ -z $PASS ]]; then
+if [[ -z $VERSION ]]; then
   echo "Call script with the new version name as parameter like
-  $0 \"1.2.3\" \"MySVNUserName\" \"MySVNPass\" [-dry]"
+  $0 \"1.2.3\" [-dry]"
   exit
 fi
 
+WORKDIR="/tmp/cvrelease"
+RELEASE_BRANCH="release-$VERSION"
 RELEASE_DIR="release_$VERSION"
-SVN_CMD="svn --username $USER --password $PASS"
+GIT_CMD="git"
+GIT_DRY_CMD=""
+
+DRYRUN=0
+if [ x"$2" = "x-dry" ] || [ x"$3" = "x-dry" ] ; then
+  echo "Using option: Dry run!"
+  DRYRUN=1
+  GIT_DRY_CMD="--dry-run"
+fi
 
-if [ x"$4" = "x-dry" ]; then
-  echo "Dry run!"
-  SVN_CMD="echo svn"
+FORCE=0
+if [ x"$2" = "x-force" ] || [ x"$3" = "x-force" ] ; then
+  echo "Using option: Force script even when working directory is already existing!"
+  FORCE=1
 fi
 
-echo "Creating Release: '$VERSION' in '$RELEASE_DIR'"
+echo "Creating Release: '$VERSION' out of branch '$RELEASE_BRANCH' in '$RELEASE_DIR'"
 
 # Make sure we start at the location of this script
 # NOTE: the script assumes to live at .../CometVisu/_support
 cd "$( dirname "${BASH_SOURCE[0]}" )"
+SCRIPT_DIR=`pwd`
 
-$SVN_CMD copy -m "Creating release branch $VERSION" \
-  "svn+ssh://$USER@svn.code.sf.net/p/openautomation/code/CometVisu/trunk" \
-  "svn+ssh://$USER@svn.code.sf.net/p/openautomation/code/CometVisu/branches/$RELEASE_DIR"
+echo "source dir: '$SCRIPT_DIR'"
+echo "option dry: $DRYRUN"
+echo "option force: $FORCE"
 
-# NOTE: the script assumes that the branches live at .../CometVisu/branches
-cd ../branches
+# make sure the temp directory does not exist
+WORKDIR_EXISTING=0
+if [ -e "$WORKDIR" ]; then
+  echo "Error: working directory '$WORKDIR' does already exist! Please delete it!"
+  WORKDIR_EXISTING=1
+fi
 
-if [ x"$4" = "x-dry" ]; then
-  # dry run? Then fake copy in /tmp/branches
-  if [ -e  /tmp/branches ]; then
-    echo "/tmp/branches does already exist - deleting it..."
-    rm -rf /tmp/branches
+if [ $WORKDIR_EXISTING -eq 1 ]; then
+  if [ $FORCE -eq 0 ]; then
+    echo "-> Stopping script"
+    exit 1
+  else
+    echo "Deleting working directory now"
+    rm -rf $WORKDIR
   fi
-  mkdir /tmp/branches
-  mkdir /tmp/_support
-  cp ../_support/* /tmp/_support
-  cp -r ../trunk /tmp/branches/$RELEASE_DIR
-  cd /tmp/branches
 fi
 
-$SVN_CMD up
-echo $VERSION > $RELEASE_DIR/VERSION
-echo $VERSION > $RELEASE_DIR/src/version
-sed -i "s/Version: SVN/Version: $VERSION/" $RELEASE_DIR/src/config/visu_config.xml 
-sed -i "s/Version: SVN/Version: $VERSION/" $RELEASE_DIR/src/config/demo/visu_config_demo.xml 
-sed -i "s/comet_16x16_000000.png/comet_16x16_ff8000.png/" $RELEASE_DIR/src/index.html
-cd $RELEASE_DIR
+mkdir $WORKDIR
+cd $WORKDIR
+
+# Get code
+$GIT_CMD clone https://github.com/CometVisu/CometVisu.git --branch $RELEASE_BRANCH --single-branch --depth 1
+
+# Set version
+echo $VERSION > CometVisu/VERSION
+echo $VERSION > CometVisu/src/version
+sed -i "s/Version: Git/Version: $VERSION/" CometVisu/src/config/visu_config.xml 
+sed -i "s/Version: Git/Version: $VERSION/" CometVisu/src/config/demo/visu_config_demo.xml 
+sed -i "s/comet_16x16_000000.png/comet_16x16_ff8000.png/" CometVisu/src/index.html
+
+cd CometVisu
 
 #make
 JS_ENGINE=`which node nodejs 2>/dev/null | head -n 1`
+if [ x"$JS_ENGINE" = "x" ]; then
+  echo Fatal error: no node or nodejs found on the system. Please install!
+  exit 1
+fi
+export NODE_PATH=$SCRIPT_DIR
 TIMESTAMP=`date +%Y%m%d-%H%M%S`
 STATIC_FILES_PRE=$(cat src/cometvisu.appcache  | sed '0,/T MODIFY!$/{//!b};d')
 STATIC_FILES_POST=$(cat src/cometvisu.appcache  | sed '/^NETWORK:$/,/^$/{//!b};d')
 PLUGIN_FILES=$(find src | grep plugins | grep -E "structure_plugin.js|\.css" | sed 's%src/%%')
 DESIGN_FILES=$(find src | grep designs | grep -E "\.js|\.css|\.ttf" | grep -v "custom.css" | sed 's%src/%%')
 mkdir -p ./release
-$JS_ENGINE ../../_support/r.js -o build.js
+$JS_ENGINE $SCRIPT_DIR/r.js -o build.js
 find release -path "*/.svn" -exec rm -rf {} +
 echo -e "$STATIC_FILES_PRE\n$DESIGN_FILES\n$PLUGIN_FILES\n\nNETWORK:\n$STATIC_FILES_POST" | \
   sed "s/# Version.*/# Version $VERSION:$TIMESTAMP/"  \
@@ -72,11 +100,24 @@ chmod -R a+w release/config
 # why do I need this?!? I'd expect r.js to create that dir already...
 mkdir -p release/config/backup
 chmod -R a+w release/config/backup
+
+echo Ready to commit...
+
+$GIT_CMD add release
+$GIT_CMD commit -a -m "New release: $VERSION"  
+# TODO implement the following line based on current discussions
+$GIT_CMD push $GIT_DRY_CMD origin $RELEASE_BRANCH:refs/heads/$RELEASE_BRANCH-testX
+
 cd ..
-$SVN_CMD propdel svn:ignore $RELEASE_DIR
-$SVN_CMD add $RELEASE_DIR/docs --depth infinity
-$SVN_CMD add $RELEASE_DIR/release --depth infinity
-$SVN_CMD ci -m "New release: $VERSION" 
+tar -cjp --exclude-vcs  -f CometVisu_$VERSION.tar.bz2 CometVisu
 
-tar -cjp --exclude-vcs  -f CometVisu_$VERSION.tar.bz2 $RELEASE_DIR
+cd $SCRIPT_DIR
 
+echo done...
+echo Release package is stored at $WORKDIR/CometVisu_$VERSION.tar.bz2 
+echo
+echo Next steps:
+echo Go to GitHub, releases
+echo -> Draft new Release
+echo -> Give release the number (like v1.2.3-pre4)
+echo -> Drag and drop the release package file on the relevant field