cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtan...@apache.org
Subject webworks commit: Updated to latest version of webworks SDK
Date Fri, 30 Nov 2012 15:34:08 GMT
Updated Branches:
  refs/heads/master fd0e12049 -> c747a03f7


Updated to latest version of webworks SDK

Research in Motion released an updated SDK for WebWorks yesterday as
well as updates to the simulator and OS on the DevAlpha devices. This
update brings our codebase up to the current version of the SDK.

- got rid of the task to copy the webworks.js file as this is no longer
  needed (webworks now provides a path for us)
- updated the index.html file to use the new path for webworks.js
- updated the addWebworks task to use the new path.
- added missing permission for contact API access.
- updates to README.md for use of qnx target
- updated project.properties to point to the location of the latest SDK


Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/c747a03f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/c747a03f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/c747a03f

Branch: refs/heads/master
Commit: c747a03f7037e85ee81af86530bf6cc126fed5e4
Parents: fd0e120
Author: Gord Tanner <gtanner@gmail.com>
Authored: Thu Nov 29 17:49:45 2012 -0500
Committer: Gord Tanner <gtanner@gmail.com>
Committed: Thu Nov 29 17:49:45 2012 -0500

----------------------------------------------------------------------
 README.md                                 |    4 ++--
 bin/templates/project/cordova/addWebworks |    2 +-
 bin/templates/project/project.properties  |    2 +-
 bin/templates/project/qnx.xml             |    8 --------
 bin/templates/project/www/config.xml      |    1 +
 bin/templates/project/www/index.html      |    2 +-
 6 files changed, 6 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/c747a03f/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index b931557..c23c110 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Cordova BlackBerry WebWorks
 ============================
 
-[Cordova framework](http://incubator.apache.org/cordova/) for __BlackBerry Tablet OS and
Smartphones__. The framework is implemented using the [BlackBerry WebWorks SDK](http://us.blackberry.com/developers/tablet/webworks.jsp).
+[Cordova framework](http://incubator.apache.org/cordova/) for __BlackBerry Tablet OS, Smartphones
and BlackBerry 10 devices__. The framework is implemented using the [BlackBerry WebWorks SDK](http://us.blackberry.com/developers/tablet/webworks.jsp).
 
 Directory Structure
 -------------------
@@ -116,7 +116,7 @@ The Cordova build scripts automate common tasks, such as compiling your
project,
     $ ant help
 
 Every command is in the form `ant TARGET COMMAND [options]`, where
-target is either `blackberry` or `playbook`.
+target is either `blackberry`, `playbook` or `qnx`.
 
 To build your project into a deployable application (.cod/.jad) file:
 

http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/c747a03f/bin/templates/project/cordova/addWebworks
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/addWebworks b/bin/templates/project/cordova/addWebworks
index 1a23ed2..701dde3 100755
--- a/bin/templates/project/cordova/addWebworks
+++ b/bin/templates/project/cordova/addWebworks
@@ -51,7 +51,7 @@ do
         # i hate regex
         jspath=$( dirname "$fullpath" ) ; jspath=${jspath#./www} ; jspath=${jspath//\/[a-zA-Z0-9]/../}
; jspath=${jspath//[a-zA-Z0-9]/}
         sed -i "" '/<head>/ a\
-        <script type="text/javascript" src="'$jspath'js/webworks.js"></script>'
$fullpath  
+        <script type="text/javascript" src="local:///chrome/webworks.js"></script>'
$fullpath  
         echo "ADDING: "$fullpath
     fi
 done

http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/c747a03f/bin/templates/project/project.properties
----------------------------------------------------------------------
diff --git a/bin/templates/project/project.properties b/bin/templates/project/project.properties
index 85a0788..1e46e9a 100644
--- a/bin/templates/project/project.properties
+++ b/bin/templates/project/project.properties
@@ -23,7 +23,7 @@
 #
 blackberry.bbwp.dir=C:\\Program Files\\Research In Motion\\BlackBerry WebWorks Packager
 playbook.bbwp.dir=C:\\Program Files\\Research In Motion\\BlackBerry WebWorks SDK for TabletOS
2.1.0.6\\bbwp
-qnx.bbwp.dir=/Developer/SDKs/Research In Motion/BlackBerry 10 WebWorks SDK 1.0.2.9
+qnx.bbwp.dir=/Developer/SDKs/Research In Motion/BlackBerry 10 WebWorks SDK 1.0.3.8
 
 # (Optional) Simulator Directory 
 # 

http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/c747a03f/bin/templates/project/qnx.xml
----------------------------------------------------------------------
diff --git a/bin/templates/project/qnx.xml b/bin/templates/project/qnx.xml
index 58e096a..6bb9d49 100644
--- a/bin/templates/project/qnx.xml
+++ b/bin/templates/project/qnx.xml
@@ -149,14 +149,6 @@
             <fileset dir="www/ext-qnx" excludes="readme.md" />
         </copy>
 
-        <!-- copy over the webworks.js file -->
-        <copy todir="www/js" overwrite="true">
-            <fileset dir="${properties.qnx.bbwp.dir}\Framework\clientFiles">
-                <include name="webworks*.js" />
-            </fileset>
-            <globmapper from="webworks*.js" to="webworks.js" />
-        </copy>
-        
         <!-- Package the WebWorks app by zipping the widget dir. -->
         <mkdir dir="${build.dir}" />
         <zip compress="false" destfile="${build.dir}/${cod.name}.zip" basedir="${widget.dir}"
excludes="**/build/**,**/.settings/**,**/.project" />

http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/c747a03f/bin/templates/project/www/config.xml
----------------------------------------------------------------------
diff --git a/bin/templates/project/www/config.xml b/bin/templates/project/www/config.xml
index 28bbce1..40ac2b8 100644
--- a/bin/templates/project/www/config.xml
+++ b/bin/templates/project/www/config.xml
@@ -90,6 +90,7 @@
     <rim:permit>access_shared</rim:permit>
     <rim:permit>read_geolocation</rim:permit>
     <rim:permit>record_audio</rim:permit> 
+    <rim:permit>access_pimdomain_contacts</rim:permit> 
   </rim:permissions>
 
 </widget>

http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/c747a03f/bin/templates/project/www/index.html
----------------------------------------------------------------------
diff --git a/bin/templates/project/www/index.html b/bin/templates/project/www/index.html
index 5280ae8..b07ab4f 100644
--- a/bin/templates/project/www/index.html
+++ b/bin/templates/project/www/index.html
@@ -34,7 +34,7 @@
             </div>
         </div>
         <!-- Don't worry about js/webworks.js if you're aren't developing for bb10 -->
-        <script type="text/javascript" src="js/webworks.js"></script>  
+        <script type="text/javascript" src="local:///chrome/webworks.js"></script>
 
         <script type="text/javascript" src="cordova-2.3.0rc1.js"></script>
         <script type="text/javascript" src="js/index.js"></script>
         <script type="text/javascript">


Mime
View raw message