aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2019-12-13 05:44:37 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2019-12-13 06:50:03 +0300
commitdfbedf7aa3366fa3b8799a43755c783565e22537 (patch)
tree3cb881438bbb1c131c0854e9575adf979df10cef
parentrename executables (diff)
downloadmath-server-dfbedf7aa3366fa3b8799a43755c783565e22537.tar.gz
math-server-dfbedf7aa3366fa3b8799a43755c783565e22537.zip
Travis: switch to boost/build.py
-rw-r--r--.travis.yml7
-rw-r--r--appveyor.yml2
-rw-r--r--client/Dockerfile12
m---------cmake0
-rw-r--r--server/Dockerfile12
5 files changed, 17 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml
index b1f6b8c..f79910c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,15 +18,16 @@ env:
- configuration=Release platform=x64
before_script:
- - ./cmake/build/boost/build_travis.sh --with-filesystem --with-program_options --with-test
+ - ./cmake/ci/boost/build_travis.py --with filesystem program_options test --link=static
script:
- |-
- ./cmake/build/build_travis.py \
+ ./cmake/ci/build_travis.py \
--configuration "$configuration" \
--install "$HOME/install" \
--toolchain ./cmake/toolchains/gcc-$platform.cmake \
--boost "$HOME/boost_1_71_0" \
--boost-librarydir "$HOME/boost_1_71_0/stage/$platform/${configuration,,}/lib" \
- -- -DENABLE_TESTS=ON
+ -- \
+ -DENABLE_TESTS=ON
- "$HOME/install/bin/math-server-unit-tests"
diff --git a/appveyor.yml b/appveyor.yml
index 6e0bbc6..7cc488c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -20,7 +20,7 @@ install:
- git submodule update --init --recursive
build_script:
- - '"%python_exe%" cmake\build\build_appveyor.py --install "%install_dir%" --boost "%appveyor_boost_root%" --boost-librarydir "%appveyor_boost_librarydir%" -- -DENABLE_TESTS=ON'
+ - '"%python_exe%" cmake\ci\build_appveyor.py --install "%install_dir%" --boost "%appveyor_boost_root%" --boost-librarydir "%appveyor_boost_librarydir%" -- -DENABLE_TESTS=ON'
after_build:
- 7z.exe a "math-server-%PLATFORM%-%CONFIGURATION%.zip" "%install_dir%"
diff --git a/client/Dockerfile b/client/Dockerfile
index 2bbc81a..44b20ec 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -21,12 +21,12 @@ ENV src_dir=/usr/src/app
COPY [".", "$src_dir"]
-RUN "$src_dir/cmake/build/build.py" \
- --src "$src_dir" \
- --install /usr/local \
- --clean \
- --configuration Release \
- -- -DENABLE_TESTS=ON \
+RUN "$src_dir/cmake/ci/build.py" \
+ --src "$src_dir" \
+ --install /usr/local \
+ --clean \
+ --configuration Release \
+ -- -DENABLE_TESTS=ON \
&& /usr/local/bin/math-server-unit-tests --log_level=all
ENTRYPOINT ["/usr/local/bin/math-client"]
diff --git a/cmake b/cmake
-Subproject 847c49dd01f984ac10e195569b49c7f1bdf3333
+Subproject b00ae22060acf80467e981d6138aa14de897785
diff --git a/server/Dockerfile b/server/Dockerfile
index 322c07f..f5248ae 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -21,12 +21,12 @@ ENV src_dir=/usr/src/app
COPY [".", "$src_dir"]
-RUN "$src_dir/cmake/build/build.py" \
- --src "$src_dir" \
- --install /usr/local \
- --clean \
- --configuration Release \
- -- -DENABLE_TESTS=ON \
+RUN "$src_dir/cmake/ci/build.py" \
+ --src "$src_dir" \
+ --install /usr/local \
+ --clean \
+ --configuration Release \
+ -- -DENABLE_TESTS=ON \
&& /usr/local/bin/math-server-unit-tests --log_level=all
CMD ["/usr/local/bin/math-server"]