You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by za...@apache.org on 2014/12/15 14:32:54 UTC
[05/37] cordova-ubuntu git commit: bin/build/run: support deploying
to latest Ubuntu Touch
bin/build/run: support deploying to latest Ubuntu Touch
Project: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/commit/73070320
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/73070320
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/73070320
Branch: refs/heads/master
Commit: 730703200d44d0a3cf7787238ceac84dd55c641f
Parents: d896d28
Author: Maxim Ermilov <ma...@canonical.com>
Authored: Mon Sep 8 15:22:11 2014 +0400
Committer: Maxim Ermilov <ma...@canonical.com>
Committed: Mon Sep 8 15:22:11 2014 +0400
----------------------------------------------------------------------
bin/build/lib/ubuntu.js | 6 +++---
main.cpp | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/73070320/bin/build/lib/ubuntu.js
----------------------------------------------------------------------
diff --git a/bin/build/lib/ubuntu.js b/bin/build/lib/ubuntu.js
index 43e0b22..1f56ce3 100644
--- a/bin/build/lib/ubuntu.js
+++ b/bin/build/lib/ubuntu.js
@@ -455,7 +455,7 @@ function isDeviceAttached(target) {
}
function getDeviceArch(target) {
- var out = adbExec(target, 'shell dpkg --print-architecture').output.split('\r\n');
+ var out = adbExec(target, 'shell "dpkg --print-architecture 2>/dev/null"').output.split('\r\n');
assert.ok(out.length == 2 && out[0].indexOf(' ') == -1);
@@ -490,7 +490,7 @@ function runOnDevice(rootDir, debug, target, architecture, framework) {
adbExec(target, 'forward --remove-all');
adbExec(target, 'push ' + names[0] + ' /home/phablet');
- adbExec(target, 'shell "cd /home/phablet/; click install ' + names[0] + ' --user=phablet"');
+ adbExec(target, 'shell "cd /home/phablet/; pkcon install-local ' + names[0] + ' -p"');
if (debug) {
console.error('Debug enabled. Try pointing a WebKit browser to http://127.0.0.1:9222');
@@ -500,7 +500,7 @@ function runOnDevice(rootDir, debug, target, architecture, framework) {
console.log('have fun!'.rainbow);
- return adbExecAsync(target, 'shell "su - phablet -c \'cd /opt/click.ubuntu.com/' + appId + '/current; QTWEBKIT_INSPECTOR_SERVER=9222 ./cordova-ubuntu www/ --desktop_file_hint=/opt/click.ubuntu.com/' + appId + '/current/cordova.desktop\'"').then(function () {
+ return adbExecAsync(target, 'shell sudo -i -u phablet bash -c "ubuntu-app-launch \\`ubuntu-app-triplet ' + appId + '\\`"').then(function () {
popd();
});
}
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/73070320/main.cpp
----------------------------------------------------------------------
diff --git a/main.cpp b/main.cpp
index d726bff..89cb23b 100644
--- a/main.cpp
+++ b/main.cpp
@@ -41,6 +41,9 @@ static void customMessageOutput(QtMsgType type, const QMessageLogContext &, cons
}
int main(int argc, char *argv[]) {
+#ifndef NDEBUG
+ qputenv("QTWEBKIT_INSPECTOR_SERVER", "9222");
+#endif
qInstallMessageHandler(customMessageOutput);
QApplication app(argc, argv);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org