diff --git a/.travis.yml b/.travis.yml index def3450d6..c63b4d449 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,7 @@ script: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make -j8 || travis_terminate 1; make install || travis_terminate 1; - sudo make dmg; + make dmg; fi after_success: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ls -lh strawberry*.dmg; fi diff --git a/cmake/Dmg.cmake b/cmake/Dmg.cmake index cf886fe54..36cc02f56 100644 --- a/cmake/Dmg.cmake +++ b/cmake/Dmg.cmake @@ -1,6 +1,6 @@ add_custom_target(dmg - COMMAND sudo /usr/local/opt/qt5/bin/macdeployqt strawberry.app - COMMAND sudo ${CMAKE_SOURCE_DIR}/dist/macos/macdeploy.py strawberry.app - COMMAND sudo ${CMAKE_SOURCE_DIR}/dist/macos/create-dmg.sh strawberry.app + COMMAND /usr/local/opt/qt5/bin/macdeployqt strawberry.app + COMMAND ${CMAKE_SOURCE_DIR}/dist/macos/macdeploy.py strawberry.app + COMMAND ${CMAKE_SOURCE_DIR}/dist/macos/create-dmg.sh strawberry.app WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) diff --git a/dist/macos/macdeploy.py b/dist/macos/macdeploy.py index 07193c1f0..747a6e254 100755 --- a/dist/macos/macdeploy.py +++ b/dist/macos/macdeploy.py @@ -304,10 +304,9 @@ def CopyLibrary(path): new_path = os.path.join(frameworks_dir, os.path.basename(path)) #args = ['cp', path, new_path] args = ['ditto', '--arch=i386', '--arch=x86_64', path, new_path] + commands.append(args) + commands.append(['chmod', '+w', new_path]) LOGGER.info("Copying library '%s'", path) - commands.append(args) - args = ['chmod', 'u+w', new_path] - commands.append(args) return new_path @@ -318,9 +317,8 @@ def CopyPlugin(path, subdir): #args = ['cp', path, new_path] args = ['ditto', '--arch=i386', '--arch=x86_64', path, new_path] commands.append(args) + commands.append(['chmod', '+w', new_path]) LOGGER.info("Copying plugin '%s'", path) - args = ['chmod', 'u+w', new_path] - commands.append(args) return new_path def CopyFramework(path): @@ -351,6 +349,7 @@ def CopyFramework(src_binary): commands.append(['mkdir', '-p', dest_dir]) commands.append(['cp', src_binary, dest_binary]) + commands.append(['chmod', '+w', dest_binary]) # Copy special files from various places: # QtCore has Resources/qt_menu.nib (copy to app's Resources)