cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tim...@apache.org
Subject [2/12] webworks commit: Updated BlackBerry to only use one javascript
Date Wed, 07 Nov 2012 23:41:52 GMT
Updated BlackBerry to only use one javascript


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/7e385cb5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/tree/7e385cb5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/diff/7e385cb5

Branch: refs/heads/bb10_ext_qnx
Commit: 7e385cb507dff4439f7eb5bf3768ef226270185f
Parents: 6b4fd01
Author: Gord Tanner <gtanner@gmail.com>
Authored: Mon Oct 22 16:39:50 2012 -0400
Committer: Gord Tanner <gtanner@gmail.com>
Committed: Fri Nov 2 09:51:15 2012 -0400

----------------------------------------------------------------------
 bin/templates/project/blackberry.xml |    2 -
 bin/templates/project/playbook.xml   |    8 -
 bin/templates/project/qnx.xml        |    8 -
 build.xml                            |    8 -
 javascript/cordova.blackberry.js     | 7864 +++++++++++++++++++----------
 javascript/cordova.playbook.js       | 7808 ----------------------------
 javascript/cordova.qnx.js            | 6246 -----------------------
 7 files changed, 5129 insertions(+), 16815 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/7e385cb5/bin/templates/project/blackberry.xml
----------------------------------------------------------------------
diff --git a/bin/templates/project/blackberry.xml b/bin/templates/project/blackberry.xml
index c657300..e34ba69 100644
--- a/bin/templates/project/blackberry.xml
+++ b/bin/templates/project/blackberry.xml
@@ -175,8 +175,6 @@
             <fileset dir="www" >
                 <exclude name="ext-air/**"/>
                 <exclude name="ext-qnx/**"/>
-                <exclude name="playbook/**"/>
-                <exclude name="qnx/**"/>
                 <exclude name="res/resourceBundles/**" unless="${globalization}"/>
             </fileset>
         </copy>

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/7e385cb5/bin/templates/project/playbook.xml
----------------------------------------------------------------------
diff --git a/bin/templates/project/playbook.xml b/bin/templates/project/playbook.xml
index 00e2d2d..6ee2af4 100644
--- a/bin/templates/project/playbook.xml
+++ b/bin/templates/project/playbook.xml
@@ -106,18 +106,10 @@
             <fileset dir="www" >
                 <exclude name="ext/**"/>
                 <exclude name="ext-air/**"/>
-                <exclude name="playbook/**"/>
                 <exclude name="res/resourceBundles/**"/>
             </fileset>
         </copy>
         
-        <!-- Overwrite the cordova js with the playbook specific cordova js -->
-        <copy todir="${widget.dir}" overwrite="true">
-            <fileset dir="www/playbook">
-                <include name="*.js" />
-            </fileset>
-        </copy>
-        
         <!-- Update WebWorks Packager with the AIR APIs -->
         <copy todir="${properties.playbook.bbwp.dir}\ext" overwrite="true">
             <fileset dir="www/ext-air" excludes="README.md" />

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/7e385cb5/bin/templates/project/qnx.xml
----------------------------------------------------------------------
diff --git a/bin/templates/project/qnx.xml b/bin/templates/project/qnx.xml
index 5f98c27..544511c 100644
--- a/bin/templates/project/qnx.xml
+++ b/bin/templates/project/qnx.xml
@@ -106,18 +106,10 @@
             <fileset dir="www" >
                 <exclude name="ext/**"/>
                 <exclude name="ext-air/**"/>
-                <exclude name="playbook/**"/>
                 <exclude name="res/resourceBundles/**"/>
             </fileset>
         </copy>
         
-        <!-- Overwrite the cordova js with the qnx specific cordova js -->
-        <copy todir="${widget.dir}" overwrite="true">
-            <fileset dir="www/qnx">
-                <include name="*.js" />
-            </fileset>
-        </copy>
-        
         <!-- Update WebWorks Packager with the QNX APIs -->
         <copy todir="${properties.qnx.bbwp.dir}\Framework\ext" overwrite="true">
             <fileset dir="www/ext-qnx" excludes="readme.md" />

http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/7e385cb5/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index e9976bc..779e0cd 100644
--- a/build.xml
+++ b/build.xml
@@ -61,14 +61,6 @@
         <!-- BB Javascript -->
         <mkdir dir="${build.dir}/${js.path}" />
         <copy file="${js.src}/cordova.blackberry.js" tofile="${build.dir}/${js.file}"
/>
-
-        <!-- PB Javascript -->
-        <mkdir dir="${build.dir}/${playbook.js.path}" />
-        <copy file="${js.src}/cordova.playbook.js" tofile="${build.dir}/${playbook.js.path}/${js.basename}"
/>
-
-        <!-- QNX Javascript -->
-        <mkdir dir="${build.dir}/${qnx.js.path}" />
-        <copy file="${js.src}/cordova.qnx.js" tofile="${build.dir}/${qnx.js.path}/${js.basename}"
/>
     </target>
 
     <!-- BUILD BLACKBERRY EXTENSION -->


Mime
View raw message