Skip to content

Commit

Permalink
A second pass at doing an embedded iTerm2, based off lemonmojo's PR g…
Browse files Browse the repository at this point in the history
…nachman#366 (gnachman#366). In this commit, we execute install_name_tool on the copy of the NMSSH.framework instead of its source, thus avoiding modification of the git committed binary. Alternatively, we could build the framework as a subproject in the iTerm2 project. But for right now, we're putting off modifying the iTerm2 project.
  • Loading branch information
jkoutavas committed Sep 26, 2019
1 parent 4160b40 commit 64a4f78
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 1 deletion.
22 changes: 22 additions & 0 deletions embed/iTerm2Lib.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@
691E35A823370AE2007FFF84 /* Frameworks */,
691E35A923370AE2007FFF84 /* Resources */,
695CD5562339A4850020B262 /* Copy Frameworks */,
6970748C233C52010092998B /* Fix Framework IDs */,
);
buildRules = (
);
Expand Down Expand Up @@ -383,6 +384,27 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
6970748C233C52010092998B /* Fix Framework IDs */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Fix Framework IDs";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "install_name_tool -change @executable_path/../Frameworks/NMSSH.framework/Versions/A/NMSSH @rpath/../Frameworks/NMSSH.framework/Versions/A/NMSSH ${TARGET_BUILD_DIR}/${TARGET_NAME}.framework/Versions/A/${TARGET_NAME}\n";
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
691E35A723370AE2007FFF84 /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>iTerm2Lib.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>3</integer>
<integer>5</integer>
</dict>
</dict>
</dict>
Expand Down

0 comments on commit 64a4f78

Please sign in to comment.