webworks commit: debug token support for playbook

[gt...@apache.org]

Updated Branches:
  refs/heads/master 4506e7d48 -> ef16d935b


debug token support for playbook


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

Branch: refs/heads/master
Commit: ef16d935bf08e0baaa8c1d875edd5af76c856f1f
Parents: 4506e7d
Author: Gord Tanner <gt...@gmail.com>
Authored: Fri Nov 23 11:32:44 2012 -0500
Committer: Gord Tanner <gt...@gmail.com>
Committed: Fri Nov 23 11:32:44 2012 -0500

----------------------------------------------------------------------
 bin/templates/project/playbook.xml       |   49 ++++++++++++++++++++++++-
 bin/templates/project/project.properties |    4 ++
 2 files changed, 52 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/ef16d935/bin/templates/project/playbook.xml
----------------------------------------------------------------------
diff --git a/bin/templates/project/playbook.xml b/bin/templates/project/playbook.xml
index b0b087a..d2f7d4d 100644
--- a/bin/templates/project/playbook.xml
+++ b/bin/templates/project/playbook.xml
@@ -45,6 +45,10 @@
         <equals arg1="${isMacOSX}" arg2="true" />
     </condition>
 
+    <condition property="blackberry-debugtokenrequest" value="${properties.playbook.bbwp.dir}/blackberry-tablet-sdk/bin/blackberry-debugtokenrequest" else="${properties.playbook.bbwp.dir}/blackberry-tablet-sdk/bin/blackberry-debugtokenrequest.bat">
+        <equals arg1="${isMacOSX}" arg2="true" />
+    </condition>
+
     <!-- LOAD DEVICE -->
     
     <target name="load-device" depends="package-app">
@@ -65,7 +69,20 @@
     <!-- DEBUG-LOAD DEVICE -->
     
     <target name="debug-device" depends="package-app">
-        <bbwp code-sign="true" debug="true" />
+        <if>
+            <equals arg1="${properties.playbook.device.pin}" arg2="" />
+            <then>
+                <echo>
+                    If you fill in the playbook.device.pin value you can use debug tokens!
+                    This means you won't have to worry about having a unique version in config.xml every time.
+                </echo>
+                <bbwp code-sign="true" debug="true" />
+            </then>
+            <else>
+                <generate-debug-token />
+                <bbwp code-sign="false" debug="true" />
+            </else>
+        </if>
 
         <exec executable="${blackberry-deploy}" dir="." failonerror="true">
             <arg value="-installApp" />
@@ -186,6 +203,36 @@
         </sequential>
     </macrodef>
 
+    <!-- install debug token" -->
+    <macrodef name="generate-debug-token">
+        <sequential>
+            <exec executable="${blackberry-debugtokenrequest}" dir="." failonerror="true">
+                <arg value="-storepass" />
+                <arg value="${properties.playbook.sigtool.csk.password}" />
+                <arg value="-deviceID" />
+                <arg value="0x${properties.playbook.device.pin}" />
+                <arg file="${properties.playbook.bbwp.dir}/debugtoken.bar" />
+            </exec>
+
+            <exec executable="${blackberry-deploy}" dir="." failonerror="true">
+                <arg value="-installApp" />
+                <arg value="-launchApp" />
+                <arg value="-device" />
+                <arg value="${properties.playbook.device.ip}" />
+                <arg value="-password" />
+                <arg value="${properties.playbook.device.password}" />
+                <arg value="-package" />
+                <arg file="${properties.playbook.bbwp.dir}/debugtoken.bar" />
+            </exec>
+
+            <replaceregexp 
+                file="${properties.playbook.bbwp.dir}/bin/bbwp.properties" 
+                match='&lt;debug_token&gt;.*&lt;\/debug_token&gt;'
+                replace='&lt;debug_token&gt;${properties.playbook.bbwp.dir}/bin/debugtoken.bar&lt;/debug_token&gt;'
+                byline='true'/>
+        </sequential>
+    </macrodef>
+
     <!-- CLEAN -->
     
     <target name="clean">

http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/ef16d935/bin/templates/project/project.properties
----------------------------------------------------------------------
diff --git a/bin/templates/project/project.properties b/bin/templates/project/project.properties
index c8f4629..85a0788 100644
--- a/bin/templates/project/project.properties
+++ b/bin/templates/project/project.properties
@@ -98,6 +98,10 @@ playbook.device.ip=
 #   you cannot deploy to device
 #
 playbook.device.password=
+# PlayBook Device PIN
+#
+#   Fill this value in to use debug tokens when debuging on the device
+playbook.device.pin=
 
 # QNX Simulator IP
 #