kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Improves build on MacOS with Homebrew or MacPorts

Browse Source 
Squashed commit of the following:

commit e158a2049b922cead90cee4a9d3814093db8d00d
Merge: e7c5c06 d545f5b
Author: Ian Rees <ian.rees@gmail.com>
Date:   Wed Mar 25 17:08:56 2015 +1300

    Merge branch 'mac-app-bundle' into macports-build-1

commit d545f5b0de0efa6a0fd020ac98bb6809d9254019
Author: Ian Rees <ian.rees@gmail.com>
Date:   Thu Mar 19 22:30:20 2015 +1300

    Minor fixes to Mac application bundle creation

commit e7c5c0630b47e89fc719259f3d81be724627f915
Author: Ian Rees <ian.rees@gmail.com>
Date:   Thu Mar 19 16:35:34 2015 +1300

    Report error if no OpenCasCADe found

commit 976b51c13a1619acf66b9d4fad5594fee292aa76
Author: Ian Rees <ian.rees@gmail.com>
Date:   Thu Mar 19 16:30:47 2015 +1300

    Detects OCE automatically on Homebrew and MacPorts

commit 1cc477f77f388f2ccb26f3884320819f8cb33249
Author: Ian Rees <ian.rees@gmail.com>
Date:   Tue Mar 17 15:00:34 2015 +1300

    Find PySide and Shiboken automagically on MacPorts

commit 8bf2ebf7397a1c8c4b1b6f1d97e303f335ab47d7
Author: Ian Rees <ian.rees@gmail.com>
Date:   Mon Mar 16 23:05:35 2015 +1300

    Finds the Python include dir and library on OSX

commit 8bba9b2c78cfe65d7c295c4c99f0a176e1281539
Author: Ian Rees <ian.rees@gmail.com>
Date:   Mon Mar 16 17:31:43 2015 +1300

    Detects Python executable in MacPorts or Homebrew

commit 349a2e0e5c4d370c331bdb54d80d8f4323db8a6b
Author: Ian Rees <ian.rees@gmail.com>
Date:   Mon Mar 16 08:25:16 2015 +1300

    Missing correct Python lib is error on cmake-ing

commit 1625fe7c1c7fb2d944b04d93be8cf90d5c829be9
Author: Ian Rees <ian.rees@gmail.com>
Date:   Sun Mar 15 21:06:08 2015 +1300

    Find PySide's UIC and RCC tools properly on MacPorts
This commit is contained in:
Ian Rees
2015-03-25 17:09:50 +13:00
committed by wmayer
parent ebb1ca3b36
commit ccfaa56b31
6 changed files with 180 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/MacAppBundle/CMakeLists.txt
View File

@@ -21,8 +21,11 @@ get_filename_component(APP_PATH ${CMAKE_INSTALL_PREFIX} PATH)
install(CODE
"message(STATUS \"Making bundle relocatable...\")
# The top-level CMakeLists.txt should prevent multiple package manager
# prefixes from being set, so the lib path will resolve correctly...
execute_process(
COMMAND ${PYTHON_EXECUTABLE}
${CMAKE_SOURCE_DIR}/src/Tools/MakeMacBundleRelocatable.py ${APP_PATH}
COMMAND ${PYTHON_EXECUTABLE}
${CMAKE_SOURCE_DIR}/src/Tools/MakeMacBundleRelocatable.py
${APP_PATH} ${HOMEBREW_PREFIX}${MACPORTS_PREFIX}/lib
)"
)

4
src/MacAppBundle/FreeCAD.app/Contents/Info.plist
View File

@@ -17,7 +17,7 @@
<key>CFBundleLongVersionString</key>
<string></string>
<key>CFBundleName</key>
<string>FreeCAD</string>
<string>NAME_STRING_FROM_CMAKE</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
@@ -25,7 +25,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>0.14-dev</string>
<string>VERSION_STRING_FROM_CMAKE</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>NSHumanReadableCopyright</key>

49
src/Tools/MakeMacBundleRelocatable.py
View File

@@ -3,7 +3,7 @@ import sys
import subprocess
import pprint
SYS_PATHS = ["/System/","/usr/lib/"]
SYS_PATHS = ["/System/", "/usr/lib/"]
class LibraryNotFound(Exception):
pass
@@ -64,7 +64,7 @@ class DepsGraph:
operation(self, self.graph[node_key], *op_args)
def is_macho(path):
output = subprocess.check_output(["file",path])
output = subprocess.check_output(["file", path])
if output.count("Mach-O") != 0:
return True
@@ -134,7 +134,7 @@ def create_dep_nodes(install_names, search_paths):
path = install_path
if not path:
raise LibraryNotFound("{0} not found in given paths".format(lib_name))
raise LibraryNotFound(lib_name + "not found in given paths")
nodes.append(Node(lib_name, path))
@@ -155,10 +155,6 @@ def should_visit(prefix, path_filters, path):
#we only want to use filters if they have the same parent as path
for rel_pf in path_filters:
pf = os.path.join(prefix, rel_pf)
#print(path)
#print(pf)
#print(os.path.split(pf)[0] == os.path.split(path)[0])
#print('----')
if os.path.split(pf)[0] == os.path.split(path)[0]:
filters.append(pf)
if not filters:
@@ -189,7 +185,7 @@ def build_deps_graph(graph, bundle_path, dirs_filter=None, search_paths=[]):
for root, dirs, files in os.walk(bundle_path):
if dirs_filter != None:
dirs[:] = [d for d in dirs if should_visit(bundle_path, dirs_filter,
dirs[:] = [d for d in dirs if should_visit(bundle_path, dirs_filter,
os.path.join(root, d))]
s_paths.insert(0, root)
@@ -197,7 +193,8 @@ def build_deps_graph(graph, bundle_path, dirs_filter=None, search_paths=[]):
for f in files:
fpath = os.path.join(root, f)
ext = os.path.splitext(f)[1]
if (ext == "" and is_macho(fpath)) or ext == ".so" or ext == ".dylib":
if ( (ext == "" and is_macho(fpath)) or
ext == ".so" or ext == ".dylib" ):
visited[fpath] = False
stack = []
@@ -223,8 +220,6 @@ def build_deps_graph(graph, bundle_path, dirs_filter=None, search_paths=[]):
if not visited[dk]:
stack.append(dk)
def in_bundle(lib, bundle_path):
if lib.startswith(bundle_path):
return True
@@ -232,12 +227,13 @@ def in_bundle(lib, bundle_path):
def copy_into_bundle(graph, node, bundle_path):
if not in_bundle(node.path, bundle_path):
subprocess.check_call(["cp","-L",os.path.join(node.path,node.name),
os.path.join(bundle_path,"lib",node.name)])
node.path = os.path.join(bundle_path,"lib")
#fix permissions
subprocess.check_call(["chmod", "a+w", os.path.join(bundle_path,"lib",node.name)])
subprocess.check_call(["cp", "-L", os.path.join(node.path, node.name),
os.path.join(bundle_path, "lib", node.name)])
node.path = os.path.join(bundle_path, "lib")
#fix permissions
subprocess.check_call(["chmod", "a+w", os.path.join(bundle_path,
"lib", node.name)])
def add_rpaths(graph, node, bundle_path):
if node.children:
@@ -249,11 +245,12 @@ def add_rpaths(graph, node, bundle_path):
for install_name in install_names:
name = os.path.basename(install_name)
#change install names to use rpaths
subprocess.check_call(["install_name_tool","-change",
subprocess.check_call(["install_name_tool", "-change",
install_name, "@rpath/" + name, lib])
dep_node = node.children[node.children.index(name)]
rel_path = os.path.relpath(graph.get_node(dep_node).path, node.path)
rel_path = os.path.relpath(graph.get_node(dep_node).path,
node.path)
rpath = ""
if rel_path == ".":
rpath = "@loader_path/"
@@ -264,21 +261,21 @@ def add_rpaths(graph, node, bundle_path):
for path in rpaths:
subprocess.call(["install_name_tool", "-add_rpath", path, lib])
def print_node(graph, node):
print(os.path.join(node.path, node.name))
def main():
if len(sys.argv) < 2:
print "Usage " + sys.argv[0] + " path [additional search paths]"
quit()
path = sys.argv[1]
bundle_path = os.path.abspath(os.path.join(path, "Contents"))
graph = DepsGraph()
dir_filter = ["bin","lib", "Mod","Mod/PartDesign",
dir_filter = ["bin", "lib", "Mod", "Mod/PartDesign",
"lib/python2.7/site-packages",
"lib/python2.7/lib-dynload"]
search_paths = [bundle_path + "/lib", "/usr/local/lib", "/usr/local/Cellar/freetype/2.5.4/lib"]
search_paths = [bundle_path + "/lib"] + sys.argv[2:]
build_deps_graph(graph, bundle_path, dir_filter, search_paths)
#graph.visit(print_node)
graph.visit(copy_into_bundle, [bundle_path])
graph.visit(add_rpaths, [bundle_path])