You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by db...@apache.org on 2016/05/19 09:54:46 UTC
[3/8] cordova-ubuntu git commit: Tweak debug launch
Tweak debug launch
(cherry picked from commit 98a1fe603d70cb0c63904d19c3ee1f5de18740af)
Project: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/commit/80536332
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/80536332
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/80536332
Branch: refs/heads/4.3.x
Commit: 80536332c6c1b1ed562e23c628df253f9b8ad441
Parents: 8dec0b1
Author: Alexandre Abreu <al...@canonical.com>
Authored: Tue May 10 10:08:03 2016 -0400
Committer: David Barth <da...@canonical.com>
Committed: Thu May 19 11:16:13 2016 +0200
----------------------------------------------------------------------
bin/templates/project/cordova/lib/run.js | 2 +-
main.cpp | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/80536332/bin/templates/project/cordova/lib/run.js
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/lib/run.js b/bin/templates/project/cordova/lib/run.js
index 580498e..f1335f9 100644
--- a/bin/templates/project/cordova/lib/run.js
+++ b/bin/templates/project/cordova/lib/run.js
@@ -165,7 +165,7 @@ to http://' + getDeviceInetAddress(target) + ':9222');
logger.info('Launching the application on your device.');
- return Devices.adbExecAsync(target, 'shell "DEBUG=1 ubuntu-app-launch \\`ubuntu-app-triplet ' + appId + '\\`"').then(function () {
+ return Devices.adbExecAsync(target, 'shell "ubuntu-app-launch \\`ubuntu-app-triplet ' + appId + '\\`"').then(function () {
logger.rainbow('have fun!');
Utils.popd();
});
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/80536332/main.cpp
----------------------------------------------------------------------
diff --git a/main.cpp b/main.cpp
index 0bf55e6..14818d6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -88,6 +88,12 @@ int main(int argc, char *argv[]) {
(qEnvironmentVariableIsSet("DEBUG")
&& QString(qgetenv("DEBUG")) == "1");
+ // TODO revamp this for something cleaner, uniform
+ // and runtime bound
+#if !defined(NDEBUG)
+ debuggingEnabled = true;
+#endif
+
view.rootContext()->setContextProperty(
"debuggingEnabled", debuggingEnabled);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org