Changeset 190821 in webkit

Timestamp:

Oct 9, 2015 3:01:16 PM (9 years ago)

Author:

BJ Burg

Message:

Teach webkitperl how to figure out IOS versions from the SDK
​https://bugs.webkit.org/show_bug.cgi?id=149963

Reviewed by Daniel Bates.

It should be easier to check the major and minor version of IOS SDKs.

• Scripts/copy-webkitlibraries-to-product-directory: use iosVersion().
• Scripts/webkitdirs.pm:

(splitVersionString): Added.
(determineOSXVersion): Use splitVersionString.
(determineIOSVersion): Added. Look at the SDK version and make a tuple.
(iosVersion): Added.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/copy-webkitlibraries-to-product-directory (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-10-09  Brian Burg  <bburg@apple.com>
+
+        Teach webkitperl how to figure out IOS versions from the SDK
+        https://bugs.webkit.org/show_bug.cgi?id=149963
+
+        Reviewed by Daniel Bates.
+
+        It should be easier to check the major and minor version of IOS SDKs.
+
+        * Scripts/copy-webkitlibraries-to-product-directory: use iosVersion().
+        * Scripts/webkitdirs.pm:
+        (splitVersionString): Added.
+        (determineOSXVersion): Use splitVersionString.
+        (determineIOSVersion): Added. Look at the SDK version and make a tuple.
+        (iosVersion): Added.
+
 2015-10-09  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory

@@ -233 +233 @@
     if (!$llvmLibraryPackage || !$llvmIncludePackage) {
         if (isIOSWebKit()) {
-            my $majorSDKVersion = $1 if xcodeSDKVersion() =~ /^(\d+)/;
+            my $majorSDKVersion = iosVersion()->{"major"};
             $llvmLibraryPackage = "WebKitLibraries/LLVMLibrariesIOS$majorSDKVersion.tar.bz2";
             $llvmIncludePackage = "WebKitLibraries/LLVMIncludesIOS$majorSDKVersion.tar.bz2";

trunk/Tools/Scripts/webkitdirs.pm

@@ -78 +78 @@
        &runMacWebKitApp
        &safariPath
+       &iosVersion
        &setConfiguration
        &setupMacWebKitEnvironment
@@ -116 +117 @@
 my $nmPath;
 my $osXVersion;
+my $iosVersion;
 my $generateDsym;
 my $isGtk;
@@ -1261 +1263 @@
 }
 
-sub determineOSXVersion()
-{
-    return if $osXVersion;
-
-    if (!isDarwin()) {
-        $osXVersion = -1;
-        return;
-    }
-
-    my $version = `sw_vers -productVersion`;
-    my @splitVersion = split(/\./, $version);
-    @splitVersion >= 2 or die "Invalid version $version";
+sub splitVersionString
+{
+    my $versionString = shift;
+    my @splitVersion = split(/\./, $versionString);
+    @splitVersion >= 2 or die "Invalid version $versionString";
     $osXVersion = {
             "major" => $splitVersion[0],
@@ -1280 +1275 @@
 }
 
+sub determineOSXVersion()
+{
+    return if $osXVersion;
+
+    if (!isDarwin()) {
+        $osXVersion = -1;
+        return;
+    }
+
+    my $versionString = `sw_vers -productVersion`;
+    $osXVersion = splitVersionString($versionString);
+}
+
 sub osXVersion()
 {
     determineOSXVersion();
     return $osXVersion;
+}
+
+sub determineIOSVersion()
+{
+    return if $iosVersion;
+
+    if (!isIOSWebKit()) {
+        $iosVersion = -1;
+        return;
+    }
+
+    my $versionString = xcodeSDKVersion();
+    $iosVersion = splitVersionString($versionString);
+}
+
+sub iosVersion()
+{
+    determineIOSVersion();
+    return $iosVersion;
 }