MOS
/
OpenBoard
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated the setup script

Browse Source
preferencesAboutTextFull
Kindov 14 years ago
parent 804d643f14
commit 22c68beb98
2 changed files with 9 additions and 7 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      Sankore_3.1.pro
  2. 12
      release.linux.sh

4
Sankore_3.1.pro
Unescape View File

@ -12,8 +12,8 @@ VERSION_PATCH = 00
VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}" VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}"
VERSION = $$replace(VERSION, "\\.r", "") VERSION = $$replace(VERSION, "\\.r", "")
SVN_VERSION = $$system(svnversion) #SVN_VERSION = $$system(svnversion)
SVN_VERSION = $$replace(SVN_VERSION, "\\n", "") #SVN_VERSION = $$replace(SVN_VERSION, "\\n", "")
LONG_VERSION = "$${VERSION}.$${SVN_VERSION}" LONG_VERSION = "$${VERSION}.$${SVN_VERSION}"
macx:OSX_VERSION = "$${VERSION} (r$${SVN_VERSION})" macx:OSX_VERSION = "$${VERSION} (r$${SVN_VERSION})"

12
release.linux.sh
Unescape View File

@ -6,18 +6,18 @@ rm -rf build/linux/release/
/usr/bin/qmake-qt4 /usr/bin/qmake-qt4
VERSION=`cat build/linux/release/version` VERSION=`cat build/linux/release/version`
if [ "$VERSION" = "" ]; then if [ ! -f build/linux/release/version ]; then
echo "version not found" echo "version not found"
exit 1 exit 1
else else
LAST_COMMITED_VERSION="`git describe $(git rev-list --tags --max-count=1)`" LAST_COMMITED_VERSION="`git describe $(git rev-list --tags --max-count=1)`"
if [ "v$VERSION" != "$LAST_COMMITED_VERSION" ]; then if [ "v$VERSION" != "$LAST_COMMITED_VERSION" ]; then
echo creating a tag with the version $VERSION 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 git push origin --tags
else else
if [ "$1" != "escape" ] ; then 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 echo sh release.linux.sh escape
exit 2 exit 2
fi fi
@ -31,12 +31,14 @@ chmod +x build/linux/release/product/run.sh
cp -R resources/linux/qtlinux/* build/linux/release/product/ cp -R resources/linux/qtlinux/* build/linux/release/product/
cp -R /usr/lib/qt4/plugins build/linux/release/product/
rm -rf install/linux rm -rf install/linux
mkdir -p 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 cd build/linux/release
# "Removing .svn directories ..." # "Removing .svn directories ..."
find . -name .svn -exec rm -rf {} \; 2> /dev/null 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 .

Write Preview
Loading…
Cancel
Save