Skip to content

Commit

Permalink
Remove openssl dependency
Browse files Browse the repository at this point in the history
TODO
- curl depends on Openssl
- Remove unused check functions
  • Loading branch information
flomnes committed Mar 18, 2021
1 parent 3c80ac7 commit bc4a458
Show file tree
Hide file tree
Showing 21 changed files with 18 additions and 1,531 deletions.
7 changes: 3 additions & 4 deletions INSTALL-centos.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ pip3 install -r src/tests/examples/requirements.txt

## [Dependencies](#deps)
ANTARES depends on several mandatory libraries.
- [OpenSSL](https://github.com/openssl/openssl)
- [CURL](https://github.com/curl/curl)
- [Sirius Solver](https://github.com/AntaresSimulatorTeam/sirius-solver/tree/Antares_VCPKG) (fork from [RTE](https://github.com/rte-france/sirius-solver/tree/Antares_VCPKG))
- [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)
Expand All @@ -69,7 +68,7 @@ The install procedure can be done

#### Yum commands
```
sudo yum install redhat-lsb-core openssl-devel curl-devel wxGTK3-devel boost-test boost-filesystem boost-regex 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 All @@ -90,7 +89,7 @@ By default the install directory is `<antares_checkout_dir>/../rte-antares-deps-
Note :
> `DEPS_INSTALL_DIR` is added to `CMAKE_PREFIX_PATH`
> If the dependency install directory contains CURL, OPENSSL or wxWidgets pre-compiled libraries an additionnal option must be used at configure time `-DUSE_PRECOMPILED_EXT=ON`
> If the dependency install directory contains CURL, or wxWidgets pre-compiled libraries an additionnal option must be used at configure time `-DUSE_PRECOMPILED_EXT=ON`
### Pre-compiled libraries download : release version only
You can download pre-compiled antares-deps archive from [Antares dependencies compilation repository](https://github.com/AntaresSimulatorTeam/antares-deps/releases/tag/v1.1.0). Only release version are available.
Expand Down Expand Up @@ -214,5 +213,5 @@ There are still some system libraries that must be installed if you want to use

```
sudo yum install epel-release
sudo yum install openssl curl wxGTK3
sudo yum install curl wxGTK3
```
5 changes: 2 additions & 3 deletions INSTALL-ubuntu.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ pip3 install -r src/src/tests/examples/requirements.txt

## [Dependencies](#deps)
ANTARES depends on several mandatory libraries.
- [OpenSSL](https://github.com/openssl/openssl)
- [CURL](https://github.com/curl/curl)
- [Sirius Solver](https://github.com/AntaresSimulatorTeam/sirius-solver/tree/Antares_VCPKG) (fork from [RTE](https://github.com/rte-france/sirius-solver/tree/Antares_VCPKG))
- [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)
Expand All @@ -50,7 +49,7 @@ The install procedure can be done

#### Command to install dependencies
```
sudo apt install uuid-dev libcurl4-openssl-dev libssl-dev libwxgtk3.0-gtk3-dev libboost-test-dev libboost-filesystem-dev libboost-regex-dev libboost-dev
sudo apt install uuid-dev libcurl4-openssl-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 @@ -190,4 +189,4 @@ There are still some system libraries that must be installed if you want to use

```
sudo apt-get install libcurl4 libwxgtk3.0-gtk3-0v5
```
```
4 changes: 1 addition & 3 deletions INSTALL-windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ pip install -r src/tests/examples/requirements.txt

## [Dependencies](#deps)
ANTARES depends on several mandatory libraries.
- [OpenSSL](https://github.com/openssl/openssl)
- [CURL](https://github.com/curl/curl)
- [Sirius Solver](https://github.com/AntaresSimulatorTeam/sirius-solver/tree/Antares_VCPKG) (fork from [RTE](https://github.com/rte-france/sirius-solver/tree/Antares_VCPKG))
- [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)
Expand Down Expand Up @@ -74,7 +73,6 @@ Note :
#### 2 Install dependencies
```
cd [vcpkg_root]
vcpkg install openssl:[vcpg-triplet]
vcpkg install curl:[vcpg-triplet]
vcpkg install wxwidgets:[vcpg-triplet]
vcpkg install boost-test:[vcpg-triplet]
Expand Down Expand Up @@ -102,7 +100,7 @@ By default the install directory is `<antares_checkout_dir>/../rte-antares-deps-
Note :
> `DEPS_INSTALL_DIR` is added to `CMAKE_PREFIX_PATH`
> If the dependency install directory contains CURL, OPENSSL or wxWidgets pre-compiled libraries an additionnal option must be used at configure time `-DUSE_PRECOMPILED_EXT=ON`
> If the dependency install directory contains CURL or wxWidgets pre-compiled libraries an additionnal option must be used at configure time `-DUSE_PRECOMPILED_EXT=ON`
### Pre-compiled libraries download : release version only
You can download pre-compiled antares-deps archive from [Antares dependencies compilation repository](https://github.com/AntaresSimulatorTeam/antares-deps/releases/tag/v1.1.0). Only release version are available.
Expand Down
1 change: 0 additions & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ Git version must be above 2.15 for external dependencies build because `--ignore

## [Dependencies](#deps)
*ANTARES* depends on severals mandatory libraries.
- [OpenSSL](https://github.com/openssl/openssl)
- [CURL](https://github.com/curl/curl)
- [Sirius Solver](https://github.com/AntaresSimulatorTeam/sirius-solver/tree/Antares_VCPKG) (fork from [RTE](https://github.com/rte-france/sirius-solver/tree/Antares_VCPKG))
- [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)
Expand Down
2 changes: 1 addition & 1 deletion docker/centos8-ortools
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN yum install -y epel-release
# Install requirements
RUN yum install -y git redhat-lsb-core gcc gcc-c++ make \
wget \
unzip openssl-devel libcurl-devel wxGTK3-devel libuuid-devel boost-devel boost-test boost-filesystem boost-regex
unzip libcurl-devel wxGTK3-devel libuuid-devel boost-devel boost-test boost-filesystem boost-regex

# Install CMake3
RUN wget https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3.tar.gz &&\
Expand Down
5 changes: 1 addition & 4 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,6 @@ add_subdirectory(antares-deps)
#libcurl
find_package(CURL REQUIRED)

#openssl
find_package(OpenSSL REQUIRED)

#Add needed definition in case of external dependencies compilation
include (antares-deps/cmake/additionnal-definitions.cmake)

Expand Down Expand Up @@ -370,7 +367,7 @@ else()
set(CPACK_PACKAGE_VERSION_PATCH ${ANTARES_VERSION_REVISION})

set(CPACK_DEBIAN_PACKAGE_DEPENDS "libcurl4,libwxgtk3.0-gtk3-0v5")
set(CPACK_RPM_PACKAGE_REQUIRES "openssl,curl,wxGTK3")
set(CPACK_RPM_PACKAGE_REQUIRES "curl,wxGTK3")
set(CPACK_RPM_PACKAGE_AUTOREQPROV "0")

configure_file("distrib/unix/packages.cmake" "distrib/unix/packages.sh")
Expand Down
2 changes: 1 addition & 1 deletion src/antares-deps
2 changes: 1 addition & 1 deletion src/distrib/unix/rpm/rte-antares.spec
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Source0: %%SOURCE%%
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: chrpath

Requires: glibc >= 2.12, libuuid >= 2.17, openssl >= 1.0
Requires: glibc >= 2.12, libuuid >= 2.17

%description
Under the impulsion given by the worldwide growth of innovative technologies
Expand Down
3 changes: 0 additions & 3 deletions src/distrib/win32/sourcefiles.inc.nsh
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,5 @@ File /r ${ANTARES_SRC_DIR}\..\resources\*.*
;${SetOutPath} "$INSTDIR\Sources\src\build_deps\curl\source"
;File /nonfatal /r /x builds .git ${ANTARES_SRC_DIR}\..\src\build_deps\curl\source\*.*

;${SetOutPath} "$INSTDIR\Sources\src\build_deps\OpenSSL\source"
;File /nonfatal /r /x .git ${ANTARES_SRC_DIR}\..\src\build_deps\OpenSSL\source\*.*

;${SetOutPath} "$INSTDIR\Sources\src\build_deps\wxWidgets\source"
;File /nonfatal /r /x .git ${ANTARES_SRC_DIR}\..\src\build_deps\wxWidgets\source\*.*
2 changes: 1 addition & 1 deletion src/ext/ext changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ nmake /f Makefile.vc mode=static VC=14 WITH_SSL=static WITH_DEVEL=../../openssl/
x64:
"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat"
cd ${ANTARES}\src\ext\libcurl\winbuild
nmake /f Makefile.vc mode=static VC=14 WITH_SSL=static WITH_DEVEL=../../openssl/vc-release-x86_64 ENABLE_SSPI=no ENABLE_IDN=no ENABLE_WINSSL=no GEN_PDB=no DEBUG=no MACHINE=x64
nmake /f Makefile.vc mode=static VC=14 ENABLE_SSPI=no ENABLE_IDN=no ENABLE_WINSSL=no GEN_PDB=no DEBUG=no MACHINE=x64
2 changes: 0 additions & 2 deletions src/internet/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ target_include_directories(libantares-license
${CMAKE_SOURCE_DIR}/ext/yuni/src
${CMAKE_SOURCE_DIR}/libs
PUBLIC
${OPENSSL_INCLUDE_DIR}
${CURL_INCLUDE_DIRS}
)

Expand All @@ -30,7 +29,6 @@ target_link_libraries(libantares-license
yuni-static-core
PUBLIC
${CURL_LIBRARIES}
${OPENSSL_LIBRARIES}
base64
)
if(WIN32 OR WIN64)
Expand Down
Loading

0 comments on commit bc4a458

Please sign in to comment.