add localization in addPbxGroup

Author: KristianDD

lib/pbxProject.js

@@ -566,11 +566,22 @@ pbxProject.prototype.addPbxGroup = function (filePathsArray, name, path, sourceT
         if (fs.existsSync(filePath) && fs.lstatSync(filePath).isDirectory()) {
             file.uuid = this.generateUuid();
             file.fileRef = file.uuid;
-            this.addToPbxFileReferenceSection(file);    // PBXFileReference
-            this.addToPbxBuildFileSection(file);
-            pbxGroup.children.push(pbxGroupChild(file));
             var files = fs.readdirSync(filePath).map(p => $path.join(filePath, p));
-            this.addPbxGroup(files, $path.basename(filePath), filePath, null, {uuid: file.uuid, filesRelativeToProject: opt.filesRelativeToProject, target: opt.target});
+            if($path.extname(filePath) === ".lproj") {
+                for (var i = 0; i < files.length; i++) {
+                    var variantGroup = this.addLocalizationVariantGroup($path.basename(files[i]), { target: opt.target, skipAddToResourcesGroup: true });
+                    var refFile = new pbxFile($path.relative(srcRootPath, files[i]), {basename: $path.parse(file.basename).name});
+                    refFile.fileRef = this.generateUuid();
+                    this.addToPbxFileReferenceSection(refFile);
+                    this.addToPbxVariantGroup(refFile, variantGroup.fileRef);
+                    pbxGroup.children.push(pbxGroupChild(variantGroup));
+                }
+            } else {
+                this.addToPbxFileReferenceSection(file);    // PBXFileReference
+                this.addToPbxBuildFileSection(file);
+                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();
@@ -1026,7 +1037,7 @@ pbxProject.prototype.addBuildPhase = function(filePathsArray, buildPhaseType, co
 
         if (!fileReference) continue;
 
-        var pbxFileObj = new pbxFile(fileReference.path);
+        var pbxFileObj = new pbxFile(fileReference.path || "");
 
         filePathToBuildFile[fileReference.path] = { uuid: buildFileKey, basename: pbxFileObj.basename, group: pbxFileObj.group };
     }
@@ -1202,13 +1213,13 @@ pbxProject.prototype.buildPhaseObject = function(name, group, target) {
     return null;
 }
 
-pbxProject.prototype.addBuildProperty = function(prop, value, build_name) {
+pbxProject.prototype.addBuildProperty = function(prop, value, build_name, productName) {
     var configurations = nonComments(this.pbxXCBuildConfigurationSection()),
         key, configuration;
 
     for (key in configurations){
         configuration = configurations[key];
-        if (!build_name || configuration.name === build_name){
+        if ((!build_name || configuration.name === build_name) && (!productName || configuration.buildSettings.PRODUCT_NAME === productName || configuration.buildSettings.PRODUCT_NAME === `"${productName}"`)) {
             configuration.buildSettings[prop] = value;
         }
     }
@@ -1515,7 +1526,7 @@ pbxProject.prototype.addTarget = function(name, type, subfolder) {
             isa: 'XCBuildConfiguration',
             buildSettings: {
                 GCC_PREPROCESSOR_DEFINITIONS: ['"DEBUG=1"', '"$(inherited)"'],
-                INFOPLIST_FILE: '"' + $path.join(targetSubfolder, targetSubfolder + '-Info.plist' + '"'),
+                INFOPLIST_FILE: '"' + $path.join(targetSubfolder, 'Info.plist' + '"'),
                 LD_RUNPATH_SEARCH_PATHS: '"$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"',
                 PRODUCT_NAME: '"' + targetName + '"',
                 SKIP_INSTALL: 'YES'
@@ -1525,7 +1536,7 @@ pbxProject.prototype.addTarget = function(name, type, subfolder) {
             name: 'Release',
             isa: 'XCBuildConfiguration',
             buildSettings: {
-                INFOPLIST_FILE: '"' + $path.join(targetSubfolder, targetSubfolder + '-Info.plist' + '"'),
+                INFOPLIST_FILE: '"' + $path.join(targetSubfolder, 'Info.plist' + '"'),
                 LD_RUNPATH_SEARCH_PATHS: '"$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"',
                 PRODUCT_NAME: '"' + targetName + '"',
                 SKIP_INSTALL: 'YES'
@@ -2037,16 +2048,24 @@ pbxProject.prototype.findPBXVariantGroupKey = function(criteria) {
     return this.findPBXGroupKeyAndType(criteria, 'PBXVariantGroup');
 }
 
-pbxProject.prototype.addLocalizationVariantGroup = function(name) {
+pbxProject.prototype.addLocalizationVariantGroup = function(name, ops) {
+    ops = ops || {};
     var groupKey = this.pbxCreateVariantGroup(name);
 
-    var resourceGroupKey = this.findPBXGroupKey({name: 'Resources'});
-    this.addToPbxGroup(groupKey, resourceGroupKey);
+    if(!ops.skipAddToResourcesGroup) {
+        var resourcesGroupKey = this.findPBXGroupKey({name: 'Resources'});
+        this.addToPbxGroup(groupKey, resourcesGroupKey);
+    }
 
     var localizationVariantGroup = {
         uuid: this.generateUuid(),
         fileRef: groupKey,
-        basename: name
+        basename: name,
+        group: "Resources",
+        children: []
+    }
+    if(ops.target) {
+        localizationVariantGroup.target = ops.target;
     }
     this.addToPbxBuildFileSection(localizationVariantGroup);        // PBXBuildFile
     this.addToPbxResourcesBuildPhase(localizationVariantGroup);     //PBXResourcesBuildPhase