diff options
Diffstat (limited to '')
| -rw-r--r-- | .ci/Makefile | 34 | ||||
| -rw-r--r-- | common.cmake (renamed from cmake/common.cmake) | 0 | ||||
| -rw-r--r-- | examples/boost/CMakeLists.txt (renamed from cmake/examples/boost/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | examples/boost/foo.cpp (renamed from cmake/examples/boost/foo.cpp) | 0 | ||||
| -rw-r--r-- | examples/dynamic/CMakeLists.txt (renamed from cmake/examples/dynamic/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | examples/dynamic/baz.cpp (renamed from cmake/examples/dynamic/baz.cpp) | 0 | ||||
| -rw-r--r-- | examples/dynamic/baz.hpp (renamed from cmake/examples/dynamic/baz.hpp) | 0 | ||||
| -rw-r--r-- | examples/dynamic/foo.cpp (renamed from cmake/examples/dynamic/foo.cpp) | 0 | ||||
| -rw-r--r-- | examples/simple/CMakeLists.txt (renamed from cmake/examples/simple/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | examples/simple/foo.cpp (renamed from cmake/examples/simple/foo.cpp) | 0 | ||||
| -rw-r--r-- | examples/static/CMakeLists.txt (renamed from cmake/examples/static/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | examples/static/bar.cpp (renamed from cmake/examples/static/bar.cpp) | 0 | ||||
| -rw-r--r-- | examples/static/bar.hpp (renamed from cmake/examples/static/bar.hpp) | 0 | ||||
| -rw-r--r-- | examples/static/foo.cpp (renamed from cmake/examples/static/foo.cpp) | 0 | ||||
| -rw-r--r-- | project/__init__.py | 0 | ||||
| -rw-r--r-- | project/boost/README.md (renamed from boost/build/README.md) | 0 | ||||
| -rw-r--r-- | project/boost/__init__.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | project/boost/build.py (renamed from boost/build/build.py) | 0 | ||||
| -rw-r--r-- | project/ci/__init__.py | 0 | ||||
| -rw-r--r-- | project/ci/appveyor/__init__.py | 0 | ||||
| -rw-r--r-- | project/ci/appveyor/boost.py (renamed from boost/build/ci/appveyor.py) | 7 | ||||
| -rw-r--r--[-rwxr-xr-x] | project/ci/appveyor/cmake.py (renamed from cmake/build/ci/appveyor.py) | 7 | ||||
| -rw-r--r-- | project/ci/travis/__init__.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | project/ci/travis/boost.py (renamed from boost/build/ci/travis.py) | 7 | ||||
| -rw-r--r--[-rwxr-xr-x] | project/ci/travis/cmake.py (renamed from cmake/build/ci/travis.py) | 7 | ||||
| -rw-r--r-- | project/cmake/README.md (renamed from cmake/build/README.md) | 0 | ||||
| -rw-r--r-- | project/cmake/__init__.py | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | project/cmake/build.py (renamed from cmake/build/build.py) | 0 | ||||
| -rw-r--r-- | toolchains/boost/README.md (renamed from boost/toolchains/README.md) | 0 | ||||
| -rw-r--r-- | toolchains/boost/mingw-w64-x64-exe.jam (renamed from boost/toolchains/mingw-w64-x64-exe.jam) | 0 | ||||
| -rw-r--r-- | toolchains/boost/mingw-w64-x64.jam (renamed from boost/toolchains/mingw-w64-x64.jam) | 0 | ||||
| -rw-r--r-- | toolchains/boost/mingw-w64-x86-exe.jam (renamed from boost/toolchains/mingw-w64-x86-exe.jam) | 0 | ||||
| -rw-r--r-- | toolchains/boost/mingw-w64-x86.jam (renamed from boost/toolchains/mingw-w64-x86.jam) | 0 | ||||
| -rw-r--r-- | toolchains/cmake/README.md (renamed from cmake/toolchains/README.md) | 0 | ||||
| -rw-r--r-- | toolchains/cmake/gcc-x64.cmake (renamed from cmake/toolchains/gcc-x64.cmake) | 0 | ||||
| -rw-r--r-- | toolchains/cmake/gcc-x86.cmake (renamed from cmake/toolchains/gcc-x86.cmake) | 0 | ||||
| -rw-r--r-- | toolchains/cmake/mingw-w64-x64.cmake (renamed from cmake/toolchains/mingw-w64-x64.cmake) | 0 | ||||
| -rw-r--r-- | toolchains/cmake/mingw-w64-x86.cmake (renamed from cmake/toolchains/mingw-w64-x86.cmake) | 0 |
38 files changed, 25 insertions, 37 deletions
diff --git a/.ci/Makefile b/.ci/Makefile index 9553238..13fa74f 100644 --- a/.ci/Makefile +++ b/.ci/Makefile @@ -53,8 +53,8 @@ x86_args = -A Win32 install_prefix = C:/install else makefile_dir := $(dir $(realpath $(firstword $(MAKEFILE_LIST)))) -x64_args := -D "CMAKE_TOOLCHAIN_FILE=$(makefile_dir)/../cmake/toolchains/gcc-x64.cmake" -x86_args := -D "CMAKE_TOOLCHAIN_FILE=$(makefile_dir)/../cmake/toolchains/gcc-x86.cmake" +x64_args := -D "CMAKE_TOOLCHAIN_FILE=$(makefile_dir)/../toolchains/cmake/gcc-x64.cmake" +x86_args := -D "CMAKE_TOOLCHAIN_FILE=$(makefile_dir)/../toolchains/cmake/gcc-x86.cmake" install_prefix := $$HOME/install endif @@ -74,7 +74,7 @@ FORCE: echo/%/build: FORCE $(newline) @echo ===================================================================== - @echo Building cmake/examples/$* + @echo Building examples/$* @echo ===================================================================== echo/%/run: FORCE @@ -95,7 +95,7 @@ echo/%/finished: FORCE .PHONY: simple/build simple/build: echo/simple/build - "$(python)" cmake/build/build.py --install "$(install_prefix)/simple" --configuration Release -- cmake/examples/simple $(x64_args) + "$(python)" -m project.cmake.build --install "$(install_prefix)/simple" --configuration Release -- examples/simple $(x64_args) .PHONY: simple/run simple/run: echo/simple/run @@ -112,7 +112,7 @@ simple: simple/build simple/run simple/verify echo/simple/finished .PHONY: static/build static/build: echo/static/build - "$(python)" cmake/build/build.py --install "$(install_prefix)/static" --configuration Debug -- cmake/examples/static $(x86_args) + "$(python)" -m project.cmake.build --install "$(install_prefix)/static" --configuration Debug -- examples/static $(x86_args) .PHONY: static/run static/run: echo/static/run @@ -129,7 +129,7 @@ static: static/build static/run static/verify echo/static/finished .PHONY: dynamic/build dynamic/build: echo/dynamic/build - "$(python)" cmake/build/build.py --install "$(install_prefix)/dynamic" --configuration RelWithDebInfo -- cmake/examples/dynamic $(x64_args) + "$(python)" -m project.cmake.build --install "$(install_prefix)/dynamic" --configuration RelWithDebInfo -- examples/dynamic $(x64_args) .PHONY: dynamic/run # Windows can pick up DLLs in the same directory, otherwise we need to add them @@ -161,7 +161,7 @@ echo/boost/%/ls: FORCE echo/boost/%/exe/build: FORCE @echo --------------------------------------------------------------------- - @echo Boost 1.$*.0: building cmake/examples/boost + @echo Boost 1.$*.0: building examples/boost @echo --------------------------------------------------------------------- echo/boost/%/exe/run: FORCE @@ -186,11 +186,11 @@ echo/boost/%/finished: FORCE .PHONY: boost/58/download boost/58/download: echo/boost/58/build - "$(python)" boost/build/build.py download 1.58.0 + "$(python)" -m project.boost.build download 1.58.0 .PHONY: boost/58/build boost/58/build: - "$(python)" boost/build/build.py build --configuration Debug --platform x86 --link static -- ./boost_1_58_0 --with-filesystem --with-program_options $(b2_flags) + "$(python)" -m project.boost.build build --configuration Debug --platform x86 --link static -- ./boost_1_58_0 --with-filesystem --with-program_options $(b2_flags) .PHONY: boost/58/ls boost/58/ls: echo/boost/58/ls @@ -198,7 +198,7 @@ boost/58/ls: echo/boost/58/ls .PHONY: boost/58/exe/build boost/58/exe/build: echo/boost/58/exe/build - "$(python)" cmake/build/build.py --install "$(install_prefix)/boost_1_58_0" --configuration Debug -- cmake/examples/boost $(x86_args) -D "BOOST_ROOT=$(cwd)/boost_1_58_0" -D "BOOST_LIBRARYDIR=$(cwd)/boost_1_58_0/stage/x86/Debug/lib" + "$(python)" -m project.cmake.build --install "$(install_prefix)/boost_1_58_0" --configuration Debug -- examples/boost $(x86_args) -D "BOOST_ROOT=$(cwd)/boost_1_58_0" -D "BOOST_LIBRARYDIR=$(cwd)/boost_1_58_0/stage/x86/Debug/lib" .PHONY: boost/58/exe/run # Boost should be linked statically, no need to adjust PATH: @@ -223,11 +223,11 @@ boost/58: boost/58/download boost/58/build boost/58/ls boost/58/exe echo/boost/5 .PHONY: boost/72/download boost/72/download: echo/boost/72/build - "$(python)" boost/build/build.py download --cache . 1.72.0 + "$(python)" -m project.boost.build download --cache . 1.72.0 .PHONY: boost/72/build boost/72/build: - "$(python)" boost/build/build.py build --platform x86 x64 --link shared -- ./boost_1_72_0 --with-filesystem --with-program_options $(b2_flags) + "$(python)" -m project.boost.build build --platform x86 x64 --link shared -- ./boost_1_72_0 --with-filesystem --with-program_options $(b2_flags) .PHONY: boost/72/ls boost/72/ls: echo/boost/72/ls @@ -235,7 +235,7 @@ boost/72/ls: echo/boost/72/ls .PHONY: boost/72/exe/build boost/72/exe/build: echo/boost/72/exe/build - "$(python)" cmake/build/build.py --install "$(install_prefix)/boost_1_72_0" --configuration Release -- cmake/examples/boost $(x64_args) -D "BOOST_ROOT=$(cwd)/boost_1_72_0" -D "BOOST_LIBRARYDIR=$(cwd)/boost_1_72_0/stage/x64/Release/lib" -D Boost_USE_STATIC_LIBS=OFF + "$(python)" -m project.cmake.build --install "$(install_prefix)/boost_1_72_0" --configuration Release -- examples/boost $(x64_args) -D "BOOST_ROOT=$(cwd)/boost_1_72_0" -D "BOOST_LIBRARYDIR=$(cwd)/boost_1_72_0/stage/x64/Release/lib" -D Boost_USE_STATIC_LIBS=OFF .PHONY: boost/72/exe/run # Boost is linked dynamically, we need to adjust PATH: @@ -265,7 +265,7 @@ boost/72: boost/72/download boost/72/build boost/72/ls boost/72/exe echo/boost/7 ifdef TRAVIS .PHONY: boost/65/build boost/65/build: echo/boost/65/build - "$(python)" boost/build/ci/travis.py --link static -- --with-filesystem --with-program_options $(b2_flags) + "$(python)" -m project.ci.travis.boost --link static -- --with-filesystem --with-program_options $(b2_flags) .PHONY: boost/65/ls boost/65/ls: echo/boost/65/ls @@ -273,12 +273,12 @@ boost/65/ls: echo/boost/65/ls .PHONY: boost/65/exe/build boost/65/exe/build: echo/boost/65/exe/build - TRAVIS_BUILD_DIR="$$TRAVIS_BUILD_DIR/cmake/examples/boost" "$(python)" cmake/build/ci/travis.py --install "$(install_prefix)/boost_1_65_0" -- -D "BOOST_ROOT=$$HOME/boost" -D "BOOST_LIBRARYDIR=$$HOME/boost/stage/$$platform/$$configuration/lib" + TRAVIS_BUILD_DIR="$$TRAVIS_BUILD_DIR/examples/boost" "$(python)" -m project.ci.travis.cmake --install "$(install_prefix)/boost_1_65_0" -- -D "BOOST_ROOT=$$HOME/boost" -D "BOOST_LIBRARYDIR=$$HOME/boost/stage/$$platform/$$configuration/lib" endif ifdef APPVEYOR .PHONY: boost/65/build boost/65/build: echo/boost/65/build - "$(python)" boost/build/ci/appveyor.py --link static -- --with-filesystem --with-program_options $(b2_flags) + "$(python)" -m project.ci.appveyor.boost --link static -- --with-filesystem --with-program_options $(b2_flags) .PHONY: boost/65/ls boost/65/ls: echo/boost/65/ls @@ -286,7 +286,7 @@ boost/65/ls: echo/boost/65/ls .PHONY: boost/65/exe/build boost/65/exe/build: echo/boost/65/exe/build - set "APPVEYOR_BUILD_FOLDER=%APPVEYOR_BUILD_FOLDER%\cmake\examples\boost" && "$(python)" cmake/build/ci/appveyor.py --install "$(install_prefix)/boost_1_65_0" -- -D "BOOST_ROOT=C:\projects\boost" -D "BOOST_LIBRARYDIR=C:\projects\boost\stage\%PLATFORM%\%CONFIGURATION%\lib" + set "APPVEYOR_BUILD_FOLDER=%APPVEYOR_BUILD_FOLDER%\examples\boost" && "$(python)" -m project.ci.appveyor.cmake --install "$(install_prefix)/boost_1_65_0" -- -D "BOOST_ROOT=C:\projects\boost" -D "BOOST_LIBRARYDIR=C:\projects\boost\stage\%PLATFORM%\%CONFIGURATION%\lib" endif .PHONY: boost/65/exe/run diff --git a/cmake/common.cmake b/common.cmake index 0d813fe..0d813fe 100644 --- a/cmake/common.cmake +++ b/common.cmake diff --git a/cmake/examples/boost/CMakeLists.txt b/examples/boost/CMakeLists.txt index 8c076c9..8c076c9 100644 --- a/cmake/examples/boost/CMakeLists.txt +++ b/examples/boost/CMakeLists.txt diff --git a/cmake/examples/boost/foo.cpp b/examples/boost/foo.cpp index 3bd0326..3bd0326 100644 --- a/cmake/examples/boost/foo.cpp +++ b/examples/boost/foo.cpp diff --git a/cmake/examples/dynamic/CMakeLists.txt b/examples/dynamic/CMakeLists.txt index 4602adb..4602adb 100644 --- a/cmake/examples/dynamic/CMakeLists.txt +++ b/examples/dynamic/CMakeLists.txt diff --git a/cmake/examples/dynamic/baz.cpp b/examples/dynamic/baz.cpp index d108ae3..d108ae3 100644 --- a/cmake/examples/dynamic/baz.cpp +++ b/examples/dynamic/baz.cpp diff --git a/cmake/examples/dynamic/baz.hpp b/examples/dynamic/baz.hpp index 2fc9b2a..2fc9b2a 100644 --- a/cmake/examples/dynamic/baz.hpp +++ b/examples/dynamic/baz.hpp diff --git a/cmake/examples/dynamic/foo.cpp b/examples/dynamic/foo.cpp index b7d9986..b7d9986 100644 --- a/cmake/examples/dynamic/foo.cpp +++ b/examples/dynamic/foo.cpp diff --git a/cmake/examples/simple/CMakeLists.txt b/examples/simple/CMakeLists.txt index 4f8859e..4f8859e 100644 --- a/cmake/examples/simple/CMakeLists.txt +++ b/examples/simple/CMakeLists.txt diff --git a/cmake/examples/simple/foo.cpp b/examples/simple/foo.cpp index b9d3132..b9d3132 100644 --- a/cmake/examples/simple/foo.cpp +++ b/examples/simple/foo.cpp diff --git a/cmake/examples/static/CMakeLists.txt b/examples/static/CMakeLists.txt index 8a6acb8..8a6acb8 100644 --- a/cmake/examples/static/CMakeLists.txt +++ b/examples/static/CMakeLists.txt diff --git a/cmake/examples/static/bar.cpp b/examples/static/bar.cpp index 37aa9b5..37aa9b5 100644 --- a/cmake/examples/static/bar.cpp +++ b/examples/static/bar.cpp diff --git a/cmake/examples/static/bar.hpp b/examples/static/bar.hpp index a3ea4c1..a3ea4c1 100644 --- a/cmake/examples/static/bar.hpp +++ b/examples/static/bar.hpp diff --git a/cmake/examples/static/foo.cpp b/examples/static/foo.cpp index c6355a2..c6355a2 100644 --- a/cmake/examples/static/foo.cpp +++ b/examples/static/foo.cpp diff --git a/project/__init__.py b/project/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/project/__init__.py diff --git a/boost/build/README.md b/project/boost/README.md index c1f903e..c1f903e 100644 --- a/boost/build/README.md +++ b/project/boost/README.md diff --git a/project/boost/__init__.py b/project/boost/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/project/boost/__init__.py diff --git a/boost/build/build.py b/project/boost/build.py index 8da8c9e..8da8c9e 100755..100644 --- a/boost/build/build.py +++ b/project/boost/build.py diff --git a/project/ci/__init__.py b/project/ci/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/project/ci/__init__.py diff --git a/project/ci/appveyor/__init__.py b/project/ci/appveyor/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/project/ci/appveyor/__init__.py diff --git a/boost/build/ci/appveyor.py b/project/ci/appveyor/boost.py index 4a55e20..4218dd6 100644 --- a/boost/build/ci/appveyor.py +++ b/project/ci/appveyor/boost.py @@ -21,6 +21,8 @@ import os import os.path import sys +from project.boost.build import BoostVersion, main as build_main + def _env(name): if name not in os.environ: @@ -80,11 +82,6 @@ def build_appveyor(argv=None): args = _parse_args(argv) _check_appveyor() - this_module_dir = os.path.dirname(os.path.abspath(__file__)) - parent_module_dir = os.path.dirname(this_module_dir) - sys.path.insert(1, parent_module_dir) - from build import BoostVersion, main as build_main - version = BoostVersion.from_string(_get_boost_version()) appveyor_argv = [ 'download', diff --git a/cmake/build/ci/appveyor.py b/project/ci/appveyor/cmake.py index b9141ec..e1ebce0 100755..100644 --- a/cmake/build/ci/appveyor.py +++ b/project/ci/appveyor/cmake.py @@ -19,6 +19,8 @@ import logging import os import sys +from project.cmake.build import build + class Image(Enum): VS_2013 = 'Visual Studio 2013' @@ -132,11 +134,6 @@ def build_appveyor(argv=None): args = _parse_args(argv) _check_appveyor() - this_module_dir = os.path.dirname(os.path.abspath(__file__)) - parent_module_dir = os.path.dirname(this_module_dir) - sys.path.insert(1, parent_module_dir) - from build import build - appveyor_argv = [ '--build', _get_build_dir(), '--configuration', _get_configuration(), diff --git a/project/ci/travis/__init__.py b/project/ci/travis/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/project/ci/travis/__init__.py diff --git a/boost/build/ci/travis.py b/project/ci/travis/boost.py index 7bbb18d..46ae96b 100755..100644 --- a/boost/build/ci/travis.py +++ b/project/ci/travis/boost.py @@ -19,6 +19,8 @@ import os import os.path import sys +from project.boost.build import BoostVersion, main as build_main + def _env(name): if name not in os.environ: @@ -78,11 +80,6 @@ def build_travis(argv=None): args = _parse_args(argv) _check_travis() - this_module_dir = os.path.dirname(os.path.abspath(__file__)) - parent_module_dir = os.path.dirname(this_module_dir) - sys.path.insert(1, parent_module_dir) - from build import BoostVersion, main as build_main - version = BoostVersion.from_string(_get_boost_version()) travis_argv = [ 'download', diff --git a/cmake/build/ci/travis.py b/project/ci/travis/cmake.py index ab93711..7a1f707 100755..100644 --- a/cmake/build/ci/travis.py +++ b/project/ci/travis/cmake.py @@ -19,6 +19,8 @@ import os import os.path import sys +from project.cmake.build import build + def _env(name): if name not in os.environ: @@ -69,11 +71,6 @@ def build_travis(argv=None): args = _parse_args(argv) _check_travis() - this_module_dir = os.path.dirname(os.path.abspath(__file__)) - parent_module_dir = os.path.dirname(this_module_dir) - sys.path.insert(1, parent_module_dir) - from build import build - travis_argv = [ '--build', _get_build_dir(), '--configuration', _get_configuration(), diff --git a/cmake/build/README.md b/project/cmake/README.md index b63564d..b63564d 100644 --- a/cmake/build/README.md +++ b/project/cmake/README.md diff --git a/project/cmake/__init__.py b/project/cmake/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/project/cmake/__init__.py diff --git a/cmake/build/build.py b/project/cmake/build.py index 695489b..695489b 100755..100644 --- a/cmake/build/build.py +++ b/project/cmake/build.py diff --git a/boost/toolchains/README.md b/toolchains/boost/README.md index 8c6870a..8c6870a 100644 --- a/boost/toolchains/README.md +++ b/toolchains/boost/README.md diff --git a/boost/toolchains/mingw-w64-x64-exe.jam b/toolchains/boost/mingw-w64-x64-exe.jam index 46ab535..46ab535 100644 --- a/boost/toolchains/mingw-w64-x64-exe.jam +++ b/toolchains/boost/mingw-w64-x64-exe.jam diff --git a/boost/toolchains/mingw-w64-x64.jam b/toolchains/boost/mingw-w64-x64.jam index f52acfa..f52acfa 100644 --- a/boost/toolchains/mingw-w64-x64.jam +++ b/toolchains/boost/mingw-w64-x64.jam diff --git a/boost/toolchains/mingw-w64-x86-exe.jam b/toolchains/boost/mingw-w64-x86-exe.jam index 87beca0..87beca0 100644 --- a/boost/toolchains/mingw-w64-x86-exe.jam +++ b/toolchains/boost/mingw-w64-x86-exe.jam diff --git a/boost/toolchains/mingw-w64-x86.jam b/toolchains/boost/mingw-w64-x86.jam index e73f190..e73f190 100644 --- a/boost/toolchains/mingw-w64-x86.jam +++ b/toolchains/boost/mingw-w64-x86.jam diff --git a/cmake/toolchains/README.md b/toolchains/cmake/README.md index 9c58eb6..9c58eb6 100644 --- a/cmake/toolchains/README.md +++ b/toolchains/cmake/README.md diff --git a/cmake/toolchains/gcc-x64.cmake b/toolchains/cmake/gcc-x64.cmake index 2f7019e..2f7019e 100644 --- a/cmake/toolchains/gcc-x64.cmake +++ b/toolchains/cmake/gcc-x64.cmake diff --git a/cmake/toolchains/gcc-x86.cmake b/toolchains/cmake/gcc-x86.cmake index e2e84be..e2e84be 100644 --- a/cmake/toolchains/gcc-x86.cmake +++ b/toolchains/cmake/gcc-x86.cmake diff --git a/cmake/toolchains/mingw-w64-x64.cmake b/toolchains/cmake/mingw-w64-x64.cmake index c689d39..c689d39 100644 --- a/cmake/toolchains/mingw-w64-x64.cmake +++ b/toolchains/cmake/mingw-w64-x64.cmake diff --git a/cmake/toolchains/mingw-w64-x86.cmake b/toolchains/cmake/mingw-w64-x86.cmake index e5dedd4..e5dedd4 100644 --- a/cmake/toolchains/mingw-w64-x86.cmake +++ b/toolchains/cmake/mingw-w64-x86.cmake |