finalise MuseScore 3 release

Turn off tx push Update Win installer images Place mac icons a bit higher in the unpack window
musescore · Dec 24, 2018 · 95066ba · 95066ba
1 parent 6187abc
commit 95066ba
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 46 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -9,6 +9,7 @@ image: Visual Studio 2017
 branches:
   only:
   - master
+  - 3.0
 
 # build cache to preserve files/folders between builds
 cache:
@@ -71,14 +72,14 @@ deploy:
     artifact: update_win_nightly.xml
 
 # uncomment in stable release
-#  - provider: S3
-#    access_key_id:
-#      secure: k68f3wMKIC5AzrfNMuC4kdPaxzvKdFVkRsietUKqc+E=
-#    secret_access_key:
-#      secure: IbpdpiHzGfMasaSA6uGrskE4xu9wE+HzElW7tIDOUww+ivHj+gN+mPgUHKCcV9Cn
-#    bucket: sparkle.musescore.org
-#    folder: testing/3/win/
-#    region: us-east-1
-#    set_public: true
-#    artifact: appcast.xml
+  - provider: S3
+    access_key_id:
+      secure: k68f3wMKIC5AzrfNMuC4kdPaxzvKdFVkRsietUKqc+E=
+    secret_access_key:
+      secure: IbpdpiHzGfMasaSA6uGrskE4xu9wE+HzElW7tIDOUww+ivHj+gN+mPgUHKCcV9Cn
+    bucket: sparkle.musescore.org
+    folder: testing/3/prebuild/win/
+    region: us-east-1
+    set_public: true
+    artifact: appcast.xml
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -74,9 +74,9 @@ include (CreatePrecompiledHeader)
 # set(CMAKE_VERBOSE_MAKEFILE ON)
 
 set(CMAKE_AUTOMOC     TRUE)
-set(MSCORE_UNSTABLE   TRUE)          # Mark as unstable
-set(MSCORE_RELEASE_CHANNEL "devel")
-#set(MSCORE_RELEASE_CHANNEL "testing")
+set(MSCORE_UNSTABLE   FALSE)          # Mark as unstable
+#set(MSCORE_RELEASE_CHANNEL "devel")
+set(MSCORE_RELEASE_CHANNEL "testing")
 #set(MSCORE_RELEASE_CHANNEL "stable")
 set(USE_SSE           TRUE)
 set(SCRIPT_INTERFACE  TRUE)

diff --git a/Makefile b/Makefile
@@ -21,8 +21,8 @@ REVISION  := `cat mscore/revision.h`
 CPUS      := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSORS_ONLN 2>/dev/null || echo 1)
 
 PREFIX    = "/usr/local"
-VERSION   = "3.0b-${REVISION}"
-#VERSION = 3.0.0
+#VERSION   = "3.0b-${REVISION}"
+VERSION = 3.0.0
 BUILD_NUMBER=""
 
 # Override SUFFIX and LABEL when multiple versions are installed to avoid conflicts.

diff --git a/Makefile.mingw b/Makefile.mingw
@@ -19,8 +19,8 @@
 
 
 REVISION  = $(shell type mscore\revision.h)
-VERSION   = 3.0b-${REVISION}
-#VERSION = 3.0.0
+#VERSION   = 3.0b-${REVISION}
+VERSION = 3.0.0
 BUILD_NUMBER=""
 CPUS = %NUMBER_OF_PROCESSORS%
 BUILD_FOR_WINSTORE="OFF"     # Override with "ON" to enable.

diff --git a/Makefile.osx b/Makefile.osx
@@ -18,8 +18,8 @@
 #=============================================================================
 
 REVISION  = `cat mscore/revision.h`
-VERSION   = "3.0b-${REVISION}"
-#VERSION = 3.0.0
+#VERSION   = "3.0b-${REVISION}"
+VERSION = 3.0.0
 BUILD_NUMBER = ""
 PREFIX=../applebuild
 

diff --git a/build/Packaging.cmake b/build/Packaging.cmake
@@ -50,16 +50,16 @@ IF(MINGW OR MSVC)
     SET(CPACK_STRIP_FILES "${MSCORE_EXECUTABLE_NAME}.exe")
 
     # File types association:
-    SET(CPACK_NSIS_DEFINES "!include ${PROJECT_SOURCE_DIR}/build/packaging\\\\FileAssociation.nsh")
-
-    SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
-        \\\${registerExtension} \\\"MuseScore File\\\" \\\".mscx\\\" \\\"\\\$INSTDIR\\\\bin\\\\${MSCORE_EXECUTABLE_NAME}.exe\\\"
-        \\\${registerExtension} \\\"Compressed MuseScore File\\\" \\\".mscz\\\" \\\"\\\$INSTDIR\\\\bin\\\\${MSCORE_EXECUTABLE_NAME}.exe\\\"
-    ")
-    SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
-        \\\${unregisterExtension} \\\".mscx\\\" \\\"MuseScore File\\\"
-        \\\${unregisterExtension} \\\".mscz\\\" \\\"Compressed MuseScore File\\\"
-    ")
+    # SET(CPACK_NSIS_DEFINES "!include ${PROJECT_SOURCE_DIR}/build/packaging\\\\FileAssociation.nsh")
+
+    # SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
+    #     \\\${registerExtension} \\\"MuseScore File\\\" \\\".mscx\\\" \\\"\\\$INSTDIR\\\\bin\\\\${MSCORE_EXECUTABLE_NAME}.exe\\\"
+    #     \\\${registerExtension} \\\"Compressed MuseScore File\\\" \\\".mscz\\\" \\\"\\\$INSTDIR\\\\bin\\\\${MSCORE_EXECUTABLE_NAME}.exe\\\"
+    # ")
+    # SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
+    #     \\\${unregisterExtension} \\\".mscx\\\" \\\"MuseScore File\\\"
+    #     \\\${unregisterExtension} \\\".mscz\\\" \\\"Compressed MuseScore File\\\"
+    # ")
 
     file(TO_CMAKE_PATH $ENV{PROGRAMFILES} PROGRAMFILES)
     SET(CPACK_WIX_ROOT "${PROGRAMFILES}/WiX Toolset v3.11")

diff --git a/build/package_mac b/build/package_mac
@@ -40,9 +40,9 @@ function set_bundle_display_options() {
             delay 1 -- sync
             set icon size of the icon view options of container window to 128
             set arrangement of the icon view options of container window to not arranged
-            set position of item "${LONGER_NAME}.app" to {400,125}
+            set position of item "${LONGER_NAME}.app" to {400,110}
             close
-            set position of item "Applications" to {150,125}
+            set position of item "Applications" to {150,110}
             open
             set background picture of the icon view options of container window to file "background.tiff" of folder "Pictures"
             set the bounds of the container window to {0, 0, 540, 300}

diff --git a/build/packaging/WIX.template.in b/build/packaging/WIX.template.in
@@ -71,14 +71,15 @@
             <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\$(var.ShortProdName)\Capabilities" Name="ApplicationIcon" Value="[INSTALL_ROOT]bin\$(var.ExeName),0" Type="string" />
             <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\$(var.ShortProdName)\Capabilities" Name="ApplicationName" Value="$(var.ProdName)" Type="string" />
             <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\$(var.ShortProdName)\Capabilities\DefaultIcon" Value="[INSTALL_ROOT]bin\$(var.ExeName),1" Type="string" />
-
+            <!--
             <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\$(var.ShortProdName)\Capabilities\FileAssociations" Name=".mscz" Value="MuseScore.mscz" Type="string" />
             <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\$(var.ShortProdName)\Capabilities\FileAssociations" Name=".mscx" Value="MuseScore.mscx" Type="string" />
-
+            -->
             <!-- TODO add more types?-->
-
+            <!--
             <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\$(var.ShortProdName)\Capabilities\MIMEAssociations" Name="application/x-musescore" Value="MuseScore.mscz" Type="string" />
             <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\$(var.ShortProdName)\Capabilities\MIMEAssociations" Name="application/x-musescore+xml" Value="MuseScore.mscx" Type="string" />
+            -->
             <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\$(var.ShortProdName)\Capabilities\shell\open\command" Value="&quot;[INSTALL_ROOT]bin\$(var.ExeName)&quot; &quot;%1&quot;" Type="string" />
             <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\RegisteredApplications" Name="$(var.ProdName)" Value="SOFTWARE\$(var.ShortProdName)\Capabilities" Type="string" />
 
@@ -115,7 +116,7 @@
             <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\Applications\$(var.ExeKey)\shell\open\command" Value="&quot;[INSTALL_ROOT]bin\$(var.ExeName)&quot; &quot;%1&quot;" Type="string" />
 
             <!-- MyApp.Document ProgIDs -->
-            <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\MuseScore.mscz" Value="Compressed MuseScore File" Type="string"/>
+            <!-- <RegistryValue Root="$(var.RegistryRoot)" Key="SOFTWARE\Classes\MuseScore.mscz" Value="Compressed MuseScore File" Type="string"/>
             <ProgId Id="MuseScore.mscz" Description="Compressed MuseScore File" Advertise="no" Icon="$(var.ExeId)" IconIndex="1">
                 <Extension Id="mscz" Advertise="no">
                     <Verb Id="open" TargetFile="$(var.ExeId)" Command="Open" Argument="&quot;%1&quot;" />
@@ -130,6 +131,7 @@
                     <MIME Advertise="no" ContentType="application/x-musescore+xml" Default="no" />
                 </Extension>
             </ProgId>
+            -->
         </Component>
 
         <FeatureRef Id="ProductFeature">

diff --git a/build/packaging/installer_background_wix.png b/build/packaging/installer_background_wix.png
diff --git a/build/packaging/installer_banner_wix.png b/build/packaging/installer_banner_wix.png
diff --git a/build/travis/job_macos/script.sh b/build/travis/job_macos/script.sh
@@ -132,7 +132,7 @@ export ARTIFACTS_REGION=us-east-1
 export ARTIFACTS_BUCKET=sparkle.musescore.org
 export ARTIFACTS_CACHE_CONTROL='public, max-age=315360000'
 export ARTIFACTS_PERMISSIONS=public-read
-export ARTIFACTS_TARGET_PATHS="/${MSCORE_RELEASE_CHANNEL}/3/macos"
+export ARTIFACTS_TARGET_PATHS="/${MSCORE_RELEASE_CHANNEL}/3/prebuild/macos"
 export ARTIFACTS_PATHS=appcast.xml
 artifacts upload
 

diff --git a/build/travis/job_macos_lupdate/script.sh b/build/travis/job_macos_lupdate/script.sh
@@ -20,15 +20,15 @@ rm mscore.pro
 rm instruments.pro
 rm tours.pro
 
-sudo pip install transifex-client
+# sudo pip install transifex-client
 
-cat > ~/.transifexrc <<EOL
-[https://www.transifex.com]
-hostname = https://www.transifex.com
-password = $TRANSIFEX_PASSWORD
-token =
-username = $TRANSIFEX_USER
-EOL
+# cat > ~/.transifexrc <<EOL
+# [https://www.transifex.com]
+# hostname = https://www.transifex.com
+# password = $TRANSIFEX_PASSWORD
+# token =
+# username = $TRANSIFEX_USER
+# EOL
 
-cp share/locale/mscore_en_US.ts share/locale/mscore_en.ts
-tx push -s
+# cp share/locale/mscore_en_US.ts share/locale/mscore_en.ts
+# tx push -s