MàJ commandes build cordova et versionnement /dist

509856eb · mathias.chouet · 6507e02d · 509856eb · 509856eb · 6507e02d
Commit 509856eb authored 5 years ago by mathias.chouet
--- a/.gitignore
+++ b/.gitignore
 # 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

--- 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
--- a/dist/.gitignore
+++ b/dist/.gitignore
-*
-*/
-!README
-!.gitignore
\ No newline at end of file
--- a/dist/README
+++ b/dist/README
-Directory for compiled app (ng build)
\ No newline at end of file
--- 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",

--- 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>