Title: [235545] trunk/Tools
- Revision
- 235545
- Author
- [email protected]
- Date
- 2018-08-31 03:54:16 -0700 (Fri, 31 Aug 2018)
Log Message
WebKitLauncher: Fix build failures
* WebKitLauncher/Configurations/Base.xcconfig:
(ARCHS): Use $(ARCHS_STANDARD_32_64_BIT).
(MACOSX_DEPLOYMENT_TARGET): Update from Snow Leopard to Sierra.
* WebKitLauncher/WebKitNightlyEnabler.m:
(myApplicationWillFinishLaunching):
* WebKitLauncher/main.m:
(displayErrorAndQuit):
(locateSafariBundle):
- Use pragma to ignore deprecation warnings.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (235544 => 235545)
--- trunk/Tools/ChangeLog 2018-08-31 10:47:22 UTC (rev 235544)
+++ trunk/Tools/ChangeLog 2018-08-31 10:54:16 UTC (rev 235545)
@@ -1,5 +1,20 @@
2018-08-31 David Kilzer <[email protected]>
+ WebKitLauncher: Fix build failures
+
+ * WebKitLauncher/Configurations/Base.xcconfig:
+ (ARCHS): Use $(ARCHS_STANDARD_32_64_BIT).
+ (MACOSX_DEPLOYMENT_TARGET): Update from Snow Leopard to Sierra.
+
+ * WebKitLauncher/WebKitNightlyEnabler.m:
+ (myApplicationWillFinishLaunching):
+ * WebKitLauncher/main.m:
+ (displayErrorAndQuit):
+ (locateSafariBundle):
+ - Use pragma to ignore deprecation warnings.
+
+2018-08-31 David Kilzer <[email protected]>
+
MobileMiniBrowser: Move test2s.mp4 into Resources directory
This makes the Resources folder in the Xcode project match
Modified: trunk/Tools/WebKitLauncher/Configurations/Base.xcconfig (235544 => 235545)
--- trunk/Tools/WebKitLauncher/Configurations/Base.xcconfig 2018-08-31 10:47:22 UTC (rev 235544)
+++ trunk/Tools/WebKitLauncher/Configurations/Base.xcconfig 2018-08-31 10:54:16 UTC (rev 235545)
@@ -21,7 +21,7 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-ARCHS = i386 x86_64;
+ARCHS = $(ARCHS_STANDARD_32_64_BIT);
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
@@ -31,7 +31,7 @@
GCC_PREPROCESSOR_DEFINITIONS = ENABLE_SPARKLE=$(ENABLE_SPARKLE);
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-MACOSX_DEPLOYMENT_TARGET = 10.6;
+MACOSX_DEPLOYMENT_TARGET = 10.12;
PREBINDING = NO;
SDKROOT = macosx;
WARNING_CFLAGS = -Wall;
Modified: trunk/Tools/WebKitLauncher/WebKitNightlyEnabler.m (235544 => 235545)
--- trunk/Tools/WebKitLauncher/WebKitNightlyEnabler.m 2018-08-31 10:47:22 UTC (rev 235544)
+++ trunk/Tools/WebKitLauncher/WebKitNightlyEnabler.m 2018-08-31 10:54:16 UTC (rev 235545)
@@ -84,9 +84,12 @@
[userDefaults synchronize];
if (extensionBundlesWereLoaded)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
NSRunInformationalAlertPanel(@"Safari extensions detected",
@"Safari extensions were detected on your system. Extensions are incompatible with nightly builds of WebKit, and may cause crashes or incorrect behavior. Please disable them if you experience such behavior.", @"Continue",
nil, nil);
+#pragma clang diagnostic pop
initializeSparkle();
}
Modified: trunk/Tools/WebKitLauncher/main.m (235544 => 235545)
--- trunk/Tools/WebKitLauncher/main.m 2018-08-31 10:47:22 UTC (rev 235544)
+++ trunk/Tools/WebKitLauncher/main.m 2018-08-31 10:54:16 UTC (rev 235545)
@@ -47,7 +47,10 @@
static void displayErrorAndQuit(NSString *title, NSString *message)
{
NSApplicationLoad();
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
NSRunCriticalAlertPanel(title, @"%@", @"Quit", nil, nil, message);
+#pragma clang diagnostic pop
exit(0);
}
@@ -148,7 +151,10 @@
}
CFURLRef safariURL = nil;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
OSStatus err = LSFindApplicationForInfo(kLSUnknownCreator, CFSTR("com.apple.Safari"), nil, nil, &safariURL);
+#pragma clang diagnostic pop
if (err != noErr)
displayErrorAndQuit(@"Unable to locate Safari", @"Nightly builds of WebKit require Safari to run. Please check that it is available and then try again.");
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
