drinkingtea/cpp-template
Template
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[buildcore] Mark all Makefile defs as vars or cmds

Browse Source
This commit is contained in:
Gary Talent 2023-08-25 00:13:55 -05:00
parent e17ba1e17a
commit 6054b03129
4 changed files with 174 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
deps/buildcore/base.mk vendored
View File

@ -9,86 +9,76 @@
ifeq (${OS},Windows_NT) ifeq (${OS},Windows_NT)
SHELL := powershell.exe SHELL := powershell.exe
.SHELLFLAGS := -NoProfile -Command .SHELLFLAGS := -NoProfile -Command
BC_OS=windows BC_VAR_OS=windows
BC_HOST_ENV=${BC_OS}
else else
BC_OS=$(shell uname | tr [:upper:] [:lower:]) BC_VAR_OS=$(shell uname | tr [:upper:] [:lower:])
BC_HOST_ENV=${BC_OS}-$(shell uname -m)
endif endif
ifdef BC_USE_DOCKER_DEVENV ifdef BC_USE_DOCKER_DEVENV
ifneq ($(shell which docker 2> /dev/null),) ifneq ($(shell which docker 2> /dev/null),)
BC_DEVENV=devenv$(shell pwd | sed 's/\//-/g') BC_VAR_DEVENV=devenv$(shell pwd | sed 's/\//-/g')
BC_DEVENV_IMAGE=${BC_PROJECT_NAME}-devenv BC_VAR_DEVENV_IMAGE=${BC_VAR_PROJECT_NAME}-devenv
ifeq ($(shell docker inspect --format="{{.State.Status}}" ${BC_DEVENV} 2>&1),running) ifeq ($(shell docker inspect --format="{{.State.Status}}" ${BC_VAR_DEVENV} 2>&1),running)
BC_ENVRUN=docker exec -i -t --user $(shell id -u ${USER}) ${BC_DEVENV} BC_CMD_ENVRUN=docker exec -i -t --user $(shell id -u ${USER}) ${BC_VAR_DEVENV}
endif endif
endif endif
endif endif
ifneq ($(shell ${BC_ENVRUN} which python3 2> /dev/null),) ifneq ($(shell ${BC_CMD_ENVRUN} which python3 2> /dev/null),)
BC_PY3=${BC_ENVRUN} python3 BC_PY3=${BC_CMD_ENVRUN} python3
else else
ifeq ($(shell ${BC_ENVRUN} python -c 'import sys; print(sys.version_info[0])'),3) ifeq ($(shell ${BC_CMD_ENVRUN} python -c 'import sys; print(sys.version_info[0])'),3)
BC_PY3=python BC_PY3=${BC_CMD_ENVRUN} python
else else
echo 'Please install Python3' echo 'Please install Python3'
exit 1 exit 1
endif endif
endif endif
BC_SCRIPTS=${BUILDCORE_PATH}/scripts BC_VAR_SCRIPTS=${BUILDCORE_PATH}/scripts
BC_SETUP_BUILD=${BC_PY3} ${BC_SCRIPTS}/setup-build.py BC_CMD_SETUP_BUILD=${BC_PY3} ${BC_VAR_SCRIPTS}/setup-build.py
BC_PYBB=${BC_PY3} ${BC_SCRIPTS}/pybb.py BC_CMD_PYBB=${BC_PY3} ${BC_VAR_SCRIPTS}/pybb.py
BC_CMAKE_BUILD=${BC_PYBB} cmake-build BC_CMD_CMAKE_BUILD=${BC_CMD_PYBB} cmake-build
BC_GETENV=${BC_PYBB} getenv BC_CMD_GETENV=${BC_CMD_PYBB} getenv
BC_CTEST=${BC_PYBB} ctest-all BC_CMD_CTEST=${BC_CMD_PYBB} ctest-all
BC_RM_RF=${BC_PYBB} rm BC_CMD_RM_RF=${BC_CMD_PYBB} rm
BC_CAT=${BC_PYBB} cat BC_CMD_MKDIR_P=${BC_CMD_PYBB} mkdir
BC_BUILD_PATH=build BC_CMD_CAT=${BC_CMD_PYBB} cat
ifdef BC_USE_VCPKG BC_CMD_DEBUGGER=${BC_CMD_PYBB} debug
ifndef BC_VCPKG_DIR_BASE BC_VAR_HOSTENV=$(shell ${BC_CMD_ENVRUN} ${BC_CMD_PYBB} hostenv)
BC_VCPKG_DIR_BASE=.vcpkg BC_VAR_BUILD_PATH=build
endif BC_VAR_CURRENT_BUILD=$(BC_VAR_HOSTENV)-$(shell ${BC_CMD_ENVRUN} ${BC_CMD_CAT} .current_build)
ifndef BC_VCPKG_VERSION
BC_VCPKG_VERSION=2023.08.09
endif
BC_VCPKG_TOOLCHAIN=--toolchain=${BC_VCPKG_DIR}/scripts/buildsystems/vcpkg.cmake
endif
BC_DEBUGGER=${BC_PYBB} debug
BC_VCPKG_DIR=$(BC_VCPKG_DIR_BASE)/$(BC_VCPKG_VERSION)-$(BC_HOST_ENV)
BC_CURRENT_BUILD=$(BC_HOST_ENV)-$(shell ${BC_ENVRUN} ${BC_CAT} .current_build)
.PHONY: build .PHONY: build
build: build:
${BC_ENVRUN} ${BC_CMAKE_BUILD} ${BC_BUILD_PATH} ${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH}
.PHONY: install .PHONY: install
install: install:
${BC_ENVRUN} ${BC_CMAKE_BUILD} ${BC_BUILD_PATH} install ${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH} install
.PHONY: clean .PHONY: clean
clean: clean:
${BC_ENVRUN} ${BC_CMAKE_BUILD} ${BC_BUILD_PATH} clean ${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH} clean
.PHONY: purge .PHONY: purge
purge: purge:
${BC_ENVRUN} ${BC_RM_RF} .current_build ${BC_CMD_RM_RF} .current_build
${BC_ENVRUN} ${BC_RM_RF} ${BC_BUILD_PATH} ${BC_CMD_RM_RF} ${BC_VAR_BUILD_PATH}
${BC_ENVRUN} ${BC_RM_RF} dist ${BC_CMD_RM_RF} dist
${BC_ENVRUN} ${BC_RM_RF} compile_commands.json ${BC_CMD_RM_RF} compile_commands.json
.PHONY: test .PHONY: test
test: build test: build
${BC_ENVRUN} mypy ${BC_SCRIPTS} ${BC_CMD_ENVRUN} mypy ${BC_VAR_SCRIPTS}
${BC_ENVRUN} ${BC_CMAKE_BUILD} ${BC_BUILD_PATH} test ${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH} test
.PHONY: test-verbose .PHONY: test-verbose
test-verbose: build test-verbose: build
${BC_ENVRUN} ${BC_CTEST} ${BC_BUILD_PATH} --output-on-failure ${BC_CMD_CTEST} ${BC_VAR_BUILD_PATH} --output-on-failure
.PHONY: test-rerun-verbose .PHONY: test-rerun-verbose
test-rerun-verbose: build test-rerun-verbose: build
${BC_ENVRUN} ${BC_CTEST} ${BC_BUILD_PATH} --rerun-failed --output-on-failure ${BC_CMD_CTEST} ${BC_VAR_BUILD_PATH} --rerun-failed --output-on-failure
ifdef BC_USE_DOCKER_DEVENV
.PHONY: devenv-image .PHONY: devenv-image
devenv-image: devenv-image:
docker build . -t ${BC_DEVENV_IMAGE} docker build . -t ${BC_VAR_DEVENV_IMAGE}
.PHONY: devenv-create .PHONY: devenv-create
devenv-create: devenv-create:
docker run -d \ docker run -d \
@ -100,73 +90,83 @@ devenv-create:
-v $(shell pwd):/usr/src/project \ -v $(shell pwd):/usr/src/project \
-v /dev/shm:/dev/shm \ -v /dev/shm:/dev/shm \
--restart=always \ --restart=always \
--name ${BC_DEVENV} \ --name ${BC_VAR_DEVENV} \
-t ${BC_DEVENV_IMAGE} bash -t ${BC_VAR_DEVENV_IMAGE} bash
.PHONY: devenv-destroy .PHONY: devenv-destroy
devenv-destroy: devenv-destroy:
docker rm -f ${BC_DEVENV} docker rm -f ${BC_VAR_DEVENV}
ifdef BC_ENVRUN ifdef BC_CMD_ENVRUN
.PHONY: devenv-shell .PHONY: devenv-shell
devenv-shell: devenv-shell:
${BC_ENVRUN} bash ${BC_CMD_ENVRUN} bash
endif
endif endif
ifdef BC_USE_VCPKG ifdef BC_USE_VCPKG
.PHONY: vcpkg ifndef BC_VCPKG_DIR_BASE
vcpkg: ${BC_VCPKG_DIR} vcpkg-install BC_VCPKG_DIR_BASE=.vcpkg
endif
ifndef BC_VCPKG_VERSION
BC_VCPKG_VERSION=2023.08.09
endif
BC_VCPKG_TOOLCHAIN=--toolchain=${BC_VAR_VCPKG_DIR}/scripts/buildsystems/vcpkg.cmake
BC_VAR_VCPKG_DIR=$(BC_VCPKG_DIR_BASE)/$(BC_VCPKG_VERSION)-$(BC_VAR_HOSTENV)
${BC_VCPKG_DIR}: .PHONY: vcpkg
${BC_ENVRUN} ${BC_RM_RF} ${BC_VCPKG_DIR} vcpkg: ${BC_VAR_VCPKG_DIR} vcpkg-install
${BC_ENVRUN} mkdir -p ${BC_VCPKG_DIR_BASE}
${BC_ENVRUN} git clone -b release --depth 1 --branch ${BC_VCPKG_VERSION} https://github.com/microsoft/vcpkg.git ${BC_VCPKG_DIR} ${BC_VAR_VCPKG_DIR}:
ifneq (${BC_OS},windows) ${BC_CMD_RM_RF} ${BC_VAR_VCPKG_DIR}
${BC_ENVRUN} ${BC_VCPKG_DIR}/bootstrap-vcpkg.sh ${BC_CMD_PYBB} mkdir ${BC_VCPKG_DIR_BASE}
${BC_CMD_ENVRUN} git clone -b release --depth 1 --branch ${BC_VCPKG_VERSION} https://github.com/microsoft/vcpkg.git ${BC_VAR_VCPKG_DIR}
ifneq (${BC_VAR_OS},windows)
${BC_CMD_ENVRUN} ${BC_VAR_VCPKG_DIR}/bootstrap-vcpkg.sh
else else
${BC_ENVRUN} ${BC_VCPKG_DIR}/bootstrap-vcpkg.bat ${BC_CMD_ENVRUN} ${BC_VAR_VCPKG_DIR}/bootstrap-vcpkg.bat
endif endif
.PHONY: vcpkg-install .PHONY: vcpkg-install
vcpkg-install: vcpkg-install:
ifneq (${BC_OS},windows) ifneq (${BC_VAR_OS},windows)
${BC_ENVRUN} ${BC_VCPKG_DIR}/vcpkg install ${BC_VCPKG_PKGS} ${BC_CMD_ENVRUN} ${BC_VAR_VCPKG_DIR}/vcpkg install ${BC_VCPKG_PKGS}
else else
${BC_ENVRUN} ${BC_VCPKG_DIR}/vcpkg install --triplet x64-windows ${BC_VCPKG_PKGS} ${BC_CMD_ENVRUN} ${BC_VAR_VCPKG_DIR}/vcpkg install --triplet x64-windows ${BC_VCPKG_PKGS}
endif endif
else ifdef USE_CONAN # USE_CONAN ################################################ else ifdef USE_CONAN # USE_VCPKG / USE_CONAN ####################################
.PHONY: setup-conan .PHONY: setup-conan
conan-config: conan-config:
${BC_ENVRUN} conan profile new ${BC_PROJECT_NAME} --detect --force ${BC_CMD_ENVRUN} conan profile new ${BC_VAR_PROJECT_NAME} --detect --force
ifeq ($(BC_OS),linux) ifeq ($(BC_VAR_OS),linux)
${BC_ENVRUN} conan profile update settings.compiler.libcxx=libstdc++11 ${BC_PROJECT_NAME} ${BC_CMD_ENVRUN} conan profile update settings.compiler.libcxx=libstdc++11 ${BC_VAR_PROJECT_NAME}
else else
${BC_ENVRUN} conan profile update settings.compiler.cppstd=20 ${BC_PROJECT_NAME} ${BC_CMD_ENVRUN} conan profile update settings.compiler.cppstd=20 ${BC_VAR_PROJECT_NAME}
ifeq ($(BC_OS),windows) ifeq ($(BC_VAR_OS),windows)
${BC_ENVRUN} conan profile update settings.compiler.runtime=static ${BC_PROJECT_NAME} ${BC_CMD_ENVRUN} conan profile update settings.compiler.runtime=static ${BC_VAR_PROJECT_NAME}
endif endif
endif endif
.PHONY: conan .PHONY: conan
conan: conan:
${BC_ENVRUN} ${BC_PYBB} conan-install ${BC_PROJECT_NAME} ${BC_CMD_PYBB} conan-install ${BC_VAR_PROJECT_NAME}
endif # USE_CONAN ############################################### endif # USE_CONAN ###############################################
ifeq (${BC_OS},darwin) ifeq (${BC_VAR_OS},darwin)
.PHONY: configure-xcode .PHONY: configure-xcode
configure-xcode: configure-xcode:
${BC_ENVRUN} ${BC_SETUP_BUILD} ${BC_VCPKG_TOOLCHAIN} --build_tool=xcode --current_build=0 --build_root=${BC_BUILD_PATH} ${BC_CMD_SETUP_BUILD} ${BC_VCPKG_TOOLCHAIN} --build_tool=xcode --current_build=0 --build_root=${BC_VAR_BUILD_PATH}
endif endif
.PHONY: configure-release .PHONY: configure-release
configure-release: configure-release:
${BC_ENVRUN} ${BC_SETUP_BUILD} ${BC_VCPKG_TOOLCHAIN} --build_type=release --build_root=${BC_BUILD_PATH} ${BC_CMD_SETUP_BUILD} ${BC_VCPKG_TOOLCHAIN} --build_type=release --build_root=${BC_VAR_BUILD_PATH}
.PHONY: configure-debug .PHONY: configure-debug
configure-debug: configure-debug:
${BC_ENVRUN} ${BC_SETUP_BUILD} ${BC_VCPKG_TOOLCHAIN} --build_type=debug --build_root=${BC_BUILD_PATH} ${BC_CMD_SETUP_BUILD} ${BC_VCPKG_TOOLCHAIN} --build_type=debug --build_root=${BC_VAR_BUILD_PATH}
.PHONY: configure-asan .PHONY: configure-asan
configure-asan: configure-asan:
${BC_ENVRUN} ${BC_SETUP_BUILD} ${BC_VCPKG_TOOLCHAIN} --build_type=asan --build_root=${BC_BUILD_PATH} ${BC_CMD_SETUP_BUILD} ${BC_VCPKG_TOOLCHAIN} --build_type=asan --build_root=${BC_VAR_BUILD_PATH}

51
deps/buildcore/scripts/pybb.py vendored
View File

@ -18,21 +18,20 @@ import subprocess
import sys import sys
from typing import List, Optional from typing import List, Optional
import util
def mkdir(path: str):
if not os.path.exists(path):
os.mkdir(path)
# this exists because Windows is utterly incapable of providing a proper rm -rf def mkdir(path: str) -> int:
def rm(path: str): try:
file_exists = os.path.exists(path) util.mkdir_p(path)
is_link = os.path.islink(path) except Exception:
is_dir = os.path.isdir(path) return 1
if (file_exists or is_link) and not is_dir: return 0
os.remove(path)
elif os.path.isdir(path):
shutil.rmtree(path) def rm_multi(paths: List[str]):
for path in paths:
util.rm(path)
def ctest_all() -> int: def ctest_all() -> int:
@ -87,11 +86,10 @@ def cat(paths: List[str]) -> int:
try: try:
with open(path) as f: with open(path) as f:
data = f.read() data = f.read()
sys.stdout.write(data) print(data)
except FileNotFoundError: except FileNotFoundError:
sys.stderr.write(f'cat: {path}: no such file or directory\n') sys.stderr.write(f'cat: {path}: no such file or directory\n')
return 1 return 1
sys.stdout.write('\n')
return 0 return 0
@ -107,12 +105,21 @@ def debug(paths: List[str]) -> int:
def get_env(var_name: str) -> int: def get_env(var_name: str) -> int:
if var_name not in os.environ: if var_name not in os.environ:
return 1 return 1
sys.stdout.write(os.environ[var_name]) print(os.environ[var_name])
return 0 return 0
def hostname() -> int: def hostname() -> int:
sys.stdout.write(platform.node()) print(platform.node())
return 0
def host_env() -> int:
os_name = os.uname().sysname.lower()
arch = platform.machine()
if arch == 'amd64':
arch = 'x86_64'
print(f'{os_name}-{arch}')
return 0 return 0
@ -123,13 +130,9 @@ def clarg(idx: int) -> Optional[str]:
def main() -> int: def main() -> int:
err = 0 err = 0
if sys.argv[1] == 'mkdir': if sys.argv[1] == 'mkdir':
try: err = mkdir(sys.argv[2])
mkdir(sys.argv[2])
except Exception:
err = 1
elif sys.argv[1] == 'rm': elif sys.argv[1] == 'rm':
for i in range(2, len(sys.argv)): rm_multi(sys.argv[2:])
rm(sys.argv[i])
elif sys.argv[1] == 'conan-install': elif sys.argv[1] == 'conan-install':
err = conan() err = conan()
elif sys.argv[1] == 'ctest-all': elif sys.argv[1] == 'ctest-all':
@ -144,6 +147,8 @@ def main() -> int:
err = get_env(sys.argv[2]) err = get_env(sys.argv[2])
elif sys.argv[1] == 'hostname': elif sys.argv[1] == 'hostname':
err = hostname() err = hostname()
elif sys.argv[1] == 'hostenv':
err = host_env()
else: else:
sys.stderr.write('Command not found\n') sys.stderr.write('Command not found\n')
err = 1 err = 1

45
deps/buildcore/scripts/setup-build.py vendored
View File

@ -15,19 +15,35 @@ import shutil
import subprocess import subprocess
import sys import sys
from pybb import mkdir, rm import util
os_name = os.uname().sysname.lower()
def main() -> int: def main() -> int:
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('--target', help='Platform target', parser.add_argument(
default='{:s}-{:s}'.format(os_name, platform.machine())) '--target',
parser.add_argument('--build_type', help='Build type (asan,debug,release)', default='release') help='Platform target',
parser.add_argument('--build_tool', help='Build tool (default,xcode)', default='') default=f'{util.get_os()}-{util.get_arch()}')
parser.add_argument('--build_root', help='Path to the root of build directories (must be in project dir)', default='build') parser.add_argument(
parser.add_argument('--toolchain', help='Path to CMake toolchain file', default='') '--build_type',
parser.add_argument('--current_build', help='Indicates whether or not to make this the active build', default=1) help='Build type (asan,debug,release)',
default='release')
parser.add_argument(
'--build_tool',
help='Build tool (default,xcode)',
default='')
parser.add_argument(
'--build_root',
help='Path to the root build directory (must be in project dir)',
default='build')
parser.add_argument(
'--toolchain',
help='Path to CMake toolchain file',
default='')
parser.add_argument(
'--current_build',
help='Indicates whether or not to make this the active build',
default=1)
args = parser.parse_args() args = parser.parse_args()
if args.build_type == 'asan': if args.build_type == 'asan':
@ -65,8 +81,8 @@ def main() -> int:
return 1 return 1
project_dir = os.getcwd() project_dir = os.getcwd()
build_dir = '{:s}/{:s}/{:s}'.format(project_dir, args.build_root, build_config) build_dir = f'{project_dir}/{args.build_root}/{build_config}'
rm(build_dir) util.rm(build_dir)
cmake_cmd = [ cmake_cmd = [
'cmake', '-S', project_dir, '-B', build_dir, build_tool, 'cmake', '-S', project_dir, '-B', build_dir, build_tool,
'-DCMAKE_EXPORT_COMPILE_COMMANDS=ON', '-DCMAKE_EXPORT_COMPILE_COMMANDS=ON',
@ -83,15 +99,16 @@ def main() -> int:
subprocess.run(cmake_cmd) subprocess.run(cmake_cmd)
mkdir('dist') util.mkdir_p('dist')
if int(args.current_build) != 0: if int(args.current_build) != 0:
cb = open('.current_build', 'w') cb = open('.current_build', 'w')
cb.write(args.build_type) cb.write(args.build_type)
cb.close() cb.close()
rm('compile_commands.json') util.rm('compile_commands.json')
if platform.system() != 'Windows': if platform.system() != 'Windows':
os.symlink('{:s}/compile_commands.json'.format(build_dir), 'compile_commands.json') os.symlink(f'{build_dir}/compile_commands.json',
'compile_commands.json')
return 0 return 0

38
deps/buildcore/scripts/util.py vendored Normal file
View File

@ -0,0 +1,38 @@
#
# Copyright 2016 - 2021 gary@drinkingtea.net
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
import os
import platform
import shutil
def mkdir_p(path: str):
if not os.path.exists(path):
os.mkdir(path)
# this exists because Windows is utterly incapable of providing a proper rm -rf
def rm(path: str):
file_exists = os.path.exists(path)
is_link = os.path.islink(path)
is_dir = os.path.isdir(path)
if (file_exists or is_link) and not is_dir:
os.remove(path)
elif os.path.isdir(path):
shutil.rmtree(path)
def get_os() -> str:
return os.uname().sysname.lower()
def get_arch() -> str:
arch = platform.machine()
if arch == 'amd64':
arch = 'x86_64'
return arch