From 22c68beb98912501fc4e79ef77b199cde24a21cc Mon Sep 17 00:00:00 2001 From: Kindov Date: Tue, 3 May 2011 15:13:55 +0200 Subject: [PATCH] Updated the setup script --- Sankore_3.1.pro | 4 ++-- release.linux.sh | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro index 07b94165..f282fc04 100644 --- a/Sankore_3.1.pro +++ b/Sankore_3.1.pro @@ -12,8 +12,8 @@ VERSION_PATCH = 00 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}" VERSION = $$replace(VERSION, "\\.r", "") -SVN_VERSION = $$system(svnversion) -SVN_VERSION = $$replace(SVN_VERSION, "\\n", "") +#SVN_VERSION = $$system(svnversion) +#SVN_VERSION = $$replace(SVN_VERSION, "\\n", "") LONG_VERSION = "$${VERSION}.$${SVN_VERSION}" macx:OSX_VERSION = "$${VERSION} (r$${SVN_VERSION})" diff --git a/release.linux.sh b/release.linux.sh index f5601c6a..2cc16bf7 100644 --- a/release.linux.sh +++ b/release.linux.sh @@ -6,18 +6,18 @@ rm -rf build/linux/release/ /usr/bin/qmake-qt4 VERSION=`cat build/linux/release/version` -if [ "$VERSION" = "" ]; then +if [ ! -f build/linux/release/version ]; then echo "version not found" exit 1 else LAST_COMMITED_VERSION="`git describe $(git rev-list --tags --max-count=1)`" if [ "v$VERSION" != "$LAST_COMMITED_VERSION" ]; then echo creating a tag with the version $VERSION - git tag -a "v$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 fallowing command line" + 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 @@ -31,12 +31,14 @@ chmod +x build/linux/release/product/run.sh cp -R resources/linux/qtlinux/* build/linux/release/product/ +cp -R /usr/lib/qt4/plugins build/linux/release/product/ + rm -rf install/linux mkdir -p install/linux -mv build/linux/release/product build/linux/release/Sankore_3.1.$VERSION.$SVN_REVISION +mv build/linux/release/product build/linux/release/Sankore_3.1.$VERSION cd build/linux/release # "Removing .svn directories ..." find . -name .svn -exec rm -rf {} \; 2> /dev/null -tar cvzf ../../../install/linux/Sankore_3.1.$VERSION.$SVN_REVISION.tar.gz Sankore_3.1.$VERSION.$SVN_REVISION -C . +tar cvzf ../../../install/linux/Sankore_3.1.$VERSION.tar.gz Sankore_3.1.$VERSION -C .