[WinCairo] Unreviewed build fix after r170937.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 12 Jul 2014 03:54:05 +0000 (03:54 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 12 Jul 2014 03:54:05 +0000 (03:54 +0000)
* WebCore.vcxproj/WebCoreGeneratedWinCairo.make:
Update and apply changes applied to WebCoreGenerated.make in r170937.

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

Source/WebCore/ChangeLog
Source/WebCore/WebCore.vcxproj/WebCoreGeneratedWinCairo.make

index 541ab8a..6367e9a 100644 (file)
@@ -1,3 +1,10 @@
+2014-07-11  Alex Christensen  <achristensen@webkit.org>
+
+        [WinCairo] Unreviewed build fix after r170937.
+
+        * WebCore.vcxproj/WebCoreGeneratedWinCairo.make:
+        Update and apply changes applied to WebCoreGenerated.make in r170937.
+
 2014-07-11  Joseph Pecoraro  <pecoraro@apple.com>
 
         Web Inspector: Crash when using a stale InspectableNode Node
index 21f53da..cde8994 100644 (file)
@@ -1,14 +1,14 @@
 make:\r
-       if exist "%ConfigurationBuildDir%\buildfailed" grep XXWebCoreGeneratedXX "%ConfigurationBuildDir%\buildfailed"\r
+       if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnle "if (/XXWebCoreGeneratedXX/) { print } else { exit 1 }" "%ConfigurationBuildDir%\buildfailed"\r
        if errorlevel 1 exit 1\r
        echo XXWebCoreGeneratedXX > "%ConfigurationBuildDir%\buildfailed"\r
 \r
-       bash build-generated-files.sh "%ConfigurationBuildDir%" "%WebKit_Libraries%" cairo "%PlatformArchitecture%"\r
-       bash migrate-scripts.sh "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts"\r
+       perl build-generated-files.pl "%ConfigurationBuildDir%" "%WebKit_Libraries%" cairo "%PlatformArchitecture%"\r
+       perl migrate-scripts.pl "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts"\r
        cmd /C copyForwardingHeaders.cmd cairo curl\r
        cmd /C copyWebCoreResourceFiles.cmd\r
        \r
 clean:\r
-       del /s /q "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\DerivedSources"\r
-       del /s /q "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts"\r
+       if exist "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\DerivedSources" del /s /q "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\DerivedSources"\r
+       if exist "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts" del /s /q "%ConfigurationBuildDir%\obj%PlatformArchitecture%\WebCore\scripts"\r
        if exist "%ConfigurationBuildDir%\buildfailed" del "%ConfigurationBuildDir%\buildfailed"\r