[Pkg-owncloud-commits] [owncloud-client] 124/159: Mac OS: The Resource/ folder in Qt frameworks might not exist

Sandro Knauß hefee-guest at moszumanska.debian.org
Fri May 1 13:05:35 UTC 2015


This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 7390ddbd98a33b8ff202399f49b6c044e1f51f04
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Fri Apr 17 13:22:19 2015 +0200

    Mac OS: The Resource/ folder in Qt frameworks might not exist
    
    Make sure to create it
---
 admin/osx/macdeployqt.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/admin/osx/macdeployqt.py b/admin/osx/macdeployqt.py
index 73acb27..3d3fe49 100755
--- a/admin/osx/macdeployqt.py
+++ b/admin/osx/macdeployqt.py
@@ -260,14 +260,18 @@ def CopyFramework(path):
   commands.append(args)
   args = ['chmod', 'u+w', os.path.join(full_path, parts[-1])]
   commands.append(args)
-  args = ['chmod', 'u+w', os.path.join(frameworks_dir, framework, "Resources")]
+  resources_dir = os.path.join(frameworks_dir, framework, "Resources")
+
+  args = ['mkdir', resources_dir]
+  commands.append(args)
+  args = ['chmod', 'u+w', resources_dir]
   commands.append(args)
 
   info_plist = os.path.join(os.path.split(path)[0], '..', '..', 'Contents', 'Info.plist')
   if not os.path.exists(info_plist):
     info_plist = os.path.join(os.path.split(path)[0], 'Resources', 'Info.plist')
   if os.path.exists(info_plist):
-    args = ['cp', '-r', info_plist, os.path.join(frameworks_dir, framework, "Resources")]
+    args = ['cp', '-r', info_plist, resources_dir]
     commands.append(args)
   return os.path.join(full_path, parts[-1])
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git



More information about the Pkg-owncloud-commits mailing list