From 588d7b7fa20a2ed541fe5ddd122fe4a9db54babd Mon Sep 17 00:00:00 2001 From: "aroben@apple.com" Date: Wed, 1 Dec 2010 23:09:38 +0000 Subject: [PATCH] Don't let harmless errorlevels from the "set" utility leak into project-specific build scripts When using set to unset an environment variable that didn't previously exist, set raises the errorlevel to 1. This was leaking into project-specific scripts, causing them to think the build has failed. We now clear the errorlevel after we finish setting environment variables. Fixes Windows builds mysteriously fail in some configurations Reviewed by Steve Falkenburg. * win/tools/vsprops/common.vsprops: Call "cmd /c" after setting environment variables to get rid of any errorlevel that "set" set. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@73075 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- WebKitLibraries/ChangeLog | 19 +++++++++++++++++++ .../win/tools/vsprops/common.vsprops | 6 +++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index 2d844345af61..60cb1f60f44f 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,22 @@ +2010-12-01 Adam Roben + + Don't let harmless errorlevels from the "set" utility leak into + project-specific build scripts + + When using set to unset an environment variable that didn't previously + exist, set raises the errorlevel to 1. This was leaking into + project-specific scripts, causing them to think the build has failed. + We now clear the errorlevel after we finish setting environment + variables. + + Fixes Windows builds mysteriously fail in + some configurations + + Reviewed by Steve Falkenburg. + + * win/tools/vsprops/common.vsprops: Call "cmd /c" after setting + environment variables to get rid of any errorlevel that "set" set. + 2010-12-01 Steve Falkenburg Reviewed by Adam Roben. diff --git a/WebKitLibraries/win/tools/vsprops/common.vsprops b/WebKitLibraries/win/tools/vsprops/common.vsprops index 699796153dad..b787f6b0df3f 100644 --- a/WebKitLibraries/win/tools/vsprops/common.vsprops +++ b/WebKitLibraries/win/tools/vsprops/common.vsprops @@ -41,15 +41,15 @@ />