Changeset 34165 in webkit for trunk/JavaScriptCore


Ignore:
Timestamp:
May 27, 2008, 8:54:35 PM (17 years ago)
Author:
Adam Roben
Message:

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.
Location:
trunk/JavaScriptCore
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/ChangeLog

    r34164 r34165  
     12008-05-27  Adam Roben  <[email protected]>
     2
     3        Windows build fix
     4
     5        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make:
     6        Remove code that appended Cygwin's /bin directory to PATH.
     7        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj:
     8        Prepend Cygwin's /bin directory to PATH. We prepend instead of append
     9        so that Cygwin's utilities will win out over Win32 versions of the
     10        same utilities (particularly perl). We do the prepend here instead of
     11        in the Makefile because nmake doesn't seem to like prepending to PATH
     12        inside the Makefile. This also matches the way WebCoreGenerated works.
     13
    1142008-05-27  Adam Roben  <[email protected]>
    215

  • trunk/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make

    r31295 r34165  
    11all:
    22    -xcopy /y/d/e/i "..\..\..\WebKitLibraries\win\tools" "$(WEBKITLIBRARIESDIR)\tools"
    3     set PATH=%PATH%;%SystemDrive%\cygwin\bin
    43    touch "$(WEBKITOUTPUTDIR)\buildfailed"
    54    bash build-generated-files.sh "$(WEBKITOUTPUTDIR)" "$(WEBKITLIBRARIESDIR)"

  • trunk/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj

    r28697 r34165  
    2424                        <Tool
    2525                                Name="VCNMakeTool"
    26                                 BuildCommandLine="nmake /nologo -f JavaScriptCoreGenerated.make"
    27                                 ReBuildCommandLine="nmake /nologo -f JavaScriptCoreGenerated.make clean&#x0D;&#x0A;nmake -f JavaScriptCoreGenerated.make"
    28                                 CleanCommandLine="nmake /nologo -f JavaScriptCoreGenerated.make clean"
     26                                BuildCommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f JavaScriptCoreGenerated.make"
     27                                ReBuildCommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f JavaScriptCoreGenerated.make clean&#x0D;&#x0A;nmake -f JavaScriptCoreGenerated.make"
     28                                CleanCommandLine="set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f JavaScriptCoreGenerated.make clean"
    2929                                Output=""
    3030                                PreprocessorDefinitions="WIN32;NDEBUG"
Note: See TracChangeset for help on using the changeset viewer.