[webkit-changes] cvs commit: WebKitTools/Scripts run-safari
run-webkit-app
Darin
darin at opensource.apple.com
Sun Sep 11 10:04:20 PDT 2005
darin 05/09/11 10:04:19
Modified: . ChangeLog
WebKit.xcodeproj project.pbxproj
WebView.subproj WebView.m
. ChangeLog
Scripts run-safari run-webkit-app
Log:
WebKit:
Reviewed, tweaked, and landed by Darin.
- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4286
.Mac prefpane crashes when Safari using CVS WebKit is running
* WebView.subproj/WebView.m: (-[WebView initWithFrame:frameName:groupName:]):
If ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH, and WEBKIT_UNSET_DYLD_FRAMEWORK_PATH
is set in the environment, then unset DYLD_FRAMEWORK_PATH.
* WebKit.xcodeproj/project.pbxproj: Set ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH
in configurations other than Default -- we don't want that code in production
builds, but we want it in builds we do ourselves and nightly builds.
WebKitTools:
Reviewed, tweaked, and landed by Darin.
- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4286
.Mac prefpane crashes when Safari using CVS WebKit is running
* Scripts/run-safari: Set WEBKIT_UNSET_DYLD_FRAMEWORK_PATH.
* Scripts/run-webkit-app: Ditto.
Revision Changes Path
1.3317 +15 -0 WebKit/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebKit/ChangeLog,v
retrieving revision 1.3316
retrieving revision 1.3317
diff -u -r1.3316 -r1.3317
--- ChangeLog 10 Sep 2005 17:36:07 -0000 1.3316
+++ ChangeLog 11 Sep 2005 17:04:11 -0000 1.3317
@@ -1,3 +1,18 @@
+2005-09-11 Mark Rowe <opendarwin.org at bdash.net.nz>
+
+ Reviewed, tweaked, and landed by Darin.
+
+ - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4286
+ .Mac prefpane crashes when Safari using CVS WebKit is running
+
+ * WebView.subproj/WebView.m: (-[WebView initWithFrame:frameName:groupName:]):
+ If ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH, and WEBKIT_UNSET_DYLD_FRAMEWORK_PATH
+ is set in the environment, then unset DYLD_FRAMEWORK_PATH.
+
+ * WebKit.xcodeproj/project.pbxproj: Set ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH
+ in configurations other than Default -- we don't want that code in production
+ builds, but we want it in builds we do ourselves and nightly builds.
+
2005-09-10 Ingmar J Stein <IngmarStein at gmail.com>
Reviewed and landed by Darin.
1.8 +8 -0 WebKit/WebKit.xcodeproj/project.pbxproj
Index: project.pbxproj
===================================================================
RCS file: /cvs/root/WebKit/WebKit.xcodeproj/project.pbxproj,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.pbxproj 9 Sep 2005 22:14:43 -0000 1.7
+++ project.pbxproj 11 Sep 2005 17:04:17 -0000 1.8
@@ -1875,6 +1875,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"$(DEBUG_DEFINES)",
"FRAMEWORK_NAME=WebKit",
+ "$(PER_CONFIGURATION_PREPROCESSOR_DEFINES)",
);
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
@@ -1937,6 +1938,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"$(DEBUG_DEFINES)",
"FRAMEWORK_NAME=WebKit",
+ "$(PER_CONFIGURATION_PREPROCESSOR_DEFINES)",
);
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
@@ -2000,6 +2002,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"$(DEBUG_DEFINES)",
"FRAMEWORK_NAME=WebKit",
+ "$(PER_CONFIGURATION_PREPROCESSOR_DEFINES)",
);
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
@@ -2062,6 +2065,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"$(DEBUG_DEFINES)",
"FRAMEWORK_NAME=WebKit",
+ "$(PER_CONFIGURATION_PREPROCESSOR_DEFINES)",
);
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
@@ -2109,6 +2113,7 @@
isa = XCBuildConfiguration;
buildSettings = {
GCC_THREADSAFE_STATICS = NO;
+ PER_CONFIGURATION_PREPROCESSOR_DEFINES = ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH;
};
name = Development;
};
@@ -2116,6 +2121,7 @@
isa = XCBuildConfiguration;
buildSettings = {
GCC_THREADSAFE_STATICS = NO;
+ PER_CONFIGURATION_PREPROCESSOR_DEFINES = ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH;
};
name = Deployment;
};
@@ -2123,6 +2129,7 @@
isa = XCBuildConfiguration;
buildSettings = {
GCC_THREADSAFE_STATICS = NO;
+ PER_CONFIGURATION_PREPROCESSOR_DEFINES = ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH;
};
name = OptimizedWithSymbols;
};
@@ -2130,6 +2137,7 @@
isa = XCBuildConfiguration;
buildSettings = {
GCC_THREADSAFE_STATICS = NO;
+ PER_CONFIGURATION_PREPROCESSOR_DEFINES = "";
};
name = Default;
};
1.305 +13 -1 WebKit/WebView.subproj/WebView.m
Index: WebView.m
===================================================================
RCS file: /cvs/root/WebKit/WebView.subproj/WebView.m,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -r1.304 -r1.305
--- WebView.m 23 Aug 2005 01:22:16 -0000 1.304
+++ WebView.m 11 Sep 2005 17:04:17 -0000 1.305
@@ -1596,7 +1596,19 @@
self = [super initWithFrame:f];
if (!self)
return nil;
-
+
+#if ENABLE_WEBKIT_UNSET_DYLD_FRAMEWORK_PATH
+ // DYLD_FRAMEWORK_PATH is used so Safari will load the development version of WebKit, which
+ // may not work with other WebKit applications. Unsetting DYLD_FRAMEWORK_PATH removes the
+ // need for Safari to unset it to prevent it from being passed to applications it launches.
+ // Unsetting it when a WebView is first created is as good a place as any.
+ // See <http://bugzilla.opendarwin.org/show_bug.cgi?id=4286> for more details.
+ if (getenv("WEBKIT_UNSET_DYLD_FRAMEWORK_PATH")) {
+ unsetenv("DYLD_FRAMEWORK_PATH");
+ unsetenv("WEBKIT_UNSET_DYLD_FRAMEWORK_PATH");
+ }
+#endif
+
_private = [[WebViewPrivate alloc] init];
[self _commonInitializationWithFrameName:frameName groupName:groupName];
[self setMaintainsBackForwardList: YES];
1.99 +10 -0 WebKitTools/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebKitTools/ChangeLog,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- ChangeLog 11 Sep 2005 09:28:00 -0000 1.98
+++ ChangeLog 11 Sep 2005 17:04:18 -0000 1.99
@@ -1,3 +1,13 @@
+2005-09-11 Mark Rowe <opendarwin.org at bdash.net.nz>
+
+ Reviewed, tweaked, and landed by Darin.
+
+ - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=4286
+ .Mac prefpane crashes when Safari using CVS WebKit is running
+
+ * Scripts/run-safari: Set WEBKIT_UNSET_DYLD_FRAMEWORK_PATH.
+ * Scripts/run-webkit-app: Ditto.
+
2005-09-11 Darin Adler <darin at apple.com>
* Scripts/run-webkit-tests: Oops. Use spaces, not tabs.
1.11 +1 -0 WebKitTools/Scripts/run-safari
Index: run-safari
===================================================================
RCS file: /cvs/root/WebKitTools/Scripts/run-safari,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- run-safari 15 Aug 2005 03:35:59 -0000 1.10
+++ run-safari 11 Sep 2005 17:04:19 -0000 1.11
@@ -43,4 +43,5 @@
# Set up DYLD_FRAMEWORK_PATH to point to the product directory.
print "Start Safari with DYLD_FRAMEWORK_PATH set to point to built WebKit in $productDir.\n";
$ENV{DYLD_FRAMEWORK_PATH} = $productDir;
+$ENV{WEBKIT_UNSET_DYLD_FRAMEWORK_PATH} = "YES";
exec $safariPath, @ARGV or die;
1.3 +1 -0 WebKitTools/Scripts/run-webkit-app
Index: run-webkit-app
===================================================================
RCS file: /cvs/root/WebKitTools/Scripts/run-webkit-app,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- run-webkit-app 15 Aug 2005 03:35:59 -0000 1.2
+++ run-webkit-app 11 Sep 2005 17:04:19 -0000 1.3
@@ -44,4 +44,5 @@
# Set up DYLD_FRAMEWORK_PATH to point to the product directory.
print "Start $ARGV[0] with DYLD_FRAMEWORK_PATH set to point to built WebKit in $productDir.\n";
$ENV{DYLD_FRAMEWORK_PATH} = $productDir;
+$ENV{WEBKIT_UNSET_DYLD_FRAMEWORK_PATH} = "YES";
exec "open -a @ARGV";
More information about the webkit-changes
mailing list