mac-libs.rb: Make bundling a bit smarter

* Resolve symlinks to avoid including the same thing twice (like
  version-numered dylib symlinks)
* Look in all Qt prefix paths for plugins - the package may not
  necessarily have the same path
* reduce install_name_tool invocations to make it a bit faster
* change dylib IDs to remove original source path
This commit is contained in:
Nadia Holmquist Pedersen 2024-08-13 07:53:09 +02:00
parent e290c42360
commit c6cab9ed41
2 changed files with 83 additions and 41 deletions

View File

@ -63,10 +63,10 @@ else()
endif() endif()
if (USE_QT6) if (USE_QT6)
find_package(Qt6 COMPONENTS Core Gui Widgets Network Multimedia OpenGL OpenGLWidgets REQUIRED) find_package(Qt6 COMPONENTS Core Gui Widgets Network Multimedia OpenGL OpenGLWidgets Svg REQUIRED)
set(QT_LINK_LIBS Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Network Qt6::Multimedia Qt6::OpenGL Qt6::OpenGLWidgets) set(QT_LINK_LIBS Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Network Qt6::Multimedia Qt6::OpenGL Qt6::OpenGLWidgets)
else() else()
find_package(Qt5 COMPONENTS Core Gui Widgets Network Multimedia REQUIRED) find_package(Qt5 COMPONENTS Core Gui Widgets Network Multimedia Svg REQUIRED)
set(QT_LINK_LIBS Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia) set(QT_LINK_LIBS Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia)
endif() endif()

View File

@ -77,6 +77,19 @@ def expand_load_path(lib, path)
return nil return nil
end end
def detect_framework(lib)
framework = lib.match(/(.*).framework/)
framework = framework.to_s if framework
if framework
fwname = File.basename(framework)
fwlib = lib.sub(framework + "/", "")
return true, framework, fwname, fwlib
else
return false
end
end
def system_path?(path) def system_path?(path)
path.match(/^\/usr\/lib|^\/System/) != nil path.match(/^\/usr\/lib|^\/System/) != nil
end end
@ -85,9 +98,10 @@ def system_lib?(lib)
system_path? File.dirname(lib) system_path? File.dirname(lib)
end end
def install_name_tool(exec, action, path1, path2 = nil) def install_name_tool(exec, *options)
args = ["-#{action.to_s}", path1] args = options.map do |it|
args << path2 if path2 != nil if it.is_a? Symbol then "-#{it.to_s}" else it end
end
Open3.popen3("install_name_tool", *args, exec) do |stdin, stdout, stderr, thread| Open3.popen3("install_name_tool", *args, exec) do |stdin, stdout, stderr, thread|
print stdout.read print stdout.read
@ -99,58 +113,68 @@ def install_name_tool(exec, action, path1, path2 = nil)
end end
def strip(lib) def strip(lib)
out, _ = Open3.capture2("strip", "-no_code_signature_warning", "-Sx", lib) out, _ = Open3.capture2("xcrun", "strip", "-no_code_signature_warning", "-Sx", lib)
print out print out
end end
def fixup_libs(prog, orig_path) def fixup_libs(prog, orig_path)
throw "fixup_libs: #{prog} doesn't exist" unless File.exist? prog throw "fixup_libs: #{prog} doesn't exist" unless File.exist? prog
libs = get_load_libs(prog).map { |it| expand_load_path(orig_path, it) }.select { |it| not system_lib? it[0] } libs = get_load_libs(prog)
.map { |it| expand_load_path(orig_path, it) }
.select { |it| not system_lib? it[0] }
FileUtils.chmod("u+w", prog) FileUtils.chmod("u+w", prog)
strip prog strip prog
changes = []
isfw, _, fwname, fwlib = detect_framework(prog)
if isfw then
changes += [:id, File.join("@rpath", fwname, fwlib)]
else
changes += [:id, File.join("@rpath", File.basename(prog))]
end
libs.each do |lib| libs.each do |lib|
libpath, libtype = lib libpath, libtype = lib
if File.basename(libpath) == File.basename(prog) if File.basename(libpath) == File.basename(prog)
if libtype == :absolute if libtype == :absolute
install_name_tool prog, :change, libpath, File.join("@rpath", File.basename(libpath)) changes += [:change, libpath, File.join("@rpath", File.basename(libpath))]
end end
next next
end end
framework = libpath.match(/(.*).framework/) is_framework, fwpath, fwname, fwlib = detect_framework(libpath)
framework = framework.to_s if framework
if framework
fwlib = libpath.sub(framework + "/", "")
fwname = File.basename(framework)
if is_framework
unless libtype == :rpath unless libtype == :rpath
install_name_tool prog, :change, libpath, File.join("@rpath", fwname, fwlib) changes += [:change, libpath, File.join("@rpath", fwname, fwlib)]
end end
next if File.exist? File.join(frameworks_dir, fwname) next if File.exist? File.join(frameworks_dir, fwname)
expath, _ = expand_load_path(orig_path, framework) expath, _ = expand_load_path(orig_path, fwpath)
FileUtils.cp_r(expath, frameworks_dir, preserve: true) FileUtils.cp_r(expath, frameworks_dir, preserve: true)
FileUtils.chmod_R("u+w", File.join(frameworks_dir, fwname)) FileUtils.chmod_R("u+w", File.join(frameworks_dir, fwname))
fixup_libs File.join(frameworks_dir, fwname, fwlib), libpath fixup_libs File.join(frameworks_dir, fwname, fwlib), libpath
else else
libname = File.basename(libpath) reallibpath = File.realpath(libpath)
libname = File.basename(reallibpath)
dest = File.join(frameworks_dir, libname) dest = File.join(frameworks_dir, libname)
if libtype == :absolute if libtype == :absolute
install_name_tool prog, :change, libpath, File.join("@rpath", libname) changes += [:change, libpath, File.join("@rpath", libname)]
end end
next if File.exist? dest next if File.exist? dest
expath, _ = expand_load_path(orig_path, libpath) expath, _ = expand_load_path(orig_path, reallibpath)
FileUtils.copy expath, frameworks_dir FileUtils.copy expath, frameworks_dir
FileUtils.chmod("u+w", dest) FileUtils.chmod("u+w", dest)
fixup_libs dest, libpath fixup_libs dest, reallibpath
end end
end end
install_name_tool(prog, *changes)
end end
if ARGV[0] == "--dmg" if ARGV[0] == "--dmg"
@ -176,14 +200,6 @@ unless File.exist? $bundle and File.exist? File.join($build_dir, "CMakeCache.txt
exit 1 exit 1
end end
File.read(File.join($build_dir, "CMakeCache.txt"))
.split("\n")
.find { |it| it.match /Qt(.)_DIR:PATH=(.*)/ }
qt_major = $1
qt_dir = $2
qt_dir = File.absolute_path("#{qt_dir}/../../..")
for lib in get_load_libs(executable) do for lib in get_load_libs(executable) do
next if system_lib? lib next if system_lib? lib
@ -196,19 +212,38 @@ for lib in get_load_libs(executable) do
$fallback_rpaths << path unless $fallback_rpaths.include? path $fallback_rpaths << path unless $fallback_rpaths.include? path
end end
$fallback_rpaths << File.join(qt_dir, "lib") $qt_major = nil
plugin_paths = [ qt_dirs = File.read(File.join($build_dir, "CMakeCache.txt"))
File.join(qt_dir, "libexec", "qt#{qt_major}", "plugins"), .split("\n")
File.join(qt_dir, "plugins"), .select { |it| it.match /^Qt([\w]+)_DIR:PATH=.*/ }
File.join(qt_dir, "share", "qt", "plugins") .map { |dir|
] dir.match /^Qt(5|6).*\=(.*)/
throw "Inconsistent Qt versions found." if $qt_major != nil && $qt_major != $1
$qt_major = $1
File.absolute_path("#{$2}/../../..")
}.uniq
qt_plugins = plugin_paths.find { |file| File.exist? file }
if qt_plugins == nil def locate_plugin(dirs, plugin)
puts "Couldn't find Qt plugins, tried looking for:" plugin_paths = [
plugin_paths.each { |path| puts " - #{path}" } File.join("plugins", plugin),
File.join("lib", "qt-#{$qt_major}", "plugins", plugin),
File.join("libexec", "qt-#{$qt_major}", "plugins", plugin),
File.join("share", "qt", "plugins", plugin)
]
dirs.each do |dir|
plugin_paths.each do |plug|
path = File.join(dir, plug)
return path if File.exists? path
end
end
puts "Couldn't find the required Qt plugin: #{plugin}"
puts "Tried the following prefixes: "
puts dirs.map { |dir| "- #{dir}"}.join("\n")
puts "With the following plugin paths:"
puts plugin_paths.map { |path| "- #{path}"}.join("\n")
exit 1 exit 1
end end
@ -217,12 +252,19 @@ fixup_libs(executable, executable)
bundle_plugins = File.join($bundle, "Contents", "PlugIns") bundle_plugins = File.join($bundle, "Contents", "PlugIns")
want_plugins = ["styles/libqmacstyle.dylib", "platforms/libqcocoa.dylib", "imageformats/libqsvg.dylib"] want_plugins = [
"styles/libqmacstyle.dylib",
"platforms/libqcocoa.dylib",
"imageformats/libqsvg.dylib"
]
want_plugins.each do |plug| want_plugins.each do |plug|
pluginpath = locate_plugin(qt_dirs, plug)
destdir = File.join(bundle_plugins, File.dirname(plug)) destdir = File.join(bundle_plugins, File.dirname(plug))
FileUtils.mkdir_p(destdir) FileUtils.mkdir_p(destdir)
FileUtils.copy(File.join(qt_plugins, plug), destdir) FileUtils.copy(pluginpath, destdir)
fixup_libs File.join(bundle_plugins, plug), File.join(qt_plugins, plug) fixup_libs File.join(bundle_plugins, plug), pluginpath
end end
want_rpath = "@executable_path/../Frameworks" want_rpath = "@executable_path/../Frameworks"