Windows build fix
authoraroben@apple.com <aroben@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 28 May 2008 03:54:35 +0000 (03:54 +0000)
committeraroben@apple.com <aroben@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 28 May 2008 03:54:35 +0000 (03:54 +0000)
        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make:
        Remove code that appended Cygwin's /bin directory to PATH.
        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj:
        Prepend Cygwin's /bin directory to PATH. We prepend instead of append
        so that Cygwin's utilities will win out over Win32 versions of the
        same utilities (particularly perl). We do the prepend here instead of
        in the Makefile because nmake doesn't seem to like prepending to PATH
        inside the Makefile. This also matches the way WebCoreGenerated works.

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

JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make
JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj

index 2c3edc7..ca8cb3e 100644 (file)
@@ -1,5 +1,18 @@
 2008-05-27  Adam Roben  <aroben@apple.com>
 
+        Windows build fix
+
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make:
+        Remove code that appended Cygwin's /bin directory to PATH.
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj:
+        Prepend Cygwin's /bin directory to PATH. We prepend instead of append
+        so that Cygwin's utilities will win out over Win32 versions of the
+        same utilities (particularly perl). We do the prepend here instead of
+        in the Makefile because nmake doesn't seem to like prepending to PATH
+        inside the Makefile. This also matches the way WebCoreGenerated works.
+
+2008-05-27  Adam Roben  <aroben@apple.com>
+
         Roll out r34163
 
         A better fix is on the way.
index eb5b3b0..e40681e 100644 (file)
@@ -1,6 +1,5 @@
 all:
     -xcopy /y/d/e/i "..\..\..\WebKitLibraries\win\tools" "$(WEBKITLIBRARIESDIR)\tools"
-    set PATH=%PATH%;%SystemDrive%\cygwin\bin
     touch "$(WEBKITOUTPUTDIR)\buildfailed"
     bash build-generated-files.sh "$(WEBKITOUTPUTDIR)" "$(WEBKITLIBRARIESDIR)"
     -mkdir 2>NUL "$(WEBKITOUTPUTDIR)\include\JavaScriptCore\JavaScriptCore"
index 0546f4d..0c49f64 100644 (file)
@@ -23,9 +23,9 @@
                        >\r
                        <Tool\r
                                Name="VCNMakeTool"\r
-                               BuildCommandLine="nmake /nologo -f JavaScriptCoreGenerated.make"\r
-                               ReBuildCommandLine="nmake /nologo -f JavaScriptCoreGenerated.make clean&#x0D;&#x0A;nmake -f JavaScriptCoreGenerated.make"\r
-                               CleanCommandLine="nmake /nologo -f JavaScriptCoreGenerated.make clean"\r
+                               BuildCommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f JavaScriptCoreGenerated.make"\r
+                               ReBuildCommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f JavaScriptCoreGenerated.make clean&#x0D;&#x0A;nmake -f JavaScriptCoreGenerated.make"\r
+                               CleanCommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f JavaScriptCoreGenerated.make clean"\r
                                Output=""\r
                                PreprocessorDefinitions="WIN32;NDEBUG"\r
                                IncludeSearchPath=""\r