Skip to content
This repository has been archived by the owner on Feb 13, 2024. It is now read-only.

[WIP] Fix Cycle dependencies build error on macOS #4149

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] Fix Cycle dependencies build error on macOS #4149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/lib/osx/TogglDesktopLibrary.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,11 +542,11 @@
isa = PBXNativeTarget;
buildConfigurationList = C55DA5A917F06A3B00B42178 /* Build configuration list for PBXNativeTarget "TogglDesktopLibrary" */;
buildPhases = (
BAA842212403D96100BCCB67 /* CopyFiles */,
C55DA59817F06A3B00B42178 /* Sources */,
C55DA59917F06A3B00B42178 /* Frameworks */,
C55DA59A17F06A3B00B42178 /* Headers */,
C5DA1FB317F19052001C4565 /* ShellScript */,
BAA842212403D96100BCCB67 /* CopyFiles */,
);
buildRules = (
);
Expand Down
15 changes: 0 additions & 15 deletions src/ui/osx/TogglDesktop/TogglDesktop.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1970,7 +1970,6 @@
74E3CDDA17FC37A500C3ADD3 /* Run Script (install bugsnag) */,
74A50AA818434D90006F37BB /* CopyFiles */,
69FC17EF17E6534400B96425 /* Resources */,
7407F1F41AA80466000380C4 /* Run Script (Fix dynamic library paths in Frameworks) */,
BA6406F121C8FC690074BC96 /* Run Formatter */,
CE4DD35122BF90B10398A0A6 /* [CP] Embed Pods Frameworks */,
B984F0D8FC24E4374FFADFBB /* Upload Bugsnag dSYM */,
Expand Down Expand Up @@ -2246,20 +2245,6 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
7407F1F41AA80466000380C4 /* Run Script (Fix dynamic library paths in Frameworks) */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
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.60.dylib\n fix $f libPocoData.60.dylib\n fix $f libPocoNetSSL.60.dylib\n fix $f libPocoXML.60.dylib\n fix $f libPocoDataSQLite.60.dylib\n fix $f libPocoNet.60.dylib\n fix $f libPocoFoundation.60.dylib\n fix $f libPocoCrypto.60.dylib\n fix $f libPocoJSON.60.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;
buildActionMask = 2147483647;
Expand Down