Title: [140694] trunk/WebKitLibraries
- Revision
- 140694
- Author
- [email protected]
- Date
- 2013-01-24 10:48:35 -0800 (Thu, 24 Jan 2013)
Log Message
Get WTF compiling in VS2010 (32bit)
https://bugs.webkit.org/show_bug.cgi?id=106986
Reviewed by Tim Horton.
If you do not have Cygwin in the overall operating system
PATH, the project will not build. In VS2005 we had logic
in the build system to guard against this. We should
retain this in the VS2010 work.
Furthermore, VS2010 has a nasty bug where to Visual Studio
tools path is not defined when performing a 'clean' phase
on an NMAKE-based build. This is corrected here as well.
* win/tools/vsprops/common.props: Revise environment setup
to ensure proper tools are in path during build.
Modified Paths
Diff
Modified: trunk/WebKitLibraries/ChangeLog (140693 => 140694)
--- trunk/WebKitLibraries/ChangeLog 2013-01-24 18:46:11 UTC (rev 140693)
+++ trunk/WebKitLibraries/ChangeLog 2013-01-24 18:48:35 UTC (rev 140694)
@@ -1,3 +1,22 @@
+2013-01-24 Brent Fulgham <[email protected]>
+
+ Get WTF compiling in VS2010 (32bit)
+ https://bugs.webkit.org/show_bug.cgi?id=106986
+
+ Reviewed by Tim Horton.
+
+ If you do not have Cygwin in the overall operating system
+ PATH, the project will not build. In VS2005 we had logic
+ in the build system to guard against this. We should
+ retain this in the VS2010 work.
+
+ Furthermore, VS2010 has a nasty bug where to Visual Studio
+ tools path is not defined when performing a 'clean' phase
+ on an NMAKE-based build. This is corrected here as well.
+
+ * win/tools/vsprops/common.props: Revise environment setup
+ to ensure proper tools are in path during build.
+
2013-01-19 Roger Fong <[email protected]>
Add WebKitLibraries property sheets for compiling WebKit in VS2010.
Modified: trunk/WebKitLibraries/win/tools/vsprops/common.props (140693 => 140694)
--- trunk/WebKitLibraries/win/tools/vsprops/common.props 2013-01-24 18:46:11 UTC (rev 140693)
+++ trunk/WebKitLibraries/win/tools/vsprops/common.props 2013-01-24 18:48:35 UTC (rev 140694)
@@ -9,10 +9,19 @@
<OutDir>$(ConfigurationBuildDir)\bin\</OutDir>
<IntDir>$(ConfigurationBuildDir)\obj\$(ProjectName)\</IntDir>
<LinkIncremental>false</LinkIncremental>
- <NMakeBuildCommandLine>nmake -f $(ProjectName).make</NMakeBuildCommandLine>
- <NMakeReBuildCommandLine>nmake /nologo -f $(ProjectName).make clean
-nmake -f $(ProjectName).make</NMakeReBuildCommandLine>
- <NMakeCleanCommandLine>REM VS2010 has a known bug where the clean command does not recognize environment variables properly unless explicitly set here
+ <NMakeBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
+if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
+nmake /nologo -f $(ProjectName).make</NMakeBuildCommandLine>
+ <NMakeReBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
+if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
+nmake /nologo -f $(ProjectName).make clean
+nmake /nologo -f $(ProjectName).make</NMakeReBuildCommandLine>
+ <NMakeCleanCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
+if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
+
+set PATH=$(VSInstallDir)\VC\bin;%PATH%
+
+REM VS2010 has a known bug where the clean command does not recognize environment variables properly unless explicitly set here
set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
nmake /nologo -f $(ProjectName).make clean</NMakeCleanCommandLine>
</PropertyGroup>
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
