Changeset 160035 in webkit

Timestamp:

Dec 3, 2013 1:50:43 PM (10 years ago)

Author:

Brent Fulgham

Message:

[Win] Support 64-bit Application Support Libraries Location
​https://bugs.webkit.org/show_bug.cgi?id=125179

Reviewed by Tim Horton.

Enable the user to specify a location for 64-bit support libraries (such as libxml2, ICU, etc.)
on Windows until an official distribution is available that properly creates registry settings
to specify these locations.

• Scripts/webkitdirs.pm:

(setupAppleWinEnv): Notify user to set WEBKIT_64_SUPPORT environment variable if needed.
(setupCygwinEnv): Report WEWBKIT_64_SUPPORT path when running 64-bit builds.
(appleApplicationSupportPath): Add WEBKIT_64_SUPPORT location to runtime environment when
running 64-bit builds.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-12-03  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Support 64-bit Application Support Libraries Location 
+        https://bugs.webkit.org/show_bug.cgi?id=125179
+
+        Reviewed by Tim Horton.
+
+        Enable the user to specify a location for 64-bit support libraries (such as libxml2, ICU, etc.)
+        on Windows until an official distribution is available that properly creates registry settings
+        to specify these locations.
+
+        * Scripts/webkitdirs.pm:
+        (setupAppleWinEnv): Notify user to set WEBKIT_64_SUPPORT environment variable if needed.
+        (setupCygwinEnv): Report WEWBKIT_64_SUPPORT path when running 64-bit builds.
+        (appleApplicationSupportPath): Add WEBKIT_64_SUPPORT location to runtime environment when
+        running 64-bit builds.
+
 2013-12-03  Mark Hahnenberg  <mhahnenberg@apple.com>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -1575 +1575 @@
         }
     }
+    # FIXME (125180): Remove the following temporary 64-bit support once official support is available.
+    if (isWin64() and !$ENV{'WEBKIT_64_SUPPORT'}) {
+        print "Warning: You must set the 'WEBKIT_64_SUPPORT' environment variable\n";
+        print "         to be able run WebKit or JavaScriptCore tests.\n\n";
+    }
 }
 
@@ -1607 +1612 @@
     print "WEBKIT_OUTPUTDIR is set to: ", $ENV{"WEBKIT_OUTPUTDIR"}, "\n";
     print "WEBKIT_LIBRARIES is set to: ", $ENV{"WEBKIT_LIBRARIES"}, "\n";
+    # FIXME (125180): Remove the following temporary 64-bit support once official support is available.
+    print "WEBKIT_64_SUPPORT is set to: ", $ENV{"WEBKIT_64_SUPPORT"}, "\n" if isWin64();
 }
 
@@ -2119 +2126 @@
 sub appleApplicationSupportPath
 {
+    if (isWin64()) {
+        # FIXME (125180): Remove the following once official 64-bit Windows support is available.
+        return $ENV{"WEBKIT_64_SUPPORT"}, "\n" if isWin64();
+    }
+
     open INSTALL_DIR, "</proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Apple\ Inc./Apple\ Application\ Support/InstallDir";
     my $path = <INSTALL_DIR>;