Skip to content

Commit 64a4f78

Browse files
committed
A second pass at doing an embedded iTerm2, based off lemonmojo's PR gnachman#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.
1 parent 4160b40 commit 64a4f78

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

embed/iTerm2Lib.xcodeproj/project.pbxproj

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,7 @@
265265
691E35A823370AE2007FFF84 /* Frameworks */,
266266
691E35A923370AE2007FFF84 /* Resources */,
267267
695CD5562339A4850020B262 /* Copy Frameworks */,
268+
6970748C233C52010092998B /* Fix Framework IDs */,
268269
);
269270
buildRules = (
270271
);
@@ -383,6 +384,27 @@
383384
};
384385
/* End PBXResourcesBuildPhase section */
385386

387+
/* Begin PBXShellScriptBuildPhase section */
388+
6970748C233C52010092998B /* Fix Framework IDs */ = {
389+
isa = PBXShellScriptBuildPhase;
390+
buildActionMask = 2147483647;
391+
files = (
392+
);
393+
inputFileListPaths = (
394+
);
395+
inputPaths = (
396+
);
397+
name = "Fix Framework IDs";
398+
outputFileListPaths = (
399+
);
400+
outputPaths = (
401+
);
402+
runOnlyForDeploymentPostprocessing = 0;
403+
shellPath = /bin/sh;
404+
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";
405+
};
406+
/* End PBXShellScriptBuildPhase section */
407+
386408
/* Begin PBXSourcesBuildPhase section */
387409
691E35A723370AE2007FFF84 /* Sources */ = {
388410
isa = PBXSourcesBuildPhase;

embed/iTerm2Lib.xcodeproj/xcuserdata/jay.xcuserdatad/xcschemes/xcschememanagement.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>iTerm2Lib.xcscheme_^#shared#^_</key>
88
<dict>
99
<key>orderHint</key>
10-
<integer>3</integer>
10+
<integer>5</integer>
1111
</dict>
1212
</dict>
1313
</dict>

0 commit comments

Comments
 (0)