Title: [162010] trunk/Tools
- Revision
- 162010
- Author
- [email protected]
- Date
- 2014-01-14 14:33:56 -0800 (Tue, 14 Jan 2014)
Log Message
[WIN] Set MSBuild environment variable to avoid long-lived processes locking log files
https://bugs.webkit.org/show_bug.cgi?id=127002
Reviewed by David Kilzer.
* Scripts/webkitdirs.pm:
(setupAppleWinEnv): Export MSBUILDDISABLENODEREUSE=1 to the environment.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (162009 => 162010)
--- trunk/Tools/ChangeLog 2014-01-14 22:20:04 UTC (rev 162009)
+++ trunk/Tools/ChangeLog 2014-01-14 22:33:56 UTC (rev 162010)
@@ -1,3 +1,13 @@
+2014-01-14 Brent Fulgham <[email protected]>
+
+ [WIN] Set MSBuild environment variable to avoid long-lived processes locking log files
+ https://bugs.webkit.org/show_bug.cgi?id=127002
+
+ Reviewed by David Kilzer.
+
+ * Scripts/webkitdirs.pm:
+ (setupAppleWinEnv): Export MSBUILDDISABLENODEREUSE=1 to the environment.
+
2014-01-14 Commit Queue <[email protected]>
Unreviewed, rolling out r162000.
Modified: trunk/Tools/Scripts/webkitdirs.pm (162009 => 162010)
--- trunk/Tools/Scripts/webkitdirs.pm 2014-01-14 22:20:04 UTC (rev 162009)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-01-14 22:33:56 UTC (rev 162010)
@@ -1436,6 +1436,7 @@
# Those environment variables must be set to be able to build inside Visual Studio.
$variablesToSet{WEBKIT_LIBRARIES} = windowsLibrariesDir() unless $ENV{WEBKIT_LIBRARIES};
$variablesToSet{WEBKIT_OUTPUTDIR} = windowsOutputDir() unless $ENV{WEBKIT_OUTPUTDIR};
+ $variablesToSet{MSBUILDDISABLENODEREUSE} = "1" unless $ENV{MSBUILDDISABLENODEREUSE};
foreach my $variable (keys %variablesToSet) {
print "Setting the Environment Variable '" . $variable . "' to '" . $variablesToSet{$variable} . "'\n\n";
@@ -1447,16 +1448,20 @@
print "Please restart your computer before attempting to build inside Visual Studio.\n\n";
}
} else {
- if (!$ENV{'WEBKIT_LIBRARIES'}) {
+ if (!defined $ENV{'WEBKIT_LIBRARIES'} || !$ENV{'WEBKIT_LIBRARIES'}) {
print "Warning: You must set the 'WebKit_Libraries' environment variable\n";
print " to be able build WebKit from within Visual Studio 2013 and newer.\n";
print " Make sure that 'WebKit_Libraries' points to the\n";
print " 'WebKitLibraries/win' directory, not the 'WebKitLibraries/' directory.\n\n";
}
- if (!$ENV{'WEBKIT_OUTPUTDIR'}) {
+ if (!defined $ENV{'WEBKIT_OUTPUTDIR'} || !$ENV{'WEBKIT_OUTPUTDIR'}) {
print "Warning: You must set the 'WebKit_OutputDir' environment variable\n";
print " to be able build WebKit from within Visual Studio 2013 and newer.\n\n";
}
+ if (!defined $ENV{'MSBUILDDISABLENODEREUSE'} || !$ENV{'MSBUILDDISABLENODEREUSE'}) {
+ print "Warning: You should set the 'MSBUILDDISABLENODEREUSE' environment variable to '1'\n";
+ print " to avoid periodic locked log files when building.\n\n";
+ }
}
# FIXME (125180): Remove the following temporary 64-bit support once official support is available.
if (isWin64() and !$ENV{'WEBKIT_64_SUPPORT'}) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
