Merge pull request #778 from NativeScript/fatme/fix-nested-folders-livesync

Fatme · Fatme · commit d289361210f4 · 2015-08-13T10:47:27.000+03:00
Fix livesync ios --emulator --watch if the file is not at project root level
diff --git a/lib/common b/lib/common
@@ -1 +1 @@
-Subproject commit 77324953dbf89ec296e1ed1711bdf28e1e83b5d6
+Subproject commit 7ce1a0bbfeb93989197d6fb675872286a960f46f
diff --git a/lib/services/usb-livesync-service.ts b/lib/services/usb-livesync-service.ts
@@ -87,10 +87,14 @@ export class UsbLiveSyncService extends usbLivesyncServiceBaseLib.UsbLiveSyncSer
 				return Future.fromResult();		
 			}
 			
+			let iOSSimulatorRelativeToProjectBasePathAction = (projectFile: string): string => {
+				return path.join(constants.APP_FOLDER_NAME, path.dirname(projectFile.split(`/${constants.APP_FOLDER_NAME}/`)[1]));
+			}
+			
 			let watchGlob = path.join(this.$projectData.projectDir, constants.APP_FOLDER_NAME);
 			let localProjectRootPath = platform.toLowerCase() === "ios" ? platformData.appDestinationDirectoryPath : null;
 			
-			this.sync(platform, this.$projectData.projectId, projectFilesPath, this.excludedProjectDirsAndFiles, watchGlob, restartAppOnDeviceAction, notInstalledAppOnDeviceAction, notRunningiOSSimulatorAction, localProjectRootPath, beforeLiveSyncAction, beforeBatchLiveSyncAction).wait();
+			this.sync(platform, this.$projectData.projectId, projectFilesPath, this.excludedProjectDirsAndFiles, watchGlob, restartAppOnDeviceAction, notInstalledAppOnDeviceAction, notRunningiOSSimulatorAction, localProjectRootPath, beforeLiveSyncAction, beforeBatchLiveSyncAction, iOSSimulatorRelativeToProjectBasePathAction).wait();
 		}).future<void>()();
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -87,10 +87,14 @@ export class UsbLiveSyncService extends usbLivesyncServiceBaseLib.UsbLiveSyncSer`
`87`	`87`	`return Future.fromResult();`
`88`	`88`	`}`
`89`	`89`
	`90`	`+ let iOSSimulatorRelativeToProjectBasePathAction = (projectFile: string): string => {`
	`91`	+ return path.join(constants.APP_FOLDER_NAME, path.dirname(projectFile.split(`/${constants.APP_FOLDER_NAME}/`)[1]));
	`92`	`+ }`
	`93`	`+`
`90`	`94`	`let watchGlob = path.join(this.$projectData.projectDir, constants.APP_FOLDER_NAME);`
`91`	`95`	`let localProjectRootPath = platform.toLowerCase() === "ios" ? platformData.appDestinationDirectoryPath : null;`
`92`	`96`
`93`		`- this.sync(platform, this.$projectData.projectId, projectFilesPath, this.excludedProjectDirsAndFiles, watchGlob, restartAppOnDeviceAction, notInstalledAppOnDeviceAction, notRunningiOSSimulatorAction, localProjectRootPath, beforeLiveSyncAction, beforeBatchLiveSyncAction).wait();`
	`97`	`+ this.sync(platform, this.$projectData.projectId, projectFilesPath, this.excludedProjectDirsAndFiles, watchGlob, restartAppOnDeviceAction, notInstalledAppOnDeviceAction, notRunningiOSSimulatorAction, localProjectRootPath, beforeLiveSyncAction, beforeBatchLiveSyncAction, iOSSimulatorRelativeToProjectBasePathAction).wait();`
`94`	`98`	`}).future<void>()();`
`95`	`99`	`}`
`96`	`100`