You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by lo...@apache.org on 2013/06/14 23:08:42 UTC
[1/2] webworks commit: [CB-3797] rename of targets.json to
blackberry10.json
Updated Branches:
refs/heads/master 49e902cbb -> 8e562c277
[CB-3797] rename of targets.json to blackberry10.json
[CB-3797] updated target script to use globally accessible blackberry10.json file, creates if not found.
[CB-3797] removed targets.json copy in create script, bug fix in target.js
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/28924ec2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/28924ec2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/28924ec2
Branch: refs/heads/master
Commit: 28924ec2a5f1b850ce03a844f24209fc75939ffc
Parents: 49e902c
Author: lorinbeer <lo...@adobe.com>
Authored: Thu Jun 13 13:44:57 2013 -0700
Committer: lorinbeer <lo...@adobe.com>
Committed: Fri Jun 14 14:08:21 2013 -0700
----------------------------------------------------------------------
blackberry10/bin/create.js | 1 -
blackberry10/bin/lib/blackberry10.json | 4 ++++
blackberry10/bin/lib/target.js | 23 +++++++++++++++++++++--
blackberry10/bin/lib/targets.json | 5 -----
4 files changed, 25 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/28924ec2/blackberry10/bin/create.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/create.js b/blackberry10/bin/create.js
index 6264e87..3b8860f 100644
--- a/blackberry10/bin/create.js
+++ b/blackberry10/bin/create.js
@@ -122,7 +122,6 @@ function copyFilesToProject() {
utils.copyFile(path.join(BIN_DIR, "target"), path.join(project_path, "cordova"));
utils.copyFile(path.join(BIN_DIR, "target.bat"), path.join(project_path, "cordova"));
utils.copyFile(path.join(BIN_DIR, "lib", "target.js"), path.join(project_path, "cordova", "lib"));
- utils.copyFile(path.join(BIN_DIR, "lib", "targets.json"), path.join(project_path, "cordova", "lib"));
// change file permission for cordova scripts because ant copy doesn't preserve file permissions
wrench.chmodSyncRecursive(path.join(project_path,"cordova"), 0700);
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/28924ec2/blackberry10/bin/lib/blackberry10.json
----------------------------------------------------------------------
diff --git a/blackberry10/bin/lib/blackberry10.json b/blackberry10/bin/lib/blackberry10.json
new file mode 100644
index 0000000..06d6a8b
--- /dev/null
+++ b/blackberry10/bin/lib/blackberry10.json
@@ -0,0 +1,4 @@
+{
+ "targets": {
+ }
+}
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/28924ec2/blackberry10/bin/lib/target.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/lib/target.js b/blackberry10/bin/lib/target.js
index b099c3e..b6ccc36 100644
--- a/blackberry10/bin/lib/target.js
+++ b/blackberry10/bin/lib/target.js
@@ -16,10 +16,13 @@
*/
var path = require('path'),
- propertiesFile = path.join(__dirname,'targets.json'),
- properties = require(propertiesFile),
fs = require('fs'),
+ utils = require('./utils'),
commander = require('commander'),
+ propertyFileName = 'blackberry10.json',
+ propertyFileDir = '.cordova',
+ propertiesFile,
+ properties,
command,
name,
ip,
@@ -28,6 +31,20 @@ var path = require('path'),
pin,
pinRegex = new RegExp("[0-9A-Fa-f]{8}");
+function initPropertiesFile() {
+ homePath = findHomePath();
+ propertiesFile = path.join(homePath, propertyFileDir, propertyFileName);
+ if (!fs.existsSync(propertiesFile)) {
+ fs.mkdirSync(path.join(homePath, propertyFileDir));
+ utils.copyFile(propertyFileName, path.join(homePath, propertyFileDir), __dirname);
+ }
+ properties = require(propertiesFile);
+}
+
+function findHomePath() {
+ return process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE;
+}
+
function writeProjectFile(contents, file) {
fs.writeFile(file, contents, 'utf-8', function (err) {
if (err) console.log("Error updating project.json :(\n" + err);
@@ -186,6 +203,8 @@ commander
try {
+ initPropertiesFile();
+
commander.parse(process.argv);
if (commander.args.length === 0) {
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/28924ec2/blackberry10/bin/lib/targets.json
----------------------------------------------------------------------
diff --git a/blackberry10/bin/lib/targets.json b/blackberry10/bin/lib/targets.json
deleted file mode 100644
index 85d0113..0000000
--- a/blackberry10/bin/lib/targets.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "defaultTarget": "bb10",
- "targets": {
- }
-}
[2/2] webworks commit: removed run script dependency or project.json
Posted by lo...@apache.org.
removed run script dependency or project.json
[CB-3797] moved blackberry json properties file initialization functions to utils
[CB-3797] updated build and run scripts to use utils.js and use blackberry10.json
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/8e562c27
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/8e562c27
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/8e562c27
Branch: refs/heads/master
Commit: 8e562c277c61e00a95ae96e106df001967ad7c06
Parents: 28924ec
Author: lorinbeer <lo...@adobe.com>
Authored: Thu Jun 13 17:47:03 2013 -0700
Committer: lorinbeer <lo...@adobe.com>
Committed: Fri Jun 14 14:08:26 2013 -0700
----------------------------------------------------------------------
blackberry10/bin/create.js | 1 +
blackberry10/bin/lib/target.js | 22 ++------------------
blackberry10/bin/lib/utils.js | 19 +++++++++++++++++
.../bin/templates/project/cordova/lib/build | 7 ++++---
.../bin/templates/project/cordova/lib/run | 12 ++++++++---
5 files changed, 35 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/8e562c27/blackberry10/bin/create.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/create.js b/blackberry10/bin/create.js
index 3b8860f..73816ab 100644
--- a/blackberry10/bin/create.js
+++ b/blackberry10/bin/create.js
@@ -122,6 +122,7 @@ function copyFilesToProject() {
utils.copyFile(path.join(BIN_DIR, "target"), path.join(project_path, "cordova"));
utils.copyFile(path.join(BIN_DIR, "target.bat"), path.join(project_path, "cordova"));
utils.copyFile(path.join(BIN_DIR, "lib", "target.js"), path.join(project_path, "cordova", "lib"));
+ utils.copyFile(path.join(BIN_DIR, "lib", "utils.js"), path.join(project_path, "cordova", "lib"));
// change file permission for cordova scripts because ant copy doesn't preserve file permissions
wrench.chmodSyncRecursive(path.join(project_path,"cordova"), 0700);
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/8e562c27/blackberry10/bin/lib/target.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/lib/target.js b/blackberry10/bin/lib/target.js
index b6ccc36..b259f0c 100644
--- a/blackberry10/bin/lib/target.js
+++ b/blackberry10/bin/lib/target.js
@@ -19,10 +19,8 @@ var path = require('path'),
fs = require('fs'),
utils = require('./utils'),
commander = require('commander'),
- propertyFileName = 'blackberry10.json',
- propertyFileDir = '.cordova',
- propertiesFile,
- properties,
+ propertiesFile = utils.initPropertiesFile(),
+ properties = require(propertiesFile),
command,
name,
ip,
@@ -31,20 +29,6 @@ var path = require('path'),
pin,
pinRegex = new RegExp("[0-9A-Fa-f]{8}");
-function initPropertiesFile() {
- homePath = findHomePath();
- propertiesFile = path.join(homePath, propertyFileDir, propertyFileName);
- if (!fs.existsSync(propertiesFile)) {
- fs.mkdirSync(path.join(homePath, propertyFileDir));
- utils.copyFile(propertyFileName, path.join(homePath, propertyFileDir), __dirname);
- }
- properties = require(propertiesFile);
-}
-
-function findHomePath() {
- return process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE;
-}
-
function writeProjectFile(contents, file) {
fs.writeFile(file, contents, 'utf-8', function (err) {
if (err) console.log("Error updating project.json :(\n" + err);
@@ -203,8 +187,6 @@ commander
try {
- initPropertiesFile();
-
commander.parse(process.argv);
if (commander.args.length === 0) {
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/8e562c27/blackberry10/bin/lib/utils.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/lib/utils.js b/blackberry10/bin/lib/utils.js
index 88dc619..34b6291 100644
--- a/blackberry10/bin/lib/utils.js
+++ b/blackberry10/bin/lib/utils.js
@@ -19,6 +19,8 @@ var fs = require('fs'),
wrench = require('wrench'),
localize = require("./localize"),
os = require('os'),
+ propertyFileName = 'blackberry10.json',
+ propertyFileDir = '.cordova',
_self;
function swapBytes(buffer) {
@@ -161,7 +163,24 @@ _self = {
loadModule: function (path) {
return require(path);
+ },
+
+ findHomePath : function () {
+ return process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE;
+ },
+
+ initPropertiesFile : function () {
+ homePath = _self.findHomePath();
+ propertiesFile = path.join(homePath, propertyFileDir, propertyFileName);
+ if (!fs.existsSync(path.join(homePath, propertyFileDir))) {
+ fs.mkdirSync(path.join(homePath, propertyFileDir));
+ }
+ if (!fs.existsSync(propertiesFile)) {
+ _self.copyFile(propertyFileName, path.join(homePath, propertyFileDir), __dirname);
+ }
+ return propertiesFile;
}
+
};
module.exports = _self;
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/8e562c27/blackberry10/bin/templates/project/cordova/lib/build
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/build b/blackberry10/bin/templates/project/cordova/lib/build
index 8843457..cdd48a4 100755
--- a/blackberry10/bin/templates/project/cordova/lib/build
+++ b/blackberry10/bin/templates/project/cordova/lib/build
@@ -18,7 +18,8 @@
var path = require("path"),
command = require("commander"),
- targets = require(path.join(__dirname,"targets.json")),
+ utils = require("./utils"),
+ bbProperties = require(utils.initPropertiesFile()),
bbwpArgv = [
process.argv[0],
path.resolve(path.join(__dirname, process.argv[1])),
@@ -50,9 +51,9 @@ function doReleaseBuild() {
if (command["keystorepass"]) {
bbwpArgv.push("--password");
bbwpArgv.push(command["keystorepass"]);
- } else if (targets.keystorepass) {
+ } else if (bbProperties.keystorepass) {
bbwpArgv.push("--password");
- bbwpArgv.push(targets.keystorepass);
+ bbwpArgv.push(bbProperties.keystorepass);
} else {
console.log("No signing password provided. Please use --keystorepass via command-line or enter a value for keystorepass in project.json");
console.log(command.helpInformation());
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/8e562c27/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 791dabe..bd3269b 100755
--- a/blackberry10/bin/templates/project/cordova/lib/run
+++ b/blackberry10/bin/templates/project/cordova/lib/run
@@ -22,11 +22,11 @@ var childProcess = require("child_process"),
util = require("util"),
wrench = require("wrench"),
conf = require("./conf"),
+ utils = require("./utils"),
localize = require("./localize"),
pkgrUtils = require("./packager-utils"),
debugTokenHelper = require("./debugtoken-helper"),
- targets = require(path.join(__dirname,'targets.json')),
- projectProperties = require(path.join(__dirname,'..','..','project.json')),
+ targets = require(utils.initPropertiesFile()),
program = require('commander'),
xml2js = require('xml2js'),
jWorkflow = require("jWorkflow"),
@@ -40,9 +40,15 @@ 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 + "/" + projectProperties.barName + ".bar"));
+ barPath = pkgrUtils.escapeStringForShell(path.normalize(__dirname + "/../../build/" + targets.targets[target].type + "/" + generateBarName() + ".bar"));
options.push("-device");
options.push(ip);