Merge pull request #598 from NativeScript/fatme/fix-broken-rebase

Fatme · Fatme · commit 83c3d5caf935 · 2015-06-26T16:01:23.000+03:00
Fix broken rebase
diff --git a/lib/services/platform-service.ts b/lib/services/platform-service.ts
@@ -165,6 +165,8 @@ export class PlatformService implements IPlatformService {
 				shell.cp("-R", path.join(appResourcesDirectoryPath, platformData.normalizedPlatformName, "*"), platformData.appResourcesDestinationDirectoryPath);
 				this.$fs.deleteDirectory(appResourcesDirectoryPath).wait();
 			}
+			
+			platformData.platformProjectService.prepareProject().wait();
 
 			// Process platform specific files
 			let directoryPath = path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME);

Original file line number	Diff line number	Diff line change
`@@ -165,6 +165,8 @@ export class PlatformService implements IPlatformService {`
`165`	`165`	`shell.cp("-R", path.join(appResourcesDirectoryPath, platformData.normalizedPlatformName, "*"), platformData.appResourcesDestinationDirectoryPath);`
`166`	`166`	`this.$fs.deleteDirectory(appResourcesDirectoryPath).wait();`
`167`	`167`	`}`
	`168`	`+`
	`169`	`+ platformData.platformProjectService.prepareProject().wait();`
`168`	`170`
`169`	`171`	`// Process platform specific files`
`170`	`172`	`let directoryPath = path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME);`