From 6b962a4d5c8d03d2d7d495a148c558701042c737 Mon Sep 17 00:00:00 2001 From: IndrekV Date: Wed, 24 Jan 2018 15:02:03 +0200 Subject: [PATCH] Fixed libcrypto and libssl path references (mac) --- .../TogglDesktop.xcodeproj/project.pbxproj | 23 ++++--------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/src/ui/osx/TogglDesktop/TogglDesktop.xcodeproj/project.pbxproj b/src/ui/osx/TogglDesktop/TogglDesktop.xcodeproj/project.pbxproj index 5825151575..63eb9b070d 100644 --- a/src/ui/osx/TogglDesktop/TogglDesktop.xcodeproj/project.pbxproj +++ b/src/ui/osx/TogglDesktop/TogglDesktop.xcodeproj/project.pbxproj @@ -1015,8 +1015,7 @@ 69FC17EF17E6534400B96425 /* Resources */, 74E3CDDA17FC37A500C3ADD3 /* Run Script (install bugsnag) */, 74A50AA818434D90006F37BB /* CopyFiles */, - 7407F1F41AA80466000380C4 /* Run Script (fix Poco paths in Frameworks) */, - 74083B2B1B84DA3F00685E21 /* Run Script (fix Poco path in main app) */, + 7407F1F41AA80466000380C4 /* Run Script (Fix dynamic library paths in Frameworks) */, 74F125D51BB2ED9000487B14 /* Run Script (fix CrashReporter path in main app) */, ); buildRules = ( @@ -1241,33 +1240,19 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 7407F1F41AA80466000380C4 /* Run Script (fix Poco paths in Frameworks) */ = { + 7407F1F41AA80466000380C4 /* Run Script (Fix dynamic library paths in Frameworks) */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Run Script (fix Poco paths in Frameworks)"; + name = "Run Script (Fix dynamic library paths in Frameworks)"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "fix() {\n pocolib=$1\n lib=$2\n oldpath=$(otool -L $pocolib|fgrep $lib|awk -F' ' '{print $1}'|grep -v @loader_path|grep -v \":\")\n if [ -z \"$oldpath\" ]; then\n return\n fi\n install_name_tool -change $oldpath @loader_path/$lib $pocolib\n \n # get shared library id name\n file=$(otool -D $pocolib |grep -v \":\")\n # get base name of the path we got\n basename=${file##*/}\n # change shared library id name\n install_name_tool -id @loader_path/$basename $pocolib\n }\n \n fix_poco_paths() {\n f=$1\n fix $f libPocoUtil.50.dylib\n fix $f libPocoData.50.dylib\n fix $f libPocoNetSSL.50.dylib\n fix $f libPocoXML.50.dylib\n fix $f libPocoDataSQLite.50.dylib\n fix $f libPocoNet.50.dylib\n fix $f libPocoFoundation.50.dylib\n fix $f libPocoCrypto.50.dylib\n fix $f libPocoJSON.50.dylib\n }\n \n for f in $BUILT_PRODUCTS_DIR/TogglDesktop.app/Contents/Frameworks/*.dylib\n do\n fix_poco_paths $f\n done\n"; - }; - 74083B2B1B84DA3F00685E21 /* Run Script (fix Poco path in main app) */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Run Script (fix Poco path in main app)"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "install_name_tool -change /usr/local/lib/libPocoJSON.50.dylib @executable_path/../../Contents/Frameworks/libPocoJSON.50.dylib $PROJECT_DIR/build/Release/TogglDesktop.app/Contents/MacOS/TogglDesktop"; + shellScript = "fix() {\n pocolib=$1\n lib=$2\n oldpath=$(otool -L $pocolib|fgrep $lib|awk -F' ' '{print $1}'|grep -v @loader_path|grep -v \":\")\n if [ -z \"$oldpath\" ]; then\n return\n fi\n install_name_tool -change $oldpath @loader_path/$lib $pocolib\n \n # get shared library id name\n file=$(otool -D $pocolib |grep -v \":\")\n # get base name of the path we got\n basename=${file##*/}\n # change shared library id name\n install_name_tool -id @loader_path/$basename $pocolib\n }\n \n fix_poco_paths() {\n f=$1\n fix $f libPocoUtil.50.dylib\n fix $f libPocoData.50.dylib\n fix $f libPocoNetSSL.50.dylib\n fix $f libPocoXML.50.dylib\n fix $f libPocoDataSQLite.50.dylib\n fix $f libPocoNet.50.dylib\n fix $f libPocoFoundation.50.dylib\n fix $f libPocoCrypto.50.dylib\n fix $f libPocoJSON.50.dylib\n fix $f libcrypto.1.1.dylib\n fix $f libssl.1.1.dylib\n }\n \n # Change dylib references in all dylibs found in Frameworks\n for f in $BUILT_PRODUCTS_DIR/TogglDesktop.app/Contents/Frameworks/*.dylib\n do\n fix_poco_paths $f\n done\n"; }; 74E3CDDA17FC37A500C3ADD3 /* Run Script (install bugsnag) */ = { isa = PBXShellScriptBuildPhase;