From 142da69c90563c52f2727c329fb80ec855548e77 Mon Sep 17 00:00:00 2001
From: shibakaneki <didier@sente.ch>
Date: Tue, 3 May 2011 15:49:57 +0200
Subject: [PATCH] Updated build scripts

---
 release.linux.sh | 10 ++--------
 release.macx.sh  | 16 +++++-----------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/release.linux.sh b/release.linux.sh
index 2cc16bf7..e721b5d1 100644
--- a/release.linux.sh
+++ b/release.linux.sh
@@ -5,6 +5,8 @@ rm -rf build/linux/release/
 
 /usr/bin/qmake-qt4
 
+make -j 4 release-install
+
 VERSION=`cat build/linux/release/version`
 if [ ! -f build/linux/release/version ]; then
     echo "version not found"
@@ -15,17 +17,9 @@ else
 	echo creating a tag with the version $VERSION
         git tag -a "v$VERSION" -m "Generating setup for v$VERSION"
 	git push origin --tags 
-    else
-	if [ "$1" != "escape" ] ; then
-	    echo "if you have already compiled a release (e.g. on a different os) please use the following command line"
-	    echo sh release.linux.sh escape
-	    exit 2
-	fi
     fi
 fi
 
-make -j 4 release-install
-
 cp resources/linux/run.sh build/linux/release/product
 chmod +x build/linux/release/product/run.sh
 
diff --git a/release.macx.sh b/release.macx.sh
index 92969380..dce50ca1 100644
--- a/release.macx.sh
+++ b/release.macx.sh
@@ -64,10 +64,14 @@ rm -rf "$BUILD_DIR"
 # generate Makefiles
 notify "Generating Makefile ..."
 
-QMAKE_CMD="$QMAKE -spec macx-g++42"
+QMAKE_CMD="$QMAKE -spec macx-g++"
 
 $QMAKE_CMD
 
+# build
+notify "Compiling ..."
+make -j4 release
+
 VERSION=`cat "$BUILD_DIR/version"`
 if [ ! -f "$BUILD_DIR/version" ]; then
     echo "version not found"
@@ -78,19 +82,9 @@ else
 	echo creating a tag with the version $VERSION
 	git tag -a "v$VERSION" -m "Generated setup for v$VERSION"
 	git push origin --tags
-    else
-	if [ "$1" != "escape" ] ; then
-	    echo "if you have already compiled a release (e.g. on a different os) please use the fallowing command line"
-	    echo sh release.macx.sh escape
-	    exit 2
-	fi
     fi
 fi
   
-# build
-notify "Compiling ..."
-make -j4 release
-
 if [ $? != 0 ]; then
     abort "compilation failed"
 fi