Merge pull request #8 from LMMS/master

Master
LostRobotMusic · Jun 21, 2019 · 7f1c954 · 7f1c954
2 parents d683a51 + 5431cc7
commit 7f1c954
Show file tree

Hide file tree

Showing 66 changed files with 16,934 additions and 47,030 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,6 +25,9 @@ matrix:
               depth: false
         - os: osx
           osx_image: xcode8.3
+before_install:
+    # appdmg doesn't work with old Node.js
+    - if [ "$TRAVIS_OS_NAME" = osx ]; then nvm install 10; fi
 install: ${TRAVIS_BUILD_DIR}/.travis/install.sh
 script: ${TRAVIS_BUILD_DIR}/.travis/script.sh
 after_script: ${TRAVIS_BUILD_DIR}/.travis/after_script.sh

diff --git a/.travis/osx..install.sh b/.travis/osx..install.sh
@@ -19,4 +19,4 @@ brew install $PACKAGES
 # fftw tries to install gcc which conflicts with travis
 brew install fftw --ignore-dependencies
 
-sudo npm install -g appdmg
+npm install -g appdmg
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,7 +33,7 @@ SET(PROJECT_COPYRIGHT   "2008-${PROJECT_YEAR} ${PROJECT_AUTHOR}")
 SET(VERSION_MAJOR       "1")
 SET(VERSION_MINOR       "2")
 SET(VERSION_RELEASE     "0")
-SET(VERSION_STAGE       "rc8")
+SET(VERSION_STAGE       "")
 SET(VERSION_BUILD       "0")
 SET(VERSION             "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}")
 IF(VERSION_STAGE)

diff --git a/cmake/apple/dmg_branding.png b/cmake/apple/dmg_branding.png
diff --git a/cmake/apple/[email protected] b/cmake/apple/[email protected]
diff --git a/cmake/apple/lmms.plist.in b/cmake/apple/lmms.plist.in
@@ -147,5 +147,7 @@
         <string>NSApplication</string>
         <key>NSHighResolutionCapable</key>
         <string>True</string>
+        <key>NSRequiresAquaSystemAppearance</key>
+        <string>False</string>
   </dict>
 </plist>
diff --git a/cmake/apple/package_apple.json.in b/cmake/apple/package_apple.json.in
@@ -1,9 +1,9 @@
 {
  "title": "@MACOSX_BUNDLE_BUNDLE_NAME@ @MACOSX_BUNDLE_LONG_VERSION_STRING@",
  "background": "@CMAKE_SOURCE_DIR@/cmake/apple/dmg_branding.png",
- "icon-size": 72,
+ "icon-size": 128,
  "contents": [
-   { "x": 460, "y": 260, "type": "link", "path": "/Applications" },
-   { "x": 220, "y": 260, "type": "file", "path": "@CMAKE_BINARY_DIR@/@[email protected]" }
+   { "x": 139, "y": 200, "type": "file", "path": "@CMAKE_BINARY_DIR@/@[email protected]" },
+   { "x": 568, "y": 200, "type": "link", "path": "/Applications" }
  ]
 }