diff --git a/CHANGELOG.md b/CHANGELOG.md index 8cc8397e0c..76c1777689 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,15 @@ NativeScript CLI Changelog ================ +1.2.3 (2015, August 18) +== + +### Fixed + +* [Fixed #776](https://github.com/NativeScript/nativescript-cli/issues/776): `tns livesync ios --emulator --watch` doesn't sync changes. +* [Fixed #777](https://github.com/NativeScript/nativescript-cli/issues/777): `tns library add ios` does not build correct relative paths to referenced frameworks for mdgenerator. +* [Fixed #779](https://github.com/NativeScript/nativescript-cli/issues/779): Command failed due to space in library reference path. + 1.2.2 (2015, August 11) == diff --git a/lib/common b/lib/common index d3997ecc34..adf981dbc2 160000 --- a/lib/common +++ b/lib/common @@ -1 +1 @@ -Subproject commit d3997ecc34c2d7180f869f1ab044dda41b8b5692 +Subproject commit adf981dbc237a2d0d6ffc8f4fcf1f423a2ddcb3c diff --git a/lib/services/android-project-service.ts b/lib/services/android-project-service.ts index 441d3e5681..aa4b9e500f 100644 --- a/lib/services/android-project-service.ts +++ b/lib/services/android-project-service.ts @@ -199,6 +199,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService private parseProjectProperties(projDir: string, destDir: string): IFuture { // projDir is libraryPath, targetPath is the path to lib folder return (() => { + projDir = projDir.trim(); let projProp = path.join(projDir, "project.properties"); if (!this.$fs.exists(projProp).wait()) { this.$logger.warn("Warning: File %s does not exist", projProp); diff --git a/lib/services/ios-project-service.ts b/lib/services/ios-project-service.ts index 9653a98db5..eb007bb90f 100644 --- a/lib/services/ios-project-service.ts +++ b/lib/services/ios-project-service.ts @@ -189,7 +189,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase var umbrellaHeader = this.getUmbrellaHeaderFromDynamicFramework(libraryPath).wait(); let frameworkName = path.basename(libraryPath, path.extname(libraryPath)); - let targetPath = path.join("lib", this.platformData.normalizedPlatformName, frameworkName); + let targetPath = path.join("lib", this.platformData.normalizedPlatformName); let fullTargetPath = path.join(this.$projectData.projectDir, targetPath); this.$fs.ensureDirectoryExists(fullTargetPath).wait(); shell.cp("-R", libraryPath, fullTargetPath); @@ -280,7 +280,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase private getFrameworkRelativePath(libraryPath: string): string { let frameworkName = path.basename(libraryPath, path.extname(libraryPath)); - let targetPath = path.join("lib", this.platformData.normalizedPlatformName, frameworkName); + let targetPath = path.join("lib", this.platformData.normalizedPlatformName); let frameworkPath = path.relative("platforms/ios", path.join(targetPath, frameworkName + ".framework")); return frameworkPath; } @@ -380,4 +380,4 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase }).future()(); } } -$injector.register("iOSProjectService", IOSProjectService); \ No newline at end of file +$injector.register("iOSProjectService", IOSProjectService); diff --git a/lib/services/usb-livesync-service.ts b/lib/services/usb-livesync-service.ts index b18602fbcf..a7744ad269 100644 --- a/lib/services/usb-livesync-service.ts +++ b/lib/services/usb-livesync-service.ts @@ -87,6 +87,10 @@ export class UsbLiveSyncService extends usbLivesyncServiceBaseLib.UsbLiveSyncSer }).future()(); } + 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 platformSpecificLiveSyncServices: IDictionary = { @@ -96,7 +100,20 @@ export class UsbLiveSyncService extends usbLivesyncServiceBaseLib.UsbLiveSyncSer let localProjectRootPath = platform.toLowerCase() === "ios" ? platformData.appDestinationDirectoryPath : null; - this.sync(platform, this.$projectData.projectId, projectFilesPath, this.excludedProjectDirsAndFiles, watchGlob, platformSpecificLiveSyncServices, restartAppOnDeviceAction, notInstalledAppOnDeviceAction, notRunningiOSSimulatorAction, localProjectRootPath, beforeLiveSyncAction, beforeBatchLiveSyncAction).wait(); + this.sync(platform, + this.$projectData.projectId, + projectFilesPath, + this.excludedProjectDirsAndFiles, + watchGlob, + platformSpecificLiveSyncServices, + restartAppOnDeviceAction, + notInstalledAppOnDeviceAction, + notRunningiOSSimulatorAction, + localProjectRootPath, + beforeLiveSyncAction, + beforeBatchLiveSyncAction, + iOSSimulatorRelativeToProjectBasePathAction + ).wait(); }).future()(); } diff --git a/package.json b/package.json index 3dcb609849..1a7d6b9947 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nativescript", "preferGlobal": true, - "version": "1.2.2", + "version": "1.2.3", "author": "Telerik ", "description": "Command-line interface for building NativeScript projects", "bin": {