Fix the backwards slashes in the commit header generation.

These backwards slashes happen with some versions of gyp. Change-Id: I6c61e212aa34999fb82d74d9f1605d674f34fce0 Reviewed-on: https://chromium-review.googlesource.com/178522Reviewed-by: Shannon Woods <shannonwoods@chromium.org> Commit-Queue: Shannon Woods <shannonwoods@chromium.org> Tested-by: Shannon Woods <shannonwoods@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>

Fix the backwards slashes in the commit header generation.
319cb329 · Jamie Madill · 372d8dd9 · 319cb329 · 319cb329 · 319cb329
Commit 319cb329 authored Dec 03, 2013 by Jamie Madill
Showing with 14 additions and 4 deletions

commit_id.vcxproj projects/src/commit_id.vcxproj +2 -2

commit_id.vcxproj.filters projects/src/commit_id.vcxproj.filters +6 -0

angle.gypi src/angle.gypi +2 -2

commit_id.bat src/commit_id.bat +4 -0

No files found.
--- a/projects/src/commit_id.vcxproj
+++ b/projects/src/commit_id.vcxproj
@@ -109,9 +109,9 @@
    <None Include="..\..\src\angle.gyp"/>
  </ItemGroup>
  <ItemGroup>
-    <CustomBuild Include="..\..\src\src\angle.gyp">
+    <CustomBuild Include="..\..\src\commit_id.bat">
      <FileType>Document</FileType>
-      <Command>call call cmd \C &quot;echo|set \p=#define COMMIT_HASH &gt; common\commit.h &amp; (git rev-parse --short=12 HEAD &gt;&gt; common\commit.h) || (echo badf00dbad00 &gt;&gt; common\commit.h)&quot; &gt; NUL</Command>
+      <Command>call call ..\..\src\commit_id.bat</Command>
      <Message>Generating commit ID header...</Message>
      <Outputs>..\..\src\common\commit.h</Outputs>
    </CustomBuild>

--- a/projects/src/commit_id.vcxproj.filters
+++ b/projects/src/commit_id.vcxproj.filters
@@ -10,10 +10,16 @@
    <Filter Include="..\..\src">
      <UniqueIdentifier>{8CDEE807-BC53-E450-C8B8-4DEBB66742D4}</UniqueIdentifier>
    </Filter>
+    <Filter Include="..\..\src\_excluded_files">
+      <UniqueIdentifier>{158E591E-B6EA-0C85-8F5A-18EAFA09B4CE}</UniqueIdentifier>
+    </Filter>
  </ItemGroup>
  <ItemGroup>
    <None Include="..\..\src\angle.gyp">
      <Filter>..\..\src</Filter>
    </None>
+    <None Include="..\..\src\commit_id.bat">
+      <Filter>..\..\src\_excluded_files</Filter>
+    </None>
  </ItemGroup>
 </Project>
--- a/src/angle.gypi
+++ b/src/angle.gypi
@@ -34,9 +34,9 @@
                            {
                                'action_name': 'Generate Commit ID Header',
                                'message': 'Generating commit ID header...',
-                                'inputs': [],
+                                'inputs': [ 'commit_id.bat' ],
                                'outputs': ['common/commit.h'],
-                                'action': ['cmd /C "echo|set /p=#define COMMIT_HASH > common/commit.h & (git rev-parse --short=12 HEAD >> common/commit.h) || (echo badf00dbad00 >> common/commit.h)" > NUL'],
+                                'action': ['<(angle_relative_src_path)commit_id.bat'],
                            }
                        ] #actions
                    }

--- a/src/commit_id.bat
+++ b/src/commit_id.bat
+@echo off
+echo|set /p=#define COMMIT_HASH > %~dp0\common\commit.h
+(git rev-parse --short=12 HEAD >> %~dp0\common\commit.h) || (echo badf00dbad00 >> %~dp0\common\commit.h) > NUL
\ No newline at end of file