feat: support entitelments, clear TargetAttributes, refactor code

Author: KristianDD

lib/pbxFile.js

@@ -24,6 +24,7 @@ var DEFAULT_SOURCETREE = '"<group>"',
     DEFAULT_GROUP = 'Resources',
     DEFAULT_FILETYPE = 'unknown',
     HEADER_FILE_TYPE_SUFFIX = ".h",
+    ENTITLEMENTS_FILE_TYPE_SUFFIX = ".entitlements",
     SOURCE_CODE_FILE_TYPE_PREFIX = "sourcecode.";
 
 var FILETYPE_BY_EXTENSION = {
@@ -50,6 +51,7 @@ var FILETYPE_BY_EXTENSION = {
         octest: 'wrapper.cfbundle',
         pch: 'sourcecode.c.h',
         plist: 'text.plist.xml',
+        entitlements: 'text.plist.entitlements',
         png: "image.png",
         sh: 'text.script.sh',
         swift: 'sourcecode.swift',
@@ -73,7 +75,8 @@ var FILETYPE_BY_EXTENSION = {
         'sourcecode.c.objc': 'Sources',
         'sourcecode.swift': 'Sources',
         'sourcecode.cpp.cpp': 'Sources',
-        'sourcecode.cpp.objcpp': 'Sources'
+        'sourcecode.cpp.objcpp': 'Sources',
+        'text.plist.entitlements': 'Reference' //only in file reference
     },
     PATH_BY_FILETYPE = {
         'compiled.mach-o.dylib': 'usr/lib/',
@@ -101,18 +104,22 @@ var FILETYPE_BY_EXTENSION = {
         'text.plist.strings': 4
     };
 
-function isSourceOrHeaderFileType(fileType) {
-    return fileType.startsWith(SOURCE_CODE_FILE_TYPE_PREFIX);
-}
-
 function isHeaderFileType(fileType) {
     return fileType.endsWith(HEADER_FILE_TYPE_SUFFIX);
 }
 
+function isSourceFileType(fileType) {
+    return fileType.startsWith(SOURCE_CODE_FILE_TYPE_PREFIX) && !isHeaderFileType(fileType);
+}
+
 function isResource(group) {
     return group === "Resources";
 }
 
+function isEntitlement(fileType) {
+    return fileType.endsWith(ENTITLEMENTS_FILE_TYPE_SUFFIX);
+}
+
 function unquoted(text){
     return text == null ? '' : text.replace (/(^")|("$)/g, '')
 }
@@ -263,7 +270,8 @@ function pbxFile(filepath, opt) {
 
 module.exports = {
     pbxFile: pbxFile,
-    isSourceOrHeaderFileType,
+    isSourceFileType,
     isHeaderFileType,
-    isResource
+    isResource,
+    isEntitlement
 }

lib/pbxProject.js

@@ -23,9 +23,10 @@ var util = require('util'),
     fork = require('child_process').fork,
     pbxWriter = require('./pbxWriter'),
     pbxFile = require('./pbxFile').pbxFile,
-    isSourceOrHeaderFileType = require('./pbxFile').isSourceOrHeaderFileType,
+    isSourceFileType = require('./pbxFile').isSourceFileType,
     isHeaderFileType = require('./pbxFile').isHeaderFileType,
     isResource = require('./pbxFile').isResource,
+    isEntitlement = require('./pbxFile').isEntitlement
     fs = require('fs'),
     parser = require('./parser/pbxproj'),
     plist = require('simple-plist'),
@@ -560,13 +561,12 @@ pbxProject.prototype.addPbxGroup = function (filePathsArray, name, path, sourceT
         var srcRootPath = $path.dirname($path.dirname(this.filepath));
         var relativePath = $path.relative(srcRootPath, filePath);
         var file = new pbxFile(opt.filesRelativeToProject ? relativePath : filePath);
-
+        file.uuid = this.generateUuid();
+        file.fileRef = this.generateUuid();
         if(opt.target) {
             file.target = opt.target;
         }
-
         if (fs.existsSync(filePath) && fs.lstatSync(filePath).isDirectory()) {
-            file.uuid = this.generateUuid();
             file.fileRef = file.uuid;
             var files = fs.readdirSync(filePath).map(p => $path.join(filePath, p));
             if($path.extname(filePath) === ".lproj") {
@@ -584,27 +584,21 @@ pbxProject.prototype.addPbxGroup = function (filePathsArray, name, path, sourceT
                 pbxGroup.children.push(pbxGroupChild(file));
                 this.addPbxGroup(files, $path.basename(filePath), filePath, null, {uuid: file.uuid, filesRelativeToProject: opt.filesRelativeToProject, target: opt.target});
             }
-        } else if (isSourceOrHeaderFileType(file.lastKnownFileType)) {
-            file.uuid = this.generateUuid();
-            file.fileRef = this.generateUuid();
-            this.addToPbxFileReferenceSection(file);    // PBXFileReference
-            this.addToPbxBuildFileSection(file);        // PBXBuildFile
-            if (!isHeaderFileType(file.lastKnownFileType)) {
-                this.addToPbxSourcesBuildPhase(file);
-            }
-            pbxGroup.children.push(pbxGroupChild(file));
-        } else if(isResource(file.group)) {
-            file.uuid = this.generateUuid();
-            file.fileRef = this.generateUuid();
-            this.addToPbxFileReferenceSection(file);    // PBXFileReference
-            this.addToPbxResourcesBuildPhase(file)
-            pbxGroup.children.push(pbxGroupChild(file));
         } else {
-            file.uuid = this.generateUuid();
-            file.fileRef = this.generateUuid();
             this.addToPbxFileReferenceSection(file);    // PBXFileReference
-            this.addToPbxBuildFileSection(file);
             pbxGroup.children.push(pbxGroupChild(file));
+            if(isHeaderFileType(file.lastKnownFileType)) {
+                continue;
+            } else if (isSourceFileType(file.lastKnownFileType)) {
+                this.addToPbxBuildFileSection(file);        // PBXBuildFile
+                this.addToPbxSourcesBuildPhase(file);
+            } else if(isEntitlement(file.lastKnownFileType)) {
+                this.addToBuildSettings('CODE_SIGN_ENTITLEMENTS', file.path, opt.target);
+            } else if(isResource(file.group)) {
+                this.addToPbxResourcesBuildPhase(file)
+            } else {
+                this.addToPbxBuildFileSection(file);
+            }
         }
     }
 
@@ -1445,14 +1439,30 @@ pbxProject.prototype.removeFromOtherLinkerFlags = function (flag) {
     }
 }
 
-pbxProject.prototype.addToBuildSettings = function (buildSetting, value) {
+pbxProject.prototype.addToBuildSettings = function (buildSetting, value, targetUuid) {
     var configurations = nonComments(this.pbxXCBuildConfigurationSection()),
+        buildConfigurationsUuids = [],
         config, buildSettings;
 
+    if(targetUuid) {
+        var targets = this.hash.project.objects['PBXNativeTarget'] || [];
+        var target = targets[targetUuid] || {};
+        var buildConfigurationList = target["buildConfigurationList"];
+        var pbxXCConfigurationListSection = this.pbxXCConfigurationList() || {};
+        var xcConfigurationList = pbxXCConfigurationListSection[buildConfigurationList] || {};
+        var buildConfigurations = xcConfigurationList.buildConfigurations || [];
+        for(var configurationUuid in buildConfigurations){
+            buildConfigurationsUuids.push(buildConfigurations[configurationUuid].value);
+        }
+
+    }
+
     for (config in configurations) {
-        buildSettings = configurations[config].buildSettings;
+        if(!target || buildConfigurationsUuids.indexOf(config) >= 0) {
+            buildSettings = configurations[config].buildSettings;
 
-        buildSettings[buildSetting] = value;
+            buildSettings[buildSetting] = value;
+        }
     }
 }
 
@@ -1762,9 +1772,15 @@ pbxProject.prototype.removeTarget = function(target, targetKey) {
         }
     }
 
+    //remove targetAttributes for target
+    var attributes = this.getFirstProject()['firstProject']['attributes'];
+    if (attributes['TargetAttributes']) {
+        delete attributes['TargetAttributes'][targetKey];
+    }
+
     //remove the target from PBXNativeTarget section
     var nativeTargets = this.pbxNativeTargetSection();
-    removeItemAndCommentFromSectionByUuid(nativeTargets, nativeTargetUuid);
+    removeItemAndCommentFromSectionByUuid(nativeTargets, targetKey);
 
     this.removePbxGroup(unquote(target.name));
 };