[packages,C] Fixes #90. HeaderLibraries are now considered for forwarded dependencies when required by another HeaderLibrary or StaticLibrary. This captures any dependents on that HeaderLibrary which are required by a future link step.

Author: markfinal

Changelog.txt

@@ -1,3 +1,5 @@
+25-Aug-2016 Fixes #90. HeaderLibraries are now considered for forwarded dependencies when required by another HeaderLibrary or StaticLibrary. This captures any dependents on that HeaderLibrary which are required by a future link step.
+
 25-Aug-2016 Issue #90. Added test HeaderLibraryTest2, to exercise a header library having a dependency on a static library, and an application then uses the header library. The static library dependency must be forwarded to the application link step.
 
 23-Aug-2016 Fixes #285. VisualStudio solution files now embed a format version number dependent on the VisualC package used.

packages/C/bam/Scripts/HeaderLibrary.cs

@@ -100,11 +100,9 @@ public void
             {
                 this.Requires(dependent);
             }
-            else
-            {
-                // this delays the dependency until a link
-                this.forwardedDeps.AddUnique(dependent);
-            }
+            // this delays the dependency until a link
+            // (and recursively checks the dependent for more forwarded dependencies)
+            this.forwardedDeps.AddUnique(dependent);
         }
     }
 }

packages/C/bam/Scripts/StaticLibrary.cs

@@ -155,19 +155,17 @@ public void
             {
                 this.Requires(dependent);
             }
-            else
+            // this delays the dependency until a link
+            // (and recursively checks the dependent for more forwarded dependencies)
+            // because there is no explicit DependsOn call, perform a cyclic dependency check here too
+            if (dependent is IForwardedLibraries)
             {
-                // this delays the dependency until a link
-                // because there is no explicit DependsOn call, perform a cyclic dependency check here too
-                if (dependent is IForwardedLibraries)
+                if ((dependent as IForwardedLibraries).ForwardedLibraries.Contains(this))
                 {
-                    if ((dependent as IForwardedLibraries).ForwardedLibraries.Contains(this))
-                    {
-                        throw new Bam.Core.Exception("Cyclic dependency found between {0} and {1}", this.ToString(), dependent.ToString());
-                    }
+                    throw new Bam.Core.Exception("Cyclic dependency found between {0} and {1}", this.ToString(), dependent.ToString());
                 }
-                this.forwardedDeps.AddUnique(dependent);
             }
+            this.forwardedDeps.AddUnique(dependent);
         }
 
         /// <summary>

tests/bamtests.py

@@ -102,4 +102,7 @@ def configure_repository():
     configs["ChangeDefaultSettings"] = TestSetup(win={"Native": [visualc64, visualc32, mingw32], "VSSolution": [visualc64, visualc32]},
                                                  linux={"Native": [gcc64, gcc32], "MakeFile": [gcc64, gcc32]},
                                                  osx={"Native": [clang64, clang32], "MakeFile": [clang64, clang32], "Xcode": [clang64, clang32]})
+    configs["HeaderLibraryTest2"] = TestSetup(win={"Native": [visualc64, visualc32, mingw32], "VSSolution": [visualc64, visualc32]},
+                                              linux={"Native": [gcc64, gcc32], "MakeFile": [gcc64, gcc32]},
+                                              osx={"Native": [clang64, clang32], "MakeFile": [clang64, clang32], "Xcode": [clang64, clang32]})
     return configs