Compare commits
2 commits
Author | SHA1 | Date | |
---|---|---|---|
|
1efc609b38 | ||
|
9be4aececb |
7 changed files with 12 additions and 10 deletions
4
Makefile
4
Makefile
|
@ -22,8 +22,8 @@ REVISION = `cat mscore/revision.h`
|
||||||
CPUS = `grep -c processor /proc/cpuinfo`
|
CPUS = `grep -c processor /proc/cpuinfo`
|
||||||
|
|
||||||
PREFIX = "/usr/local"
|
PREFIX = "/usr/local"
|
||||||
VERSION = "2.0b-${REVISION}"
|
#VERSION = "2.0b-${REVISION}"
|
||||||
#VERSION = 2.0
|
VERSION = 2.0beta1
|
||||||
|
|
||||||
#
|
#
|
||||||
# change path to include your Qt5 installation
|
# change path to include your Qt5 installation
|
||||||
|
|
|
@ -20,7 +20,9 @@
|
||||||
|
|
||||||
|
|
||||||
REVISION = $(shell type mscore\revision.h)
|
REVISION = $(shell type mscore\revision.h)
|
||||||
VERSION = 2.0b-${REVISION}
|
#VERSION = 2.0b-${REVISION}
|
||||||
|
VERSION = 2.0beta1
|
||||||
|
|
||||||
CPUS = 1
|
CPUS = 1
|
||||||
|
|
||||||
release:
|
release:
|
||||||
|
|
|
@ -19,8 +19,8 @@
|
||||||
#=============================================================================
|
#=============================================================================
|
||||||
|
|
||||||
REVISION = `cat mscore/revision.h`
|
REVISION = `cat mscore/revision.h`
|
||||||
VERSION = "2.0b-${REVISION}"
|
#VERSION = "2.0b-${REVISION}"
|
||||||
|
VERSION = 2.0beta1
|
||||||
PREFIX=../applebuild
|
PREFIX=../applebuild
|
||||||
|
|
||||||
XCODEPROJ = mscore.xcodeproj
|
XCODEPROJ = mscore.xcodeproj
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
VERSION=2.0
|
VERSION=2.0
|
||||||
APPNAME=mscore
|
APPNAME=mscore
|
||||||
LONG_NAME=MuseScore
|
LONG_NAME="MuseScore"
|
||||||
|
|
||||||
WORKING_DIRECTORY=applebuild
|
WORKING_DIRECTORY=applebuild
|
||||||
BACKGROUND=build/packaging/musescore-dmg-background.png
|
BACKGROUND=build/packaging/musescore-dmg-background.png
|
||||||
|
@ -100,7 +100,7 @@ rm -rf ${VOLUME}/${APPNAME}.app/Contents/Frameworks/QtBluetooth.*
|
||||||
rm -rf ${VOLUME}/${APPNAME}.app/Contents/Frameworks/QtWebSockets.*
|
rm -rf ${VOLUME}/${APPNAME}.app/Contents/Frameworks/QtWebSockets.*
|
||||||
rm -rf ${VOLUME}/${APPNAME}.app/Contents/Frameworks/QtNfc.*
|
rm -rf ${VOLUME}/${APPNAME}.app/Contents/Frameworks/QtNfc.*
|
||||||
|
|
||||||
mv ${VOLUME}/${APPNAME}.app ${VOLUME}/${LONG_NAME}.app
|
mv ${VOLUME}/${APPNAME}.app ${VOLUME}/${LONG_NAME}\ 2.app
|
||||||
|
|
||||||
# copy in background image
|
# copy in background image
|
||||||
mkdir -p ${VOLUME}/Pictures
|
mkdir -p ${VOLUME}/Pictures
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
<Product Id="$(var.CPACK_WIX_PRODUCT_GUID)"
|
<Product Id="$(var.CPACK_WIX_PRODUCT_GUID)"
|
||||||
Name="$(var.CPACK_PACKAGE_NAME)"
|
Name="$(var.CPACK_PACKAGE_NAME)"
|
||||||
Language="1033"
|
Language="1033"
|
||||||
Version="$(var.CPACK_PACKAGE_VERSION)"
|
Version="1.95.0"
|
||||||
Manufacturer="$(var.CPACK_PACKAGE_VENDOR)"
|
Manufacturer="$(var.CPACK_PACKAGE_VENDOR)"
|
||||||
UpgradeCode="$(var.CPACK_WIX_UPGRADE_GUID)">
|
UpgradeCode="$(var.CPACK_WIX_UPGRADE_GUID)">
|
||||||
|
|
||||||
|
|
|
@ -4594,7 +4594,7 @@ int main(int argc, char* av[])
|
||||||
|
|
||||||
QCoreApplication::setOrganizationName("MuseScore");
|
QCoreApplication::setOrganizationName("MuseScore");
|
||||||
QCoreApplication::setOrganizationDomain("musescore.org");
|
QCoreApplication::setOrganizationDomain("musescore.org");
|
||||||
QCoreApplication::setApplicationName("MuseScoreDevelopment");
|
QCoreApplication::setApplicationName("MuseScore2");
|
||||||
QAccessible::installFactory(AccessibleScoreView::ScoreViewFactory);
|
QAccessible::installFactory(AccessibleScoreView::ScoreViewFactory);
|
||||||
Q_INIT_RESOURCE(zita);
|
Q_INIT_RESOURCE(zita);
|
||||||
Q_INIT_RESOURCE(noeffect);
|
Q_INIT_RESOURCE(noeffect);
|
||||||
|
|
|
@ -115,7 +115,7 @@ void UpdateChecker::check(QString rev, bool m)
|
||||||
#if defined(Q_OS_MAC)
|
#if defined(Q_OS_MAC)
|
||||||
os = "mac";
|
os = "mac";
|
||||||
#endif
|
#endif
|
||||||
if(qApp->applicationName() == "MuseScore"){ //avoid nightly cymbals
|
if(qApp->applicationName() == "MuseScore2"){ //avoid nightly cymbals
|
||||||
if(MuseScore::unstable()){
|
if(MuseScore::unstable()){
|
||||||
release = "pre";
|
release = "pre";
|
||||||
}else{
|
}else{
|
||||||
|
|
Loading…
Reference in a new issue