You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bh...@apache.org on 2013/06/18 01:31:16 UTC
[1/5] webworks commit: [CB-3830] Fixed issue detecting java on Path
in Windows
Updated Branches:
refs/heads/master 06acc708b -> ad8ac3d91
[CB-3830] Fixed issue detecting java on Path in Windows
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/d7b32c9a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/d7b32c9a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/d7b32c9a
Branch: refs/heads/master
Commit: d7b32c9ab2c33ed42f8e97d1901243e5166b42cf
Parents: df6228e
Author: jkeshavarzi <jk...@blackberry.com>
Authored: Mon Jun 17 16:14:03 2013 -0400
Committer: jkeshavarzi <jk...@blackberry.com>
Committed: Mon Jun 17 16:20:58 2013 -0400
----------------------------------------------------------------------
blackberry10/bin/check_reqs.bat | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/d7b32c9a/blackberry10/bin/check_reqs.bat
----------------------------------------------------------------------
diff --git a/blackberry10/bin/check_reqs.bat b/blackberry10/bin/check_reqs.bat
index 8dbcbf2..aef7171 100755
--- a/blackberry10/bin/check_reqs.bat
+++ b/blackberry10/bin/check_reqs.bat
@@ -56,9 +56,11 @@ for %%X in (blackberry-signer) do (
)
set FOUNDJAVA=
-for %%X in (java) do (
- if not defined FOUNDJAVA (
- set FOUNDJAVA=%%~$PATH:X
+for %%e in (%PATHEXT%) do (
+ for %%X in (java%%e) do (
+ if not defined FOUNDJAVA (
+ set FOUNDJAVA=%%~$PATH:X
+ )
)
)
[4/5] webworks commit: [CB-3830] Update Windows create script to look
at check_req error code
Posted by bh...@apache.org.
[CB-3830] Update Windows create script to look at check_req error code
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/2684836d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/2684836d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/2684836d
Branch: refs/heads/master
Commit: 2684836d8532d9619bf114de48d3df90a5de7806
Parents: e95b34c
Author: Bryan Higgins <bh...@blackberry.com>
Authored: Mon Jun 17 10:10:53 2013 -0400
Committer: jkeshavarzi <jk...@blackberry.com>
Committed: Mon Jun 17 16:20:58 2013 -0400
----------------------------------------------------------------------
blackberry10/bin/create.bat | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/2684836d/blackberry10/bin/create.bat
----------------------------------------------------------------------
diff --git a/blackberry10/bin/create.bat b/blackberry10/bin/create.bat
index 2966f72..ed595ab 100644
--- a/blackberry10/bin/create.bat
+++ b/blackberry10/bin/create.bat
@@ -20,7 +20,9 @@ goto comment
set BIN_DIR=%~dp0
-"%BIN_DIR%check_reqs"
+call "%BIN_DIR%check_reqs"
+
+if "%ERRORLEVEL%" == "1" exit /B 1
pushd %BIN_DIR%..
call npm install
[2/5] webworks commit: [CB-3830] Check for java on path
Posted by bh...@apache.org.
[CB-3830] Check for java on path
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/df6228ee
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/df6228ee
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/df6228ee
Branch: refs/heads/master
Commit: df6228ee7866b2122ccaf4cd0edd7a86a8ce09b2
Parents: 2684836
Author: Bryan Higgins <bh...@blackberry.com>
Authored: Mon Jun 17 10:16:41 2013 -0400
Committer: jkeshavarzi <jk...@blackberry.com>
Committed: Mon Jun 17 16:20:58 2013 -0400
----------------------------------------------------------------------
blackberry10/bin/check_reqs | 14 +++++++++-----
blackberry10/bin/check_reqs.bat | 22 +++++++++++++++++-----
2 files changed, 26 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/df6228ee/blackberry10/bin/check_reqs
----------------------------------------------------------------------
diff --git a/blackberry10/bin/check_reqs b/blackberry10/bin/check_reqs
index 4362ccf..a813293 100755
--- a/blackberry10/bin/check_reqs
+++ b/blackberry10/bin/check_reqs
@@ -20,24 +20,28 @@
NODE=$(command -v node)
NPM=$(command -v npm)
+JAVA=$(command -v java)
PACKAGER=$(command -v blackberry-nativepackager)
DEPLOYER=$(command -v blackberry-deploy)
SIGNER=$(command -v blackberry-signer)
if [ -z "$NODE" ]; then
- echo "Node cannot be found on the path. Aborting."
+ echo node cannot be found on the path. Aborting.
EXIT_CODE=1
elif [ -z "$NPM" ]; then
- echo "npm cannot be found on the path. Aborting."
+ echo npm cannot be found on the path. Aborting.
+ EXIT_CODE=1
+elif [ -z "$JAVA" ]; then
+ echo java cannot be found on the path. Aborting.
EXIT_CODE=1
elif [ -z "$PACKAGER" ]; then
- echo "blackberry-nativepackager cannot be found on the path. Aborting."
+ echo blackberry-nativepackager cannot be found on the path. Aborting.
EXIT_CODE=1
elif [ -z "$DEPLOYER" ]; then
- echo "blackberry-deploy cannot be found on the path. Aborting."
+ echo blackberry-deploy cannot be found on the path. Aborting.
EXIT_CODE=1
elif [ -z "$SIGNER" ]; then
- echo "blackberry-signer cannot be found on the path. Aborting."
+ echo blackberry-signer cannot be found on the path. Aborting.
EXIT_CODE=1
else
node "$( dirname "$0" )/check_reqs.js" "$@"
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/df6228ee/blackberry10/bin/check_reqs.bat
----------------------------------------------------------------------
diff --git a/blackberry10/bin/check_reqs.bat b/blackberry10/bin/check_reqs.bat
index 0593e19..8dbcbf2 100755
--- a/blackberry10/bin/check_reqs.bat
+++ b/blackberry10/bin/check_reqs.bat
@@ -55,24 +55,36 @@ for %%X in (blackberry-signer) do (
)
)
+set FOUNDJAVA=
+for %%X in (java) do (
+ if not defined FOUNDJAVA (
+ set FOUNDJAVA=%%~$PATH:X
+ )
+)
+
+
if not defined FOUNDNODE (
- echo "npm cannot be found on the path. Aborting."
+ echo npm cannot be found on the path. Aborting.
exit /b 1
)
if not defined FOUNDNPM (
- echo "Node cannot be found on the path. Aborting."
+ echo node cannot be found on the path. Aborting.
+ exit /b 1
+)
+if not defined FOUNDJAVA (
+ echo java cannot be found on the path. Aborting.
exit /b 1
)
if not defined FOUNDPACKAGER (
- echo "blackberry-nativepackager cannot be found on the path. Aborting."
+ echo blackberry-nativepackager cannot be found on the path. Aborting.
exit /b 1
)
if not defined FOUNDDEPLOYER (
- echo "blackberry-deploy cannot be found on the path. Aborting."
+ echo blackberry-deploy cannot be found on the path. Aborting.
exit /b 1
)
if not defined FOUNDSIGNER (
- echo "blackberry-signer cannot be found on the path. Aborting."
+ echo blackberry-signer cannot be found on the path. Aborting.
exit /b 1
)
[5/5] webworks commit: [CB-3830] Removed dependency on BBDNK
[Packaging, deploying, signing, debugTokens]
Posted by bh...@apache.org.
[CB-3830] Removed dependency on BBDNK [Packaging, deploying, signing, debugTokens]
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/ad8ac3d9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/ad8ac3d9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/ad8ac3d9
Branch: refs/heads/master
Commit: ad8ac3d915bb05d64f71b7e153e3cb509abdfe11
Parents: d7b32c9
Author: jkeshavarzi <jk...@blackberry.com>
Authored: Mon Jun 17 18:04:17 2013 -0400
Committer: jkeshavarzi <jk...@blackberry.com>
Committed: Mon Jun 17 18:04:17 2013 -0400
----------------------------------------------------------------------
blackberry10/bin/check_reqs.bat | 6 +-
.../project/cordova/lib/debugtoken-helper.js | 48 ++++++---------
.../project/cordova/lib/native-packager.js | 28 ++++-----
.../bin/templates/project/cordova/lib/run | 64 +++++++++-----------
.../project/cordova/lib/signing-helper.js | 5 --
.../cordova/unit/spec/lib/native-packager.js | 4 +-
.../cordova/unit/spec/lib/signing-helper.js | 8 ---
7 files changed, 66 insertions(+), 97 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/ad8ac3d9/blackberry10/bin/check_reqs.bat
----------------------------------------------------------------------
diff --git a/blackberry10/bin/check_reqs.bat b/blackberry10/bin/check_reqs.bat
index aef7171..b7173f7 100755
--- a/blackberry10/bin/check_reqs.bat
+++ b/blackberry10/bin/check_reqs.bat
@@ -35,21 +35,21 @@ for %%X in (npm) do (
)
set FOUNDPACKAGER=
-for %%X in (blackberry-nativepackager) do (
+for %%X in (blackberry-nativepackager.bat) do (
if not defined FOUNDPACKAGER (
set FOUNDPACKAGER=%%~$PATH:X
)
)
set FOUNDDEPLOYER=
-for %%X in (blackberry-deploy) do (
+for %%X in (blackberry-deploy.bat) do (
if not defined FOUNDDEPLOYER (
set FOUNDDEPLOYER=%%~$PATH:X
)
)
set FOUNDSIGNER=
-for %%X in (blackberry-signer) do (
+for %%X in (blackberry-signer.bat) do (
if not defined FOUNDSIGNER (
set FOUNDSIGNER=%%~$PATH:X
)
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/ad8ac3d9/blackberry10/bin/templates/project/cordova/lib/debugtoken-helper.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/debugtoken-helper.js b/blackberry10/bin/templates/project/cordova/lib/debugtoken-helper.js
index 6d8c838..09324d7 100755
--- a/blackberry10/bin/templates/project/cordova/lib/debugtoken-helper.js
+++ b/blackberry10/bin/templates/project/cordova/lib/debugtoken-helper.js
@@ -105,24 +105,20 @@ function execNativeScript(script, options, callback) {
script += ".bat";
}
- if (fs.existsSync(conf.DEPENDENCIES_TOOLS)) {
- process = childProcess.spawn(path.normalize(conf.DEPENDENCIES_TOOLS + script), options, {
- "cwd" : workingDir,
- "env" : process ? process.env : undefined
- });
+ process = childProcess.spawn(script, options, {
+ "cwd" : workingDir,
+ "env" : process ? process.env : undefined
+ });
- process.stdout.on("data", pkgrUtils.handleProcessOutput);
+ process.stdout.on("data", pkgrUtils.handleProcessOutput);
- process.stderr.on("data", pkgrUtils.handleProcessOutput);
+ process.stderr.on("data", pkgrUtils.handleProcessOutput);
- process.on("exit", function (code) {
- if (callback && typeof callback === "function") {
- callback(code);
- }
- });
- } else {
- throw localize.translate("EXCEPTION_MISSING_TOOLS");
- }
+ process.on("exit", function (code) {
+ if (callback && typeof callback === "function") {
+ callback(code);
+ }
+ });
}
function checkTarget(target) {
@@ -154,7 +150,7 @@ function deployTokenToTargetsRecursively() {
logger.info(localize.translate("PROGRESS_DEPLOYING_DEBUG_TOKEN", target));
if (checkTarget(target)) {
- execNativeScript("/bin/blackberry-deploy",
+ execNativeScript("blackberry-deploy",
generateDeployTokenOptions(target),
deployTokenToTargetsRecursively
);
@@ -205,7 +201,7 @@ self.createToken = function (projectProperties, target, keystorepass, callback)
} else {
logger.info(localize.translate("PROGRESS_GENERATING_DEBUG_TOKEN"));
// Call "blackberry-debugtokenrequest" to generate debug token
- execNativeScript("/bin/blackberry-debugtokenrequest",
+ execNativeScript("blackberry-debugtokenrequest",
generateCreateTokenOptions(pins, keystorepass),
callback
);
@@ -248,7 +244,7 @@ self.deployToken = function (projectProperties, target, callback) {
self.checkDebugToken = function (pin, callback) {
var process,
- script = "/bin/blackberry-nativepackager",
+ script = "blackberry-nativepackager",
nativePackager;
if (!callback || typeof callback !== "function") {
@@ -264,16 +260,12 @@ self.checkDebugToken = function (pin, callback) {
script += ".bat";
}
- if (fs.existsSync(conf.DEPENDENCIES_TOOLS)) {
- nativePackager = childProcess.exec(path.normalize(conf.DEPENDENCIES_TOOLS + script +" -listManifest " + debugTokenDir), {
- "cwd": workingDir,
- "env": process ? process.env : undefined
- }, function (error, stdout, stderr) {
- callback(isDebugTokenValid(pin, stdout));
- });
- } else {
- throw localize.translate("EXCEPTION_MISSING_TOOLS");
- }
+ nativePackager = childProcess.exec(path.normalize(script +" -listManifest " + debugTokenDir), {
+ "cwd": workingDir,
+ "env": process ? process.env : undefined
+ }, function (error, stdout, stderr) {
+ callback(isDebugTokenValid(pin, stdout));
+ });
return;
};
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/ad8ac3d9/blackberry10/bin/templates/project/cordova/lib/native-packager.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/native-packager.js b/blackberry10/bin/templates/project/cordova/lib/native-packager.js
index 162cbbd..a35b5ba 100644
--- a/blackberry10/bin/templates/project/cordova/lib/native-packager.js
+++ b/blackberry10/bin/templates/project/cordova/lib/native-packager.js
@@ -246,7 +246,7 @@ function generateOptionsFile(session, target, config) {
}
function execNativePackager(session, callback) {
- var script = "/bin/blackberry-nativepackager",
+ var script = "blackberry-nativepackager",
cwd = session.sourceDir,
nativePkgr;
@@ -254,24 +254,20 @@ function execNativePackager(session, callback) {
script += ".bat";
}
- if (fs.existsSync(conf.DEPENDENCIES_TOOLS)) {
- nativePkgr = childProcess.spawn(path.normalize(conf.DEPENDENCIES_TOOLS + script), ["@options"], {
- "cwd": cwd,
- "env": process.env
- });
+ nativePkgr = childProcess.spawn(script, ["@options"], {
+ "cwd": cwd,
+ "env": process.env
+ });
- nativePkgr.stdout.on("data", pkgrUtils.handleProcessOutput);
+ nativePkgr.stdout.on("data", pkgrUtils.handleProcessOutput);
- nativePkgr.stderr.on("data", pkgrUtils.handleProcessOutput);
+ nativePkgr.stderr.on("data", pkgrUtils.handleProcessOutput);
- nativePkgr.on("exit", function (code) {
- if (callback && typeof callback === "function") {
- callback(code);
- }
- });
- } else {
- throw localize.translate("EXCEPTION_MISSING_TOOLS");
- }
+ nativePkgr.on("exit", function (code) {
+ if (callback && typeof callback === "function") {
+ callback(code);
+ }
+ });
}
module.exports = {
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/ad8ac3d9/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 3bcfeb6..fc98542 100755
--- a/blackberry10/bin/templates/project/cordova/lib/run
+++ b/blackberry10/bin/templates/project/cordova/lib/run
@@ -77,7 +77,7 @@ function generateOptions(uninstall) {
}
function execNativeDeploy(optionsArray, callback) {
- var script = "/bin/blackberry-deploy",
+ var script = "blackberry-deploy",
nativeDeploy;
options = optionsArray.join(" ");
@@ -85,24 +85,20 @@ function execNativeDeploy(optionsArray, callback) {
script += ".bat";
}
- if (fs.existsSync(conf.DEPENDENCIES_TOOLS)) {
- nativeDeploy = childProcess.exec(path.normalize(conf.DEPENDENCIES_TOOLS + script +" "+ options), {
- "cwd": workingdir,
- "env": process.env
- });
+ nativeDeploy = childProcess.exec(path.normalize(script +" "+ options), {
+ "cwd": workingdir,
+ "env": process.env
+ });
- nativeDeploy.stdout.on("data", pkgrUtils.handleProcessOutput);
+ nativeDeploy.stdout.on("data", pkgrUtils.handleProcessOutput);
- nativeDeploy.stderr.on("data", pkgrUtils.handleProcessOutput);
+ nativeDeploy.stderr.on("data", pkgrUtils.handleProcessOutput);
- nativeDeploy.on("exit", function (code) {
- if (callback && typeof callback === "function") {
- callback(code);
- }
- });
- } else {
- throw localize.translate("EXCEPTION_MISSING_TOOLS");
- }
+ nativeDeploy.on("exit", function (code) {
+ if (callback && typeof callback === "function") {
+ callback(code);
+ }
+ });
}
function checkTarget() {
@@ -137,27 +133,25 @@ function uninstall() {
script += ".bat";
}
- if (fs.existsSync(conf.DEPENDENCIES_TOOLS)) {
- nativeDeploy = childProcess.exec(path.normalize(conf.DEPENDENCIES_TOOLS + script +" -listInstalledApps -device " +ip+ " -password " +password), {
- "cwd": workingdir,
- "env": process.env
- }, function (error, stdout, stderr) {
- var parser = new xml2js.Parser();
- fs.readFile(path.join(__dirname + "/../../www/", "config.xml"), function(err, data) {
- parser.parseString(data, function (err, result) {
- if (stdout.indexOf(result['@'].id) != -1) {
- var options = generateOptions(true);
- execNativeDeploy(options,
- function(){
- deploy();
- });
- } else {
- deploy();
- }
- });
+ nativeDeploy = childProcess.exec(script +" -listInstalledApps -device " +ip+ " -password " +password, {
+ "cwd": workingdir,
+ "env": process.env
+ }, function (error, stdout, stderr) {
+ var parser = new xml2js.Parser();
+ fs.readFile(path.join(__dirname + "/../../www/", "config.xml"), function(err, data) {
+ parser.parseString(data, function (err, result) {
+ if (stdout.indexOf(result['@'].id) != -1) {
+ var options = generateOptions(true);
+ execNativeDeploy(options,
+ function(){
+ deploy();
+ });
+ } else {
+ deploy();
+ }
});
});
- }
+ });
}
function deploy() {
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/ad8ac3d9/blackberry10/bin/templates/project/cordova/lib/signing-helper.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/signing-helper.js b/blackberry10/bin/templates/project/cordova/lib/signing-helper.js
index d0daafd..b7cdd9b 100644
--- a/blackberry10/bin/templates/project/cordova/lib/signing-helper.js
+++ b/blackberry10/bin/templates/project/cordova/lib/signing-helper.js
@@ -62,16 +62,12 @@ function getDefaultPath(file) {
function execSigner(session, target, callback) {
var script = "blackberry-signer",
- cwd = path.normalize(conf.DEPENDENCIES_TOOLS + "/bin/"),
signer,
params = session.getParams("blackberry-signer"),
args = [];
if (pkgrUtils.isWindows()) {
script += ".bat";
- } else {
- // add path to executable to work around issue with node
- script = cwd + script;
}
args.push("-keystore");
@@ -92,7 +88,6 @@ function execSigner(session, target, callback) {
args.push(path.resolve(util.format(session.barPath, target)));
signer = childProcess.spawn(script, args, {
- "cwd": cwd,
"env": process.env
});
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/ad8ac3d9/blackberry10/bin/test/cordova/unit/spec/lib/native-packager.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/test/cordova/unit/spec/lib/native-packager.js b/blackberry10/bin/test/cordova/unit/spec/lib/native-packager.js
index a4ab63e..bcbe5d8 100644
--- a/blackberry10/bin/test/cordova/unit/spec/lib/native-packager.js
+++ b/blackberry10/bin/test/cordova/unit/spec/lib/native-packager.js
@@ -128,7 +128,7 @@ describe("Native packager", function () {
"<permission system=\"false\">access_internet</permission>" +
"<name>" + config.name['default'] + "</name>" +
"<description>" + config.description['default'] + "</description></qnx>",
- cmd = path.normalize(session.conf.DEPENDENCIES_TOOLS + "/bin/blackberry-nativepackager" + (pkgrUtils.isWindows() ? ".bat" : ""));
+ cmd = "blackberry-nativepackager" + (pkgrUtils.isWindows() ? ".bat" : "");
spyOn(pkgrUtils, "writeFile").andCallFake(function (sourceDir, outputDir, data) {
expect(sourceDir).toEqual(session.sourceDir);
@@ -323,7 +323,7 @@ describe("Native packager", function () {
});
it("exec blackberry-nativepackager with additional params", function () {
- var cmd = path.normalize(session.conf.DEPENDENCIES_TOOLS + "/bin/blackberry-nativepackager" + (pkgrUtils.isWindows() ? ".bat" : ""));
+ var cmd = "blackberry-nativepackager" + (pkgrUtils.isWindows() ? ".bat" : "");
spyOn(pkgrUtils, "writeFile");
session.getParams = jasmine.createSpy("session getParams").andReturn({
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/ad8ac3d9/blackberry10/bin/test/cordova/unit/spec/lib/signing-helper.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/test/cordova/unit/spec/lib/signing-helper.js b/blackberry10/bin/test/cordova/unit/spec/lib/signing-helper.js
index ad91726..8aa37fd 100644
--- a/blackberry10/bin/test/cordova/unit/spec/lib/signing-helper.js
+++ b/blackberry10/bin/test/cordova/unit/spec/lib/signing-helper.js
@@ -376,10 +376,6 @@ describe("signing-helper", function () {
var callback = jasmine.createSpy("callback"),
cmd = "blackberry-signer" + (pkgrUtils.isWindows() ? ".bat" : "");
- if (!pkgrUtils.isWindows()) {
- cmd = path.normalize(conf.DEPENDENCIES_TOOLS + "/bin/") + cmd;
- }
-
session.getParams = jasmine.createSpy("session getParams").andReturn(null);
signingHelper.execSigner(session, "device", callback);
expect(childProcess.spawn).toHaveBeenCalledWith(cmd, ["-keystore", session.keystore, "-storepass", session.storepass, path.resolve("c:/device/Demo.bar")], jasmine.any(Object));
@@ -392,10 +388,6 @@ describe("signing-helper", function () {
var callback = jasmine.createSpy("callback"),
cmd = "blackberry-signer" + (pkgrUtils.isWindows() ? ".bat" : "");
- if (!pkgrUtils.isWindows()) {
- cmd = path.normalize(conf.DEPENDENCIES_TOOLS + "/bin/") + cmd;
- }
-
session.getParams = jasmine.createSpy("session getParams").andReturn({
"-proxyhost": "abc.com",
"-proxyport": "80"
[3/5] webworks commit: [CB-3799] Modified scripts to store debugtoken
as %HOME%/.cordova/blackberry10-debugtoken.bar - Includes modifications to
util scripts for reading from properties file
Posted by bh...@apache.org.
[CB-3799] Modified scripts to store debugtoken as
%HOME%/.cordova/blackberry10-debugtoken.bar
- Includes modifications to util scripts for reading from properties
file
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/e95b34c3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/e95b34c3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/e95b34c3
Branch: refs/heads/master
Commit: e95b34c35f7fbefcde0cff9614386e7024f0c987
Parents: 06acc70
Author: Jeffrey Heifetz <jh...@blackberry.com>
Authored: Mon Jun 17 11:52:37 2013 -0400
Committer: jkeshavarzi <jk...@blackberry.com>
Committed: Mon Jun 17 16:20:58 2013 -0400
----------------------------------------------------------------------
blackberry10/bin/lib/blackberry10.json | 4 ---
blackberry10/bin/lib/target.js | 30 ++++++----------
blackberry10/bin/lib/utils.js | 37 +++++++++++++++-----
.../bin/templates/project/cordova/lib/build | 16 ++++-----
.../bin/templates/project/cordova/lib/conf.js | 3 +-
.../project/cordova/lib/debugtoken-helper.js | 4 +--
.../project/cordova/lib/native-packager.js | 13 +++----
.../bin/templates/project/cordova/lib/run | 4 +--
8 files changed, 57 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/e95b34c3/blackberry10/bin/lib/blackberry10.json
----------------------------------------------------------------------
diff --git a/blackberry10/bin/lib/blackberry10.json b/blackberry10/bin/lib/blackberry10.json
deleted file mode 100644
index 06d6a8b..0000000
--- a/blackberry10/bin/lib/blackberry10.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "targets": {
- }
-}
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/e95b34c3/blackberry10/bin/lib/target.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/lib/target.js b/blackberry10/bin/lib/target.js
index b259f0c..a436be4 100644
--- a/blackberry10/bin/lib/target.js
+++ b/blackberry10/bin/lib/target.js
@@ -19,8 +19,7 @@ var path = require('path'),
fs = require('fs'),
utils = require('./utils'),
commander = require('commander'),
- propertiesFile = utils.initPropertiesFile(),
- properties = require(propertiesFile),
+ properties = utils.getProperties(),
command,
name,
ip,
@@ -29,13 +28,6 @@ var path = require('path'),
pin,
pinRegex = new RegExp("[0-9A-Fa-f]{8}");
-function writeProjectFile(contents, file) {
- fs.writeFile(file, contents, 'utf-8', function (err) {
- if (err) console.log("Error updating project.json :(\n" + err);
- process.exit();
- });
-}
-
function isValidIp(ip) {
var num,
result = true,
@@ -44,7 +36,7 @@ function isValidIp(ip) {
if (typeof ip !== 'string') {
console.log("IP is required");
console.log(commander.helpInformation());
- process.exit(2);
+ process.exit(2);
} else {
ipArray = ip.split('.');
if (ipArray.length !== 4) {
@@ -66,7 +58,7 @@ function isValidType(type) {
if (typeof type !== 'string') {
console.log("target type is required");
console.log(commander.helpInformation());
- process.exit(2);
+ process.exit(2);
}
else if (!(type === 'device' || type === 'simulator')) {
result = false;
@@ -105,7 +97,7 @@ commander
if (commander.args.length === 1) {
console.log("Target details not specified");
console.log(commander.helpInformation());
- process.exit(2);
+ process.exit(2);
}
name = commander.args[0];
ip = commander.args[1];
@@ -119,17 +111,17 @@ commander
if (!isValidIp(ip)) {
console.log("Invalid IP: " + ip);
console.log(commander.helpInformation());
- process.exit(2);
+ process.exit(2);
}
if (!isValidType(type)) {
console.log("Invalid target type: " + type);
console.log(commander.helpInformation());
- process.exit(2);
+ process.exit(2);
}
if (!isValidPin(pin)) {
console.log("Invalid PIN: " + pin);
console.log(commander.helpInformation());
- process.exit(2);
+ process.exit(2);
}
if (properties.targets.hasOwnProperty(name)) {
console.log("Overwriting target: " + name);
@@ -144,13 +136,13 @@ commander
if (commander.args.length === 1) {
console.log('No target specified');
console.log(commander.helpInformation());
- process.exit(2);
+ process.exit(2);
}
name = commander.args[0];
if (!properties.targets.hasOwnProperty(name)) {
console.log("Target: '" + name + "' not found");
console.log(commander.helpInformation());
- process.exit(2);
+ process.exit(2);
}
if (name === properties.defaultTarget) {
console.log("Deleting default target, please set a new default target");
@@ -173,7 +165,7 @@ commander
} else {
console.log("Target '" + name + "' not found");
console.log(commander.helpInformation());
- process.exit(2);
+ process.exit(2);
}
});
@@ -203,7 +195,7 @@ try {
properties.defaultTarget = Object.keys(properties.targets)[0];
}
- writeProjectFile(JSON.stringify(properties, null, 4) + "\n", propertiesFile);
+ utils.writeToPropertiesFile(properties);
} catch (e) {
console.log(e);
process.exit();
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/e95b34c3/blackberry10/bin/lib/utils.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/lib/utils.js b/blackberry10/bin/lib/utils.js
index 34b6291..de4557c 100644
--- a/blackberry10/bin/lib/utils.js
+++ b/blackberry10/bin/lib/utils.js
@@ -19,8 +19,12 @@ var fs = require('fs'),
wrench = require('wrench'),
localize = require("./localize"),
os = require('os'),
- propertyFileName = 'blackberry10.json',
- propertyFileDir = '.cordova',
+ PROPERTY_FILE_NAME = 'blackberry10.json',
+ CORDOVA_DIR = '.cordova',
+ DEFAULT_PROPERTY_FILE = {
+ targets: {
+ }
+ },
_self;
function swapBytes(buffer) {
@@ -169,16 +173,31 @@ _self = {
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));
+ getCordovaDir: function () {
+ var cordovaPath = path.join(_self.findHomePath(), CORDOVA_DIR);
+
+ if (!fs.existsSync(cordovaPath)) {
+ fs.mkdirSync(cordovaPath);
}
+
+ return cordovaPath;
+ },
+
+ getProperties: function () {
+ var propertiesFile = path.join(_self.getCordovaDir(), PROPERTY_FILE_NAME);
+
if (!fs.existsSync(propertiesFile)) {
- _self.copyFile(propertyFileName, path.join(homePath, propertyFileDir), __dirname);
+ _self.writeToPropertiesFile(DEFAULT_PROPERTY_FILE);
}
- return propertiesFile;
+
+ return require(propertiesFile);
+ },
+
+ writeToPropertiesFile: function (data) {
+ var contents = JSON.stringify(data, null, 4) + "\n",
+ propertiesFile = path.join(_self.getCordovaDir(), PROPERTY_FILE_NAME);
+
+ fs.writeFileSync(propertiesFile, contents, 'utf-8');
}
};
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/e95b34c3/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 cdd48a4..77da8dd 100755
--- a/blackberry10/bin/templates/project/cordova/lib/build
+++ b/blackberry10/bin/templates/project/cordova/lib/build
@@ -19,13 +19,13 @@
var path = require("path"),
command = require("commander"),
utils = require("./utils"),
- bbProperties = require(utils.initPropertiesFile()),
+ bbProperties = utils.getProperties(),
bbwpArgv = [
- process.argv[0],
- path.resolve(path.join(__dirname, process.argv[1])),
- path.resolve(path.join(__dirname, "..", "..", "www")),
- "-o",
- path.resolve(path.join(__dirname, "..", "..", "build"))
+ process.argv[0],
+ path.resolve(path.join(__dirname, process.argv[1])),
+ path.resolve(path.join(__dirname, "..", "..", "www")),
+ "-o",
+ path.resolve(path.join(__dirname, "..", "..", "build"))
],
jWorkflow = require("jWorkflow"),
childProcess = require("child_process"),
@@ -56,7 +56,7 @@ function doReleaseBuild() {
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());
+ console.log(command.helpInformation());
process.exit(2);
}
@@ -93,7 +93,7 @@ function clean(previous, baton) {
if (pkgrUtils.isWindows()) {
execName = "clean";
- }
+ }
baton.take();
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/e95b34c3/blackberry10/bin/templates/project/cordova/lib/conf.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/conf.js b/blackberry10/bin/templates/project/cordova/lib/conf.js
index 89f8372..6d0dfd1 100644
--- a/blackberry10/bin/templates/project/cordova/lib/conf.js
+++ b/blackberry10/bin/templates/project/cordova/lib/conf.js
@@ -15,6 +15,7 @@
*/
var path = require("path"),
+ utils = require("./utils"),
fs = require("fs");
function getToolsDir() {
@@ -40,7 +41,7 @@ module.exports = {
DEPENDENCIES_BOOTSTRAP: path.normalize(__dirname + "/../framework/bootstrap"),
DEPENDENCIES_TOOLS: getToolsDir(),
DEPENDENCIES_WWE: path.normalize(__dirname + "/../dependencies/%s-wwe"),
- DEBUG_TOKEN: path.normalize(__dirname + "/../debugtoken.bar"),
+ DEBUG_TOKEN: path.normalize(path.join(utils.getCordovaDir(), "blackberry10-debugtoken.bar")),
DEFAULT_ICON: path.normalize(__dirname + "/../default-icon.png"),
BAR_DESCRIPTOR: "bar-descriptor.xml",
BBWP_IGNORE_FILENAME: ".bbwpignore"
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/e95b34c3/blackberry10/bin/templates/project/cordova/lib/debugtoken-helper.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/debugtoken-helper.js b/blackberry10/bin/templates/project/cordova/lib/debugtoken-helper.js
index f1a4220..6d8c838 100755
--- a/blackberry10/bin/templates/project/cordova/lib/debugtoken-helper.js
+++ b/blackberry10/bin/templates/project/cordova/lib/debugtoken-helper.js
@@ -21,8 +21,9 @@ var childProcess = require("child_process"),
localize = require("./localize"),
logger = require("./logger"),
pkgrUtils = require("./packager-utils"),
+ utils = require("./utils"),
workingDir = path.normalize(__dirname + "/.."),
- debugTokenDir = path.normalize(workingDir + "/" + "debugtoken.bar"),
+ debugTokenDir = path.normalize(path.join(utils.getCordovaDir(), "blackberry10-debugtoken.bar")),
properties,
targets,
deployCallback,
@@ -33,7 +34,6 @@ function isDebugTokenValid(pin, data) {
i,
l,
expiry = null,
- pin,
devices = [],
line,
now = new Date();
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/e95b34c3/blackberry10/bin/templates/project/cordova/lib/native-packager.js
----------------------------------------------------------------------
diff --git a/blackberry10/bin/templates/project/cordova/lib/native-packager.js b/blackberry10/bin/templates/project/cordova/lib/native-packager.js
index d9fe3a2..162cbbd 100644
--- a/blackberry10/bin/templates/project/cordova/lib/native-packager.js
+++ b/blackberry10/bin/templates/project/cordova/lib/native-packager.js
@@ -197,16 +197,11 @@ function generateOptionsFile(session, target, config) {
//if -d was provided and we are not signing [-g], set debugToken
if (session.debug && !isSigning) {
- if (path.extname(conf.DEBUG_TOKEN) === ".bar") {
- if (fs.existsSync(conf.DEBUG_TOKEN)) {
- debugToken = "-debugToken" + NL;
- debugToken += conf.DEBUG_TOKEN + NL;
- }
- else {
- logger.warn(localize.translate("EXCEPTION_DEBUG_TOKEN_NOT_FOUND"));
- }
+ if (fs.existsSync(conf.DEBUG_TOKEN)) {
+ debugToken = "-debugToken" + NL;
+ debugToken += conf.DEBUG_TOKEN + NL;
} else {
- logger.warn(localize.translate("EXCEPTION_DEBUG_TOKEN_WRONG_FILE_EXTENSION"));
+ logger.warn(localize.translate("EXCEPTION_DEBUG_TOKEN_NOT_FOUND"));
}
}
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/e95b34c3/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 bd3269b..3bcfeb6 100755
--- a/blackberry10/bin/templates/project/cordova/lib/run
+++ b/blackberry10/bin/templates/project/cordova/lib/run
@@ -26,7 +26,7 @@ var childProcess = require("child_process"),
localize = require("./localize"),
pkgrUtils = require("./packager-utils"),
debugTokenHelper = require("./debugtoken-helper"),
- targets = require(utils.initPropertiesFile()),
+ targets = utils.getProperties(),
program = require('commander'),
xml2js = require('xml2js'),
jWorkflow = require("jWorkflow"),
@@ -237,7 +237,7 @@ function build(previous, baton) {
if (pkgrUtils.isWindows()) {
execName = "build";
- }
+ }
nativeDeploy = childProcess.exec(execName, {
"cwd": path.normalize(__dirname + "/.."),