Merge lp:~kalikiana/midori/bzr-release-scripts into lp:midori

[Cris Dywan]

Port git-specific bits from release scripts to bzr

[Paweł Forysiuk (tuxator)]

+ OLDVER=0.5.1 (line 51)
is that on purpose? it is because there is no git tag?

[Paweł Forysiuk (tuxator)]

review: Approve

[Cris Dywan (kalikiana)]

I realized the wscript is what contains the version and avoids the race condition of running it twice, which happened to me before, and having to manually sort it out. This is why I didn't use equivalent bzr code.

=== modified file 'tools/midori-dev'
--- tools/midori-dev	2012-04-05 21:47:48 +0000
+++ tools/midori-dev	2013-05-19 14:06:29 +0000
@@ -9,10 +9,10 @@
 #
 # See the file COPYING for the full license text.
 #
-# midori-dev: Run, update or debug Midori from git.
+# midori-dev: Run, update or debug Midori from bzr.
 
-# Adjust this to where you have your git sources
-DEVDIR=~/src/xfce/midori/git
+# Adjust this to where you have your bzr sources
+DEVDIR=~/src/xfce/midori/bzr
 
 # Location of stdout and stderr from running midori
 LOG=~/.midori.out
@@ -40,7 +40,7 @@
 fi
 
 case $CMD in
-  git)
+  bzr)
     exec ./waf build --run "$@" >& $LOG
     ;;
   gdb)
@@ -72,13 +72,13 @@
     fi
     ;;
   pull)
-    git pull
+    bzr pull
     ;;
   *)
     cat << EOM
 Usage: Create a symlink midori-<CMD>, or run 'midori-dev <CMD>'
 where CMD can be
-  git:  run the current git version
+  bzr:  run the current bzr version
   gdb:  open the last core dump in gdb
   save: saves relevant information about the last crash
         so that it can be analyzed later

=== modified file 'tools/release'
--- tools/release	2013-05-17 18:38:50 +0000
+++ tools/release	2013-05-19 14:06:29 +0000
@@ -9,24 +9,25 @@
 #
 # See the file COPYING for the full license text.
 
-OLDVER=$(git describe --abbrev=0)
+OLDVER=$(grep --color=no 'VERSION = VERSION_FULL = ' wscript | sed -r "s@.+ = '(.+)'@\1@")
 NEWVER=$(python -c "print('0.'+str(float('$OLDVER'[2:])+.1))")
 if [ "x$1" = "xbefore" ]; then
     echo Bumping from $OLDVER to $NEWVER
+    OLDVER=0.5.1
     sed -i "s@$OLDVER@$NEWVER@g" wscript win32/makedist/midori.nsi
-    echo; echo v$NEWVER:; git log --pretty='format: %s' $OLDVER..HEAD | grep -v l10n | grep -v makedist | grep -v tools/release | grep -v nsi | grep -v -E 'Update .+ translation'; echo
+    echo; echo v$NEWVER:; bzr log --line -rtag:$OLDVER.. | sed -r 's@.+2013-[0-9]+-[0-9]+ @@' | grep -v l10n | grep -v makedist | grep -v tools/release | grep -v nsi | grep -v -E 'Update .+ translation'; echo
     curl http://wiki.xfce.org/_export/xhtml/midori/faq | \
         sed 's@This is a list of frequently asked questions@This is <a href="http://wiki.xfce.org/midori/faq">a snapshot of the online FAQ</a>@g' | \
         sed 's@<link rel="style.*>@<link rel="stylesheet" href="faq.css" />@g' > data/faq.html
 elif [ "x$1" = "xafter" ]; then
-    echo -n git commit -m "'Bump version to $NEWVER'"
+    echo -n bzr commit -p -m "'Bump version to $NEWVER'"
     case $SHELL in
     *fish*)
         echo -n '; and ' ;;
     *)
         echo -n ' && ' ;;
     esac
-    echo git tag -a $NEWVER -m "'Bump version to $NEWVER'"
+    echo bzr tag $NEWVER
     echo Press RETURN to download tarball now; read yes
     wget http://git.xfce.org/apps/midori/snapshot/midori-$NEWVER.tar.bz2
     echo https://releases.xfce.org/

=== modified file 'win32/makedist/win32-release'
--- win32/makedist/win32-release	2013-04-06 20:06:12 +0000
+++ win32/makedist/win32-release	2013-05-19 14:06:29 +0000
@@ -10,7 +10,7 @@
 # See the file COPYING for the full license text.
 
 
-version=$(git describe --abbrev=0)
+version=$(grep --color=no 'VERSION = VERSION_FULL = ' wscript | sed -r "s@.+ = '(.+)'@\1@")
 dropbox_dir=$HOME/Dropbox/Public
 
 # 32-bit build