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/09/02 13:58:23 UTC
[1/8] cordova-ubuntu git commit: initPlugins only once; See CB-11355;
Thanks to Pat Deegan for pointing that out
Repository: cordova-ubuntu
Updated Branches:
refs/heads/master 2e2083f60 -> a66e07bb6
initPlugins only once; See CB-11355; Thanks to Pat Deegan for pointing that out
Project: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/commit/68d1cd91
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/68d1cd91
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/68d1cd91
Branch: refs/heads/master
Commit: 68d1cd91f25560de8642aa3386e126045e1f3784
Parents: 2e2083f
Author: David Barth <da...@canonical.com>
Authored: Fri Jun 10 15:34:16 2016 +0200
Committer: David Barth <da...@canonical.com>
Committed: Fri Jun 10 15:34:16 2016 +0200
----------------------------------------------------------------------
src/cordova.cpp | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/68d1cd91/src/cordova.cpp
----------------------------------------------------------------------
diff --git a/src/cordova.cpp b/src/cordova.cpp
index 152baa7..2f41ab6 100644
--- a/src/cordova.cpp
+++ b/src/cordova.cpp
@@ -88,6 +88,11 @@ const CordovaInternal::Config& Cordova::config() const {
void Cordova::initPlugins() {
+ static bool alreadyLoaded = false;
+
+ if (alreadyLoaded)
+ return;
+
QList<QDir> searchPath = {get_app_dir()};
_plugins.clear();
@@ -114,6 +119,8 @@ void Cordova::initPlugins() {
_plugins += plugins;
}
}
+
+ alreadyLoaded = true;
}
void Cordova::loadFinished(bool ok) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[6/8] cordova-ubuntu git commit: Merge pull request #14 from
cordova-ubuntu/connectivity-dependencies
Posted by db...@apache.org.
Merge pull request #14 from cordova-ubuntu/connectivity-dependencies
Add connectivity dev build dependencies
Project: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/commit/1f3e0f77
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/1f3e0f77
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/1f3e0f77
Branch: refs/heads/master
Commit: 1f3e0f7750dadc589f7b516768ea700dd9fc8e05
Parents: 143bfde 73b952f
Author: David Barth <da...@canonical.com>
Authored: Thu Aug 18 18:12:26 2016 +0200
Committer: GitHub <no...@github.com>
Committed: Thu Aug 18 18:12:26 2016 +0200
----------------------------------------------------------------------
bin/templates/project/cordova/lib/build.js | 5 +++--
bin/templates/project/misc/control | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/1f3e0f77/bin/templates/project/cordova/lib/build.js
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[8/8] cordova-ubuntu git commit: CB-11733 Updated RELEASENOTES and
Version for release 4.3.5
Posted by db...@apache.org.
CB-11733 Updated RELEASENOTES and Version for release 4.3.5
Project: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/commit/a66e07bb
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/a66e07bb
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/a66e07bb
Branch: refs/heads/master
Commit: a66e07bb63ac144b58c25bc020877839311661c2
Parents: 375feed
Author: David Barth <da...@canonical.com>
Authored: Fri Sep 2 15:52:47 2016 +0200
Committer: David Barth <da...@canonical.com>
Committed: Fri Sep 2 15:52:47 2016 +0200
----------------------------------------------------------------------
RELEASENOTES.md | 6 ++++++
package.json | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/a66e07bb/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index d704078..f23a477 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,6 +20,12 @@
-->
## Release Notes for Cordova Ubuntu ##
+### 4.3.5 (Sep 02, 2016)
+* Make sure that all plugin dependencies linking flags are taken into account when compiling
+* Add connectivity dev build dependencies
+* Fix (Yn) prompt issue with chroot install
+* initPlugins only once; See CB-11355; Thanks to Pat Deegan for pointing that out
+
### 4.3.4
* fix build issue with function signature missing the cordova variable name; also avoid a warning
* use ubuntu-app-stop to stop the app more cleanly
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/a66e07bb/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 1cd7300..f89fd02 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-ubuntu",
- "version": "4.3.4",
+ "version": "4.3.5",
"description": "Cordova tooling for the Ubuntu platform.",
"main": "bin/create",
"repository": {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/8] cordova-ubuntu git commit: Fix (Yn) prompt issue with chroot
install
Posted by db...@apache.org.
Fix (Yn) prompt issue with chroot install
Project: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/commit/3e4fd369
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/3e4fd369
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/3e4fd369
Branch: refs/heads/master
Commit: 3e4fd3691fb7da8836151f8881514ec23c340743
Parents: 68d1cd9
Author: Alexandre Abreu <al...@canonical.com>
Authored: Wed Jul 13 16:14:32 2016 -0400
Committer: Alexandre Abreu <al...@canonical.com>
Committed: Wed Jul 13 16:14:32 2016 -0400
----------------------------------------------------------------------
bin/templates/project/cordova/lib/build.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/3e4fd369/bin/templates/project/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/lib/build.js b/bin/templates/project/cordova/lib/build.js
index 484ac6c..8a9d4a9 100644
--- a/bin/templates/project/cordova/lib/build.js
+++ b/bin/templates/project/cordova/lib/build.js
@@ -2,7 +2,7 @@
/*
*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2016 Canonical Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -344,7 +344,7 @@ function checkEnv(ubuntuDir) {
rl.on('line', function(line) {
rl.close();
- if (line !== 'Y' && line !== 'y') {
+ if (line !== 'Y' && line !== 'y' && line.length !== 0) {
deferred.reject(new Error());
return;
}
@@ -398,7 +398,7 @@ function checkChrootEnv(ubuntuDir, architecture, framework) {
rl.on('line', function(line) {
rl.close();
- if (line !== 'Y' && line !== 'y') {
+ if (line !== 'Y' && line !== 'y' && line.length != 0) {
deferred.reject(new Error());
return;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[7/8] cordova-ubuntu git commit: Merge pull request #15 from
cordova-ubuntu/ldflags
Posted by db...@apache.org.
Merge pull request #15 from cordova-ubuntu/ldflags
Make sure that all plugin dependencies linking flags are taken into account when compiling
Project: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/commit/375feedb
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/375feedb
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/375feedb
Branch: refs/heads/master
Commit: 375feedb70d3d463fe495e728071e323f756c5af
Parents: 1f3e0f7 1e8c852
Author: David Barth <da...@canonical.com>
Authored: Thu Aug 18 18:12:53 2016 +0200
Committer: GitHub <no...@github.com>
Committed: Thu Aug 18 18:12:53 2016 +0200
----------------------------------------------------------------------
CMakeLists.txt | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[5/8] cordova-ubuntu git commit: Merge pull request #13 from
cordova-ubuntu/fix-chroot-install-prompt
Posted by db...@apache.org.
Merge pull request #13 from cordova-ubuntu/fix-chroot-install-prompt
Fix (Yn) prompt issue with chroot install
Project: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/commit/143bfdec
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/143bfdec
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/143bfdec
Branch: refs/heads/master
Commit: 143bfdec882883a57369f9f0cd59f3db9016275d
Parents: 68d1cd9 3e4fd36
Author: David Barth <da...@canonical.com>
Authored: Thu Aug 18 18:11:55 2016 +0200
Committer: GitHub <no...@github.com>
Committed: Thu Aug 18 18:11:55 2016 +0200
----------------------------------------------------------------------
bin/templates/project/cordova/lib/build.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[4/8] cordova-ubuntu git commit: Make sure that all plugin
dependencies linking flags are taken into account when compiling
Posted by db...@apache.org.
Make sure that all plugin dependencies linking flags are taken into account when compiling
Project: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/commit/1e8c852b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/1e8c852b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/1e8c852b
Branch: refs/heads/master
Commit: 1e8c852b1a28bd0bf59b521fff8e4f42c8991f6f
Parents: 73b952f
Author: Alexandre Abreu <al...@canonical.com>
Authored: Thu Jul 28 11:41:18 2016 -0400
Committer: Alexandre Abreu <al...@canonical.com>
Committed: Thu Jul 28 11:41:18 2016 -0400
----------------------------------------------------------------------
CMakeLists.txt | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/1e8c852b/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7679e42..bb70591 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,7 +118,13 @@ ADD_LIBRARY(coreplugins SHARED
qt5_use_modules(coreplugins Widgets Location Sensors Feedback SystemInfo Contacts Multimedia Quick MultimediaWidgets)
target_link_libraries(cordova-ubuntu cordovaubuntuplugin)
-target_link_libraries(coreplugins cordovaubuntuplugin ${PLUGIN_DEPS_LIBRARIES})
+target_link_libraries(
+ coreplugins
+ cordovaubuntuplugin
+ ${PLUGIN_DEPS_LIBRARIES}
+ ${PLUGIN_DEPS_LDFLAGS}
+ ${PLUGIN_DEPS_LDFLAGS_OTHER}
+ )
install (TARGETS cordova-ubuntu DESTINATION ${CMAKE_INSTALL_PREFIX})
install (TARGETS coreplugins DESTINATION ${CMAKE_INSTALL_PREFIX}/www)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[3/8] cordova-ubuntu git commit: Add connectivity dev build
dependencies
Posted by db...@apache.org.
Add connectivity dev build dependencies
Project: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/commit/73b952f3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/73b952f3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/73b952f3
Branch: refs/heads/master
Commit: 73b952f353729a0cb732546120a9e6d459a0a9c2
Parents: 68d1cd9
Author: Alexandre Abreu <al...@canonical.com>
Authored: Mon Jul 18 17:00:47 2016 -0400
Committer: Alexandre Abreu <al...@canonical.com>
Committed: Mon Jul 18 17:00:47 2016 -0400
----------------------------------------------------------------------
bin/templates/project/cordova/lib/build.js | 5 +++--
bin/templates/project/misc/control | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/73b952f3/bin/templates/project/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/lib/build.js b/bin/templates/project/cordova/lib/build.js
index 484ac6c..6016cb3 100644
--- a/bin/templates/project/cordova/lib/build.js
+++ b/bin/templates/project/cordova/lib/build.js
@@ -317,7 +317,8 @@ function checkEnv(ubuntuDir) {
'qtmultimedia5-dev',
'qtpim5-dev',
'libqt5sensors5-dev',
- 'qtsystems5-dev'
+ 'qtsystems5-dev',
+ 'libconnectivity-qt1-dev'
];
deps = deps.concat(additionalDependencies(ubuntuDir));
@@ -362,7 +363,7 @@ function checkEnv(ubuntuDir) {
}
function checkChrootEnv(ubuntuDir, architecture, framework) {
- var deps = "cmake libicu-dev:ARCH pkg-config qtbase5-dev:ARCH qtchooser qtdeclarative5-dev:ARCH qtfeedback5-dev:ARCH qtlocation5-dev:ARCH qtmultimedia5-dev:ARCH qtpim5-dev:ARCH libqt5sensors5-dev:ARCH qtsystems5-dev:ARCH ";
+ var deps = "cmake libicu-dev:ARCH pkg-config qtbase5-dev:ARCH qtchooser qtdeclarative5-dev:ARCH qtfeedback5-dev:ARCH qtlocation5-dev:ARCH qtmultimedia5-dev:ARCH qtpim5-dev:ARCH libqt5sensors5-dev:ARCH qtsystems5-dev:ARCH libconnectivity-qt1-dev:ARCH ";
deps += additionalDependencies(ubuntuDir).join(' ');
deps = deps.replace(/ARCH/g, architecture);
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/73b952f3/bin/templates/project/misc/control
----------------------------------------------------------------------
diff --git a/bin/templates/project/misc/control b/bin/templates/project/misc/control
index 51fb082..420c3e4 100644
--- a/bin/templates/project/misc/control
+++ b/bin/templates/project/misc/control
@@ -9,7 +9,8 @@ Build-Depends: ubuntu-sdk,
libqt5sensors5-dev,
qtsystems5-dev,
qtlocation5-dev,
- libicu-dev
+ libicu-dev,
+ libconnectivity-qt1-dev
Package: {PACKAGE_NAME}
Architecture: any
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org