Use dylibbundler instead of hacked bundler

Author: hsource

Makefile

@@ -12,6 +12,13 @@ all: frontend pob
 	cp ${DIR}/Info.plist.sh ${DIR}/PathOfBuilding.app/Contents/Info.plist; \
 	echo 'Finished'
 
+# Sign with the first available identity
+sign:
+	echo 'Signing with the first available identity'; \
+	rm -rf PathOfBuilding.app/Contents/MacOS/spec/TestBuilds/3.13; \
+	codesign --force --deep --sign $$(security find-identity -v -p codesigning | awk 'FNR == 1 {print $$2}') PathOfBuilding.app; \
+	codesign -d -v PathOfBuilding.app
+
 pob: load_pob luacurl frontend
 	rm -rf PathOfBuildingBuild; \
 	cp -rf PathOfBuilding PathOfBuildingBuild; \
@@ -44,8 +51,9 @@ luacurl:
 	popd
 
 # curl is used since mesonInstaller.sh copies over the shared library dylib
+# dylibbundler is used to copy over dylibs that lcurl.so uses
 tools:
-	brew install qt@5 luajit zlib meson curl
+	brew install qt@5 luajit zlib meson curl dylibbundler
 
 # We don't usually modify the PathOfBuilding directory, so there's rarely a
 # need to delete it. We separate it out to a separate task.

README.md

@@ -43,12 +43,14 @@ Error loading main script: error loading module 'lcurl.safe' from file './lcurl.
     Expected in: /usr/lib/libcurl.4.dylib
 ```
 
-To try to fix this issue, we include the libcurl.4.dylib in our app.
+To try to fix this issue, we include the libcurl.4.dylib in our app
+using dylibbundler.
 
 We change it in mesonInstaller.sh based on https://stackoverflow.com/a/38709580/319066
 
-- `otool -L lcurl.so` can be used to debug the paths
-- `install_name_tool ...` is used to change the paths
+- `otool -L lcurl.so` can be used to debug the paths.
+- `install_name_tool ...` is used to change the paths behind the scenes, but
+  dylibbundler does all the work for us.
 
 ## Old manual steps to build:
 

meson.build

@@ -10,6 +10,7 @@ else
    gl_dep = dependency('gl')
 endif
 zlib_dep = dependency('zlib')
+curl_dep = dependency('libcurl')
 
 # Import the extension module that knows how
 # to invoke Qt tools.
@@ -18,7 +19,7 @@ prep = qt5.preprocess(moc_headers : ['subscript.hpp', 'pobwindow.hpp'])
 
 executable('PathOfBuilding',
   sources : ['main.cpp', prep],
-  dependencies : [qt5_dep, gl_dep, zlib_dep, lua_dep],
+  dependencies : [qt5_dep, gl_dep, zlib_dep, lua_dep, curl_dep],
   install : true)
 
 

mesonInstaller.sh

@@ -1,15 +1,16 @@
 #!/bin/bash
 
-cp -rf ${MESON_SOURCE_ROOT}/PathOfBuildingBuild/* ${MESON_INSTALL_PREFIX}/Contents/MacOS/
-cp -f ${MESON_SOURCE_ROOT}/fonts/*.ttf ${MESON_INSTALL_PREFIX}/Contents/MacOS/
+cp -rf "${MESON_SOURCE_ROOT}"/PathOfBuildingBuild/* "${MESON_INSTALL_PREFIX}"/Contents/MacOS/
+cp -f "${MESON_SOURCE_ROOT}"/fonts/*.ttf "${MESON_INSTALL_PREFIX}"/Contents/MacOS/
 
-mkdir -p ${MESON_INSTALL_PREFIX}/Contents/Frameworks
+mkdir -p "${MESON_INSTALL_PREFIX}/Contents/Frameworks"
 
-# This is an attempted fix to the error on old Mac versions:
+# Meson doesn't bundle dependencies of our shared library by default, so we have
+# to do it on our own.
+#
+# This fixes the error:
 # "Symbol not found: _curl_easy_option_by_id" since that didn't exist in older
 # cURL libraries.
-#
-# Copy over the library 
-cp -f "$(brew --prefix --installed curl)/lib/libcurl.4.dylib" ${MESON_INSTALL_PREFIX}/Contents/Frameworks
-# Change the reference to refer to the new library path
-install_name_tool -change "$(brew --prefix --installed curl)/lib/libcurl.4.dylib" @executable_path/../Frameworks/libcurl.4.dylib ${MESON_INSTALL_PREFIX}/Contents/MacOS/lcurl.so
+echo 'Bundling dylibs for lcurl.so'
+cd "${MESON_INSTALL_PREFIX}/Contents"
+dylibbundler --overwrite-dir --create-dir --bundle-deps --fix-file MacOS/lcurl.so