You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ja...@apache.org on 2019/05/07 15:07:05 UTC
[cordova-windows] branch janpio-fix_description created (now
1eba7d6)
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a change to branch janpio-fix_description
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git.
at 1eba7d6 clean up
This branch includes the following new commits:
new 25edc12 create empty defaults.xml
new 1eba7d6 clean up
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 01/02: create empty defaults.xml
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-fix_description
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit 25edc12b09d2eefe8fa161d51762d2d802d1aefc
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Tue May 7 17:00:36 2019 +0200
create empty defaults.xml
---
template/cordova/defaults.xml | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/template/cordova/defaults.xml b/template/cordova/defaults.xml
new file mode 100644
index 0000000..5913ea0
--- /dev/null
+++ b/template/cordova/defaults.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+-->
+<widget id="io.cordova.hellocordova" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+
+</widget>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 02/02: clean up
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-fix_description
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit 1eba7d68c82e5a4cc22959b07f54571fde1e1386
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Tue May 7 17:06:53 2019 +0200
clean up
---
template/cordova/defaults.xml | 4 +++-
template/cordova/lib/prepare.js | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/template/cordova/defaults.xml b/template/cordova/defaults.xml
index 5913ea0..e402031 100644
--- a/template/cordova/defaults.xml
+++ b/template/cordova/defaults.xml
@@ -19,6 +19,8 @@
# under the License.
#
-->
-<widget id="io.cordova.hellocordova" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget xmlns = "http://www.w3.org/ns/widgets"
+ id = "io.cordova.helloCordova"
+ version = "2.0.0">
</widget>
\ No newline at end of file
diff --git a/template/cordova/lib/prepare.js b/template/cordova/lib/prepare.js
index d7024a0..347d772 100644
--- a/template/cordova/lib/prepare.js
+++ b/template/cordova/lib/prepare.js
@@ -705,10 +705,11 @@ module.exports.addBOMToFile = addBOMToFile;
* configuration is already dumped to appropriate config.xml file.
*/
function updateConfigFilesFrom (sourceConfig, configMunger, locations) {
- // First cleanup current config and merge project's one into own
var defaultConfig = locations.defaultConfigXml;
var ownConfig = locations.configXml;
var sourceCfg = sourceConfig.path;
+
+ // First cleanup current config and merge project's one into own
// If defaults.xml is present, overwrite platform config.xml with it.
// Otherwise save whatever is there as defaults so it can be
// restored or copy project config into platform if none exists.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org