Skip to content

Fix prepare for both platforms #1099

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 28, 2015
Merged

Fix prepare for both platforms #1099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e971e1f
Fixes https://github.com/NativeScript/nativescript-cli/issues/1027
Oct 23, 2015
c4e0667
Fix unit tests
Oct 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/common
Open in desktop
Submodule common updated 9 files
+0 −9 declarations.d.ts
+0 −1 definitions/node.d.ts
+0 −18 file-system.ts
+1 −5 mobile/ios/ios-emulator-services.ts
+0 −1 options.ts
+1 −1 services/usb-livesync-service-base.ts
+ − test/resources/sampleZipFileTest.zip
+0 −191 test/unit-tests/file-system.ts
+0 −35 test/unit-tests/stubs.ts
2 changes: 1 addition & 1 deletion lib/definitions/plugins.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
interface IPluginsService {
add(plugin: string): IFuture<void>; // adds plugin by name, github url, local path and et.
remove(pluginName: string): IFuture<void>; // removes plugin only by name
prepare(pluginData: IDependencyData): IFuture<void>;
prepare(pluginData: IDependencyData, platform: string): IFuture<void>;
getAllInstalledPlugins(): IFuture<IPluginData[]>;
ensureAllDependenciesAreInstalled(): IFuture<void>;
afterPrepareAllPlugins(): IFuture<void>;
Expand Down
45 changes: 21 additions & 24 deletions lib/services/plugins-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,40 +122,37 @@ export class PluginsService implements IPluginsService {
}).future<void>()();
}

public prepare(dependencyData: IDependencyData): IFuture<void> {
public prepare(dependencyData: IDependencyData, platform: string): IFuture<void> {
return (() => {
platform = platform.toLowerCase();
let platformData = this.$platformsData.getPlatformData(platform);
let pluginDestinationPath = path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME, "tns_modules");
let pluginData = this.convertToPluginData(dependencyData);

let action = (pluginDestinationPath: string, platform: string, platformData: IPlatformData) => {
return (() => {
if(!this.isPluginDataValidForPlatform(pluginData, platform).wait()) {
return;
}
if(!this.isPluginDataValidForPlatform(pluginData, platform).wait()) {
return;
}

if(this.$fs.exists(path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME)).wait()) {
this.$fs.ensureDirectoryExists(pluginDestinationPath).wait();
shelljs.cp("-Rf", pluginData.fullPath, pluginDestinationPath);
if(this.$fs.exists(path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME)).wait()) {
this.$fs.ensureDirectoryExists(pluginDestinationPath).wait();
shelljs.cp("-Rf", pluginData.fullPath, pluginDestinationPath);

let pluginConfigurationFilePath = this.getPluginConfigurationFilePath(pluginData, platformData);
if(this.$fs.exists(pluginConfigurationFilePath).wait()) {
this.merge(pluginData, platformData).wait();
}
let pluginConfigurationFilePath = this.getPluginConfigurationFilePath(pluginData, platformData);

this.$projectFilesManager.processPlatformSpecificFiles(pluginDestinationPath, platform).wait();
if(this.$fs.exists(pluginConfigurationFilePath).wait()) {
this.merge(pluginData, platformData).wait();
}

pluginData.pluginPlatformsFolderPath = (_platform: string) => path.join(pluginData.fullPath, "platforms", _platform);
platformData.platformProjectService.preparePluginNativeCode(pluginData).wait();
this.$projectFilesManager.processPlatformSpecificFiles(pluginDestinationPath, platform).wait();

shelljs.rm("-rf", path.join(pluginDestinationPath, pluginData.name, "platforms"));
pluginData.pluginPlatformsFolderPath = (_platform: string) => path.join(pluginData.fullPath, "platforms", _platform);
platformData.platformProjectService.preparePluginNativeCode(pluginData).wait();

// Show message
this.$logger.out(`Successfully prepared plugin ${pluginData.name} for ${platform}.`);
}
shelljs.rm("-rf", path.join(pluginDestinationPath, pluginData.name, "platforms"));

}).future<void>()();
};

this.executeForAllInstalledPlatforms(action).wait();
// Show message
this.$logger.out(`Successfully prepared plugin ${pluginData.name} for ${platform}.`);
}
}).future<void>()();
}

Expand Down
2 changes: 1 addition & 1 deletion lib/tools/broccoli/node-modules-dest-copy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export class DestCopy implements IBroccoliPlugin {

let isPlugin = !!dependency.nativescript;
if(isPlugin) {
this.$pluginsService.prepare(dependency).wait();
this.$pluginsService.prepare(dependency, platform).wait();
}

if (dependency.name === constants.TNS_CORE_MODULES_NAME) {
Expand Down
4 changes: 2 additions & 2 deletions test/plugins-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ describe("Plugins service", () => {
`\n@#[line:1,col:39].` +
`\n@#[line:1,col:39].`;
mockBeginCommand(testInjector, expectedErrorMessage);
pluginsService.prepare(pluginJsonData).wait();
pluginsService.prepare(pluginJsonData, "android").wait();
});
it("merges AndroidManifest.xml and produces correct xml", () => {
let pluginName = "mySamplePlugin";
Expand Down Expand Up @@ -609,7 +609,7 @@ describe("Plugins service", () => {
let pluginConfigurationFilePath = path.join(pluginPlatformsDirPath, "AndroidManifest.xml");
fs.writeFile(pluginConfigurationFilePath, xml).wait();

pluginsService.prepare(pluginJsonData).wait();
pluginsService.prepare(pluginJsonData, "android").wait();

let expectedXml = '<?xmlversion="1.0"encoding="utf-8"?><manifestxmlns:android="http://schemas.android.com/apk/res/android"package="com.example.android.basiccontactables"android:versionCode="1"android:versionName="1.0"><supports-screensandroid:smallScreens="true"android:normalScreens="true"android:largeScreens="true"android:xlargeScreens="true"/><uses-sdkandroid:minSdkVersion="17"android:targetSdkVersion="23"/><uses-permissionandroid:name="android.permission.READ_EXTERNAL_STORAGE"/><uses-permissionandroid:name="android.permission.WRITE_EXTERNAL_STORAGE"/><uses-permissionandroid:name="android.permission.INTERNET"/><applicationandroid:name="com.tns.NativeScriptApplication"android:allowBackup="true"android:icon="@drawable/icon"android:label="@string/app_name"android:theme="@style/AppTheme"><activityandroid:name="com.tns.NativeScriptActivity"android:label="@string/title_activity_kimera"android:configChanges="keyboardHidden|orientation|screenSize"><intent-filter><actionandroid:name="android.intent.action.MAIN"/><categoryandroid:name="android.intent.category.LAUNCHER"/></intent-filter></activity><activityandroid:name="com.tns.ErrorReportActivity"/></application><uses-permissionandroid:name="android.permission.READ_CONTACTS"/></manifest>';
expectedXml = helpers.stringReplaceAll(expectedXml, EOL, "");
Expand Down