Skip to content

Commit

Permalink
Merge pull request #451 from AntaresSimulatorTeam/feature/merge-doc
Browse files Browse the repository at this point in the history
Merge 'doc' branch
  • Loading branch information
flomnes authored Nov 10, 2021
2 parents dea3bcc + e06208e commit 9ab23e2
Show file tree
Hide file tree
Showing 5 changed files with 82 additions and 37 deletions.
13 changes: 13 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,19 @@ Until 2018 it was distributed under the terms of a proprietary license.

In May 2018 RTE decided to release the project under the GPLv3 license.

[linux_system_svg]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/workflows/Linux%20CI%20(system%20libs)/badge.svg

[linux_system_link]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/actions?query=workflow%3A"Linux%20CI%20(system%20libs)"

[windows_vcpkg_svg]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/workflows/Windows%20CI%20(VCPKG)/badge.svg

[windows_vcpkg_link]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/actions?query=workflow%3A"Windows%20CI%20(VCPKG)"

[centos7_system_svg]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/workflows/Centos7%20CI%20(system%20libs)/badge.svg

[centos7_system_link]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/actions?query=workflow%3A"Centos7%20CI%20(system%20libs)"


# Links:

- Antares web site : https://antares-simulator.org
Expand Down
38 changes: 27 additions & 11 deletions docs/build/0-INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
[Supported OS](#supported-os) | [CMake version](#cmake-version) | [Python version](#python-version) | [Git version](#git-version) | [Dependencies](#dependencies)

## C/I status
| OS | Status |
|:-------|--------|
| Ubuntu | [![Status][ubuntu_precompiled_svg]][ubuntu_precompiled_link] |
| Windows | [![Status][windows_precompiled_svg]][windows_precompiled_link] |
| Centos7 | [![Status][centos_precompiled_svg]][centos_precompiled_link] |
| OS | System librairies | Built in libraries |
|:-------|--------|------|
| Ubuntu | [![Status][linux_system_svg]][linux_system_link] | [![Status][linux_deps_build_svg]][linux_deps_build_link] |
| Windows | [![Status][windows_vcpkg_svg]][windows_vcpkg_link] | [![Status][windows_deps_build_svg]][windows_deps_build_link] |
| Centos7 | [![Status][centos_system_svg]][centos_system_link] | [![Status][centos_deps_build_svg]][centos_deps_build_link] |

## [Supported OS](#supported-os)
*ANTARES* compilation is tested on :
Expand Down Expand Up @@ -35,11 +35,27 @@ Git version must be above 2.15 for external dependencies build because `--ignore

Installation of these dependencies is described in OS specific *ANTARES* install procedure.

[ubuntu_precompiled_svg]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/workflows/Ubuntu%20CI%20(pre-compiled)/badge.svg
[ubuntu_precompiled_link]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/actions?query=workflow%3A"Ubuntu%20CI%20(pre-compiled)"

[windows_precompiled_svg]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/workflows/Windows%20CI%20(VCPKG%20and%20pre-compiled)/badge.svg
[windows_precompiled_link]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/actions?query=workflow%3A"Windows%20CI%20(VCPKG%20and%20pre-compiled)"
[linux_system_svg]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/workflows/Linux%20CI%20(system%20libs)/badge.svg

[centos_precompiled_svg]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/workflows/Centos7%20CI%20(pre-compiled)/badge.svg
[centos_precompiled_link]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/actions?query=workflow%3A"Centos7%20CI%20(pre-compiled)"
[linux_system_link]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/actions?query=workflow%3A"Linux%20CI%20(system%20libs)"

[linux_deps_build_svg]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/workflows/Linux%20CI%20(deps.%20compilation)/badge.svg

[linux_deps_build_link]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/actions?query=workflow%3A"Linux%20CI%20(deps.%20compilation)"

[windows_deps_build_svg]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/workflows/Windows%20CI%20(deps.%20compilation)/badge.svg

[windows_deps_build_link]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/actions?query=workflow%3A"Windows%20CI%20(deps.%20compilation)"

[windows_vcpkg_svg]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/workflows/Windows%20CI%20(VCPKG)/badge.svg

[windows_vcpkg_link]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/actions?query=workflow%3A"Windows%20CI%20(VCPKG)"

[centos_deps_build_svg]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/workflows/Centos7%20CI%20(deps.%20compilation)/badge.svg

[centos_deps_build_link]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/actions?query=workflow%3A"Centos7%20CI%20(deps.%20compilation)"

[centos_system_svg]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/workflows/Centos7%20CI%20(system%20libs)/badge.svg

[centos_system_link]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/actions?query=workflow%3A"Centos7%20CI%20(system%20libs)"
22 changes: 13 additions & 9 deletions docs/build/INSTALL-centos.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,17 @@
[Environnement](#environment) | [CMake version](#cmake-version) | [GCC version](#gcc-version) | [Python version](#python-version) | [Dependencies](#dependencies) | [Building](#building-antares-solution) | [Tests](#tests) | [Installer creation](#installer-creation)

## C/I status
[![Status][centos_precompiled_svg]][centos_precompiled_link] [![Status][centos_deps_build_svg]][centos_deps_build_link]
| OS | System librairies | Built in libraries |
|:-------|--------|------|
| Centos7 | [![Status][centos_system_svg]][centos_system_link] | [![Status][centos_deps_build_svg]][centos_deps_build_link] |

[centos_deps_build_svg]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/workflows/Centos7%20CI%20(deps.%20compilation)/badge.svg

[centos_deps_build_link]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/actions?query=workflow%3A"Centos7%20CI%20(deps.%20compilation)"

[centos_system_svg]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/workflows/Centos7%20CI%20(system%20libs)/badge.svg

[centos_system_link]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/actions?query=workflow%3A"Centos7%20CI%20(system%20libs)"

## [CMake version](#cmake-version)
CMake 3.x must be used.
Expand Down Expand Up @@ -47,7 +57,7 @@ pip3 install -r src/tests/examples/requirements.txt
- [OR-Tools](https://github.com/AntaresSimulatorTeam/or-tools/tree/rte_dev_sirius) (fork from [RTE](https://github.com/rte-france/or-tools/tree/rte_dev_sirius) based on official OR-Tools github)
- [wxWidgets](https://github.com/wxWidgets/wxWidgets)
(Only for the complete Antares Simulator solution with GUI)
- Boost libraries : test (Only for unit tests)
- Boost libraries : test process filesystem regex dll (Only for unit tests)

This section describes the install procedures for the third-party Open source libraries used by ANTARES.
The install procedure can be done
Expand All @@ -57,7 +67,7 @@ The install procedure can be done

#### Yum commands
```
sudo yum install redhat-lsb-core wxGTK3-devel boost-test boost-devel unzip
sudo yum install redhat-lsb-core curl-devel wxGTK3-devel boost-test boost-filesystem boost-regex boost-devel unzip
```
### [Automatic librairies compilation from git](#git_compil)
[Antares dependencies compilation repository](https://github.com/AntaresSimulatorTeam/antares-deps) is used as a git submodule for automatic librairies compilation from git.
Expand Down Expand Up @@ -204,9 +214,3 @@ There are still some system libraries that must be installed if you want to use
sudo yum install epel-release
sudo yum install curl wxGTK3
```

[centos_deps_build_svg]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/workflows/Centos7%20CI%20(deps.%20compilation)/badge.svg
[centos_deps_build_link]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/actions?query=workflow%3A"Centos7%20CI%20(deps.%20compilation)"

[centos_precompiled_svg]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/workflows/Centos7%20CI%20(pre-compiled)/badge.svg
[centos_precompiled_link]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/actions?query=workflow%3A"Centos7%20CI%20(pre-compiled)"
22 changes: 13 additions & 9 deletions docs/build/INSTALL-ubuntu.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,17 @@
[Environnement](#environment) | [Build tools](#build-tools) | [Environnement build install](#env-build-install) | [Python version](#python-version) | [Dependencies](#dependencies) | [Building](#building-antares-solution) | [Tests](#tests) | [Installer creation](#installer-creation)

## C/I status
[![Status][ubuntu_precompiled_svg]][ubuntu_precompiled_link] [![Status][ubuntu_deps_build_svg]][ubuntu_deps_build_link]
| OS | System librairies | Built in libraries |
|:-------|--------|------|
| Ubuntu | [![Status][linux_system_svg]][linux_system_link] | [![Status][linux_deps_build_svg]][linux_deps_build_link] |

[linux_system_svg]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/workflows/Linux%20CI%20(system%20libs)/badge.svg

[linux_system_link]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/actions?query=workflow%3A"Linux%20CI%20(system%20libs)"

[linux_deps_build_svg]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/workflows/Linux%20CI%20(deps.%20compilation)/badge.svg

[linux_deps_build_link]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/actions?query=workflow%3A"Linux%20CI%20(deps.%20compilation)"

## [Build tools](#build-tools)

Expand All @@ -28,7 +38,7 @@ pip3 install -r src/src/tests/examples/requirements.txt
- [OR-Tools](https://github.com/AntaresSimulatorTeam/or-tools/tree/rte_dev_sirius) (fork from [RTE](https://github.com/rte-france/or-tools/tree/rte_dev_sirius) based on official OR-Tools github)
- [wxWidgets](https://github.com/wxWidgets/wxWidgets)
(Only for the complete Antares Simulator solution with GUI)
- Boost libraries : test (Only for unit tests)
- Boost libraries : test process filesystem regex dll (Only for unit tests)

This section describes the install procedures for the third-party Open source libraries used by ANTARES.
The install procedure can be done
Expand All @@ -38,7 +48,7 @@ The install procedure can be done

#### Command to install dependencies
```
sudo apt install uuid-dev libwxgtk3.0-gtk3-dev libboost-test-dev
sudo apt install uuid-dev libwxgtk3.0-gtk3-dev libboost-test-dev libboost-filesystem-dev libboost-regex-dev libboost-dev
```

### [Automatic librairies compilation from git](#git_compil)
Expand Down Expand Up @@ -179,9 +189,3 @@ There are still some system libraries that must be installed if you want to use
```
sudo apt-get install libwxgtk3.0-gtk3-0v5
```

[ubuntu_precompiled_svg]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/workflows/Ubuntu%20CI%20(pre-compiled)/badge.svg
[ubuntu_precompiled_link]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/actions?query=workflow%3A"Ubuntu%20CI%20(pre-compiled)"

[ubuntu_deps_build_svg]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/workflows/Ubuntu%20CI%20(deps.%20compilation)/badge.svg
[ubuntu_deps_build_link]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/actions?query=workflow%3A"Ubuntu%20CI%20(deps.%20compilation)"
24 changes: 16 additions & 8 deletions docs/build/INSTALL-windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,17 @@
[CMake version](#cmake-version) | [Python version](#python-version) | [Dependencies](#dependencies) | [Building](#building-antares-solution) | [Tests](#tests) | [Installer creation](#installer-creation)

## C/I status
[![Status][windows_precompiled_svg]][windows_precompiled_link] [![Status][windows_precompiled_only_svg]][windows_precompiled_only_link]
| OS | System librairies | Built in libraries |
|:-------|--------|------|
| Windows | [![Status][windows_vcpkg_svg]][windows_vcpkg_link] | [![Status][windows_deps_build_svg]][windows_deps_build_link] |

[windows_deps_build_svg]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/workflows/Windows%20CI%20(deps.%20compilation)/badge.svg

[windows_deps_build_link]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/actions?query=workflow%3A"Windows%20CI%20(deps.%20compilation)"

[windows_vcpkg_svg]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/workflows/Windows%20CI%20(VCPKG)/badge.svg

[windows_vcpkg_link]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/actions?query=workflow%3A"Windows%20CI%20(VCPKG)"

## [CMake version](#cmake-version)
CMake 3.x must be used.
Expand All @@ -26,7 +36,7 @@ pip install -r src/tests/examples/requirements.txt
- [OR-Tools](https://github.com/AntaresSimulatorTeam/or-tools/tree/rte_dev_sirius) (fork from [RTE](https://github.com/rte-france/or-tools/tree/rte_dev_sirius) based on official OR-Tools github)
- [wxWidgets](https://github.com/wxWidgets/wxWidgets)
(Only for the complete Antares Simulator solution with GUI)
- Boost libraries : test (Only for unit tests)
- Boost libraries : test process filesystem regex dll (Only for unit tests)

This section describes the install procedures for the third-party Open source libraries used by ANTARES.
The install procedure can be done
Expand Down Expand Up @@ -64,6 +74,10 @@ Note :
cd [vcpkg_root]
vcpkg install wxwidgets:[vcpg-triplet]
vcpkg install boost-test:[vcpg-triplet]
vcpkg install boost-filesystem:[vcpg-triplet]
vcpkg install boost-process[vcpg-triplet]
vcpkg install boost-dll:[vcpg-triplet]
vcpkg install boost-regex:[vcpg-triplet]
```
### [Automatic librairies compilation from git](#git_compil)
[Antares dependencies compilation repository](https://github.com/AntaresSimulatorTeam/antares-deps) is used as a git submodule for automatic librairies compilation from git.
Expand Down Expand Up @@ -203,9 +217,3 @@ cpack -GNSIS
```
Currently missing in NSIS installer :
- External libraries sources

[windows_precompiled_only_svg]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/workflows/Windows%20CI%20(pre-compiled%20only)/badge.svg
[windows_precompiled_only_link]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/actions?query=workflow%3A"Windows%20CI%20(pre-compiled%20only)"

[windows_precompiled_svg]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/workflows/Windows%20CI%20(VCPKG%20and%20pre-compiled)/badge.svg
[windows_precompiled_link]: https://github.com/AntaresSimulatorTeam/Antares_Simulator/actions?query=workflow%3A"Windows%20CI%20(VCPKG%20and%20pre-compiled)"

0 comments on commit 9ab23e2

Please sign in to comment.