Declare commit_id a gyp 'hard_dependency'.

Hard dependencies are marked for static library targets, unlike normal soft dependencies which the static libraries ignore. This change ensures we run the commit_id script before compiling any static libraries that depend on it. Change-Id: Ic29652012883273810c2863132d6f49bd6ada4b8 Reviewed-on: https://chromium-review.googlesource.com/216461Tested-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org>

Declare commit_id a gyp 'hard_dependency'.
b33b4777 · Jamie Madill · 58f79422 · b33b4777 · b33b4777 · b33b4777
Commit b33b4777 authored Sep 04, 2014 by Jamie Madill
5 changed files
--- a/projects/build/all.sln
+++ b/projects/build/all.sln
@@ -95,6 +95,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\src\libGLES
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2_static", "..\src\libGLESv2_static.vcxproj", "{F8ABD31A-EC2F-A211-D514-076C763B69F9}"
+	ProjectSection(ProjectDependencies) = postProject
+		{3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mip_map_2d", "..\samples\mip_map_2d.vcxproj", "{A6E86EB3-561F-9FAB-670F-EF23556344BE}"
 	ProjectSection(ProjectDependencies) = postProject

--- a/projects/src/angle.sln
+++ b/projects/src/angle.sln
@@ -33,6 +33,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "libGLESv2.vcxp
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2_static", "libGLESv2_static.vcxproj", "{F8ABD31A-EC2F-A211-D514-076C763B69F9}"
+	ProjectSection(ProjectDependencies) = postProject
+		{3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "preprocessor", "preprocessor.vcxproj", "{C7BAF548-697D-2DCB-9DF3-9D1506A7B444}"
 EndProject

--- a/projects/src/libGLESv2_static.vcxproj
+++ b/projects/src/libGLESv2_static.vcxproj
@@ -209,6 +209,12 @@
  <ItemGroup>
    <ResourceCompile Include="..\..\src\libGLESv2\libGLESv2.rc"/>
  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="commit_id.vcxproj">
+      <Project>{3B7F5656-177F-52EE-26B3-D6A75368D0A9}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
  <ImportGroup Label="ExtensionTargets"/>
 </Project>
--- a/src/angle.gypi
+++ b/src/angle.gypi
@@ -26,6 +26,7 @@
        {
            'target_name': 'copy_scripts',
            'type': 'none',
+            'hard_dependency': 1,
            'copies':
            [
                {
@@ -46,6 +47,7 @@
                    'type': 'none',
                    'includes': [ '../build/common_defines.gypi', ],
                    'dependencies': [ 'copy_scripts', ],
+                    'hard_dependency': 1,
                    'actions':
                    [
                        {
@@ -77,6 +79,7 @@
                {
                    'target_name': 'commit_id',
                    'type': 'none',
+                    'hard_dependency': 1,
                    'copies':
                    [
                        {

--- a/src/libGLESv2.gypi
+++ b/src/libGLESv2.gypi
@@ -438,7 +438,9 @@
                {
                    'target_name': 'libGLESv2_static',
                    'type': 'static_library',
-                    'dependencies': [ 'libANGLE' ],
+                    # make sure we depend on commit_id as a hard dependency, otherwise
+                    # we will try to build the static_lib in parallel
+                    'dependencies': [ 'libANGLE', 'commit_id' ],
                    'includes': [ '../build/common_defines.gypi', ],
                    'sources':
                    [