WebKitLauncher: Fix build failures
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 31 Aug 2018 10:54:16 +0000 (10:54 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 31 Aug 2018 10:54:16 +0000 (10:54 +0000)
* 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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@235545 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/WebKitLauncher/Configurations/Base.xcconfig
Tools/WebKitLauncher/WebKitNightlyEnabler.m
Tools/WebKitLauncher/main.m

index 824af51..7afc47f 100644 (file)
@@ -1,5 +1,20 @@
 2018-08-31  David Kilzer  <ddkilzer@apple.com>
 
+        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  <ddkilzer@apple.com>
+
         MobileMiniBrowser: Move test2s.mp4 into Resources directory
 
         This makes the Resources folder in the Xcode project match
index 470af1d..bbe831d 100644 (file)
@@ -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_MODEL_TUNING = G5;
 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;
index a2a27be..999f1c1 100644 (file)
@@ -84,9 +84,12 @@ static void myApplicationWillFinishLaunching(CFNotificationCenterRef center, voi
     [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();
 }
index bf7f419..43155fd 100644 (file)
@@ -47,7 +47,10 @@ int posix_spawnattr_setflags(posix_spawnattr_t *, short) WEAK_IMPORT;
 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 @@ static NSBundle *locateSafariBundle()
     }
 
     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.");