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