prepare release of 2.0 RC

musescore · Mar 12, 2015 · bf1ec31 · bf1ec31
1 parent 0a109c8
commit bf1ec31
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -22,8 +22,8 @@ REVISION  = `cat mscore/revision.h`
 CPUS      = `grep -c processor /proc/cpuinfo`
 
 PREFIX    = "/usr/local"
-VERSION   = "2.0b-${REVISION}"
-#VERSION   = 2.0
+#VERSION   = "2.0b-${REVISION}"
+VERSION   = 2.0rc
 
 #
 # change path to include your Qt5 installation

diff --git a/Makefile.mingw b/Makefile.mingw
@@ -20,8 +20,9 @@
 
 
 REVISION  = $(shell type mscore\revision.h)
-VERSION   = 2.0b-${REVISION}
+#VERSION   = 2.0b-${REVISION}
 CPUS = 1
+VERSION   = 2.0rc
 
 release:
 	if not exist build.release\nul mkdir build.release

diff --git a/Makefile.osx b/Makefile.osx
@@ -19,7 +19,8 @@
 #=============================================================================
 
 REVISION  = `cat mscore/revision.h`
-VERSION   = "2.0b-${REVISION}"
+#VERSION   = "2.0b-${REVISION}"
+VERSION   = 2.0rc
 
 PREFIX=../applebuild
 

diff --git a/build/packaging/WIX.template.in b/build/packaging/WIX.template.in
@@ -17,7 +17,7 @@
     <Product Id="$(var.CPACK_WIX_PRODUCT_GUID)"
         Name="$(var.ProdName)"
         Language="1033"
-        Version="$(var.CPACK_PACKAGE_VERSION)"
+        Version="1.97.0"
         Manufacturer="$(var.CPACK_PACKAGE_VENDOR)"
         UpgradeCode="$(var.CPACK_WIX_UPGRADE_GUID)">
 

diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
@@ -4518,11 +4518,11 @@ int main(int argc, char* av[])
       revision = QString(f.readAll()).trimmed();
       f.close();
 
-      MuseScoreApplication* app = new MuseScoreApplication("mscore-dev", argc, av);
+      MuseScoreApplication* app = new MuseScoreApplication("mscore2", argc, av);
 
       QCoreApplication::setOrganizationName("MuseScore");
       QCoreApplication::setOrganizationDomain("musescore.org");
-      QCoreApplication::setApplicationName("MuseScoreDevelopment");
+      QCoreApplication::setApplicationName("MuseScore2");
       QCoreApplication::setApplicationVersion(VERSION);
       QAccessible::installFactory(AccessibleScoreView::ScoreViewFactory);
       QAccessible::installFactory(AccessibleSearchBox::SearchBoxFactory);