diff --git a/.gitignore b/.gitignore
index 155517befbc7745270d27468a7a432f107aa9e2e..8e45ac0b2e608c15ba24f1dbf02f110a048d8e0e 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 a9321e3be0958bf89cae841bab1412f284ee33b4..2549eceba2a4da967f9cec15968303b6cf00ea02 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 e47bb0d92d9fce4f9ce5e29baf7b9c8ea191febc..0000000000000000000000000000000000000000
--- 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 ce1e15a871cec72952b0547f9f7959e3938dbdef..0000000000000000000000000000000000000000
--- 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 6d25b09aaa50be5f318084fb06645bf816bb89a3..26d0b766714ab629a546ea2264afa2a25526e8ed 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 6f9d235bd12cb5fc03984a25650c1490d50e7ed7..d0cfac235296d6710cfcc21a7553284552ccd812 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>