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:57:13 UTC
[1/5] 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/4.3.x a12a3d13d -> 5cc933504
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/cc9f2b03
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/cc9f2b03
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/cc9f2b03
Branch: refs/heads/4.3.x
Commit: cc9f2b03b7b64cf89561321c970cfa620640ce3a
Parents: a12a3d1
Author: David Barth <da...@canonical.com>
Authored: Fri Jun 10 15:34:16 2016 +0200
Committer: David Barth <da...@canonical.com>
Committed: Fri Sep 2 15:55:28 2016 +0200
----------------------------------------------------------------------
src/cordova.cpp | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/cc9f2b03/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
[4/5] 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/d6c06c05
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/d6c06c05
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/d6c06c05
Branch: refs/heads/4.3.x
Commit: d6c06c056fd442b059edb3a90c0986aba8dbc0ab
Parents: ea8c6e1
Author: Alexandre Abreu <al...@canonical.com>
Authored: Thu Jul 28 11:41:18 2016 -0400
Committer: David Barth <da...@canonical.com>
Committed: Fri Sep 2 15:56:36 2016 +0200
----------------------------------------------------------------------
CMakeLists.txt | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/d6c06c05/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
[2/5] 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/6e8fef44
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/6e8fef44
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/6e8fef44
Branch: refs/heads/4.3.x
Commit: 6e8fef445f0972785472f5bc42a908cbbfce68c9
Parents: cc9f2b0
Author: Alexandre Abreu <al...@canonical.com>
Authored: Wed Jul 13 16:14:32 2016 -0400
Committer: David Barth <da...@canonical.com>
Committed: Fri Sep 2 15:56:22 2016 +0200
----------------------------------------------------------------------
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/6e8fef44/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
[3/5] 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/ea8c6e1b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/ea8c6e1b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/ea8c6e1b
Branch: refs/heads/4.3.x
Commit: ea8c6e1bad01aaf6178e4384e944c8ee215f2dea
Parents: 6e8fef4
Author: Alexandre Abreu <al...@canonical.com>
Authored: Mon Jul 18 17:00:47 2016 -0400
Committer: David Barth <da...@canonical.com>
Committed: Fri Sep 2 15:56:29 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/ea8c6e1b/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 8a9d4a9..2860f30 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/ea8c6e1b/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
[5/5] 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/5cc93350
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/5cc93350
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/5cc93350
Branch: refs/heads/4.3.x
Commit: 5cc9335047a14ce1b9504af7f4342823622e5998
Parents: d6c06c0
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:56:43 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/5cc93350/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/5cc93350/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