diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7fc2645b8143e169002284f58e856eb5a5d2d47a..8a8ed69afd24c6f1a98416d71dc809542b51759a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ stages: - release-linux - release-windows - release-mac - #- release-android + - release-android variables: LC_ALL: C.UTF-8 @@ -87,11 +87,11 @@ release-mac: script: - npm run release-mac -# release-android: -# stage: release-android -# only: -# - tags -# - schedules -# - web -# script: -# - npm run release-android +release-android: + stage: release-android + only: + - tags + - schedules + - web + script: + - npm run release-android diff --git a/README.md b/README.md index 07aa15a30c71bf28672746dfca40a0869efe1b5e..ae68deaa3747b40caf8bbd1a9edf18412b56d632 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Then, back to the ngHyd project folder, run : `npm run electron` -### To build a complete release for Linux (has to be run on Linux platform) +### To build a complete release for Linux (from Linux platform) `npm run release-linux` @@ -55,7 +55,22 @@ Find the .deb package in `/release`. Running `dpkg -i cassiopee_*.deb` will install Cassiopée in `/opt/Cassiopee` -### To build a complete release for Windows (has to be run on Windows platform) + +### To build a complete release for Windows (from Linux platform) + +#### install dependencies + * wine >= 2.0 - see https://wiki.winehq.org/Download#binary + +#### build .exe installer + +`npm run release-windows` + +Find the generated installer in `/release`. + +Running the generated installer will install Cassiopée in `C:\Users\YourUser\AppData\local\Programs\cassiopee` + + +### To build a complete release for Windows (from Windows platform) #### install dependencies * python for windows https://www.python.org/downloads/windows/ @@ -74,19 +89,39 @@ Find the generated installer in `/release`. Running the generated installer will install Cassiopée in `C:\Users\YourUser\AppData\local\Programs\cassiopee` -### To build a complete release for Android +### To build a complete release for MacOS (from Linux platform) + +#### build package + +`npm run release-mac` + +Find the generated package in `/release`. + +Note: the generated package will not be signed. + + +### To build a complete release for Android (from Linux platform) #### install dependencies - * java (system wide) : for ex. `apt install oracle-java8-jdk` + * java (system wide) : for ex. `apt install openjdk-8-jdk` or `apt install oracle-java8-jdk` * 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. +#### using GUI + +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. + +#### using CLI + +Download Android SDK Tools from https://developer.android.com/studio : click "DOWNLOAD OPTIONS" then scroll down to "Command line tools only" and choose `sdk-tools-linux-*.zip`. Download and unzip to, for example, `/opt/android/`. Add `/opt/android/tools/bin` to your PATH. + +Install an SDK, for example android 28 (Android 9 "Pie") : + * `sdkmanager "platform-tools" "platforms;android-28" "build-tools;28.0.3"` #### build .apk package @@ -94,6 +129,8 @@ Running the generated installer will install Cassiopée in `C:\Users\YourUser\Ap Find the generated package in `/release`. +Note: the generated package will not be signed. + ### To generate compodoc