Title: [160035] trunk/Tools
- Revision
- 160035
- Author
- bfulg...@apple.com
- Date
- 2013-12-03 13:50:43 -0800 (Tue, 03 Dec 2013)
Log 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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (160034 => 160035)
--- trunk/Tools/ChangeLog 2013-12-03 21:49:03 UTC (rev 160034)
+++ trunk/Tools/ChangeLog 2013-12-03 21:50:43 UTC (rev 160035)
@@ -1,3 +1,20 @@
+2013-12-03 Brent Fulgham <bfulg...@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 <mhahnenb...@apple.com>
run-jsc-stress-tests only supports host environments that have make installed
Modified: trunk/Tools/Scripts/webkitdirs.pm (160034 => 160035)
--- trunk/Tools/Scripts/webkitdirs.pm 2013-12-03 21:49:03 UTC (rev 160034)
+++ trunk/Tools/Scripts/webkitdirs.pm 2013-12-03 21:50:43 UTC (rev 160035)
@@ -1574,6 +1574,11 @@
print " to be able build WebKit from within Visual Studio 2010 and newer.\n\n";
}
}
+ # 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 _javascript_Core tests.\n\n";
+ }
}
sub setupCygwinEnv()
@@ -1606,6 +1611,8 @@
print "Building results into: ", baseProductDir(), "\n";
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();
}
sub dieIfWindowsPlatformSDKNotInstalled
@@ -2118,6 +2125,11 @@
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>;
$path =~ s/[\r\n\x00].*//;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
