Add fixes for app_extension Info.plist files. Add build phase creation and registering with custom targets. Cleanup.

Author: sidneys

lib/pbxProject.js

@@ -115,7 +115,10 @@ pbxProject.prototype.addProductFile = function(targetPath, opt) {
     file.fileRef = this.generateUuid();
     file.target = opt ? opt.target : undefined;
     file.group = opt ? opt.group : undefined;
+    file.uuid = this.generateUuid();
+    file.path = file.basename;
 
+    this.addToPbxFileReferenceSection(file);
     this.addToProductsPbxGroup(file);                // PBXGroup
 
     return file;
@@ -208,9 +211,8 @@ pbxProject.prototype.removeResourceFile = function(path, opt) {
 }
 
 pbxProject.prototype.addFramework = function(fpath, opt) {
+
     var file = new pbxFile(fpath, opt);
-    // catch duplicates
-    if (this.hasFile(file.path)) return false;
 
     file.uuid = this.generateUuid();
     file.fileRef = this.generateUuid();
@@ -252,14 +254,10 @@ pbxProject.prototype.addCopyfile = function(fpath, opt) {
     // catch duplicates
     if (this.hasFile(file.path)) {
         file = this.hasFile(file.path);
-    } else {
-        file.uuid = this.generateUuid();
-        file.fileRef = this.generateUuid();
     }
 
+    file.fileRef = file.uuid = this.generateUuid();
     file.target = opt ? opt.target : undefined;
-    file.group = 'CopyFiles';
-
 
     this.addToPbxBuildFileSection(file);        // PBXBuildFile
     this.addToPbxFileReferenceSection(file);    // PBXFileReference
@@ -269,11 +267,11 @@ pbxProject.prototype.addCopyfile = function(fpath, opt) {
 }
 
 pbxProject.prototype.pbxCopyfilesBuildPhaseObj = function(target) {
-    return this.buildPhaseObject('PBXCopyFilesBuildPhase', 'CopyFiles', target);
+    return this.buildPhaseObject('PBXCopyFilesBuildPhase', 'Copy Files', target);
 }
 
 pbxProject.prototype.addToPbxCopyfilesBuildPhase = function(file) {
-    var sources = this.buildPhaseObject('PBXCopyFilesBuildPhase', 'CopyFiles', file.target);
+    var sources = this.buildPhaseObject('PBXCopyFilesBuildPhase', 'Copy Files', file.target);
     sources.files.push(pbxBuildPhaseObj(file));
 }
 
@@ -642,24 +640,40 @@ pbxProject.prototype.addTargetDependency = function(target, dependencyTargets) {
     return { uuid: target, target: nativeTargets[target] };
 }
 
-pbxProject.prototype.addBuildPhase = function(filePathsArray, addToType, comment, folderType, subfolderPath) {
-    var buildPhaseSection = this.hash.project.objects[addToType],
+pbxProject.prototype.addBuildPhase = function(filePathsArray, buildPhaseType, comment, target, folderType, subfolderPath) {
+    var buildPhaseSection,
         fileReferenceSection = this.pbxFileReferenceSection(),
         buildFileSection = this.pbxBuildFileSection(),
-        phaseUuid = this.generateUuid(),
-        commentKey = f("%s_comment", phaseUuid),
-        buildPhaseRef = {
-            isa: addToType,
+        buildPhaseUuid = this.generateUuid(),
+        buildPhaseTargetUuid = target || this.getFirstTarget().uuid,
+        commentKey = f("%s_comment", buildPhaseUuid),
+        buildPhase = {
+            isa: buildPhaseType,
             buildActionMask: 2147483647,
             files: [],
             runOnlyForDeploymentPostprocessing: 0
         },
         filePathToBuildFile = {};
 
+    if (buildPhaseType === 'PBXCopyFilesBuildPhase') {
+        buildPhase = pbxCopyFilesBuildPhaseObj(buildPhase, folderType, subfolderPath, comment);
+    }
+
+    if (!this.hash.project.objects[buildPhaseType]) {
+        this.hash.project.objects[buildPhaseType] = new Object();
+    }
+
+    if (!this.hash.project.objects[buildPhaseType][buildPhaseUuid]) {
+        this.hash.project.objects[buildPhaseType][buildPhaseUuid] = buildPhase;
+        this.hash.project.objects[buildPhaseType][commentKey] = comment;
+    }
+
+    if (this.hash.project.objects['PBXNativeTarget'][buildPhaseTargetUuid]['buildPhases']) {
+        this.hash.project.objects['PBXNativeTarget'][buildPhaseTargetUuid]['buildPhases'].push({
+            value: buildPhaseUuid,
+            comment: comment
+        })
 
-    // Add CopyFiles BuildPhase template
-    if (addToType === 'PBXCopyFilesBuildPhase') {
-        buildPhaseRef = pbxCopyFilesBuildPhaseObj(buildPhaseRef, folderType, subfolderPath, comment);
     }
 
 
@@ -695,15 +709,15 @@ pbxProject.prototype.addBuildPhase = function(filePathsArray, addToType, comment
         file.fileRef = this.generateUuid();
         this.addToPbxFileReferenceSection(file);    // PBXFileReference
         this.addToPbxBuildFileSection(file);        // PBXBuildFile
-        buildPhaseRef.files.push(pbxBuildPhaseObj(file));
+        buildPhase.files.push(pbxBuildPhaseObj(file));
     }
 
     if (buildPhaseSection) {
-        buildPhaseSection[phaseUuid] = buildPhaseRef;
+        buildPhaseSection[buildPhaseUuid] = buildPhase;
         buildPhaseSection[commentKey] = comment;
-        }
+    }
 
-    return { uuid: phaseUuid, buildPhase: buildPhaseRef };
+    return { uuid: buildPhaseUuid, buildPhase: buildPhase };
 }
 
 // helper access functions
@@ -993,11 +1007,12 @@ pbxProject.prototype.hasFile = function(filePath) {
     return false;
 }
 
-pbxProject.prototype.addTarget = function(name, type) {
+pbxProject.prototype.addTarget = function(name, type, subfolder) {
 
     // Setup uuid and name of new target
     var targetUuid = this.generateUuid(),
         targetType = type,
+        targetSubfolder = subfolder,
         targetName = name.trim();
 
     // Check type against list of allowed target types
@@ -1013,19 +1028,19 @@ pbxProject.prototype.addTarget = function(name, type) {
             isa: 'XCBuildConfiguration',
             buildSettings: {
                 GCC_PREPROCESSOR_DEFINITIONS: ['"DEBUG=1"', '"$(inherited)"'],
-                INFOPLIST_FILE: '"' + path.join(targetName, targetName + '-Info.plist' + '"'),
+                INFOPLIST_FILE: '"' + path.join(targetSubfolder, targetSubfolder + '-Info.plist' + '"'),
                 LD_RUNPATH_SEARCH_PATHS: '"$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"',
-                PRODUCT_NAME: targetName,
+                PRODUCT_NAME: '"' + targetName + '"',
                 SKIP_INSTALL: 'YES'
             }
         },
         {
             name: 'Release',
             isa: 'XCBuildConfiguration',
             buildSettings: {
-                INFOPLIST_FILE: '"' + path.join(targetName, targetName + '-Info.plist' + '"'),
+                INFOPLIST_FILE: '"' + path.join(targetSubfolder, targetSubfolder + '-Info.plist' + '"'),
                 LD_RUNPATH_SEARCH_PATHS: '"$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"',
-                PRODUCT_NAME: targetName,
+                PRODUCT_NAME: '"' + targetName + '"',
                 SKIP_INSTALL: 'YES'
             }
         }
@@ -1038,16 +1053,20 @@ pbxProject.prototype.addTarget = function(name, type) {
     var productName = targetName,
         productType = producttypeForTargettype(targetType),
         productFileType = filetypeForProducttype(productType),
-        productFile = this.addProductFile(productName, { 'target': targetUuid,  'explicitFileType': productFileType}),
+        productFile = this.addProductFile(productName, { group: 'Copy Files', 'target': targetUuid, 'explicitFileType': productFileType}),
         productFileName = productFile.basename;
 
+
+    // Product: Add to build file list
+    this.addToPbxBuildFileSection(productFile);
+
     // Target: Create
     var target = {
             uuid: targetUuid,
             pbxNativeTarget: {
                 isa: 'PBXNativeTarget',
-                name: targetName,
-                productName: targetName,
+                name: '"' + targetName + '"',
+                productName: '"' + targetName + '"',
                 productReference: productFile.fileRef,
                 productType: '"' + producttypeForTargettype(targetType) + '"',
                 buildConfigurationList: buildConfigurations.uuid,
@@ -1062,9 +1081,15 @@ pbxProject.prototype.addTarget = function(name, type) {
 
     // Product: Embed (only for "extension"-type targets)
     if (targetType === 'app_extension') {
-        // Create "Copy Files" build phase for target which contains the extension
-        this.addToPbxBuildFileSection(productFile);
-        this.addBuildPhase([productFileName], 'PBXCopyFilesBuildPhase', 'Copy Files', targetType)
+
+        // Create CopyFiles phase in first target
+        this.addBuildPhase([], 'PBXCopyFilesBuildPhase', 'Copy Files', this.getFirstTarget().uuid,  targetType)
+
+        // Add product to CopyFiles phase
+        this.addToPbxCopyfilesBuildPhase(productFile)
+
+       // this.addBuildPhaseToTarget(newPhase.buildPhase, this.getFirstTarget().uuid)
+
     };
 
     // Target: Add uuid to root project
@@ -1180,7 +1205,7 @@ function pbxCopyFilesBuildPhaseObj(obj, folderType, subfolderPath, phaseName){
         xpc_services: 0
     }
 
-    obj.name = '"' + phaseName + '"' || '""';
+    obj.name = '"' + phaseName + '"';
     obj.dstPath = subfolderPath || '""';
     obj.dstSubfolderSpec = SUBFOLDERSPEC_BY_DESTINATION[DESTINATION_BY_TARGETTYPE[folderType]];