You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by GitBox <gi...@apache.org> on 2018/11/28 12:09:19 UTC
[GitHub] brodybits closed pull request #173: Remove browserify flag support
brodybits closed pull request #173: Remove browserify flag support
URL: https://github.com/apache/cordova-mobile-spec/pull/173
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/createmobilespec/createmobilespec.js b/createmobilespec/createmobilespec.js
index 2b0a3ef..e71fdcb 100755
--- a/createmobilespec/createmobilespec.js
+++ b/createmobilespec/createmobilespec.js
@@ -139,7 +139,6 @@ var top_dir = process.cwd() + path.sep,
.boolean("linkplugins").describe("linkplugins", "Use the --link flag when running `cordova plugin add`.\n")
.boolean("linkplatforms").describe("linkplatforms", "Use the --link flag when running `cordova platform add`.\n")
.boolean("link").describe("link", "Alias for --linkplugins --linkplatforms.\n")
- .boolean("browserify").describe("browserify", "Use the --browserify flag when running `cordova plugin add`.\n")
.boolean("telerikplugins").describe("telerikplugins", "Adds a bunch of known-to-be-popular plugins from Telerik-Verified-Plugins.\n")
.boolean("cprplugins").describe("cprplugins", "Adds a bunch of known-to-be-popular plugins from Cordova Plugin Regsitry.\n")
.boolean("plugregplugins").describe("cprplugins", "Adds a bunch of known-to-be-popular plugins from PlugReg (that are not on the CPR).\n")
@@ -286,7 +285,6 @@ var cli = argv.global ? "cordova" : cli_local_bin;
var projectDirName = argv._[0] || "mobilespec";
var cli_project_dir = path.join(top_dir, projectDirName);
-var browserifyFlag = argv.browserify ? ' --browserify' : '';
var variableFlag = '';
// some plugins support setting config.xml <preference> elements via a --variable flag.
if (argv.variable) {
@@ -555,7 +553,7 @@ function installPlugins() {
shelljs.exec(nodeCommand + path.join(top_dir, "cordova-plugman", "main.js") +
" install --platform " + platform +
" --project . --plugin " + plugin +
- " --searchpath " + top_dir + browserifyFlag);
+ " --searchpath " + top_dir);
});
// Install new-style test plugins
@@ -566,7 +564,7 @@ function installPlugins() {
if (fs.existsSync(potential_tests_plugin_xml)) {
shelljs.exec(nodeCommand + path.join(top_dir, "cordova-plugman", "main.js") +
" install --platform " + platform +
- " --project . --plugin " + path.dirname(potential_tests_plugin_xml) + browserifyFlag);
+ " --project . --plugin " + path.dirname(potential_tests_plugin_xml));
}
});
popd();
@@ -584,7 +582,7 @@ function installPlugins() {
console.log("Installing local test framework plugins...");
var linkPluginsFlag = (argv.link || argv.linkplugins) ? ' --link' : '';
var forcePluginsFlag = (argv.forceplugins)? ' --force' : '';
- var allPluginFlags = linkPluginsFlag + browserifyFlag + variableFlag + forcePluginsFlag;
+ var allPluginFlags = linkPluginsFlag + variableFlag + forcePluginsFlag;
// Install mobilespec tests only if we install default list of plugins
// If custom list of plugins is being installed, mobilespec tests can be listed there, if needed
@@ -613,7 +611,7 @@ function installPlugins() {
if (argv.thirdpartyplugins || argv.cprplugins) {
var mapVars = ' --variable API_KEY_FOR_ANDROID="AIzaSyBICVSs9JqT7WdASuN5HSe7w-pCE0n_X88" --variable API_KEY_FOR_IOS="AIzaSyAikyYG24YYFvq5Vy41P5kppsfO2GgF9jM"';
var fbVars = ' --variable APP_ID=value --variable APP_NAME=value';
- pluginAdd(CORDOVA_REGISTRY_PLUGINS.join(' '), searchPath, browserifyFlag + mapVars + fbVars + variableFlag);
+ pluginAdd(CORDOVA_REGISTRY_PLUGINS.join(' '), searchPath, mapVars + fbVars + variableFlag);
// Delete duplicate <uses-permission> due to maxSdk (CB-8401)
if (argv.android) {
shelljs.sed('-i', /{[^{]*(maxSdk|WRITE_EXTERNAL_STORAGE).*?(maxSdk|WRITE_EXTERNAL_STORAGE)[^}]*},/, '', path.join('plugins', 'android.json'));
@@ -621,10 +619,10 @@ function installPlugins() {
}
}
if (argv.thirdpartyplugins || argv.telerikplugins) {
- pluginAdd(TELERIK_VERIFIED_PLUGINS.join(' '), searchPath, browserifyFlag + variableFlag);
+ pluginAdd(TELERIK_VERIFIED_PLUGINS.join(' '), searchPath, variableFlag);
}
if (argv.thirdpartyplugins || argv.plugregplugins) {
- pluginAdd(PLUGREG_PLUGINS.join(' '), searchPath, browserifyFlag + variableFlag);
+ pluginAdd(PLUGREG_PLUGINS.join(' '), searchPath, variableFlag);
}
if (argv.thirdpartyplugins) {
pluginAdd('org.apache.cordova.mobilespec.thirdpartytests', mobile_spec_git_dir, allPluginFlags);
@@ -696,7 +694,7 @@ function summary() {
// Executing cordova prepare
console.log("Preparing project...");
- shelljs.exec(cli + " prepare" + browserifyFlag);
+ shelljs.exec(cli + " prepare");
if (!argv.global) {
console.log("Linking CLI...");
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org