diff options
author | Egor Tensin <Egor.Tensin@gmail.com> | 2020-02-01 16:05:22 +0300 |
---|---|---|
committer | Egor Tensin <Egor.Tensin@gmail.com> | 2020-02-01 16:43:38 +0300 |
commit | d1fffee66ca763502f89df17a116fdad79023f7c (patch) | |
tree | 1377fb4faa3a12e17a793b42cf7ec77651ea6de6 | |
parent | Makefile: try less verbose output (diff) | |
download | cmake-common-d1fffee66ca763502f89df17a116fdad79023f7c.tar.gz cmake-common-d1fffee66ca763502f89df17a116fdad79023f7c.zip |
Makefile: prettier output
Diffstat (limited to '')
-rw-r--r-- | .appveyor.yml | 4 | ||||
-rw-r--r-- | Makefile | 118 |
2 files changed, 85 insertions, 37 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 35bb4c3..4c59f4a 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -22,16 +22,12 @@ install: - choco install make build_script: - - echo Simple CMake projects - make simple - make static - make dynamic - - echo Boost 1.58.0 - make boost/58 - - echo Boost 1.72.0 - make boost/72 - - echo Boost 1.65.0 - make boost/65 @@ -18,6 +18,7 @@ verify_arch = powershell -file ./.ci/verify_arch.ps1 python = python ls = dir /a-D /S /B cwd = $(shell cd) +newline = @echo. else ext = x64_args = @@ -27,91 +28,142 @@ verify_arch = ./.ci/verify_arch.sh python = python3 ls = ls --almost-all -R cwd = $(shell pwd) +newline = @echo endif ifdef appveyor_python_exe python = $(appveyor_python_exe) endif +echo/%/build: + $(newline) + @echo ===================================================================== + @echo Building cmake/examples/$* + @echo ===================================================================== + +echo/%/run: + @echo --------------------------------------------------------------------- + @echo Running $*/bin/foo + @echo --------------------------------------------------------------------- + +echo/%/verify: + @echo --------------------------------------------------------------------- + @echo Verifying $*/bin/foo + @echo --------------------------------------------------------------------- + +echo/%/finished: + @echo ===================================================================== + $(newline) + # examples/simple: x64/Release build. -simple/build: +simple/build: echo/simple/build "$(python)" cmake/build/build.py --install "$(install_prefix)/simple" --configuration Release -- cmake/examples/simple $(x64_args) -simple/run: +simple/run: echo/simple/run "$(install_prefix)/simple/bin/foo" -simple/verify: +simple/verify: echo/simple/verify $(verify_arch) "$(install_prefix)/simple/bin/foo$(ext)" x64 -simple: simple/build simple/run simple/verify +simple: simple/build simple/run simple/verify echo/simple/finished .PHONY: simple simple/build simple/run simple/verify # examples/static: x86/Debug build. -static/build: +static/build: echo/static/build "$(python)" cmake/build/build.py --install "$(install_prefix)/static" --configuration Debug -- cmake/examples/static $(x86_args) -static/run: +static/run: echo/static/run "$(install_prefix)/static/bin/foo" -static/verify: +static/verify: echo/static/verify $(verify_arch) "$(install_prefix)/static/bin/foo$(ext)" x86 -static: static/build static/run static/verify +static: static/build static/run static/verify echo/static/finished .PHONY: static static/build static/run static/verify # examples/dynamic: x64/RelWithDebInfo build. -dynamic/build: +dynamic/build: echo/dynamic/build "$(python)" cmake/build/build.py --install "$(install_prefix)/dynamic" --configuration RelWithDebInfo -- cmake/examples/dynamic $(x64_args) # Windows can pick up DLLs in the same directory, otherwise we need to add them # to PATH. -dynamic/run: +dynamic/run: echo/dynamic/run ifeq ($(windows),1) "$(install_prefix)/dynamic/bin/foo" else LD_LIBRARY_PATH="$(install_prefix)/dynamic/lib" "$(install_prefix)/dynamic/bin/foo" endif -dynamic/verify: +dynamic/verify: echo/dynamic/verify $(verify_arch) "$(install_prefix)/dynamic/bin/foo$(ext)" x64 -dynamic: dynamic/build dynamic/run dynamic/verify +dynamic: dynamic/build dynamic/run dynamic/verify echo/dynamic/finished .PHONY: dynamic dynamic/build dynamic/run dynamic/verify +echo/boost/%/build: + $(newline) + @echo ===================================================================== + @echo Building Boost 1.$*.0 + @echo ===================================================================== + +echo/boost/%/ls: + @echo --------------------------------------------------------------------- + @echo Boost 1.$*.0: stage/ + @echo --------------------------------------------------------------------- + +echo/boost/%/exe/build: + @echo --------------------------------------------------------------------- + @echo Boost 1.$*.0: building cmake/examples/boost + @echo --------------------------------------------------------------------- + +echo/boost/%/exe/run: + @echo --------------------------------------------------------------------- + @echo Boost 1.$*.0: running boost_1_$*_0/bin/foo + @echo --------------------------------------------------------------------- + +echo/boost/%/exe/verify: + @echo --------------------------------------------------------------------- + @echo Boost 1.$*.0: verifying boost_1_$*_0/bin/foo + @echo --------------------------------------------------------------------- + +echo/boost/%/finished: + @echo ===================================================================== + $(newline) + # Boost 1.58.0: # * temporary download, # * x86, Debug, static libraries only. # examples/boost: # * x86/Debug build. -boost/58/download: +boost/58/download: echo/boost/58/build "$(python)" boost/build/build.py download 1.58.0 boost/58/build: "$(python)" boost/build/build.py build --configuration Debug --platform x86 --link static -- ./boost_1_58_0 --with-filesystem --with-program_options $(boost_quiet) -boost/58/ls: +boost/58/ls: echo/boost/58/ls $(ls) "./boost_1_58_0/stage" -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" # Boost should be linked statically, no need to adjust PATH: -boost/58/exe/run: +boost/58/exe/run: echo/boost/58/exe/run "$(install_prefix)/boost_1_58_0/bin/foo" -boost/58/exe/verify: +boost/58/exe/verify: echo/boost/58/exe/verify $(verify_arch) "$(install_prefix)/boost_1_58_0/bin/foo$(ext)" x86 boost/58/exe: boost/58/exe/build boost/58/exe/run boost/58/exe/verify -boost/58: boost/58/download boost/58/build boost/58/ls boost/58/exe +boost/58: boost/58/download boost/58/build boost/58/ls boost/58/exe echo/boost/58/finished .PHONY: boost/58 boost/58/download boost/58/build boost/58/ls boost/58/exe boost/58/exe/build boost/58/exe/run boost/58/exe/verify @@ -121,32 +173,32 @@ boost/58: boost/58/download boost/58/build boost/58/ls boost/58/exe # examples/boost: # * x64/Release build. -boost/72/download: +boost/72/download: echo/boost/72/build "$(python)" boost/build/build.py download --cache . 1.72.0 boost/72/build: "$(python)" boost/build/build.py build --platform x86 x64 --link shared -- ./boost_1_72_0 --with-filesystem --with-program_options $(boost_quiet) -boost/72/ls: +boost/72/ls: echo/boost/72/ls $(ls) "./boost_1_72_0/stage" -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 # Boost is linked dynamically, we need to adjust PATH: -boost/72/exe/run: +boost/72/exe/run: echo/boost/72/exe/run ifeq ($(windows),1) set "PATH=$(cwd)\boost_1_72_0\stage\x64\Release\lib;%PATH%" && "$(install_prefix)/boost_1_72_0/bin/foo" else LD_LIBRARY_PATH="$(cwd)/boost_1_72_0/stage/x64/Release/lib" "$(install_prefix)/boost_1_72_0/bin/foo" endif -boost/72/exe/verify: +boost/72/exe/verify: echo/boost/72/exe/verify $(verify_arch) "$(install_prefix)/boost_1_72_0/bin/foo$(ext)" x64 boost/72/exe: boost/72/exe/build boost/72/exe/run boost/72/exe/verify -boost/72: boost/72/download boost/72/build boost/72/ls boost/72/exe +boost/72: boost/72/download boost/72/build boost/72/ls boost/72/exe echo/boost/72/finished .PHONY: boost/72 boost/72/download boost/72/build boost/72/ls boost/72/exe boost/72/exe/build boost/72/exe/run boost/72/exe/verify @@ -157,32 +209,32 @@ boost/72: boost/72/download boost/72/build boost/72/ls boost/72/exe # * x64/MinSizeRel build (set in .travis.yml and .appveyor.yml). ifdef TRAVIS -boost/65/build: +boost/65/build: echo/boost/65/build "$(python)" boost/build/ci/travis.py --link static -- --with-filesystem --with-program_options $(boost_quiet) -boost/65/ls: +boost/65/ls: echo/boost/65/ls $(ls) "$$HOME/boost/stage" -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" endif ifdef APPVEYOR -boost/65/build: +boost/65/build: echo/boost/65/build "$(python)" boost/build/ci/appveyor.py --link static -- --with-filesystem --with-program_options $(boost_quiet) -boost/65/ls: +boost/65/ls: echo/boost/65/ls $(ls) "C:/projects/boost/stage" -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" endif -boost/65/exe/run: +boost/65/exe/run: echo/boost/65/exe/run "$(install_prefix)/boost_1_65_0/bin/foo" -boost/65/exe/verify: +boost/65/exe/verify: echo/boost/65/exe/verify $(verify_arch) "$(install_prefix)/boost_1_65_0/bin/foo$(ext)" x64 boost/65/exe: boost/65/exe/build boost/65/exe/run boost/65/exe/verify -boost/65: boost/65/build boost/65/ls boost/65/exe +boost/65: boost/65/build boost/65/ls boost/65/exe echo/boost/65/finished |