Skip to content

Commit 51b25dc

Browse files
author
Sam Weinig
committed
Make running MiniBrowser.app without explicitly setting DYLD_FRAMEWORK_PATH.
Reviewed by Mark Rowe. * MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj: * MiniBrowser/mac/make-launchable.sh: Added. Canonical link: https://commits.webkit.org/49707@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@58438 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 3ec047a commit 51b25dc

3 files changed

Lines changed: 64 additions & 0 deletions

File tree

‎WebKitTools/ChangeLog‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
2010-04-28 Sam Weinig <sam@webkit.org>
2+
3+
Reviewed by Mark Rowe.
4+
5+
Make running MiniBrowser.app without explicitly setting DYLD_FRAMEWORK_PATH.
6+
7+
* MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj:
8+
* MiniBrowser/mac/make-launchable.sh: Added.
9+
110
2010-04-28 Eric Seidel <eric@webkit.org>
211

312
Reviewed by David Levin.

‎WebKitTools/MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
3232
8D1107310486CEB800E47090 /* MiniBrowser-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "MiniBrowser-Info.plist"; path = "mac/MiniBrowser-Info.plist"; sourceTree = "<group>"; };
3333
8D1107320486CEB800E47090 /* MiniBrowser.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MiniBrowser.app; sourceTree = BUILT_PRODUCTS_DIR; };
34+
BC1770121188DF19007D9E9A /* make-launchable.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = "make-launchable.sh"; path = "mac/make-launchable.sh"; sourceTree = "<group>"; };
3435
BC329486116A92E2008635D0 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = mac/main.m; sourceTree = "<group>"; };
3536
BC329496116A941B008635D0 /* BrowserWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BrowserWindowController.h; path = mac/BrowserWindowController.h; sourceTree = "<group>"; };
3637
BC329497116A941B008635D0 /* BrowserWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BrowserWindowController.m; path = mac/BrowserWindowController.m; sourceTree = "<group>"; };
@@ -100,6 +101,7 @@
100101
080E96DDFE201D6D7F000001 /* Classes */,
101102
29B97315FDCFA39411CA2CEA /* Other Sources */,
102103
29B97317FDCFA39411CA2CEA /* Resources */,
104+
BC1770481188EB05007D9E9A /* Scripts */,
103105
29B97323FDCFA39411CA2CEA /* Frameworks */,
104106
19C28FACFE9D520D11CA2CBB /* Products */,
105107
);
@@ -136,6 +138,14 @@
136138
name = Frameworks;
137139
sourceTree = "<group>";
138140
};
141+
BC1770481188EB05007D9E9A /* Scripts */ = {
142+
isa = PBXGroup;
143+
children = (
144+
BC1770121188DF19007D9E9A /* make-launchable.sh */,
145+
);
146+
name = Scripts;
147+
sourceTree = "<group>";
148+
};
139149
/* End PBXGroup section */
140150

141151
/* Begin PBXNativeTarget section */
@@ -146,6 +156,7 @@
146156
8D1107290486CEB800E47090 /* Resources */,
147157
8D11072C0486CEB800E47090 /* Sources */,
148158
8D11072E0486CEB800E47090 /* Frameworks */,
159+
BC17701E1188DFB4007D9E9A /* Make Launchable */,
149160
);
150161
buildRules = (
151162
);
@@ -188,6 +199,23 @@
188199
};
189200
/* End PBXResourcesBuildPhase section */
190201

202+
/* Begin PBXShellScriptBuildPhase section */
203+
BC17701E1188DFB4007D9E9A /* Make Launchable */ = {
204+
isa = PBXShellScriptBuildPhase;
205+
buildActionMask = 2147483647;
206+
files = (
207+
);
208+
inputPaths = (
209+
);
210+
name = "Make Launchable";
211+
outputPaths = (
212+
);
213+
runOnlyForDeploymentPostprocessing = 0;
214+
shellPath = /bin/sh;
215+
shellScript = "mac/make-launchable.sh\n";
216+
};
217+
/* End PBXShellScriptBuildPhase section */
218+
191219
/* Begin PBXSourcesBuildPhase section */
192220
8D11072C0486CEB800E47090 /* Sources */ = {
193221
isa = PBXSourcesBuildPhase;

‎WebKitTools/MiniBrowser/mac/make-launchable.sh‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#!/bin/sh
2+
3+
# Copyright (C) 2010 Apple Inc. All rights reserved.
4+
#
5+
# Redistribution and use in source and binary forms, with or without
6+
# modification, are permitted provided that the following conditions
7+
# are met:
8+
# 1. Redistributions of source code must retain the above copyright
9+
# notice, this list of conditions and the following disclaimer.
10+
# 2. Redistributions in binary form must reproduce the above copyright
11+
# notice, this list of conditions and the following disclaimer in the
12+
# documentation and/or other materials provided with the distribution.
13+
#
14+
# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
15+
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
16+
# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
17+
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
18+
# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
19+
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
20+
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
21+
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
22+
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
23+
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
24+
# THE POSSIBILITY OF SUCH DAMAGE.
25+
26+
echo "Making app bundle launchable";
27+
defaults write "${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH%.plist}" LSEnvironment -dict DYLD_FRAMEWORK_PATH "${BUILT_PRODUCTS_DIR}"

0 commit comments

Comments
 (0)