You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by fi...@apache.org on 2013/02/06 20:06:16 UTC
[5/6] git commit: updating blackberry to 2.4.0
updating blackberry to 2.4.0
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/68e12b4b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/68e12b4b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/68e12b4b
Branch: refs/heads/master
Commit: 68e12b4b4b4c07fc8f649c1b0f21ee262f72de67
Parents: 5203a27
Author: Fil Maj <ma...@gmail.com>
Authored: Wed Feb 6 11:09:09 2013 -0800
Committer: Fil Maj <ma...@gmail.com>
Committed: Wed Feb 6 11:09:09 2013 -0800
----------------------------------------------------------------------
.gitignore | 2 +
lib/cordova-blackberry/VERSION | 2 +-
lib/cordova-blackberry/bin/create | 26 +++++++-------
lib/cordova-blackberry/bin/create.js | 20 ++++++----
.../bin/templates/project/www/config.xml | 2 +-
.../bin/templates/project/www/index.html | 2 +-
lib/cordova-blackberry/build.xml | 4 +-
.../javascript/cordova.blackberry.js | 27 ++++++++++-----
8 files changed, 50 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/68e12b4b/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 9e13c2c..1228061 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ temp
.DS_Store
spec/fixtures/projects/native
spec/fixtures/projects/cordova
+lib/cordova-android/framework/bin
+lib/cordova-android/framework/gen
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/68e12b4b/lib/cordova-blackberry/VERSION
----------------------------------------------------------------------
diff --git a/lib/cordova-blackberry/VERSION b/lib/cordova-blackberry/VERSION
index 2eca156..197c4d5 100644
--- a/lib/cordova-blackberry/VERSION
+++ b/lib/cordova-blackberry/VERSION
@@ -1 +1 @@
-2.4.0rc1
+2.4.0
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/68e12b4b/lib/cordova-blackberry/bin/create
----------------------------------------------------------------------
diff --git a/lib/cordova-blackberry/bin/create b/lib/cordova-blackberry/bin/create
index 974dc10..870bad1 100755
--- a/lib/cordova-blackberry/bin/create
+++ b/lib/cordova-blackberry/bin/create
@@ -19,13 +19,13 @@
# create a cordova/blackberry project
#
# USAGE
-# ./create [path appname]
+# ./create [path package appname]
#
set -e
if [ -n "$1" ] && [ "$1" == "-h" ]
then
- echo 'usage: create path appname'
+ echo 'usage: create path package appname'
echo 'After you have created your application, make sure to customize the project.properties file inside your app directory with your environment specifics!'
exit 0
fi
@@ -34,7 +34,8 @@ BUILD_PATH="$( cd "$( dirname "$0" )/.." && pwd )"
VERSION=$(cat "$BUILD_PATH/VERSION")
PROJECT_PATH="${1:-"./example"}"
-APPNAME=${2:-"cordovaExample"}
+PACKAGE=${2:-"org.apache.cordova.example"}
+NAME=${3:-"cordovaExample"}
# clobber any existing example
if [ -d "$PROJECT_PATH" ]
@@ -74,18 +75,17 @@ then
mv ant-contrib-1.0b3.jar "$BUILD_PATH"/bin/templates/project/lib/ant-contrib
fi
- echo "Building cordova-$VERSION.jar and cordova-$VERSION.js ..."
- (cd "$BUILD_PATH" && "$ANT" dist &> /dev/null )
-
- # copy project template
- echo "Copying assets and resources ..."
- cp -r "$BUILD_PATH/dist/sample/." "$PROJECT_PATH"
+ echo "Creating BlackBerry project..."
+ (cd "$BUILD_PATH" && "$ANT" create -Dproject.path="$PROJECT_PATH" &> /dev/null )
+ # interpolate the activity and package into config.xml
+ echo "Updating config.xml ..."
+ sed -i '' -e "s/__NAME__/${NAME}/g" "$MANIFEST_PATH"
+ sed -i '' -e "s/__PACKAGE__/${PACKAGE}/g" "$MANIFEST_PATH"
else
# copy project template if in distribution
echo "Copying assets and resources ..."
cp -r "$BUILD_PATH/sample/." "$PROJECT_PATH"
+ echo "Updating config.xml ..."
+ sed -i '' -e "s/cordovaExample/${NAME}/g" "$MANIFEST_PATH"
+ sed -i '' -e "s/org.apache.cordova.example/${PACKAGE}/g" "$MANIFEST_PATH"
fi
-
-# interpolate the app name into config.xml
-echo "Updating config.xml ..."
-sed -i '' -e "s/__NAME__/${APPNAME}/g" "$MANIFEST_PATH"
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/68e12b4b/lib/cordova-blackberry/bin/create.js
----------------------------------------------------------------------
diff --git a/lib/cordova-blackberry/bin/create.js b/lib/cordova-blackberry/bin/create.js
index 9d4ce62..ac4b083 100644
--- a/lib/cordova-blackberry/bin/create.js
+++ b/lib/cordova-blackberry/bin/create.js
@@ -21,7 +21,7 @@
* create a cordova/blackberry project
*
* USAGE
- * ./create [path package activity]
+ * ./create [path package appname]
*/
var fso = WScript.CreateObject('Scripting.FileSystemObject');
@@ -93,15 +93,17 @@ function cleanup() {
}
var args = WScript.Arguments, PROJECT_PATH="example",
- APPNAME="cordovaExample",
+ PACKAGE="org.apache.cordova.example",
+ NAME="cordovaExample",
shell=WScript.CreateObject("WScript.Shell");
// working dir
var ROOT = WScript.ScriptFullName.split('\\bin\\create.js').join('');
-if (args.Count() == 2) {
+if (args.Count() == 3) {
PROJECT_PATH=args(0);
- APPNAME=args(1);
+ PACKAGE=args(1);
+ NAME=args(2);
}
if(fso.FolderExists(PROJECT_PATH)) {
@@ -114,12 +116,14 @@ var VERSION=read(ROOT+'\\VERSION').replace(/\r\n/,'').replace(/\n/,'');
if(fso.FolderExists(ROOT+'\\framework')){
downloadAntContrib();
- exec('ant.bat -f '+ ROOT +'\\build.xml dist');
- // copy in the project template
- exec('cmd /c xcopy '+ ROOT + '\\dist\\sample\\* '+PROJECT_PATH+' /I /S /Y');
+ exec('ant.bat -f '+ ROOT +'\\build.xml create -Dproject.path="' + PROJECT_PATH + '"');
+ replaceInFile(MANIFEST_PATH, /__PACKAGE__/, PACKAGE);
+ replaceInFile(MANIFEST_PATH, /__ACTIVITY__/, NAME);
}else{
// copy in the project template
exec('cmd /c xcopy '+ ROOT + '\\sample\\* '+PROJECT_PATH+' /I /S /Y');
+ replaceInFile(MANIFEST_PATH, /org.apache.cordova.example/, PACKAGE);
+ replaceInFile(MANIFEST_PATH, /cordovaExample/, NAME);
}
-replaceInFile(MANIFEST_PATH, /__NAME__/, APPNAME);
+
cleanup();
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/68e12b4b/lib/cordova-blackberry/bin/templates/project/www/config.xml
----------------------------------------------------------------------
diff --git a/lib/cordova-blackberry/bin/templates/project/www/config.xml b/lib/cordova-blackberry/bin/templates/project/www/config.xml
index 40ac2b8..0de8bb5 100644
--- a/lib/cordova-blackberry/bin/templates/project/www/config.xml
+++ b/lib/cordova-blackberry/bin/templates/project/www/config.xml
@@ -24,7 +24,7 @@
<widget xmlns="http://www.w3.org/ns/widgets"
xmlns:rim="http://www.blackberry.com/ns/widgets"
- version="1.0.0.0" id="__NAME__">
+ version="1.0.0.0" id="__PACKAGE__">
<name>__NAME__</name>
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/68e12b4b/lib/cordova-blackberry/bin/templates/project/www/index.html
----------------------------------------------------------------------
diff --git a/lib/cordova-blackberry/bin/templates/project/www/index.html b/lib/cordova-blackberry/bin/templates/project/www/index.html
index b5b9a09..f3c00e2 100644
--- a/lib/cordova-blackberry/bin/templates/project/www/index.html
+++ b/lib/cordova-blackberry/bin/templates/project/www/index.html
@@ -33,7 +33,7 @@
<p class="event received">Device is Ready</p>
</div>
</div>
- <script type="text/javascript" src="cordova-2.4.0rc1.js"></script>
+ <script type="text/javascript" src="cordova-2.4.0.js"></script>
<script type="text/javascript" src="js/index.js"></script>
<script type="text/javascript">
app.initialize();
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/68e12b4b/lib/cordova-blackberry/build.xml
----------------------------------------------------------------------
diff --git a/lib/cordova-blackberry/build.xml b/lib/cordova-blackberry/build.xml
index 779e0cd..dcddbb6 100644
--- a/lib/cordova-blackberry/build.xml
+++ b/lib/cordova-blackberry/build.xml
@@ -110,7 +110,7 @@
</copy>
<!-- change file permission for cordova scripts because ant copy doesn't preserve file permissions -->
- <chmod dir="${template.project.dir}/cordova" perm="700" includes="*"/>
+ <chmod dir="${project.path}/cordova" perm="700" includes="*"/>
<!-- update project files to reference cordova.x.x.x.js -->
<replaceregexp match="cordova\.js" replace="${js.basename}" byline="true">
@@ -204,7 +204,7 @@ Getting Started:
<!-- update config.xml to have a default name-->
<replace file="${dist.project.path}/www/config.xml" token="__NAME__" value="cordovaExample"/>
-
+ <replace file="${dist.project.path}/www/config.xml" token="__PACKAGE__" value="org.apache.cordova.example"/>
<echo>
Distribution Complete!
======================
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/68e12b4b/lib/cordova-blackberry/javascript/cordova.blackberry.js
----------------------------------------------------------------------
diff --git a/lib/cordova-blackberry/javascript/cordova.blackberry.js b/lib/cordova-blackberry/javascript/cordova.blackberry.js
index d0d6073..a963a2d 100644
--- a/lib/cordova-blackberry/javascript/cordova.blackberry.js
+++ b/lib/cordova-blackberry/javascript/cordova.blackberry.js
@@ -1,6 +1,8 @@
-// commit 71223711fb1591b1255d871140d959fd9095f0c3
+// Platform: blackberry
-// File generated at :: Mon Jan 21 2013 16:21:41 GMT-0800 (PST)
+// commit ac725f6ae0bd655789771e2a40b8d60cb4c8c221
+
+// File generated at :: Tue Feb 05 2013 16:15:50 GMT-0800 (PST)
/*
Licensed to the Apache Software Foundation (ASF) under one
@@ -1418,6 +1420,7 @@ module.exports = {
CELL_2G: "2g",
CELL_3G: "3g",
CELL_4G: "4g",
+ CELL:"cellular",
NONE: "none"
};
@@ -5345,7 +5348,7 @@ module.exports = {
model: "PlayBook",
name: "PlayBook", // deprecated: please use device.model
uuid: info.uuid,
- cordova: "2.4.0rc1"
+ cordova: "2.4.0"
});
}),
request = new blackberry.transport.RemoteFunctionCall("org/apache/cordova/getDeviceInfo");
@@ -5464,7 +5467,7 @@ define("cordova/plugin/air/platform", function(require, exports, module) {
module.exports = {
id: "playbook",
- initialize:function() {},
+ initialize:function() {}
};
});
@@ -9038,7 +9041,7 @@ module.exports = {
model: "Dev Alpha",
name: "Dev Alpha", // deprecated: please use device.model
uuid: blackberry.identity.uuid,
- cordova: "2.4.0rc1"
+ cordova: "2.4.0"
});
return { "status" : cordova.callbackStatus.NO_RESULT, "message" : "Device info returned" };
@@ -9788,8 +9791,13 @@ module.exports = {
var id = args[0],
src = args[1];
+
+ if (typeof src == "undefined"){
+ audioObjects[id] = new Audio();
+ } else {
+ audioObjects[id] = new Audio(src);
+ }
- audioObjects[id] = new Audio(src);
return {"status" : 1, "message" : "Audio object created" };
},
startPlayingAudio: function (args, win, fail) {
@@ -9801,7 +9809,7 @@ module.exports = {
audio = audioObjects[id],
result;
- if (args.length === 1) {
+ if (args.length === 1 || typeof args[1] == "undefined" ) {
return {"status" : 9, "message" : "Media source argument not found"};
}
@@ -9812,7 +9820,6 @@ module.exports = {
audio = audioObjects[id] = new Audio(args[1]);
audio.play();
-
return {"status" : 1, "message" : "Audio play started" };
},
stopPlayingAudio: function (args, win, fail) {
@@ -9929,8 +9936,10 @@ module.exports = {
result;
if (audio) {
+ if(audio.src !== ""){
+ audio.src = undefined;
+ }
audioObjects[id] = undefined;
- audio.src = undefined;
//delete audio;
}