You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ti...@apache.org on 2012/08/29 23:18:01 UTC
[1/4] webworks commit: Updates for the new Webworks SDK
Updated Branches:
refs/heads/master 94bfc069b -> a50a05886
Updates for the new Webworks SDK
- Copy over webworks.js from the SDK
- no more need to have a custom config.xml (all features can be ignored
now)
- fixed up where native extensions were being copied
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/commit/690e80c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/tree/690e80c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/diff/690e80c5
Branch: refs/heads/master
Commit: 690e80c52d3f25251549e3390b7f08b769d3c0f3
Parents: 94bfc06
Author: Gord Tanner <gt...@gmail.com>
Authored: Tue Aug 28 13:23:43 2012 -0400
Committer: Tim Kim <ti...@nitobi.com>
Committed: Wed Aug 29 14:17:35 2012 -0700
----------------------------------------------------------------------
bin/templates/project/project.properties | 2 +-
bin/templates/project/qnx.xml | 13 ++++-
bin/templates/project/www/config.xml | 1 +
bin/templates/project/www/index.html | 2 +-
bin/templates/project/www/qnx/config.xml | 73 -------------------------
5 files changed, 13 insertions(+), 78 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/690e80c5/bin/templates/project/project.properties
----------------------------------------------------------------------
diff --git a/bin/templates/project/project.properties b/bin/templates/project/project.properties
index 8b5b815..67213c2 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.1.8
+qnx.bbwp.dir=/Developer/SDKs/Research In Motion/BlackBerry 10 WebWorks SDK 1.0.1.17
# (Optional) Simulator Directory
#
http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/690e80c5/bin/templates/project/qnx.xml
----------------------------------------------------------------------
diff --git a/bin/templates/project/qnx.xml b/bin/templates/project/qnx.xml
index a125cca..2952f54 100644
--- a/bin/templates/project/qnx.xml
+++ b/bin/templates/project/qnx.xml
@@ -114,13 +114,20 @@
<copy todir="${widget.dir}" overwrite="true">
<fileset dir="www/qnx">
<include name="*.js" />
- <include name="config.xml" />
</fileset>
</copy>
<!-- Update WebWorks Packager with the QNX APIs -->
- <copy todir="${properties.qnx.bbwp.dir}\ext" overwrite="true">
- <fileset dir="www/ext-qnx" excludes="README.md" />
+ <copy todir="${properties.qnx.bbwp.dir}\Framework\ext" overwrite="true">
+ <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. -->
http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/690e80c5/bin/templates/project/www/config.xml
----------------------------------------------------------------------
diff --git a/bin/templates/project/www/config.xml b/bin/templates/project/www/config.xml
index d9d33d3..d267d5c 100644
--- a/bin/templates/project/www/config.xml
+++ b/bin/templates/project/www/config.xml
@@ -53,6 +53,7 @@
<feature id="blackberry.widgetcache" required="true" version="1.0.0.0"/>
<feature id="blackberry.media.camera" />
<feature id="blackberry.ui.dialog" />
+ <feature id="blackberry.connection" />
<feature id="blackberry.media.microphone" required="true" version="1.0.0.0"/>
<!-- Cordova API -->
http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/690e80c5/bin/templates/project/www/index.html
----------------------------------------------------------------------
diff --git a/bin/templates/project/www/index.html b/bin/templates/project/www/index.html
index a9648b9..1480690 100644
--- a/bin/templates/project/www/index.html
+++ b/bin/templates/project/www/index.html
@@ -33,7 +33,7 @@
<p class="status complete blink hide">Device is Ready</p>
</div>
</div>
- <script type="text/javascript" src="js/webworks-1.0.1.8.js"></script>
+ <script type="text/javascript" src="js/webworks.js"></script>
<script type="text/javascript" src="cordova-2.1.0rc1.js"></script>
<script type="text/javascript" src="js/index.js"></script>
<script type="text/javascript">
http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/690e80c5/bin/templates/project/www/qnx/config.xml
----------------------------------------------------------------------
diff --git a/bin/templates/project/www/qnx/config.xml b/bin/templates/project/www/qnx/config.xml
deleted file mode 100644
index 971dfd3..0000000
--- a/bin/templates/project/www/qnx/config.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!--
- Widget Configuration Reference:
- http://docs.blackberry.com/en/developers/deliverables/15274/
--->
-
-<widget xmlns="http://www.w3.org/ns/widgets"
- xmlns:rim="http://www.blackberry.com/ns/widgets"
- version="1.0.0.0" id="__NAME__">
-
- <name>__NAME__</name>
-
- <author>Your Name Here</author>
-
- <description>
- A sample Apache Cordova application that responds to the deviceready event.
- </description>
-
- <license href="http://opensource.org/licenses/alphabetical">
- </license>
-
- <!-- Cordova API -->
- <feature id="blackberry.system" required="true" version="1.0.0.0" />
- <feature id="blackberry.identity" required="true" version="1.0.0.0" />
- <feature id="blackberry.app" required="true" version="1.0.0.0" />
- <feature id="blackberry.ui.dialog" />
- <feature id="blackberry.connection" />
-
- <!-- Cordova API -->
- <access subdomains="true" uri="file:///store/home" />
- <access subdomains="true" uri="file:///SDCard" />
-
- <!-- Expose access to all URIs, including the file and http protocols -->
- <access subdomains="true" uri="*" />
-
- <icon rim:hover="false" src="res/icon/cordova_bb_80.png" />
- <icon rim:hover="true" src="res/icon/cordova_bb_80.png" />
-
- <rim:loadingScreen backgroundColor="#CFCFCF"
- foregroundImage="res/screen/blackberry_transparent_300.png"
- onFirstLaunch="true">
- <rim:transitionEffect type="fadeOut" />
- </rim:loadingScreen>
-
- <content src="index.html" />
-
- <rim:permissions>
- <rim:permit>use_camera</rim:permit>
- <rim:permit>read_device_identifying_information</rim:permit>
- <rim:permit>access_shared</rim:permit>
- <rim:permit>read_geolocation</rim:permit>
- <rim:permit>record_audio</rim:permit>
- </rim:permissions>
-
-</widget>