From 03fbf669ef6af5c3053dc90bf0c8b1fdd3ba3c91 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Wed, 29 May 2019 17:24:13 +0200
Subject: [PATCH 1/6] Versionnement de cordova, sans /platforms ni /plugins
(test)
---
.gitignore | 4 +
config.xml | 29 ++++
hooks/README.md | 23 +++
package-lock.json | 397 ++++++++++++++++++++++++++++++++++++++--------
package.json | 15 +-
src/index.html | 2 +
www | 1 +
7 files changed, 405 insertions(+), 66 deletions(-)
create mode 100644 config.xml
create mode 100644 hooks/README.md
create mode 120000 www
diff --git a/.gitignore b/.gitignore
index 2d1cac7ef..07d3db63e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,7 @@ debug
git.readme
grep
install_jalhyd
+
+# Cordova
+platforms/**
+plugins/**
diff --git a/config.xml b/config.xml
new file mode 100644
index 000000000..17fb7b1c9
--- /dev/null
+++ b/config.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='utf-8'?>
+<widget id="fr.irstea.cassiopee" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+ <name>Cassiopée</name>
+ <description>
+ A sample Apache Cordova application that responds to the deviceready event.
+ </description>
+ <author email="dev@cordova.apache.org" href="http://cordova.io">
+ Apache Cordova Team
+ </author>
+ <content src="index.html" />
+ <icon src="icon.png" />
+ <plugin name="cordova-plugin-whitelist" spec="1" />
+ <access origin="*" />
+ <allow-intent href="http://*/*" />
+ <allow-intent href="https://*/*" />
+ <allow-intent href="tel:*" />
+ <allow-intent href="sms:*" />
+ <allow-intent href="mailto:*" />
+ <allow-intent href="geo:*" />
+ <platform name="android">
+ <allow-intent href="market:*" />
+ <icon src="icon.png" qualifier="ldpi" />
+ </platform>
+ <platform name="ios">
+ <allow-intent href="itms:*" />
+ <allow-intent href="itms-apps:*" />
+ <icon src="icon.png" qualifier="ldpi" />
+ </platform>
+</widget>
diff --git a/hooks/README.md b/hooks/README.md
new file mode 100644
index 000000000..574ad4c9b
--- /dev/null
+++ b/hooks/README.md
@@ -0,0 +1,23 @@
+<!--
+#
+# 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.
+#
+-->
+# Cordova Hooks
+
+Cordova Hooks represent special scripts which could be added by application and plugin developers or even by your own build system to customize cordova commands. See Hooks Guide for more details: http://cordova.apache.org/docs/en/edge/guide_appdev_hooks_index.md.html#Hooks%20Guide.
diff --git a/package-lock.json b/package-lock.json
index f0b5b1327..265e3c560 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
{
- "name": "nghyd",
+ "name": "fr.irstea.cassiopee",
"version": "4.1.0",
"lockfileVersion": 1,
"requires": true,
@@ -1822,9 +1822,7 @@
"abbrev": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
- "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
- "dev": true,
- "optional": true
+ "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
},
"accepts": {
"version": "1.3.5",
@@ -1917,6 +1915,14 @@
"integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
"dev": true
},
+ "android-versions": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.4.0.tgz",
+ "integrity": "sha512-GnomfYsBq+nZh3c3UH/4r9Jt6FuTxdhUJbeHIdYOH5xBhQ8I0ZzC2/RM5IFFIjrzuNWSHb8JWP1lPK0/a26jrg==",
+ "requires": {
+ "semver": "^5.4.1"
+ }
+ },
"angular2-chartjs": {
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/angular2-chartjs/-/angular2-chartjs-0.5.1.tgz",
@@ -1925,6 +1931,11 @@
"chart.js": "^2.3.0"
}
},
+ "ansi": {
+ "version": "0.3.1",
+ "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",
+ "integrity": "sha1-DELU+xcWDVqa8eSEus4cZpIsGyE="
+ },
"ansi-align": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz",
@@ -2590,8 +2601,7 @@
"balanced-match": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
- "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
- "dev": true
+ "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
},
"base": {
"version": "0.11.2",
@@ -2657,8 +2667,7 @@
"base64-js": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
- "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
- "dev": true
+ "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
},
"base64id": {
"version": "1.0.0",
@@ -2705,6 +2714,11 @@
"callsite": "1.0.0"
}
},
+ "big-integer": {
+ "version": "1.6.43",
+ "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.43.tgz",
+ "integrity": "sha512-9dULc9jsKmXl0Aeunug8wbF+58n+hQoFjqClN7WeZwGLh0XJUWyJJ9Ee+Ep+Ql/J9fRsTVaeThp8MhiCCrY0Jg=="
+ },
"big.js": {
"version": "5.2.2",
"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -2871,11 +2885,18 @@
}
}
},
+ "bplist-parser": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz",
+ "integrity": "sha1-1g1dzCDLptx+HymbNdPh+V2vuuY=",
+ "requires": {
+ "big-integer": "^1.6.7"
+ }
+ },
"brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
- "dev": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -3780,8 +3801,7 @@
"concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
- "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
- "dev": true
+ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
},
"concat-stream": {
"version": "1.6.2",
@@ -3941,6 +3961,80 @@
"serialize-javascript": "^1.4.0"
}
},
+ "cordova-android": {
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-8.0.0.tgz",
+ "integrity": "sha512-Ipv8HbVJpxEyYFSFLTEOaLRp0yxBtJVNbgSuDEB4naa34FzQaRWSNiiMcPJnO+x3hRXNt7pcwa46hARNzhn7+w==",
+ "requires": {
+ "android-versions": "^1.3.0",
+ "cordova-common": "^3.1.0",
+ "elementtree": "^0.1.7",
+ "nopt": "^4.0.1",
+ "properties-parser": "^0.3.1",
+ "q": "^1.4.1",
+ "shelljs": "^0.5.3"
+ },
+ "dependencies": {
+ "nopt": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+ "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+ "requires": {
+ "abbrev": "1",
+ "osenv": "^0.1.4"
+ }
+ },
+ "shelljs": {
+ "version": "0.5.3",
+ "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz",
+ "integrity": "sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM="
+ }
+ }
+ },
+ "cordova-common": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-3.1.0.tgz",
+ "integrity": "sha512-J2MM1ioyLlBYdwdXH40OZL4hN7XEBOfurddKYifF4aTkb2PkbeM+KVORt53eyU+8ScA0QmRLuTG0EM55eLms0A==",
+ "requires": {
+ "ansi": "^0.3.1",
+ "bplist-parser": "^0.1.0",
+ "cross-spawn": "^6.0.5",
+ "elementtree": "0.1.7",
+ "endent": "^1.1.1",
+ "fs-extra": "^7.0.0",
+ "glob": "^7.1.2",
+ "minimatch": "^3.0.0",
+ "plist": "^3.0.1",
+ "q": "^1.4.1",
+ "strip-bom": "^3.0.0",
+ "underscore": "^1.8.3",
+ "which": "^1.3.0"
+ },
+ "dependencies": {
+ "cross-spawn": {
+ "version": "6.0.5",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+ "requires": {
+ "nice-try": "^1.0.4",
+ "path-key": "^2.0.1",
+ "semver": "^5.5.0",
+ "shebang-command": "^1.2.0",
+ "which": "^1.2.9"
+ }
+ },
+ "strip-bom": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+ "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
+ }
+ }
+ },
+ "cordova-plugin-device": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/cordova-plugin-device/-/cordova-plugin-device-2.0.2.tgz",
+ "integrity": "sha1-/Ajzci5n7ve2xnv8mag99q3Quro="
+ },
"core-js": {
"version": "2.6.5",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
@@ -4196,11 +4290,15 @@
"integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
"dev": true
},
+ "dedent": {
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+ "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw="
+ },
"deep-equal": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
- "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
- "dev": true
+ "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
},
"deep-extend": {
"version": "0.6.0",
@@ -4290,6 +4388,14 @@
}
}
},
+ "define-properties": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+ "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+ "requires": {
+ "object-keys": "^1.0.12"
+ }
+ },
"define-property": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
@@ -4331,6 +4437,11 @@
}
}
},
+ "defined": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
+ "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM="
+ },
"del": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
@@ -5025,6 +5136,21 @@
"integrity": "sha512-glecGr/kFdfeXUHOHAWvGcXrxNU+1wSO/t5B23tT1dtlvYB26GY8aHzZSWD7HqhqC800Lr+w/hQul6C5AF542w==",
"dev": true
},
+ "elementtree": {
+ "version": "0.1.7",
+ "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz",
+ "integrity": "sha1-mskb5uUvtuYkTE5UpKw+2K6OKcA=",
+ "requires": {
+ "sax": "1.1.4"
+ },
+ "dependencies": {
+ "sax": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz",
+ "integrity": "sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk="
+ }
+ }
+ },
"elliptic": {
"version": "6.4.1",
"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
@@ -5076,6 +5202,16 @@
"once": "^1.4.0"
}
},
+ "endent": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/endent/-/endent-1.3.0.tgz",
+ "integrity": "sha512-C8AryqPPwtydqcpO5AF6k9Bd1EpFkQtvsefJqS3y3n8TG13Jy63MascDxTOULZYqrUde+dK6BjNc6LIMr3iI2A==",
+ "requires": {
+ "dedent": "^0.7.0",
+ "fast-json-parse": "^1.0.3",
+ "objectorarray": "^1.0.3"
+ }
+ },
"engine.io": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz",
@@ -5197,6 +5333,29 @@
"is-arrayish": "^0.2.1"
}
},
+ "es-abstract": {
+ "version": "1.13.0",
+ "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz",
+ "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==",
+ "requires": {
+ "es-to-primitive": "^1.2.0",
+ "function-bind": "^1.1.1",
+ "has": "^1.0.3",
+ "is-callable": "^1.1.4",
+ "is-regex": "^1.0.4",
+ "object-keys": "^1.0.12"
+ }
+ },
+ "es-to-primitive": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
+ "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
+ "requires": {
+ "is-callable": "^1.1.4",
+ "is-date-object": "^1.0.1",
+ "is-symbol": "^1.0.2"
+ }
+ },
"es6-promise": {
"version": "4.2.5",
"resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz",
@@ -5710,6 +5869,11 @@
"micromatch": "^3.1.10"
}
},
+ "fast-json-parse": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz",
+ "integrity": "sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw=="
+ },
"fast-json-stable-stringify": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
@@ -5913,6 +6077,14 @@
}
}
},
+ "for-each": {
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+ "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+ "requires": {
+ "is-callable": "^1.1.3"
+ }
+ },
"for-in": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -6006,7 +6178,6 @@
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
"integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
- "dev": true,
"requires": {
"graceful-fs": "^4.1.2",
"jsonfile": "^4.0.0",
@@ -6047,8 +6218,7 @@
"fs.realpath": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
- "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
- "dev": true
+ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
},
"fsevents": {
"version": "1.2.7",
@@ -6614,8 +6784,7 @@
"function-bind": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
- "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
- "dev": true
+ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
},
"gauge": {
"version": "2.7.4",
@@ -6687,7 +6856,6 @@
"version": "7.1.3",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
"integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
- "dev": true,
"requires": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
@@ -6796,8 +6964,7 @@
"graceful-fs": {
"version": "4.1.15",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
- "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
- "dev": true
+ "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
},
"hammerjs": {
"version": "2.0.8",
@@ -6850,7 +7017,6 @@
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
- "dev": true,
"requires": {
"function-bind": "^1.1.1"
}
@@ -6893,6 +7059,11 @@
"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
"dev": true
},
+ "has-symbols": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
+ "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q="
+ },
"has-unicode": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
@@ -7346,7 +7517,6 @@
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
- "dev": true,
"requires": {
"once": "^1.3.0",
"wrappy": "1"
@@ -7355,8 +7525,7 @@
"inherits": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
- "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
- "dev": true
+ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
},
"ini": {
"version": "1.3.5",
@@ -7551,6 +7720,11 @@
"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
"dev": true
},
+ "is-callable": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+ "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
+ },
"is-ci": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
@@ -7580,6 +7754,11 @@
}
}
},
+ "is-date-object": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+ "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
+ },
"is-descriptor": {
"version": "0.1.6",
"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -7737,6 +7916,14 @@
"integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
"dev": true
},
+ "is-regex": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+ "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+ "requires": {
+ "has": "^1.0.1"
+ }
+ },
"is-relative": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
@@ -7758,6 +7945,14 @@
"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
"dev": true
},
+ "is-symbol": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
+ "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
+ "requires": {
+ "has-symbols": "^1.0.0"
+ }
+ },
"is-typedarray": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
@@ -7809,8 +8004,7 @@
"isexe": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
- "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
- "dev": true
+ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
},
"isobject": {
"version": "3.0.1",
@@ -8243,7 +8437,6 @@
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
- "dev": true,
"requires": {
"graceful-fs": "^4.1.6"
}
@@ -9166,7 +9359,6 @@
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
- "dev": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -9409,8 +9601,7 @@
"nice-try": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
- "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
- "dev": true
+ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
},
"node-fetch": {
"version": "1.6.3",
@@ -9806,8 +9997,7 @@
"object-keys": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.0.tgz",
- "integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg==",
- "dev": true
+ "integrity": "sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg=="
},
"object-visit": {
"version": "1.0.1",
@@ -9827,6 +10017,14 @@
"isobject": "^3.0.1"
}
},
+ "objectorarray": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/objectorarray/-/objectorarray-1.0.3.tgz",
+ "integrity": "sha512-kPoflSYkAf/Onvjr4ZLaq37vDuOXjVzfwLCRuORRzYGdXkHa/vacPT0RgR+KmtkwOYFcxTMM62BRrZk8GGKHjw==",
+ "requires": {
+ "tape": "^4.8.0"
+ }
+ },
"obuf": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
@@ -9852,7 +10050,6 @@
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
- "dev": true,
"requires": {
"wrappy": "1"
}
@@ -10068,8 +10265,7 @@
"os-homedir": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
- "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
- "dev": true
+ "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
},
"os-locale": {
"version": "1.4.0",
@@ -10094,14 +10290,12 @@
"os-tmpdir": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
- "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
- "dev": true
+ "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
},
"osenv": {
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
- "dev": true,
"requires": {
"os-homedir": "^1.0.0",
"os-tmpdir": "^1.0.0"
@@ -10419,8 +10613,7 @@
"path-is-absolute": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
- "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
- "dev": true
+ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
},
"path-is-inside": {
"version": "1.0.2",
@@ -10431,14 +10624,12 @@
"path-key": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
- "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
- "dev": true
+ "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
},
"path-parse": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
- "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
- "dev": true
+ "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
},
"path-to-regexp": {
"version": "0.1.7",
@@ -10558,7 +10749,6 @@
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz",
"integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==",
- "dev": true,
"requires": {
"base64-js": "^1.2.3",
"xmlbuilder": "^9.0.7",
@@ -10781,6 +10971,14 @@
"retry": "^0.10.0"
}
},
+ "properties-parser": {
+ "version": "0.3.1",
+ "resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.3.1.tgz",
+ "integrity": "sha1-ExbpU5/7/ZOEXjabIRAiq9R4dxo=",
+ "requires": {
+ "string.prototype.codepointat": "^0.2.0"
+ }
+ },
"protoduck": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/protoduck/-/protoduck-5.0.1.tgz",
@@ -10993,8 +11191,7 @@
"q": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz",
- "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=",
- "dev": true
+ "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4="
},
"qjobs": {
"version": "1.2.0",
@@ -11487,6 +11684,14 @@
"browserify-optional": "^1.0.0"
}
},
+ "resumer": {
+ "version": "0.0.0",
+ "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz",
+ "integrity": "sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=",
+ "requires": {
+ "through": "~2.3.4"
+ }
+ },
"ret": {
"version": "0.1.15",
"resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
@@ -11730,8 +11935,7 @@
"semver": {
"version": "5.5.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz",
- "integrity": "sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==",
- "dev": true
+ "integrity": "sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw=="
},
"semver-diff": {
"version": "2.1.0",
@@ -11902,7 +12106,6 @@
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
"integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
- "dev": true,
"requires": {
"shebang-regex": "^1.0.0"
}
@@ -11910,8 +12113,7 @@
"shebang-regex": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
- "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
- "dev": true
+ "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
},
"shelljs": {
"version": "0.8.3",
@@ -12693,6 +12895,21 @@
"strip-ansi": "^3.0.0"
}
},
+ "string.prototype.codepointat": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz",
+ "integrity": "sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg=="
+ },
+ "string.prototype.trim": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz",
+ "integrity": "sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=",
+ "requires": {
+ "define-properties": "^1.1.2",
+ "es-abstract": "^1.5.0",
+ "function-bind": "^1.0.2"
+ }
+ },
"string_decoder": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -12831,6 +13048,59 @@
"integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
"dev": true
},
+ "tape": {
+ "version": "4.10.2",
+ "resolved": "https://registry.npmjs.org/tape/-/tape-4.10.2.tgz",
+ "integrity": "sha512-mgl23h7W2yuk3N85FOYrin2OvThTYWdwbk6XQ1pr2PMJieyW2FM/4Bu/+kD/wecb3aZ0Enm+Syinyq467OPq2w==",
+ "requires": {
+ "deep-equal": "~1.0.1",
+ "defined": "~1.0.0",
+ "for-each": "~0.3.3",
+ "function-bind": "~1.1.1",
+ "glob": "~7.1.4",
+ "has": "~1.0.3",
+ "inherits": "~2.0.3",
+ "minimist": "~1.2.0",
+ "object-inspect": "~1.6.0",
+ "resolve": "~1.10.1",
+ "resumer": "~0.0.0",
+ "string.prototype.trim": "~1.1.2",
+ "through": "~2.3.8"
+ },
+ "dependencies": {
+ "glob": {
+ "version": "7.1.4",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+ "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+ "requires": {
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.0.4",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
+ }
+ },
+ "minimist": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+ "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+ },
+ "object-inspect": {
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
+ "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="
+ },
+ "resolve": {
+ "version": "1.10.1",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.1.tgz",
+ "integrity": "sha512-KuIe4mf++td/eFb6wkaPbMDnP6kObCaEtIDuHOUED6MNUo4K670KZUHuuvYPZDxNF0WVLw49n06M2m2dXphEzA==",
+ "requires": {
+ "path-parse": "^1.0.6"
+ }
+ }
+ }
+ },
"tar": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
@@ -13118,8 +13388,7 @@
"through": {
"version": "2.3.8",
"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
- "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
- "dev": true
+ "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
},
"through2": {
"version": "2.0.5",
@@ -13523,6 +13792,11 @@
"integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
"dev": true
},
+ "underscore": {
+ "version": "1.9.1",
+ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
+ "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="
+ },
"unicode-properties": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/unicode-properties/-/unicode-properties-1.1.0.tgz",
@@ -13616,8 +13890,7 @@
"universalify": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
- "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
- "dev": true
+ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
},
"unix-crypt-td-js": {
"version": "1.0.0",
@@ -14381,7 +14654,6 @@
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
- "dev": true,
"requires": {
"isexe": "^2.0.0"
}
@@ -14482,8 +14754,7 @@
"wrappy": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
- "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
- "dev": true
+ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
},
"write-file-atomic": {
"version": "2.4.2",
@@ -14548,14 +14819,12 @@
"xmlbuilder": {
"version": "9.0.7",
"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
- "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
- "dev": true
+ "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
},
"xmldom": {
"version": "0.1.27",
"resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
- "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=",
- "dev": true
+ "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk="
},
"xmlhttprequest-ssl": {
"version": "1.5.5",
diff --git a/package.json b/package.json
index f49a07597..a4062a2d8 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,6 @@
{
- "name": "cassiopee",
+ "name": "fr.irstea.cassiopee",
+ "displayName": "Cassiopée",
"description": "Hydraulic calculators",
"author": "Irstea",
"version": "4.1.0",
@@ -44,6 +45,8 @@
"@types/pako": "^1.0.1",
"@types/sprintf-js": "^1.1.2",
"angular2-chartjs": "^0.5.1",
+ "cordova-android": "^8.0.0",
+ "cordova-plugin-device": "^2.0.2",
"core-js": "^2.6.5",
"file-saver": "^2.0.1",
"hammerjs": "^2.0.8",
@@ -89,5 +92,13 @@
"tslint": "^5.13.1",
"typescript": "~3.1.1",
"webpack-dev-server": "^3.2.1"
+ },
+ "cordova": {
+ "plugins": {
+ "cordova-plugin-whitelist": {}
+ },
+ "platforms": [
+ "android"
+ ]
}
-}
+}
\ No newline at end of file
diff --git a/src/index.html b/src/index.html
index d0cfac235..6f9d235bd 100644
--- a/src/index.html
+++ b/src/index.html
@@ -7,6 +7,8 @@
<title>ngHyd - Calculettes hydrauliques</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
+
+ <script type="text/javascript" src="cordova.js"></script>
</head>
<body>
diff --git a/www b/www
new file mode 120000
index 000000000..53c37a166
--- /dev/null
+++ b/www
@@ -0,0 +1 @@
+dist
\ No newline at end of file
--
GitLab
From 9266001b7a28477292447007ba68601542e8e1a6 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Mon, 3 Jun 2019 10:35:38 +0200
Subject: [PATCH 2/6] =?UTF-8?q?M=C3=A0J=20build=20cordova?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config.xml | 6 +++---
package.json | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/config.xml b/config.xml
index 17fb7b1c9..fcbc4ec07 100644
--- a/config.xml
+++ b/config.xml
@@ -8,7 +8,7 @@
Apache Cordova Team
</author>
<content src="index.html" />
- <icon src="icon.png" />
+ <icon src="src/icon.png" />
<plugin name="cordova-plugin-whitelist" spec="1" />
<access origin="*" />
<allow-intent href="http://*/*" />
@@ -19,11 +19,11 @@
<allow-intent href="geo:*" />
<platform name="android">
<allow-intent href="market:*" />
- <icon src="icon.png" qualifier="ldpi" />
+ <icon src="src/icon.png" qualifier="ldpi" />
</platform>
<platform name="ios">
<allow-intent href="itms:*" />
<allow-intent href="itms-apps:*" />
- <icon src="icon.png" qualifier="ldpi" />
+ <icon src="src/icon.png" qualifier="ldpi" />
</platform>
</widget>
diff --git a/package.json b/package.json
index a4062a2d8..6d25b09aa 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
"release-clean": "rm -r release/*",
"release-linux": "npm run release-clean & npm run build && electron-builder",
"release-windows": "rd /s /q release & ng build --prod --build-optimizer=false && npm run electron-builder",
+ "release-cordova": "cordova platform add android & rm dist/assets/docs-fr/sitemap.xml.gz & cordova build android && mv platforms/android/app/build/outputs/apk/debug/app-debug.apk release/cassiopee.apk",
"lint": "ng lint",
"e2e": "ng e2e",
"e2equick": "ng e2e --dev-server-target= --baseUrl=http://localhost:4200",
--
GitLab
From 11f21af73f7c83b300d75249bac27c3e7cc2c768 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Mon, 3 Jun 2019 10:45:35 +0200
Subject: [PATCH 3/6] versionnement des dossiers release et dist
---
.gitignore | 3 +--
dist/.gitignore | 4 ++++
dist/README | 1 +
release/.gitignore | 4 ++++
release/README | 1 +
5 files changed, 11 insertions(+), 2 deletions(-)
create mode 100644 dist/.gitignore
create mode 100644 dist/README
create mode 100644 release/.gitignore
create mode 100644 release/README
diff --git a/.gitignore b/.gitignore
index 07d3db63e..155517bef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,13 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
# compiled output
-/dist
/tmp
-/release
/out-tsc
/src/assets/docs-*
/compodoc-fr
cassiopee_doc-fr.md
cassiopee_doc-fr.md.tex
+# /dist and /release have a specific .gitignore
# dependencies
/node_modules
diff --git a/dist/.gitignore b/dist/.gitignore
new file mode 100644
index 000000000..e47bb0d92
--- /dev/null
+++ b/dist/.gitignore
@@ -0,0 +1,4 @@
+*
+*/
+!README
+!.gitignore
\ No newline at end of file
diff --git a/dist/README b/dist/README
new file mode 100644
index 000000000..ce1e15a87
--- /dev/null
+++ b/dist/README
@@ -0,0 +1 @@
+Directory for compiled app (ng build)
\ No newline at end of file
diff --git a/release/.gitignore b/release/.gitignore
new file mode 100644
index 000000000..e47bb0d92
--- /dev/null
+++ b/release/.gitignore
@@ -0,0 +1,4 @@
+*
+*/
+!README
+!.gitignore
\ No newline at end of file
diff --git a/release/README b/release/README
new file mode 100644
index 000000000..633a02659
--- /dev/null
+++ b/release/README
@@ -0,0 +1 @@
+Directory for built packages (electron, cordova)
\ No newline at end of file
--
GitLab
From 6507e02dd76ca0b6910c690af3563f6f7bb1255c Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Mon, 3 Jun 2019 11:10:06 +0200
Subject: [PATCH 4/6] Fix #216
ajout doc. pour cordova
---
README.md | 52 +++++++++++++++++++++++++++++++++++++++-------------
1 file changed, 39 insertions(+), 13 deletions(-)
diff --git a/README.md b/README.md
index e406de7bd..a9321e3be 100644
--- a/README.md
+++ b/README.md
@@ -194,25 +194,15 @@ Custom Material SVG Icons will only show up when the application is deployed on
5. **Si une nouvelle classe a été créée à l'étape 2**, dans la méthode _FormulaireService.newFormulaire()_, compléter le _switch_ pour fournir la classe à instancier.
-# Build desktop packages with Electron
-
-## linux .deb package
-
-Execute `npm run release-linux`. Find the .deb package in `/release`.
-
-Running `dpkg -i cassiopee_*.deb` will install Cassiopée in `/opt/Cassiopee`
-
-## windows installer
+# Build under Windows
-Several npm scripts of `package.json` won't work with windows (for ex. "preprocess"). Building
-the Electron package is a little more complicated.
+Several npm scripts of `package.json` won't work with windows (for ex. "preprocess"). Building is a little more complicated.
### install dependencies
* Git, for example [https://gitforwindows.org](https://gitforwindows.org)
* Nodejs [https://nodejs.org/en/download](https://nodejs.org/en/download)
* typescript compiler (system wide) : `npm install -g typescript`
* angular cli (system wide) : `npm install -g @angular/cli`
- * electron-builder (system wide) : `npm install -g electron-builder`
### build jalhyd
Clone `jalhyd` repository.
@@ -229,7 +219,6 @@ As `mkdocs` does not work, copy `src/assets/docs-fr` folder **from a linux build
Compile jalhyd with `tsc --p "src/tsconfig.app.json"`
-
### build nghyd
Clone `nghyd` repository.
@@ -242,6 +231,43 @@ export const nghydVersion = "4.3.0-119-ga6ef812";
```
Compile nghyd with `ng build --prod --build-optimizer=false`
+
+# Build desktop packages with Electron
+
+## linux .deb package
+
+Execute `npm run release-linux`. Find the .deb package in `/release`.
+
+Running `dpkg -i cassiopee_*.deb` will install Cassiopée in `/opt/Cassiopee`
+
+## windows installer
+
+Follow "Build under Windows" instructions first (see above). Then,
+
+### install dependencies
+ * electron-builder (system wide) : `npm install -g electron-builder`
+
Build package with `electron-builder`. Find the generated installer in `/release`.
Running the generated installer will install Cassiopée in `C:\Users\YourUser\AppData\local\Programs\cassiopee`
+
+# Build mobile packages with Cordova
+
+Cordova embeds the whole app in a Web view, allowing it to run on mobile devices
+
+## Android .apk
+
+### install dependencies
+ * java (system wide) : for ex. `apt install oracle-java8-jdk`
+ * cordova (system wide) : `npm install -g cordova`
+ * gradle (system wide) : `apt install gradle`
+
+### install Android Studio and SDKs
+
+ Download
+ Android Studio here and install it : https://developer.android.com/studio
+
+ Run Android Studio, click "configure > SDK manager". Install at least one SDK, for ex. 7.0 Nougat.
+
+ Build .apk package with `npm run release-cordova`. Find the generated package in `/release`.
+
\ No newline at end of file
--
GitLab
From 509856eb2f55212b857fe1c9d93dec529959629f Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Mon, 3 Jun 2019 11:44:56 +0200
Subject: [PATCH 5/6] =?UTF-8?q?M=C3=A0J=20commandes=20build=20cordova=20et?=
=?UTF-8?q?=20versionnement=20/dist?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 3 ++-
README.md | 2 +-
dist/.gitignore | 4 ----
dist/README | 1 -
package.json | 16 +++++++++-------
src/index.html | 2 --
6 files changed, 12 insertions(+), 16 deletions(-)
delete mode 100644 dist/.gitignore
delete mode 100644 dist/README
diff --git a/.gitignore b/.gitignore
index 155517bef..8e45ac0b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,14 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
# compiled output
+/dist
/tmp
/out-tsc
/src/assets/docs-*
/compodoc-fr
cassiopee_doc-fr.md
cassiopee_doc-fr.md.tex
-# /dist and /release have a specific .gitignore
+# /release has a specific .gitignore
# dependencies
/node_modules
diff --git a/README.md b/README.md
index a9321e3be..2549eceba 100644
--- a/README.md
+++ b/README.md
@@ -269,5 +269,5 @@ Cordova embeds the whole app in a Web view, allowing it to run on mobile devices
Run Android Studio, click "configure > SDK manager". Install at least one SDK, for ex. 7.0 Nougat.
- Build .apk package with `npm run release-cordova`. Find the generated package in `/release`.
+ Build .apk package with `npm run release-android`. Find the generated package in `/release`.
\ No newline at end of file
diff --git a/dist/.gitignore b/dist/.gitignore
deleted file mode 100644
index e47bb0d92..000000000
--- a/dist/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*
-*/
-!README
-!.gitignore
\ No newline at end of file
diff --git a/dist/README b/dist/README
deleted file mode 100644
index ce1e15a87..000000000
--- a/dist/README
+++ /dev/null
@@ -1 +0,0 @@
-Directory for compiled app (ng build)
\ No newline at end of file
diff --git a/package.json b/package.json
index 6d25b09aa..26d0b7667 100644
--- a/package.json
+++ b/package.json
@@ -9,17 +9,19 @@
"license": "MIT",
"scripts": {
"ng": "ng",
+ "lint": "ng lint",
+ "e2e": "ng e2e",
+ "electron": "electron .",
+ "electron-builder": "electron-builder",
"start": "npm run preprocess && ng serve --host 0.0.0.0",
"prod": "npm run preprocess && ng serve --host 0.0.0.0 --prod",
"build": "npm run preprocess && ng build --prod --build-optimizer=false",
- "electron": "electron .",
- "electron-builder": "electron-builder",
- "release-clean": "rm -r release/*",
- "release-linux": "npm run release-clean & npm run build && electron-builder",
+ "build-cordova": "npm run preprocess && npm run add-cordova-js; ng build --prod --build-optimizer=false; npm run remove-cordova-js",
+ "add-cordova-js": "sed -i '/<\\/title>/a <script type=\"text/javascript\" src=\"cordova.js\"></script>' src/index.html",
+ "remove-cordova-js": "sed -i '/cordova.js/d' src/index.html",
+ "release-linux": "npm run build && electron-builder",
"release-windows": "rd /s /q release & ng build --prod --build-optimizer=false && npm run electron-builder",
- "release-cordova": "cordova platform add android & rm dist/assets/docs-fr/sitemap.xml.gz & cordova build android && mv platforms/android/app/build/outputs/apk/debug/app-debug.apk release/cassiopee.apk",
- "lint": "ng lint",
- "e2e": "ng e2e",
+ "release-android": "npm run build-cordova && cordova platform add android; rm dist/assets/docs-fr/sitemap.xml.gz && cordova build android && mv platforms/android/app/build/outputs/apk/debug/app-debug.apk release/cassiopee.apk",
"e2equick": "ng e2e --dev-server-target= --baseUrl=http://localhost:4200",
"jalhyd": "rm node_modules/jalhyd && cd ../jalhyd && npm run build && cd ../nghyd && npm install ../jalhyd",
"mathjax": "mkdir -p docs-fr/javascripts/mathjax && rsync -az --delete `cat rsync-mathjax-files` docs-fr/javascripts/mathjax",
diff --git a/src/index.html b/src/index.html
index 6f9d235bd..d0cfac235 100644
--- a/src/index.html
+++ b/src/index.html
@@ -7,8 +7,6 @@
<title>ngHyd - Calculettes hydrauliques</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
-
- <script type="text/javascript" src="cordova.js"></script>
</head>
<body>
--
GitLab
From 66311da078f8db62e20e4e9eaae906ab968dddc9 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Mon, 3 Jun 2019 12:14:12 +0200
Subject: [PATCH 6/6] =?UTF-8?q?M=C3=A0J=20script=20build=20cordova?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/package.json b/package.json
index 26d0b7667..bad7e6e72 100644
--- a/package.json
+++ b/package.json
@@ -16,9 +16,8 @@
"start": "npm run preprocess && ng serve --host 0.0.0.0",
"prod": "npm run preprocess && ng serve --host 0.0.0.0 --prod",
"build": "npm run preprocess && ng build --prod --build-optimizer=false",
- "build-cordova": "npm run preprocess && npm run add-cordova-js; ng build --prod --build-optimizer=false; npm run remove-cordova-js",
- "add-cordova-js": "sed -i '/<\\/title>/a <script type=\"text/javascript\" src=\"cordova.js\"></script>' src/index.html",
- "remove-cordova-js": "sed -i '/cordova.js/d' src/index.html",
+ "build-cordova": "npm run preprocess && ng build --prod --build-optimizer=false && npm run add-cordova-js",
+ "add-cordova-js": "sed -i '/<\\/title>/a <script type=\"text/javascript\" src=\"cordova.js\"></script>' dist/index.html",
"release-linux": "npm run build && electron-builder",
"release-windows": "rd /s /q release & ng build --prod --build-optimizer=false && npm run electron-builder",
"release-android": "npm run build-cordova && cordova platform add android; rm dist/assets/docs-fr/sitemap.xml.gz && cordova build android && mv platforms/android/app/build/outputs/apk/debug/app-debug.apk release/cassiopee.apk",
--
GitLab