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

Made commands use local cordova

Browse Source
This commit is contained in:
Sashko Stubailo
2014-08-11 16:12:11 -07:00
parent 33440ebd7a
commit 9a2ae6ec59
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tools/commands-cordova.js
View File

@@ -26,6 +26,9 @@ var cordova = exports;
var supportedPlatforms = ['ios', 'android', 'firefoxos'];
var localCordova = path.join(files.getCurrentToolsDir(),
"scripts", "cordova.sh");
var execFileSyncOrThrow = function (file, args, opts) {
var process = execFileSync(file, args, opts);
if (! process.success)
@@ -134,7 +137,7 @@ cordova.ensureCordovaProject = function (localPath, appName) {
var localPluginsPath = localPluginsPathFromCordovaPath(cordovaPath);
if (! fs.existsSync(cordovaPath)) {
try {
var creation = execFileSyncOrThrow('cordova',
var creation = execFileSyncOrThrow(localCordova,
['create', path.basename(cordovaPath), 'com.meteor.' + appName, appName.replace(/\s/g, '')],
{ cwd: path.dirname(cordovaPath) });
@@ -153,7 +156,7 @@ cordova.ensureCordovaProject = function (localPath, appName) {
cordova.ensureCordovaPlatforms = function (localPath) {
var cordovaPath = path.join(localPath, 'cordova-build');
var platforms = project.getCordovaPlatforms();
var platformsList = execFileSyncOrThrow('cordova', ['platform', 'list'],
var platformsList = execFileSyncOrThrow(localCordova, ['platform', 'list'],
{ cwd: cordovaPath });
// eg. ['android 3.5.0', 'ios 3.5.0']
@@ -163,13 +166,13 @@ cordova.ensureCordovaPlatforms = function (localPath) {
_.each(platforms, function (platform) {
if (! _.contains(installedPlatforms, platform) &&
_.contains(supportedPlatforms, platform))
execFileSyncOrThrow('cordova', ['platform', 'add', platform], { cwd: cordovaPath });
execFileSyncOrThrow(localCordova, ['platform', 'add', platform], { cwd: cordovaPath });
});
_.each(installedPlatforms, function (platform) {
if (! _.contains(platforms, platform) &&
_.contains(supportedPlatforms, platform))
execFileSyncOrThrow('cordova', ['platform', 'rm', platform], { cwd: cordovaPath });
execFileSyncOrThrow(localCordova, ['platform', 'rm', platform], { cwd: cordovaPath });
});
return true;
@@ -204,7 +207,7 @@ cordova.ensureCordovaPlugins = function (localPath, options) {
// XXX compare the latest used sha's with the currently required sha's for
// plugins fetched from a github/tarball url.
var pluginsOutput = execFileSyncOrThrow('cordova', ['plugin', 'list'],
var pluginsOutput = execFileSyncOrThrow(localCordova, ['plugin', 'list'],
{ cwd: cordovaPath }).stdout;
var installedPlugins = {};
@@ -251,7 +254,7 @@ cordova.ensureCordovaPlugins = function (localPath, options) {
}
if (_.has(installedPlugins, name))
execFileSyncOrThrow('cordova', ['plugin', 'rm', name], { cwd: cordovaPath });
execFileSyncOrThrow(localCordova, ['plugin', 'rm', name], { cwd: cordovaPath });
// XXX do something different for plugins fetched from a url.
var pluginInstallCommand = version ? name + '@' + version : name;
@@ -273,7 +276,7 @@ cordova.ensureCordovaPlugins = function (localPath, options) {
});
}
process.stdout.write('Installing ' + pluginInstallCommand + '\n');
var execRes = execFileSyncOrThrow('cordova',
var execRes = execFileSyncOrThrow(localCordova,
['plugin', 'add', pluginInstallCommand].concat(additionalArgs), { cwd: cordovaPath });
if (! execRes.success)
throw new Error("Failed to install plugin " + name + ": " + execRes.stderr);
@@ -281,7 +284,7 @@ cordova.ensureCordovaPlugins = function (localPath, options) {
_.each(installedPlugins, function (version, name) {
if (! _.has(plugins, name))
execFileSyncOrThrow('cordova', ['plugin', 'rm', name], { cwd: cordovaPath });
execFileSyncOrThrow(localCordova, ['plugin', 'rm', name], { cwd: cordovaPath });
});
};
@@ -327,7 +330,7 @@ var buildCordova = function (localPath, options) {
fs.writeFileSync(path.join(wwwPath, 'meteor_cordova_loader.js'), loaderCode);
// Give the buffer more space as the output of the build is really huge
execFileSyncOrThrow('cordova', ['build'],
execFileSyncOrThrow(localCordova, ['build'],
{ cwd: cordovaPath, maxBuffer: 2000*1024 });
};
@@ -383,7 +386,7 @@ var execCordovaOnPlatform = function (localPath, platformName) {
platform ];
// XXX error if not a Cordova project
execFileAsync('cordova', args, { cwd: cordovaPath });
execFileAsync(localCordova, args, { cwd: cordovaPath });
return 0;
};