diff options
| -rw-r--r-- | .travis.yml | 33 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | appveyor.yml | 35 | ||||
| m--------- | cmake | 0 |
4 files changed, 46 insertions, 24 deletions
diff --git a/.travis.yml b/.travis.yml index fe372b2..7047131 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,22 +18,21 @@ env: - configuration=Release platform=x64 before_script: - - |- - ./cmake/ci/boost/build_travis.py \ - -- \ - link=static \ - target-os=windows \ - --user-config="$TRAVIS_BUILD_DIR/cmake/toolchains/boost/mingw-w64-$platform.jam" \ - --with-filesystem \ - --with-program_options \ - --with-system + - >- + ./cmake/boost/build/ci/travis.py + --link static + -- + target-os=windows + --user-config="$TRAVIS_BUILD_DIR/cmake/boost/toolchains/mingw-w64-$platform.jam" + --with-filesystem + --with-program_options + --with-system script: - - |- - ./cmake/ci/build_travis.py \ - --install "$HOME/install" \ - -- \ - -D "BOOST_ROOT=$HOME/boost_1_71_0" \ - -D "BOOST_LIBRARYDIR=$HOME/boost_1_71_0/stage/$platform/$configuration/lib" \ - -D "CMAKE_TOOLCHAIN_FILE=cmake/toolchains/mingw-w64-$platform.cmake" \ - -D CMAKE_SYSTEM_NAME=Windows + - >- + ./cmake/cmake/build/ci/travis.py + --install "$HOME/install" + -- + -D "CMAKE_TOOLCHAIN_FILE=cmake/cmake/toolchains/mingw-w64-$platform.cmake" + -D "BOOST_ROOT=$HOME/boost_1_71_0" + -D "BOOST_LIBRARYDIR=$HOME/boost_1_71_0/stage/$platform/$configuration/lib" diff --git a/CMakeLists.txt b/CMakeLists.txt index 232aeb7..d581426 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5) # for Boost::* imported targets project(aes_tools C CXX) -include(cmake/common.cmake) +include(cmake/cmake/common.cmake) add_subdirectory(aes) add_subdirectory(aesxx) diff --git a/appveyor.yml b/appveyor.yml index 7c22ce5..0261da0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,22 +30,45 @@ install: - git submodule update --init --recursive build_script: - - '"%python_exe%" cmake\ci\build_appveyor.py --install "%install_dir%" -- -D "BOOST_ROOT=%appveyor_boost_root%" -D "BOOST_LIBRARYDIR=%appveyor_boost_librarydir%" -D "AES_TOOLS_ASM=%use_asm%"' + - >- + "%python_exe%" cmake\cmake\build\ci\appveyor.py + --install "%install_dir%" + -- + -D "AES_TOOLS_ASM=%use_asm%" + -D "BOOST_ROOT=%appveyor_boost_root%" + -D "BOOST_LIBRARYDIR=%appveyor_boost_librarydir%" after_build: - 7z.exe a "%APPVEYOR_PROJECT_NAME%-%PLATFORM%-%CONFIGURATION%.zip" "%install_dir%" - appveyor.exe PushArtifact "%APPVEYOR_PROJECT_NAME%-%PLATFORM%-%CONFIGURATION%.zip" test_script: - - '"%python_exe%" "%APPVEYOR_BUILD_FOLDER%\\test\\nist.py" --path "%install_dir%\bin" --log "%APPVEYOR_BUILD_FOLDER%\test\nist.log"' + - >- + "%python_exe%" "%APPVEYOR_BUILD_FOLDER%\test\nist.py" + --path "%install_dir%\bin" + --log "%APPVEYOR_BUILD_FOLDER%\test\nist.log" - ps: Get-Content "$env:APPVEYOR_BUILD_FOLDER\test\nist.log" -Tail 5 - - '"%python_exe%" "%APPVEYOR_BUILD_FOLDER%\\test\\cavp.py" --path "%install_dir%\bin" --log "%APPVEYOR_BUILD_FOLDER%\test\cavp.log"' + - >- + "%python_exe%" "%APPVEYOR_BUILD_FOLDER%\test\cavp.py" + --path "%install_dir%\bin" + --log "%APPVEYOR_BUILD_FOLDER%\test\cavp.log" - ps: Get-Content "$env:APPVEYOR_BUILD_FOLDER\test\cavp.log" -Tail 5 - - '"%python_exe%" "%APPVEYOR_BUILD_FOLDER%\\test\\nist.py" --path "%install_dir%\bin" --log "%APPVEYOR_BUILD_FOLDER%\test\nist_boxes.log" --boxes' + - >- + "%python_exe%" "%APPVEYOR_BUILD_FOLDER%\test\nist.py" + --path "%install_dir%\bin" + --log "%APPVEYOR_BUILD_FOLDER%\test\nist_boxes.log" + --boxes - ps: Get-Content "$env:APPVEYOR_BUILD_FOLDER\test\nist_boxes.log" -Tail 5 - - '"%python_exe%" "%APPVEYOR_BUILD_FOLDER%\\test\\cavp.py" --path "%install_dir%\bin" --log "%APPVEYOR_BUILD_FOLDER%\test\cavp_boxes.log" --boxes' + - >- + "%python_exe%" "%APPVEYOR_BUILD_FOLDER%\test\cavp.py" + --path "%install_dir%\bin" + --log "%APPVEYOR_BUILD_FOLDER%\test\cavp_boxes.log" + --boxes - ps: Get-Content "$env:APPVEYOR_BUILD_FOLDER\test\cavp_boxes.log" -Tail 5 - - '"%python_exe%" "%APPVEYOR_BUILD_FOLDER%\\test\\file.py" --path "%install_dir%\bin" --log "%APPVEYOR_BUILD_FOLDER%\test\file.log"' + - >- + "%python_exe%" "%APPVEYOR_BUILD_FOLDER%\test\file.py" + --path "%install_dir%\bin" + --log "%APPVEYOR_BUILD_FOLDER%\test\file.log" - ps: Get-Content "$env:APPVEYOR_BUILD_FOLDER\test\file.log" -Tail 5 for: diff --git a/cmake b/cmake -Subproject aaf52cd2c859fe8047f9058d3043d9eba783042 +Subproject d83b675f53bd18204b1f07105b3944cc9756e7d |