From: Eric Bollengier Date: Tue, 27 Apr 2010 19:35:25 +0000 (+0200) Subject: Tweak release scripts X-Git-Tag: Release-5.0.2~2 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e22c1d0de6a5b2a74a2642e7071c5830214b99b1;p=bacula%2Fbacula Tweak release scripts --- diff --git a/bacula/release/makeclean b/bacula/release/makeclean index ec44b8b002..9ed063381d 100755 --- a/bacula/release/makeclean +++ b/bacula/release/makeclean @@ -1,2 +1,2 @@ #!/bin/sh -rm -rf bacula-* winbacula* win64bacula* +rm -rf bacula-* win32bacula* win64bacula* diff --git a/bacula/release/makerescuerel b/bacula/release/makerescuerel index fc34b4a455..2f8add903b 100755 --- a/bacula/release/makerescuerel +++ b/bacula/release/makerescuerel @@ -32,7 +32,6 @@ if [ $? -ne 0 ]; then exit 1 fi -ver=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' version.h` src=`pwd` git checkout ${branch} if [ $? -ne 0 ]; then @@ -40,6 +39,7 @@ if [ $? -ne 0 ]; then exit 1 fi git pull origin ${branch} +ver=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' version.h` fulltag=$tagbase$ver echo " " echo "Making $reltype for $base_pkg-$ver ..." diff --git a/bacula/release/makewinrel b/bacula/release/makewinrel index b119efc10b..ad29d78d66 100755 --- a/bacula/release/makewinrel +++ b/bacula/release/makewinrel @@ -30,7 +30,6 @@ if [ $? -ne 0 ]; then echo "Directory: $1 does not exist" exit 1 fi -ver=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' src/version.h` src=`pwd` git checkout ${branch} if [ $? -ne 0 ]; then @@ -38,6 +37,7 @@ if [ $? -ne 0 ]; then exit 1 fi git pull origin ${branch} +ver=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' src/version.h` fulltag=$tagbase$ver echo " " echo "Making $reltype for $base_pkg-$ver ..." @@ -46,16 +46,16 @@ echo "OK? ctl-c to stop" read a cd src/win32 -rm -f release32/winbacula-$ver.exe +rm -f release32/win32bacula-$ver.exe rm -f release64/win64bacula-$ver.exe make clean ./makeall -cp release32/winbacula-$ver.exe ${cwd} +cp release32/win32bacula-$ver.exe ${cwd} cp release64/win64bacula-$ver.exe ${cwd} git checkout master cd ${cwd} rm -f *.exe.sig -./sign winbacula-$ver.exe +./sign win32bacula-$ver.exe ./sign win64bacula-$ver.exe ls -l win*.exe* diff --git a/bacula/src/qt-console/make-win32 b/bacula/src/qt-console/make-win32 index b75ff1723b..3360e3401f 100755 --- a/bacula/src/qt-console/make-win32 +++ b/bacula/src/qt-console/make-win32 @@ -12,7 +12,7 @@ if test -e ../config.h.orig ; then mv -f ../config.h.orig ../config.h fi if test -d ../win32/release32; then - cp -f debug/bat.exe ../win32/release32 + cp -f release/bat.exe ../win32/release32 cp -f ${DEPKGS}/depkgs-mingw32/lib/qt/QtGui4.dll ../win32/release32 cp -f ${DEPKGS}/depkgs-mingw32/lib/qt/QtCore4.dll ../win32/release32 rm -rf ../win32/release32/help