From 1368b7299aee1c5847167df32051eaf2511a4c8c Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Tue, 30 Jul 2019 17:37:03 +0200
Subject: [PATCH] Update README and package.json
---
README.md | 19 ++++++-------------
package.json | 2 +-
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/README.md b/README.md
index 624bb30d2..3791075e2 100644
--- a/README.md
+++ b/README.md
@@ -196,7 +196,7 @@ Custom Material SVG Icons will only show up when the application is deployed on
# Build under Windows
-Several npm scripts of `package.json` won't work with windows (for ex. "preprocess"). Building is a little more complicated.
+Several npm scripts of `package.json` won't work with windows (for ex. "mkdocs"). Building is a little more complicated.
### install dependencies
* Git, for example [https://gitforwindows.org](https://gitforwindows.org)
@@ -209,13 +209,7 @@ Clone `jalhyd` repository.
Install packages with `npm install`.
-As `preprocess` does not work, copy `src/date_revision.ts` file from a linux build, or create it with the following (example) content :
-```typescript
-export const jalhydDateRev = "2019-05-24";
-export const jalhydVersion = "stable-105-gdfc538b";
-```
-
-As `mkdocs` does not work, copy `src/assets/docs-fr` folder **from a linux build**.
+Run `npm run preprocess`
Compile jalhyd with `tsc --p "src/tsconfig.app.json"`
@@ -224,11 +218,10 @@ Clone `nghyd` repository.
Install packages with `npm install`.
-As `preprocess` does not work, copy `src/date_revision.ts` file from a linux build, or create it with the following (example) content :
-```typescript
-export const nghydDateRev = "2019-05-28";
-export const nghydVersion = "4.3.0-119-ga6ef812";
-```
+Run `node preprocessors.js`
+
+As `mkdocs` does not work, copy `src/assets/docs-fr` folder **from a linux build**.
+
Compile nghyd with `ng build --prod --build-optimizer=false`
diff --git a/package.json b/package.json
index 668fc9ac8..5f8ce2656 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
"build": "npm run preprocess && ng build --prod --build-optimizer=false",
"build-cordova": "npm run preprocess && ng build --prod --build-optimizer=false && npm run update-dist-index-mimetypes && npm run add-cordova-js",
"add-cordova-js": "sed -i '/<\\/title>/a <script type=\"text/javascript\" src=\"cordova.js\"></script>' dist/index.html",
- "update-dist-index-mimetypes": "nodejs ./update-dist-index-mimetypes.js",
+ "update-dist-index-mimetypes": "node ./update-dist-index-mimetypes.js",
"release-linux": "npm run build && npm run update-dist-index-mimetypes && electron-builder",
"release-windows": "rd /s /q release & ng build --prod --build-optimizer=false && npm run update-dist-index-mimetypes && 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