github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix how cordovaDependencies are written to file

Browse Source
This commit is contained in:
Matthew Arbesfeld
2014-08-21 00:51:48 -07:00
parent c05397be11
commit 8d51254a2c
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/unipackage.js
View File

@@ -507,8 +507,6 @@ _.extend(Unipackage.prototype, {
buildInfoJson.buildTimeDirectDependencies || null;
self.buildTimePluginDependencies =
buildInfoJson.buildTimePluginDependencies || null;
self.cordovaDependencies =
buildInfoJson.cordovaDependencies || null;
if (options.buildOfPath &&
(buildInfoJson.source !== options.buildOfPath)) {
@@ -631,8 +629,8 @@ _.extend(Unipackage.prototype, {
throw new Error("bad resource type in unipackage: " +
JSON.stringify(resource.type));
});
if (unibuildMeta.arch === 'browser')
unibuildMeta.arch = 'client';
self.cordovaDependencies = mainJson.cordovaDependencies || null;
self.unibuilds.push(new Unibuild(self, {
name: unibuildMeta.name,
@@ -682,7 +680,8 @@ _.extend(Unipackage.prototype, {
earliestCompatibleVersion: self.earliestCompatibleVersion,
isTest: self.isTest,
unibuilds: [],
plugins: []
plugins: [],
cordovaDependencies: self.cordovaDependencies
};
var buildInfoJson = null;
@@ -941,7 +940,9 @@ _.extend(Unipackage.prototype, {
'HEAD',
// The actual trees to copy!
'tools', 'examples', 'LICENSE.txt', 'meteor',
'scripts/admin/launch-meteor');
'scripts/admin/launch-meteor',
'scripts/cordova.sh',
'scripts/ensure_android_bundle.sh');
// Trim blank line and unnecessary examples.
pathsToCopy = _.filter(pathsToCopy.split('\n'), function (f) {