Merge pull request #34 from cheekiatng/timob-20484

[TIMOB-20484] Hyperloop: iOS: Local-embedded frameworks not working

documentation/ios.md

@@ -365,18 +365,25 @@ module.exports = {
 		ios: {
 			xcodebuild: {
 				flags: {
-					FRAMEWORK_SEARCH_PATHS: '/path/to/framework'
+					FRAMEWORK_SEARCH_PATHS: '../../src'
 				},
 				frameworks: [
 					'FrameworkName'
 				]
-			}
+			},
+			thirdparty: {
+				'FrameworkName': {
+					source: ['src'],
+					header: 'src',
+					resource: 'src'
+				}
+			}			
 		}
 	}
 };
 ```
 
-In the above example, `/path/to/framework` should point the the location of the `.framework` file and `FrameworkName` should be the name of the Framework.
+In the above example, the value for key `FRAMEWORK_SEARCH_PATHS` should point to the location of the `.framework` file and `FrameworkName` should be the name of the Framework. The `.framework` file should be in the `src` folder in project root.
 
 ## Resources
 

iphone/plugin/hyperloop.js

@@ -755,8 +755,8 @@ HyperloopiOSBuilder.prototype.updateXcodeProject = function updateXcodeProject()
 			isa: 'PBXFileReference',
 			lastKnownFileType: 'wrapper.framework',
 			name: '"' + framework + '"',
-			path: '"System/Library/Frameworks/' + framework + '"',
-			sourceTree: 'SDKROOT'
+			path: '"../../src/' + framework + '"',
+			sourceTree: '"<absolute>"'
 		};
 		xobjs.PBXFileReference[fileRefUuid + '_comment'] = framework;
 
@@ -1009,6 +1009,11 @@ HyperloopiOSBuilder.prototype.hookXcodebuild = function hookXcodebuild(data) {
 		this.headers.forEach(function (header) {
 			addParam('HEADER_SEARCH_PATHS', header);
 		});
+		//For some reason, when using ticore and having custom headers, the original header search path goes missing. 
+		//FIX ME
+		if(!this.builder.tiapp.ios['use-jscore-framework']) {
+			addParam('HEADER_SEARCH_PATHS', 'headers');
+		}		
 	}
 
 	addParam('GCC_PREPROCESSOR_DEFINITIONS', '$(inherited) HYPERLOOP=1');
@@ -1021,22 +1026,22 @@ HyperloopiOSBuilder.prototype.hookXcodebuild = function hookXcodebuild(data) {
 		if (value.indexOf(' ') !== -1 && !quotesRegExp.test(value)) {
 			value = '"' + value + '"';
 		}
-
-		// check if the param is already in the xcodebuild arguments
-		for (var i = 0; i < args.length; i++) {
-			var parts = args[i].split('=');
-			if (parts.length > 1 && parts[0] === key) {
-				// yes, so merge the values
-				var values = parts[1].match(/(?:[^\s"]+|"[^"]*")+/g);
-				if (values.indexOf(value) === -1) {
-					args[i] = key + '=' + parts[1] + ' ' + value;
+		value.forEach(function (value) {
+			// check if the param is already in the xcodebuild arguments
+			args.forEach(function (arg) {
+				var parts = arg.split('=');
+				if (parts.length > 1 && parts[0] === key) {
+					// yes, so merge the values
+					var values = parts[1].match(/(?:[^\s"]+|"[^"]*")+/g);
+					if (values.indexOf(value) === -1) {
+						arg = key + '=' + parts[1] + ' ' + value;
+					}
+					return;
 				}
-				return;
-			}
-		}
-
-		// param does not exist, so just add it
-		args.push(key + '=' + params[key]);
+			});
+			// param does not exist, so just add it
+			args.push(key + '=' + params[key]);
+		});
 	});
 };
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hyperloop",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Access native APIs from within Titanium.",
   "keywords": [
     "appcelerator",