[packages,XcodeBuilder] Fixes #209. Xcode generation now supports identifying .tbd files, new in Xcode 7, which are text based dylib definition files. The LinkPrebuiltLibrary exercises this when targeting Xcode7.

Author: markfinal

Changelog.txt

@@ -1,3 +1,5 @@
+11-Apr-2016 Fixes #209. Xcode generation now supports identifying .tbd files, new in Xcode 7, which are text based dylib definition files. The LinkPrebuiltLibrary exercises this when targeting Xcode7.
+
 11-Apr-2016 Fixes #218. Removed unused code from Bam.Core.TimingProfileUtilities that had been identified by Coverity scan.
 
 11-Apr-2016 Fixes #217. Fetching the rank of a ModuleCollection from the Bam.Core.DependencyGraph used a comparison for a default System.Collections.Generic.Dictionary<int, ModuleCollection> which Coverity scan identified as logically dead code (equivalent to null, even though that doesn't compile), suggesting all ModuleCollections should have a valid rank index (which isn't true). Regardless, the code has been tidied up to eliminate ambiguity.

packages/ClangCommon/bam/Scripts/LinkerSettings/Xcode/C/ICommonLinkerSettings.cs

@@ -40,113 +40,114 @@ private static XcodeBuilder.BuildFile
         {
             var fileRef = target.Project.EnsureFileReferenceExists(
                 Bam.Core.TokenizedString.CreateVerbatim(pathToLibrary),
-                XcodeBuilder.FileReference.EFileType.Archive,
+                type,
                 true,
                 sourcetree);
             var buildFile = target.EnsureFrameworksBuildFileExists(
                 fileRef.Path,
-                XcodeBuilder.FileReference.EFileType.Archive);
+                type);
             target.Project.MainGroup.AddChild(fileRef);
             return buildFile;
         }
 
-        private static XcodeBuilder.BuildFile
-        FindLibraryInLibrarySearchPaths(
-            XcodeBuilder.Target target,
-            C.ICommonLinkerSettings settings,
+        private static System.Tuple<string,XcodeBuilder.FileReference.EFileType>
+        SearchForLibraryPath(
+            string searchPath,
             string libname)
         {
-            foreach (var searchPath in settings.LibraryPaths)
+            // look for dylibs first
+            var pattern = System.String.Format("lib{0}.dylib", libname);
+            Bam.Core.Log.DebugMessage("Searching {0} for {1}", searchPath, pattern);
+            var results = System.IO.Directory.GetFiles(searchPath, pattern);
+            if (results.Length > 0)
             {
-                var realSearchpath = searchPath.Parse();
-                // some lib paths might not exist yet
-                if (!System.IO.Directory.Exists(realSearchpath))
+                if (results.Length > 1)
                 {
-                    continue;
+                    throw new Bam.Core.Exception("Found {0} instances of {1} dynamic libraries in {2}. Which was intended?", results.Length, libname, searchPath);
                 }
-                // look for dylibs first
-                var pattern = System.String.Format("lib{0}.dylib", libname);
-                Bam.Core.Log.DebugMessage("Searching {0} for {1}", realSearchpath, pattern);
-                var results = System.IO.Directory.GetFiles(realSearchpath, pattern);
+                return System.Tuple.Create(results[0], XcodeBuilder.FileReference.EFileType.DynamicLibrary);
+            }
+            else
+            {
+                // then static libs
+                pattern = System.String.Format("lib{0}.a", libname);
+                Bam.Core.Log.DebugMessage("Searching {0} for {1}", searchPath, pattern);
+                results = System.IO.Directory.GetFiles(searchPath, pattern);
                 if (results.Length > 0)
                 {
                     if (results.Length > 1)
                     {
-                        throw new Bam.Core.Exception("Found {0} instances of {1} dynamic libraries in {2}. Which was intended?", results.Length, libname, realSearchpath);
+                        throw new Bam.Core.Exception("Found {0} instances of {1} static libraries in {2}. Which was intended?", results.Length, libname, searchPath);
                     }
-                    return CreateLinkableReferences(
-                        target,
-                        System.String.Format("{0}/lib{1}.dylib", realSearchpath, libname),
-                        XcodeBuilder.FileReference.EFileType.DynamicLibrary,
-                        XcodeBuilder.FileReference.ESourceTree.Absolute);
+                    return System.Tuple.Create(results[0], XcodeBuilder.FileReference.EFileType.Archive);
                 }
                 else
                 {
-                    // then static libs
-                    pattern = System.String.Format("lib{0}.a", libname);
-                    Bam.Core.Log.DebugMessage("Searching {0} for {1}", realSearchpath, pattern);
-                    results = System.IO.Directory.GetFiles(realSearchpath, pattern);
+                    // then text based dylib definitions (Xcode7+)
+                    pattern = System.String.Format("lib{0}.tbd", libname);
+                    Bam.Core.Log.DebugMessage("Searching {0} for {1}", searchPath, pattern);
+                    results = System.IO.Directory.GetFiles(searchPath, pattern);
                     if (results.Length > 0)
                     {
                         if (results.Length > 1)
                         {
-                            throw new Bam.Core.Exception("Found {0} instances of {1} static libraries in {2}. Which was intended?", results.Length, libname, realSearchpath);
+                            throw new Bam.Core.Exception("Found {0} instances of {1} text based dylib definition libraries in {2}. Which was intended?", results.Length, libname, searchPath);
                         }
-                        return CreateLinkableReferences(
-                            target,
-                            System.String.Format("{0}/lib{1}.a", realSearchpath, libname),
-                            XcodeBuilder.FileReference.EFileType.Archive,
-                            XcodeBuilder.FileReference.ESourceTree.Absolute);
+                        return System.Tuple.Create(results[0], XcodeBuilder.FileReference.EFileType.TextBasedDylibDefinition);
                     }
                 }
             }
             return null;
         }
 
         private static XcodeBuilder.BuildFile
-        FindLibraryInSDKSearchPaths(
+        FindLibraryInLibrarySearchPaths(
             XcodeBuilder.Target target,
             C.ICommonLinkerSettings settings,
             string libname)
         {
-            var meta = Bam.Core.Graph.Instance.PackageMetaData<Clang.MetaData>("Clang");
-            var searchPath = System.String.Format("{0}/usr/lib", meta.SDKPath);
-            var pattern = System.String.Format("lib{0}.dylib", libname);
-            Bam.Core.Log.DebugMessage("Searching {0} for {1}", searchPath, pattern);
-            var results = System.IO.Directory.GetFiles(searchPath, pattern);
-            if (results.Length > 0)
+            foreach (var searchPath in settings.LibraryPaths)
             {
-                if (results.Length > 1)
+                var realSearchpath = searchPath.Parse();
+                // some lib paths might not exist yet
+                if (!System.IO.Directory.Exists(realSearchpath))
                 {
-                    throw new Bam.Core.Exception("Found {0} instances of {1} dynamic libraries in {2}. Which was intended?", results.Length, libname, searchPath);
+                    continue;
                 }
-                return CreateLinkableReferences(
-                    target,
-                    System.String.Format("usr/lib/lib{0}.dylib", libname),
-                    XcodeBuilder.FileReference.EFileType.DynamicLibrary,
-                    XcodeBuilder.FileReference.ESourceTree.SDKRoot);
-            }
-            else
-            {
-                pattern = System.String.Format("lib{0}.a", libname);
-                Bam.Core.Log.DebugMessage("Searching {0} for {1}", searchPath, pattern);
-                results = System.IO.Directory.GetFiles(searchPath, pattern);
-                if (results.Length > 0)
+
+                var results = SearchForLibraryPath(realSearchpath, libname);
+                if (null != results)
                 {
-                    if (results.Length > 1)
-                    {
-                        throw new Bam.Core.Exception("Found {0} instances of {1} static libraries in {2}. Which was intended?", results.Length, libname, searchPath);
-                    }
                     return CreateLinkableReferences(
                         target,
-                        System.String.Format("usr/lib/lib{0}.a", libname),
-                        XcodeBuilder.FileReference.EFileType.Archive,
-                        XcodeBuilder.FileReference.ESourceTree.SDKRoot);
+                        results.Item1,
+                        results.Item2,
+                        XcodeBuilder.FileReference.ESourceTree.Absolute);
                 }
             }
             return null;
         }
 
+        private static XcodeBuilder.BuildFile
+        FindLibraryInSDKSearchPaths(
+            XcodeBuilder.Target target,
+            C.ICommonLinkerSettings settings,
+            string libname)
+        {
+            var meta = Bam.Core.Graph.Instance.PackageMetaData<Clang.MetaData>("Clang");
+            var searchPath = System.String.Format("{0}/usr/lib", meta.SDKPath);
+            var results = SearchForLibraryPath(searchPath, libname);
+            if (null != results)
+            {
+                return CreateLinkableReferences(
+                    target,
+                    results.Item1.Replace(meta.SDKPath,string.Empty).TrimStart(new [] { '/'}),
+                    results.Item2,
+                    XcodeBuilder.FileReference.ESourceTree.Absolute);
+            }
+            return null;
+        }
+
         public static void
         Convert(
             this C.ICommonLinkerSettings settings,

packages/XcodeBuilder/bam/Scripts/FileReference.cs

@@ -76,6 +76,9 @@ public static string
             case FileReference.EFileType.YaccFile:
                 return "sourcecode.yacc";
 
+            case FileReference.EFileType.TextBasedDylibDefinition:
+                return "sourcecode.text-based-dylib-definition";
+
             default:
                 throw new Bam.Core.Exception("Unrecognized file type {0}", type.ToString());
             }
@@ -131,7 +134,8 @@ public enum EFileType
             ApplicationBundle,
             Project,
             YaccFile,
-            LexFile
+            LexFile,
+            TextBasedDylibDefinition
         }
 
         public enum ESourceTree