From: romibi <romibi@bluewin.ch>
Date: Tue, 5 Jul 2016 19:39:39 +0000 (+0200)
Subject: Fix Mac Deploy scripts for newer Xcode and git
X-Git-Tag: travis-deploy-test~405
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=236ad337e4f2bb4227547efe590942fe2b6c6052

Fix Mac Deploy scripts for newer Xcode and git

Resolves GH-229.
---

diff --git a/cmake/QuasselCompileSettings.cmake b/cmake/QuasselCompileSettings.cmake
index b2977b30..1e9646a7 100644
--- a/cmake/QuasselCompileSettings.cmake
+++ b/cmake/QuasselCompileSettings.cmake
@@ -80,6 +80,6 @@ endif()
 # Mac build stuff
 if (APPLE AND DEPLOY)
     set(CMAKE_OSX_ARCHITECTURES "x86_64")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.8")
-    set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.9")
+    set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk")
 endif()
diff --git a/scripts/build/macosx_DeployApp.py b/scripts/build/macosx_DeployApp.py
index 2f6957af..4ca72b49 100755
--- a/scripts/build/macosx_DeployApp.py
+++ b/scripts/build/macosx_DeployApp.py
@@ -200,6 +200,7 @@ class InstallQt(object):
             else:
                 newlibname = "@executable_path/%s%s" % (frameworkname, libpath)
             # print 'install_name_tool -id "%s" "%s"' % (newlibname, lib)
+            os.system('chmod +w "%s"' % (lib))
             os.system('install_name_tool -id "%s" "%s"' % (newlibname, lib))
 
             self.resolveDependancies(lib)
@@ -221,6 +222,8 @@ class InstallQt(object):
             newlibname = "@executable_path/Frameworks/%s" % newlibname
 
         # print 'install_name_tool -change "%s" "%s" "%s"' % (lib, newlibname, obj)
+        os.system('chmod +w "%s"' % (lib))
+        os.system('chmod +w "%s"' % (obj))
         os.system('install_name_tool -change "%s" "%s" "%s"' % (lib, newlibname, obj))
 
 if __name__ == "__main__":
diff --git a/scripts/build/macosx_makePackage.sh b/scripts/build/macosx_makePackage.sh
index a9326c0a..02ec5548 100755
--- a/scripts/build/macosx_makePackage.sh
+++ b/scripts/build/macosx_makePackage.sh
@@ -41,7 +41,7 @@ if [ ! -f "$mypath" ]; then
 fi
 
 SCRIPTDIR=$(dirname $mypath)
-QUASSEL_VERSION=$(git-describe)
+QUASSEL_VERSION=$(git describe)
 BUILDTYPE=$1
 
 # check the working dir
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cff7f94c..84da4767 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -90,7 +90,7 @@ if(APPLE)
                        COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Client ..)
     add_custom_command(TARGET quasselcore POST_BUILD
                        COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Core ..)
-    add_custom_command(TARGET quasselcore POST_BUILD
+    add_custom_command(TARGET quassel POST_BUILD
                        COMMAND ${CMAKE_SOURCE_DIR}/scripts/build/macosx_makePackage.sh Mono ..)
   endif()
 endif()