Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (170921 => 170922)
--- trunk/Source/_javascript_Core/ChangeLog 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-07-09 18:05:06 UTC (rev 170922)
@@ -1,3 +1,19 @@
+2014-07-09 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Remove use of 'grep' in build steps
+ https://bugs.webkit.org/show_bug.cgi?id=134770
+ <rdar://problem/17608783>
+
+ Reviewed by Tim Horton.
+
+ Replace uses of the grep command in Windows builds with the equivalent
+ Perl program.
+
+ * _javascript_Core.vcxproj/_javascript_CorePreBuild.cmd:
+ * _javascript_Core.vcxproj/jsc/jscPreBuild.cmd:
+ * _javascript_Core.vcxproj/testRegExp/testRegExpPreBuild.cmd:
+ * _javascript_Core.vcxproj/testapi/testapiPreBuild.cmd:
+
2014-07-08 Benjamin Poulain <benja...@webkit.org>
Restore the assertion changed with 170839
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CorePreBuild.cmd (170921 => 170922)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CorePreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CorePreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
@@ -1,6 +1,6 @@
-%SystemDrive%\cygwin\bin\which.exe bash
+%SystemDrive%\cygwin\bin\which.exe perl
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
if errorlevel 1 exit 1
echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/jscPreBuild.cmd (170921 => 170922)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/jscPreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/jscPreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
@@ -1,6 +1,6 @@
-%SystemDrive%\cygwin\bin\which.exe bash
+%SystemDrive%\cygwin\bin\which.exe perl
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
if errorlevel 1 exit 1
echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testRegExp/testRegExpPreBuild.cmd (170921 => 170922)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testRegExp/testRegExpPreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testRegExp/testRegExpPreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
@@ -1,6 +1,6 @@
-%SystemDrive%\cygwin\bin\which.exe bash
+%SystemDrive%\cygwin\bin\which.exe perl
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
if errorlevel 1 exit 1
echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapiPreBuild.cmd (170921 => 170922)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapiPreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapiPreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
@@ -1,6 +1,6 @@
-%SystemDrive%\cygwin\bin\which.exe bash
+%SystemDrive%\cygwin\bin\which.exe perl
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
if errorlevel 1 exit 1
echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
Modified: trunk/Source/WTF/ChangeLog (170921 => 170922)
--- trunk/Source/WTF/ChangeLog 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/WTF/ChangeLog 2014-07-09 18:05:06 UTC (rev 170922)
@@ -1,3 +1,16 @@
+2014-07-09 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Remove use of 'grep' in build steps
+ https://bugs.webkit.org/show_bug.cgi?id=134770
+ <rdar://problem/17608783>
+
+ Reviewed by Tim Horton.
+
+ Replace uses of the grep command in Windows builds with the equivalent
+ Perl program.
+
+ * WTF.vcxproj/WTFPreBuild.cmd:
+
2014-07-07 Zan Dobersek <zdober...@igalia.com>
Enable ARMv7 disassembler for the GTK port
Modified: trunk/Source/WTF/WTF.vcxproj/WTFPreBuild.cmd (170921 => 170922)
--- trunk/Source/WTF/WTF.vcxproj/WTFPreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/WTF/WTF.vcxproj/WTFPreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
@@ -1,6 +1,6 @@
-%SystemDrive%\cygwin\bin\which.exe bash
+%SystemDrive%\cygwin\bin\which.exe perl
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
if errorlevel 1 exit 1
echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
Modified: trunk/Source/WebCore/ChangeLog (170921 => 170922)
--- trunk/Source/WebCore/ChangeLog 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/WebCore/ChangeLog 2014-07-09 18:05:06 UTC (rev 170922)
@@ -1,3 +1,19 @@
+2014-07-09 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Remove use of 'grep' in build steps
+ https://bugs.webkit.org/show_bug.cgi?id=134770
+ <rdar://problem/17608783>
+
+ Reviewed by Tim Horton.
+
+ Replace uses of the grep command in Windows builds with the equivalent
+ Perl program.
+
+ * WebCore.vcxproj/WebCoreGenerated.make:
+ * WebCore.vcxproj/WebCorePreBuild.cmd:
+ * platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp:
+ (WebCore::WebCoreAVCFResourceLoader::notifyFinished):
+
2014-07-09 Alex Christensen <achristen...@webkit.org>
Added css jit profiler, disabled by default.
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.make (170921 => 170922)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.make 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.make 2014-07-09 18:05:06 UTC (rev 170922)
@@ -1,5 +1,5 @@
make:
- if exist "%ConfigurationBuildDir%\buildfailed" grep XXWebCoreGeneratedXX "%ConfigurationBuildDir%\buildfailed"
+ if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XXWebCoreGeneratedXX/) { print } else { exit 1 }" "%ConfigurationBuildDir%\buildfailed"
if errorlevel 1 exit 1
echo XXWebCoreGeneratedXX > "%ConfigurationBuildDir%\buildfailed"
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCorePreBuild.cmd (170921 => 170922)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCorePreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCorePreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
@@ -1,7 +1,7 @@
-%SystemDrive%\cygwin\bin\which.exe bash
+%SystemDrive%\cygwin\bin\which.exe perl
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
if errorlevel 1 exit 1
echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
set AngleHeadersDirectory=%CONFIGURATIONBUILDDIR%\include\private
Modified: trunk/Source/WebKit/ChangeLog (170921 => 170922)
--- trunk/Source/WebKit/ChangeLog 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/WebKit/ChangeLog 2014-07-09 18:05:06 UTC (rev 170922)
@@ -1,3 +1,19 @@
+2014-07-09 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Remove use of 'grep' in build steps
+ https://bugs.webkit.org/show_bug.cgi?id=134770
+ <rdar://problem/17608783>
+
+ Reviewed by Tim Horton.
+
+ Replace uses of the grep command in Windows builds with the equivalent
+ Perl program.
+
+ * WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd:
+ * WebKit.vcxproj/WebKit/WebKitPreBuild.cmd:
+ * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd:
+ * WebKit.vcxproj/WebKitGUID/WebKitGUIDPreBuild.cmd:
+
2014-07-08 Brent Fulgham <bfulg...@apple.com>
[Win] Implement auto-version as a Perl program
Modified: trunk/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd (170921 => 170922)
--- trunk/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
@@ -1,7 +1,7 @@
-%SystemDrive%\cygwin\bin\which.exe bash
+%SystemDrive%\cygwin\bin\which.exe perl
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
if errorlevel 1 exit 1
echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPreBuild.cmd (170921 => 170922)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
@@ -1,7 +1,7 @@
-%SystemDrive%\cygwin\bin\which.exe bash
+%SystemDrive%\cygwin\bin\which.exe perl
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
if errorlevel 1 exit 1
echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd (170921 => 170922)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorPreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
@@ -1,4 +1,4 @@
-%SystemDrive%\cygwin\bin\which.exe bash
+%SystemDrive%\cygwin\bin\which.exe perl
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
echo Preparing generator output directory...
@@ -12,7 +12,7 @@
del /F /Q "%OUTDIR%\WebKitExportGenerator%DEBUGSUFFIX%.exe"
cmd /c
-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
if errorlevel 1 exit 1
echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDPreBuild.cmd (170921 => 170922)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDPreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUIDPreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
@@ -1,6 +1,6 @@
-%SystemDrive%\cygwin\bin\which.exe bash
+%SystemDrive%\cygwin\bin\which.exe perl
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
if errorlevel 1 exit 1
echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
Modified: trunk/Tools/ChangeLog (170921 => 170922)
--- trunk/Tools/ChangeLog 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Tools/ChangeLog 2014-07-09 18:05:06 UTC (rev 170922)
@@ -1,3 +1,21 @@
+2014-07-09 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Remove use of 'grep' in build steps
+ https://bugs.webkit.org/show_bug.cgi?id=134770
+ <rdar://problem/17608783>
+
+ Reviewed by Tim Horton.
+
+ Replace uses of the grep command in Windows builds with the equivalent
+ Perl program.
+
+ * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreePreBuild.cmd:
+ * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffPreBuild.cmd:
+ * DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginPreBuild.cmd:
+ * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIPreBuild.cmd:
+ * WinLauncher/WinLauncher.vcxproj/WinLauncherLibPreBuild.cmd:
+ * WinLauncher/WinLauncher.vcxproj/WinLauncherPreBuild.cmd:
+
2014-07-09 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r170889.
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreePreBuild.cmd (170921 => 170922)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreePreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreePreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
@@ -1,7 +1,7 @@
-%SystemDrive%\cygwin\bin\which.exe bash
+%SystemDrive%\cygwin\bin\which.exe perl
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
if errorlevel 1 exit 1
echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffPreBuild.cmd (170921 => 170922)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffPreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffPreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
@@ -1,6 +1,6 @@
-%SystemDrive%\cygwin\bin\which.exe bash
+%SystemDrive%\cygwin\bin\which.exe perl
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
if errorlevel 1 exit 1
echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginPreBuild.cmd (170921 => 170922)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginPreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginPreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
@@ -1,6 +1,6 @@
-%SystemDrive%\cygwin\bin\which.exe bash
+%SystemDrive%\cygwin\bin\which.exe perl
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
if errorlevel 1 exit 1
echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIPreBuild.cmd (170921 => 170922)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIPreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIPreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
@@ -1,6 +1,6 @@
-%SystemDrive%\cygwin\bin\which.exe bash
+%SystemDrive%\cygwin\bin\which.exe perl
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
if errorlevel 1 exit 1
echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
Modified: trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibPreBuild.cmd (170921 => 170922)
--- trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibPreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLibPreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
@@ -1,6 +1,6 @@
-%SystemDrive%\cygwin\bin\which.exe bash
+%SystemDrive%\cygwin\bin\which.exe perl
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
if errorlevel 1 exit 1
echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
Modified: trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherPreBuild.cmd (170921 => 170922)
--- trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherPreBuild.cmd 2014-07-09 17:49:59 UTC (rev 170921)
+++ trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherPreBuild.cmd 2014-07-09 18:05:06 UTC (rev 170922)
@@ -1,6 +1,6 @@
-%SystemDrive%\cygwin\bin\which.exe bash
+%SystemDrive%\cygwin\bin\which.exe perl
if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
cmd /c
-if exist "%CONFIGURATIONBUILDDIR%\buildfailed" grep XX%PROJECTNAME%XX "%CONFIGURATIONBUILDDIR%\buildfailed"
+if exist "%CONFIGURATIONBUILDDIR%\buildfailed" perl -wnne "if (/XX%PROJECTNAME%XX/) { print } else { exit 1 }" "%CONFIGURATIONBUILDDIR%\buildfailed"
if errorlevel 1 exit 1
echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
