Updated build scripts

preferencesAboutTextFull
shibakaneki 14 years ago
parent ed1bd5261b
commit 142da69c90
  1. 10
      release.linux.sh
  2. 16
      release.macx.sh

@ -5,6 +5,8 @@ rm -rf build/linux/release/
/usr/bin/qmake-qt4 /usr/bin/qmake-qt4
make -j 4 release-install
VERSION=`cat build/linux/release/version` VERSION=`cat build/linux/release/version`
if [ ! -f build/linux/release/version ]; then if [ ! -f build/linux/release/version ]; then
echo "version not found" echo "version not found"
@ -15,16 +17,8 @@ else
echo creating a tag with the version $VERSION echo creating a tag with the version $VERSION
git tag -a "v$VERSION" -m "Generating setup for v$VERSION" git tag -a "v$VERSION" -m "Generating setup for v$VERSION"
git push origin --tags 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 fi
fi
make -j 4 release-install
cp resources/linux/run.sh build/linux/release/product cp resources/linux/run.sh build/linux/release/product
chmod +x build/linux/release/product/run.sh chmod +x build/linux/release/product/run.sh

@ -64,10 +64,14 @@ rm -rf "$BUILD_DIR"
# generate Makefiles # generate Makefiles
notify "Generating Makefile ..." notify "Generating Makefile ..."
QMAKE_CMD="$QMAKE -spec macx-g++42" QMAKE_CMD="$QMAKE -spec macx-g++"
$QMAKE_CMD $QMAKE_CMD
# build
notify "Compiling ..."
make -j4 release
VERSION=`cat "$BUILD_DIR/version"` VERSION=`cat "$BUILD_DIR/version"`
if [ ! -f "$BUILD_DIR/version" ]; then if [ ! -f "$BUILD_DIR/version" ]; then
echo "version not found" echo "version not found"
@ -78,18 +82,8 @@ else
echo creating a tag with the version $VERSION echo creating a tag with the version $VERSION
git tag -a "v$VERSION" -m "Generated setup for v$VERSION" git tag -a "v$VERSION" -m "Generated setup for v$VERSION"
git push origin --tags 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 fi
fi
# build
notify "Compiling ..."
make -j4 release
if [ $? != 0 ]; then if [ $? != 0 ]; then
abort "compilation failed" abort "compilation failed"

Loading…
Cancel
Save