Merge pull request #5786 from cb1kenobi/timob-17059_3_3_X

[TIMOB-17059] Fixed bug with paths in the build.properties not escaping ...
tidev · Jun 10, 2014 · 011ea59 · 011ea59
2 parents 1777726 + 4aad84b
commit 011ea59
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/android/templates/module/default/hooks/android-module.js b/android/templates/module/default/hooks/android-module.js
@@ -73,7 +73,7 @@ exports.init = function (logger, config, cli, appc) {
 
 				// add the maps.jar if we have Google APIs
 				if (target && target.libraries && target.libraries['com.google.android.maps']) {
-					libs.push(path.join(target.path, 'libs', target.libraries['com.google.android.maps'].jar));
+					target.path && libs.push(path.join(target.path, 'libs', target.libraries['com.google.android.maps'].jar));
 				}
 
 				// add the Titanium specific jars
@@ -92,13 +92,13 @@ exports.init = function (logger, config, cli, appc) {
 				}).join('\n\t');
 
 				// set the Android platform path
-				variables.androidPlatformPath = api && api.platformPath || '';
+				variables.androidPlatformPath = api && api.platformPath ? api.platformPath.replace(/\\/g, '\\\\') : '';
 
 				// set the Google APIs path
-				variables.googleAPIPath = api && api.googleAPIPath || '';
+				variables.googleAPIPath = api && api.googleAPIPath ? api.googleAPIPath.replace(/\\/g, '\\\\') : '';
 
 				// set the Titanium Android platform path
-				variables.tisdkAndroidPath = path.join(data.args[0].tisdkPath, 'android');
+				variables.tisdkAndroidPath = path.join(data.args[0].tisdkPath, 'android').replace(/\\/g, '\\\\');
 
 				callback();
 			}.bind(this));

diff --git a/node_modules/titanium-sdk/lib/android.js b/node_modules/titanium-sdk/lib/android.js
diff --git a/node_modules/titanium-sdk/lib/windows.js b/node_modules/titanium-sdk/lib/windows.js