diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro index aff1440b..367a2059 100644 --- a/Sankore_3.1.pro +++ b/Sankore_3.1.pro @@ -1,4 +1,4 @@ -TARGET = "Sankore 3.1" +TARGET = "Sankore" TEMPLATE = app THIRD_PARTY_PATH=../Sankore-ThirdParty diff --git a/release.linux.sh b/release.linux.sh index 6243016b..13d70a77 100644 --- a/release.linux.sh +++ b/release.linux.sh @@ -46,8 +46,8 @@ 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" -m "Generating setup for v$VERSION" -# git push origin --tags + git tag -a "v$VERSION" -m "Generating setup for v$VERSION" + git push origin --tags fi fi @@ -93,10 +93,10 @@ copyQtLibrary libQtCore rm -rf install/linux mkdir -p install/linux -mv build/linux/release/product build/linux/release/Sankore_3.1.$VERSION +mv build/linux/release/product build/linux/release/Sankore.$VERSION cd build/linux/release # "Removing .svn directories ..." find . -name .svn -exec rm -rf {} \; 2> /dev/null -tar cvzf ../../../install/linux/Sankore\ 3.1.tar.gz Sankore_3.1.$VERSION -C . +tar cvzf ../../../install/linux/Sankore.tar.gz Sankore.$VERSION -C . echo "Build Finished" diff --git a/release.macx.sh b/release.macx.sh index 1226458f..8cb5919b 100644 --- a/release.macx.sh +++ b/release.macx.sh @@ -103,11 +103,11 @@ if [ $? != 0 ]; then fi -NAME="Sankore 3.1" +NAME="Sankore" DMG="$NAME.dmg" VOLUME="/Volumes/$NAME" -APP="$PRODUCT_DIR/Sankore 3.1.app" +APP="$PRODUCT_DIR/Sankore.app" DSYM_NAME="$NAME (r$SVN_REVISION).dSYM" DSYM="$PRODUCT_DIR/$DSYM_NAME" GSYM_i386="$PRODUCT_DIR/$NAME i386.sym" @@ -128,8 +128,8 @@ notify "Bulding frameworks ..." $MACDEPLOYQT "$APP" notify "Extracting debug information ..." -$DSYMUTIL "$APP/Contents/MacOS/Sankore 3.1" -o "$DSYM" -$STRIP -S "$APP/Contents/MacOS/Sankore 3.1" +$DSYMUTIL "$APP/Contents/MacOS/Sankore" -o "$DSYM" +$STRIP -S "$APP/Contents/MacOS/Sankore" notify "Creating dmg ..." umount "$VOLUME" 2> /dev/null diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp index 53d522b2..c39fa906 100644 --- a/src/core/UBSettings.cpp +++ b/src/core/UBSettings.cpp @@ -756,7 +756,7 @@ QString UBSettings::uniboardDataDirectory() } } QString qtDataPath = UBFileSystemUtils::normalizeFilePath(UBDesktopServices::storageLocation(QDesktopServices::DataLocation)); - qtDataPath.replace("/Sankore 3.1", ""); + qtDataPath.replace("/Sankore", ""); return qtDataPath; } diff --git a/src/core/main.cpp b/src/core/main.cpp index 795d2417..a85d5a29 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -88,7 +88,7 @@ int main(int argc, char *argv[]) QApplication::setGraphicsSystem("raster"); #endif - UBApplication app("Sankore 3.1", argc, argv); + UBApplication app("Sankore", argc, argv); //BUGFIX: //when importing a sankore file that contains a non standard character diff --git a/src/frameworks/UBDesktopServices_mac.cpp b/src/frameworks/UBDesktopServices_mac.cpp index 0614b2c9..a2b9a019 100644 --- a/src/frameworks/UBDesktopServices_mac.cpp +++ b/src/frameworks/UBDesktopServices_mac.cpp @@ -96,7 +96,7 @@ QString UBDesktopServices::storageLocation(StandardLocation type) QString path = getFullPath(ref); if (QDesktopServices::DataLocation == type || QDesktopServices::CacheLocation == type) - path += "/Sankore/Sankore 3.1"; + path += "/Sankore/Sankore"; return path; } diff --git a/src/transition/UniboardSankoreTransition.cpp b/src/transition/UniboardSankoreTransition.cpp index 26fa1168..86b449d3 100644 --- a/src/transition/UniboardSankoreTransition.cpp +++ b/src/transition/UniboardSankoreTransition.cpp @@ -31,7 +31,7 @@ UniboardSankoreTransition::UniboardSankoreTransition(QObject *parent) : mUniboardSourceDirectory = UBFileSystemUtils::normalizeFilePath(UBDesktopServices::storageLocation(QDesktopServices::DataLocation)); #if defined(Q_WS_MACX) - mOldSankoreDirectory.replace("Sankore/Sankore 3.1", "Sankore 3.1"); + mOldSankoreDirectory.replace("Sankore/Sankore 3.1", "Sankore"); mUniboardSourceDirectory.replace("Sankore/Sankore 3.1", "Uniboard"); #else mUniboardSourceDirectory.replace("Sankore/Sankore 3.1", "Mnemis/Uniboard");