[Win] Unreviewed build fix after r180676.
authorbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 26 Feb 2015 18:19:41 +0000 (18:19 +0000)
committerbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 26 Feb 2015 18:19:41 +0000 (18:19 +0000)
I forgot to checkin one of the more important changes!

* win/tools/vsprops/common.props:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@180680 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/vsprops/common.props

index de9d6c5..972f61e 100644 (file)
@@ -1,5 +1,13 @@
 2015-02-26  Brent Fulgham  <bfulgham@apple.com>
 
+        [Win] Unreviewed build fix after r180676.
+
+        I forgot to checkin one of the more important changes!
+
+        * win/tools/vsprops/common.props:
+
+2015-02-26  Brent Fulgham  <bfulgham@apple.com>
+
         [Win] Make build logs more legible by reducing noise
         https://bugs.webkit.org/show_bug.cgi?id=142034
 
index 4dff1ef..5094b52 100644 (file)
@@ -74,114 +74,114 @@ nmake /nologo -f $(ProjectName).make clean</NMakeCleanCommandLine>
       <HeaderFileName>$(OutDir)%(Filename).h</HeaderFileName>
     </Midl>
     <PostBuildEvent>
-      <Command>REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)PostBuild.cmd file.
-if not exist "$(ProjectDir)$(ProjectName)PostBuild.cmd" exit /b
+      <Command>@REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)PostBuild.cmd file.
+@if not exist "$(ProjectDir)$(ProjectName)PostBuild.cmd" exit /b
 
-set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
-set CONFIGURATIONNAME=$(ConfigurationName)
-set INPUTDIR=$(InputDir)
-set INPUTFILENAME=$(InputFileName)
-set INPUTPATH=$(InputPath)
-set INTDIR=$(IntDir)
-set OUTDIR=$(OutDir)
-set PLATFORMARCHITECTURE=$(PlatformArchitecture)
-set PLATFORMNAME=$(PlatformName)
-set PROJECTDIR=$(ProjectDir)
-set PROJECTFILENAME=$(ProjectFileName)
-set PROJECTNAME=$(ProjectName)
-set PROJECTPATH=$(ProjectPath)
-set SOLUTIONDIR=$(SolutionDir)
-set SOLUTIONFILENAME=$(SolutionFileName)
-set SOLUTIONNAME=$(SolutionName)
-set SOLUTIONPATH=$(SolutionPath)
-set TARGETDIR=$(TargetDir)
-set TARGETEXT=$(TargetExt)
-set TARGETFILENAME=$(TargetFileName)
-set TARGETPATH=$(TargetPath)
-set DEBUGSUFFIX=$(DebugSuffix)
-set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
+@set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
+@set CONFIGURATIONNAME=$(ConfigurationName)
+@set INPUTDIR=$(InputDir)
+@set INPUTFILENAME=$(InputFileName)
+@set INPUTPATH=$(InputPath)
+@set INTDIR=$(IntDir)
+@set OUTDIR=$(OutDir)
+@set PLATFORMARCHITECTURE=$(PlatformArchitecture)
+@set PLATFORMNAME=$(PlatformName)
+@set PROJECTDIR=$(ProjectDir)
+@set PROJECTFILENAME=$(ProjectFileName)
+@set PROJECTNAME=$(ProjectName)
+@set PROJECTPATH=$(ProjectPath)
+@set SOLUTIONDIR=$(SolutionDir)
+@set SOLUTIONFILENAME=$(SolutionFileName)
+@set SOLUTIONNAME=$(SolutionName)
+@set SOLUTIONPATH=$(SolutionPath)
+@set TARGETDIR=$(TargetDir)
+@set TARGETEXT=$(TargetExt)
+@set TARGETFILENAME=$(TargetFileName)
+@set TARGETPATH=$(TargetPath)
+@set DEBUGSUFFIX=$(DebugSuffix)
+@set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
 
-REM If any of the above variables didn't exist previously and
-REM were set to an empty string, set will set the errorlevel to 1,
-REM which will cause the project-specific script to think the build
-REM has failed. This cmd /c call will clear the errorlevel.
-cmd /c
+@REM If any of the above variables didn't exist previously and
+@REM were set to an empty string, set will set the errorlevel to 1,
+@REM which will cause the project-specific script to think the build
+@REM has failed. This cmd /c call will clear the errorlevel.
+@cmd /c
 
-"$(ProjectDir)$(ProjectName)PostBuild.cmd"
+@"$(ProjectDir)$(ProjectName)PostBuild.cmd"
 </Command>
     </PostBuildEvent>
     <PreBuildEvent>
-      <Command>REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)PreBuild.cmd file.
-if not exist "$(ProjectDir)$(ProjectName)PreBuild.cmd" exit /b
+      <Command>@REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)PreBuild.cmd file.
+@if not exist "$(ProjectDir)$(ProjectName)PreBuild.cmd" exit /b
 
-set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
-set CONFIGURATIONNAME=$(ConfigurationName)
-set INPUTDIR=$(InputDir)
-set INPUTFILENAME=$(InputFileName)
-set INPUTPATH=$(InputPath)
-set INTDIR=$(IntDir)
-set OUTDIR=$(OutDir)
-set PLATFORMARCHITECTURE=$(PlatformArchitecture)
-set PLATFORMNAME=$(PlatformName)
-set PROJECTDIR=$(ProjectDir)
-set PROJECTFILENAME=$(ProjectFileName)
-set PROJECTNAME=$(ProjectName)
-set PROJECTPATH=$(ProjectPath)
-set SOLUTIONDIR=$(SolutionDir)
-set SOLUTIONFILENAME=$(SolutionFileName)
-set SOLUTIONNAME=$(SolutionName)
-set SOLUTIONPATH=$(SolutionPath)
-set TARGETDIR=$(TargetDir)
-set TARGETEXT=$(TargetExt)
-set TARGETFILENAME=$(TargetFileName)
-set TARGETPATH=$(TargetPath)
-set DEBUGSUFFIX=$(DebugSuffix)
-set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
+@set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
+@set CONFIGURATIONNAME=$(ConfigurationName)
+@set INPUTDIR=$(InputDir)
+@set INPUTFILENAME=$(InputFileName)
+@set INPUTPATH=$(InputPath)
+@set INTDIR=$(IntDir)
+@set OUTDIR=$(OutDir)
+@set PLATFORMARCHITECTURE=$(PlatformArchitecture)
+@set PLATFORMNAME=$(PlatformName)
+@set PROJECTDIR=$(ProjectDir)
+@set PROJECTFILENAME=$(ProjectFileName)
+@set PROJECTNAME=$(ProjectName)
+@set PROJECTPATH=$(ProjectPath)
+@set SOLUTIONDIR=$(SolutionDir)
+@set SOLUTIONFILENAME=$(SolutionFileName)
+@set SOLUTIONNAME=$(SolutionName)
+@set SOLUTIONPATH=$(SolutionPath)
+@set TARGETDIR=$(TargetDir)
+@set TARGETEXT=$(TargetExt)
+@set TARGETFILENAME=$(TargetFileName)
+@set TARGETPATH=$(TargetPath)
+@set DEBUGSUFFIX=$(DebugSuffix)
+@set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
 
-REM If any of the above variables didn't exist previously and
-REM were set to an empty string, set will set the errorlevel to 1,
-REM which will cause the project-specific script to think the build
-REM has failed. This cmd /c call will clear the errorlevel.
-cmd /c
+@REM If any of the above variables didn't exist previously and
+@REM were set to an empty string, set will set the errorlevel to 1,
+@REM which will cause the project-specific script to think the build
+@REM has failed. This cmd /c call will clear the errorlevel.
+@cmd /c
 
-"$(ProjectDir)$(ProjectName)PreBuild.cmd"
+@"$(ProjectDir)$(ProjectName)PreBuild.cmd"
 </Command>
     </PreBuildEvent>
     <PreLinkEvent>
-      <Command>REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)PreLink.cmd file.
-if not exist "$(ProjectDir)$(ProjectName)PreLink.cmd" exit /b
+      <Command>@REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)PreLink.cmd file.
+@if not exist "$(ProjectDir)$(ProjectName)PreLink.cmd" exit /b
 
-set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
-set CONFIGURATIONNAME=$(ConfigurationName)
-set INPUTDIR=$(InputDir)
-set INPUTFILENAME=$(InputFileName)
-set INPUTPATH=$(InputPath)
-set INTDIR=$(IntDir)
-set OUTDIR=$(OutDir)
-set PLATFORMARCHITECTURE=$(PlatformArchitecture)
-set PLATFORMNAME=$(PlatformName)
-set PROJECTDIR=$(ProjectDir)
-set PROJECTFILENAME=$(ProjectFileName)
-set PROJECTNAME=$(ProjectName)
-set PROJECTPATH=$(ProjectPath)
-set SOLUTIONDIR=$(SolutionDir)
-set SOLUTIONFILENAME=$(SolutionFileName)
-set SOLUTIONNAME=$(SolutionName)
-set SOLUTIONPATH=$(SolutionPath)
-set TARGETDIR=$(TargetDir)
-set TARGETEXT=$(TargetExt)
-set TARGETFILENAME=$(TargetFileName)
-set TARGETPATH=$(TargetPath)
-set DEBUGSUFFIX=$(DebugSuffix)
-set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
+@set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
+@set CONFIGURATIONNAME=$(ConfigurationName)
+@set INPUTDIR=$(InputDir)
+@set INPUTFILENAME=$(InputFileName)
+@set INPUTPATH=$(InputPath)
+@set INTDIR=$(IntDir)
+@set OUTDIR=$(OutDir)
+@set PLATFORMARCHITECTURE=$(PlatformArchitecture)
+@set PLATFORMNAME=$(PlatformName)
+@set PROJECTDIR=$(ProjectDir)
+@set PROJECTFILENAME=$(ProjectFileName)
+@set PROJECTNAME=$(ProjectName)
+@set PROJECTPATH=$(ProjectPath)
+@set SOLUTIONDIR=$(SolutionDir)
+@set SOLUTIONFILENAME=$(SolutionFileName)
+@set SOLUTIONNAME=$(SolutionName)
+@set SOLUTIONPATH=$(SolutionPath)
+@set TARGETDIR=$(TargetDir)
+@set TARGETEXT=$(TargetExt)
+@set TARGETFILENAME=$(TargetFileName)
+@set TARGETPATH=$(TargetPath)
+@set DEBUGSUFFIX=$(DebugSuffix)
+@set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
 
-REM If any of the above variables didn't exist previously and
-REM were set to an empty string, set will set the errorlevel to 1,
-REM which will cause the project-specific script to think the build
-REM has failed. This cmd /c call will clear the errorlevel.
-cmd /c
+@REM If any of the above variables didn't exist previously and
+@REM were set to an empty string, set will set the errorlevel to 1,
+@REM which will cause the project-specific script to think the build
+@REM has failed. This cmd /c call will clear the errorlevel.
+@cmd /c
 
-"$(ProjectDir)$(ProjectName)PreLink.cmd"
+@"$(ProjectDir)$(ProjectName)PreLink.cmd"
 </Command>
     </PreLinkEvent>
     <ResourceCompile>