Commit 927d6675 authored by aroben@apple.com's avatar 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.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@34165 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 9de75275
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
......
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"
......
......@@ -23,9 +23,9 @@
>
<Tool
Name="VCNMakeTool"
BuildCommandLine="nmake /nologo -f JavaScriptCoreGenerated.make"
ReBuildCommandLine="nmake /nologo -f JavaScriptCoreGenerated.make clean&#x0D;&#x0A;nmake -f JavaScriptCoreGenerated.make"
CleanCommandLine="nmake /nologo -f JavaScriptCoreGenerated.make clean"
BuildCommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f JavaScriptCoreGenerated.make"
ReBuildCommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f JavaScriptCoreGenerated.make clean&#x0D;&#x0A;nmake -f JavaScriptCoreGenerated.make"
CleanCommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f JavaScriptCoreGenerated.make clean"
Output=""
PreprocessorDefinitions="WIN32;NDEBUG"
IncludeSearchPath=""
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment