Changeset 140694 in webkit

Timestamp:

Jan 24, 2013 10:48:35 AM (11 years ago)

Author:

bfulgham@webkit.org

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.

Location:

trunk/WebKitLibraries

Files:

• ChangeLog (modified) (1 diff)
• win/tools/vsprops/common.props (modified) (1 diff)

trunk/WebKitLibraries/ChangeLog

@@ +1 @@
+2013-01-24  Brent Fulgham  <bfulgham@webkit.org>
+
+        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  <roger_fong@apple.com>
 

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

@@ -10 +10 @@
     <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>