Commit 602c1cb1 authored by bfulgham@apple.com's avatar 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.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@160035 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent a2f7d4c8
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>
run-jsc-stress-tests only supports host environments that have make installed
......
......@@ -1574,6 +1574,11 @@ sub setupAppleWinEnv()
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 JavaScriptCore tests.\n\n";
}
}
sub setupCygwinEnv()
......@@ -1606,6 +1611,8 @@ sub setupCygwinEnv()
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 buildGtkProject
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].*//;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment