Updated Branches: refs/heads/master a633dceae -> 78f6f9e53
gen bar name function moved from create to lib utils Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/f186fdba Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/f186fdba Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/f186fdba Branch: refs/heads/master Commit: f186fdbafce24c6eb0fe5314c636c7d90773e45a Parents: a633dce Author: lorinbeer <[email protected]> Authored: Wed Jul 10 09:20:22 2013 -0700 Committer: lorinbeer <[email protected]> Committed: Wed Jul 10 09:20:22 2013 -0700 ---------------------------------------------------------------------- blackberry10/bin/create.js | 4 ---- blackberry10/bin/lib/utils.js | 5 +++++ blackberry10/bin/templates/project/cordova/lib/run | 6 ------ 3 files changed, 5 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/f186fdba/blackberry10/bin/create.js ---------------------------------------------------------------------- diff --git a/blackberry10/bin/create.js b/blackberry10/bin/create.js index 73816ab..7f73c5f 100644 --- a/blackberry10/bin/create.js +++ b/blackberry10/bin/create.js @@ -161,10 +161,6 @@ function updateProject() { fs.writeFileSync(configXMLPath, xmlString.replace("default.app.id", app_id), "utf-8"); } - if (typeof bar_name !== "undefined") { - projectJson.barName = bar_name; - } - projectJson.globalFetchDir = path.join(__dirname, "..", "plugins"); fs.writeFileSync(path.join(project_path, "project.json"), JSON.stringify(projectJson, null, 4) + "\n", "utf-8"); http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/f186fdba/blackberry10/bin/lib/utils.js ---------------------------------------------------------------------- diff --git a/blackberry10/bin/lib/utils.js b/blackberry10/bin/lib/utils.js index 0a4f8a8..f87a781 100644 --- a/blackberry10/bin/lib/utils.js +++ b/blackberry10/bin/lib/utils.js @@ -19,6 +19,7 @@ var fs = require('fs'), wrench = require('wrench'), localize = require("./localize"), os = require('os'), + DEFAULT_BAR_NAME = "project", PROPERTY_FILE_NAME = 'blackberry10.json', CORDOVA_DIR = '.cordova', DEFAULT_PROPERTY_FILE = { @@ -206,6 +207,10 @@ _self = { propertiesFile = path.join(_self.getCordovaDir(), PROPERTY_FILE_NAME); fs.writeFileSync(propertiesFile, contents, 'utf-8'); + }, + + genBarName: function() { + return "DEFAULT_BAR_NAME"; } }; http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/f186fdba/blackberry10/bin/templates/project/cordova/lib/run ---------------------------------------------------------------------- diff --git a/blackberry10/bin/templates/project/cordova/lib/run b/blackberry10/bin/templates/project/cordova/lib/run index fc98542..5da5dab 100755 --- a/blackberry10/bin/templates/project/cordova/lib/run +++ b/blackberry10/bin/templates/project/cordova/lib/run @@ -40,12 +40,6 @@ var childProcess = require("child_process"), password, workingdir = path.normalize(__dirname + "/.."); -function generateBarName() { - // temporary stub - prop = require(path.join("..","..","project.json")); - return prop.barName; -} - function generateOptions(uninstall) { var options = []; barPath = pkgrUtils.escapeStringForShell(path.normalize(__dirname + "/../../build/" + targets.targets[target].type + "/" + generateBarName() + ".bar"));
