Updated Branches: refs/heads/master 721f55138 -> 9c1edccf6
Added debug token support to the debug-device command in qnx Anyone developing on BlackBerry 10 has surely crossed the annoying issue where you need to have a unqiue version number everytime you sign an app. Added an optional value to project.properties for the device pin (which you can get from the about screen Hardware section) that when filled in will create and load a debug token on your device and get around needing to sign the app to load it on the phone. 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/9c1edccf Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/tree/9c1edccf Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/diff/9c1edccf Branch: refs/heads/master Commit: 9c1edccf60b48e1914f4b7093cf00d477908a05d Parents: 721f551 Author: Gord Tanner <[email protected]> Authored: Sun Nov 18 10:10:49 2012 -0500 Committer: Gord Tanner <[email protected]> Committed: Sun Nov 18 10:10:49 2012 -0500 ---------------------------------------------------------------------- bin/templates/project/project.properties | 5 +++ bin/templates/project/qnx.xml | 44 ++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/9c1edccf/bin/templates/project/project.properties ---------------------------------------------------------------------- diff --git a/bin/templates/project/project.properties b/bin/templates/project/project.properties index 6cff197..c8f4629 100644 --- a/bin/templates/project/project.properties +++ b/bin/templates/project/project.properties @@ -126,3 +126,8 @@ qnx.device.ip= # you cannot deploy to device # qnx.device.password= + +# QNX Device PIN +# +# Fill this value in to use debug tokens when debuging on the device +qnx.device.pin= http://git-wip-us.apache.org/repos/asf/incubator-cordova-blackberry-webworks/blob/9c1edccf/bin/templates/project/qnx.xml ---------------------------------------------------------------------- diff --git a/bin/templates/project/qnx.xml b/bin/templates/project/qnx.xml index d63ae5d..58e096a 100644 --- a/bin/templates/project/qnx.xml +++ b/bin/templates/project/qnx.xml @@ -45,6 +45,10 @@ <equals arg1="${isMacOSX}" arg2="true" /> </condition> + <condition property="blackberry-debugtokenrequest" value="${properties.qnx.bbwp.dir}/dependencies/tools/bin/blackberry-debugtokenrequest" else="${properties.qnx.bbwp.dir}/dependencies/tools/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.qnx.device.pin}" arg2="" /> + <then> + <echo> + If you fill in the qnx.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" /> @@ -193,6 +210,30 @@ </sequential> </macrodef> + <!-- install debug token" --> + <macrodef name="generate-debug-token"> + <sequential> + <exec executable="${blackberry-debugtokenrequest}" dir="." failonerror="true"> + <arg value="-storepass" /> + <arg value="${properties.qnx.sigtool.password}" /> + <arg value="-deviceID" /> + <arg value="0x${properties.qnx.device.pin}" /> + <arg file="${properties.qnx.bbwp.dir}/debugtoken.bar" /> + </exec> + + <exec executable="${blackberry-deploy}" dir="." failonerror="true"> + <arg value="-installApp" /> + <arg value="-device" /> + <arg value="${properties.qnx.device.ip}" /> + <arg value="-password" /> + <arg value="${properties.qnx.device.password}" /> + <arg value="-package" /> + <arg file="${properties.qnx.bbwp.dir}/debugtoken.bar" /> + </exec> + </sequential> + </macrodef> + + <!-- CLEAN --> <target name="clean"> @@ -242,6 +283,7 @@ <echo message="Generated name: ${cod.name}.bar" /> </target> + <!-- HELP --> <target name="help">
