gary/sc9k
1
0
Fork 0
mirror of https://github.com/gtalent/sc9k.git synced 2025-06-08 06:34:52 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

[buildcore] Update buildcore

Browse Source
This commit is contained in:
Gary Talent 2022-01-30 18:56:46 -06:00
parent 8d0b0fb4c5
commit c1cab3e3f3
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
deps/buildcore/base.mk vendored
View File

@ -16,7 +16,15 @@ else
HOST_ENV=${OS}-$(shell uname -m) HOST_ENV=${OS}-$(shell uname -m)
endif endif
ifeq ($(shell python -c 'import sys; print(sys.version_info[0])'),3) DEVENV=devenv$(shell pwd | sed 's/\//-/g')
DEVENV_IMAGE=${PROJECT_NAME}-devenv
ifneq ($(shell which docker 2> /dev/null),)
ifeq ($(shell docker inspect --format="{{.State.Status}}" ${DEVENV} 2>&1),running)
ENV_RUN=docker exec -i -t --user $(shell id -u ${USER}) ${DEVENV}
endif
endif
ifeq ($(shell ${ENV_RUN} python -c 'import sys; print(sys.version_info[0])'),3)
PYTHON3=python PYTHON3=python
else else
PYTHON3=python3 PYTHON3=python3
@ -26,6 +34,7 @@ SCRIPTS=${BUILDCORE_PATH}/scripts
SETUP_BUILD=${PYTHON3} ${SCRIPTS}/setup-build.py SETUP_BUILD=${PYTHON3} ${SCRIPTS}/setup-build.py
PYBB=${PYTHON3} ${SCRIPTS}/pybb.py PYBB=${PYTHON3} ${SCRIPTS}/pybb.py
CMAKE_BUILD=${PYBB} cmake-build CMAKE_BUILD=${PYBB} cmake-build
CTEST=${PYBB} ctest-all
RM_RF=${PYBB} rm RM_RF=${PYBB} rm
ifdef USE_VCPKG ifdef USE_VCPKG
ifndef VCPKG_DIR_BASE ifndef VCPKG_DIR_BASE
@ -43,13 +52,6 @@ else
endif endif
VCPKG_DIR=$(VCPKG_DIR_BASE)/$(VCPKG_VERSION)-$(HOST_ENV) VCPKG_DIR=$(VCPKG_DIR_BASE)/$(VCPKG_VERSION)-$(HOST_ENV)
DEVENV=devenv$(shell pwd | sed 's/\//-/g')
DEVENV_IMAGE=${PROJECT_NAME}-devenv
ifneq ($(shell which docker 2> /dev/null),)
ifeq ($(shell docker inspect --format="{{.State.Status}}" ${DEVENV} 2>&1),running)
ENV_RUN=docker exec -i -t --user $(shell id -u ${USER}) ${DEVENV}
endif
endif
CURRENT_BUILD=$(HOST_ENV)-$(shell ${PYBB} cat .current_build) CURRENT_BUILD=$(HOST_ENV)-$(shell ${PYBB} cat .current_build)
.PHONY: build .PHONY: build
@ -69,6 +71,12 @@ purge:
.PHONY: test .PHONY: test
test: build test: build
${ENV_RUN} ${CMAKE_BUILD} build test ${ENV_RUN} ${CMAKE_BUILD} build test
.PHONY: test-verbose
test-verbose: build
${ENV_RUN} ${CTEST} build --output-on-failure
.PHONY: test-rerun-verbose
test-rerun-verbose: build
${ENV_RUN} ${CTEST} build --rerun-failed --output-on-failure
.PHONY: devenv-image .PHONY: devenv-image
devenv-image: devenv-image:
@ -89,11 +97,14 @@ devenv-create:
.PHONY: devenv-destroy .PHONY: devenv-destroy
devenv-destroy: devenv-destroy:
docker rm -f ${DEVENV} docker rm -f ${DEVENV}
ifdef ENV_RUN
.PHONY: devenv-shell .PHONY: devenv-shell
devenv-shell: devenv-shell:
${ENV_RUN} bash ${ENV_RUN} bash
endif
ifdef USE_VCPKG ifdef USE_VCPKG
.PHONY: vcpkg .PHONY: vcpkg
vcpkg: ${VCPKG_DIR} vcpkg-install vcpkg: ${VCPKG_DIR} vcpkg-install
@ -114,18 +125,20 @@ ifneq (${OS},windows)
else else
${VCPKG_DIR}/vcpkg install --triplet x64-windows ${VCPKG_PKGS} ${VCPKG_DIR}/vcpkg install --triplet x64-windows ${VCPKG_PKGS}
endif endif
else # USE_VCPKG
else # USE_VCPKG ################################################
.PHONY: setup-conan .PHONY: setup-conan
conan-config: conan-config:
conan profile new nostalgia --detect --force ${ENV_RUN} conan profile new ${PROJECT_NAME} --detect --force
ifeq ($(OS),linux) ifeq ($(OS),linux)
conan profile update settings.compiler.libcxx=libstdc++11 ${PROJECT_NAME} ${ENV_RUN} conan profile update settings.compiler.libcxx=libstdc++11 ${PROJECT_NAME}
endif endif
.PHONY: conan .PHONY: conan
conan: conan:
@mkdir -p .conanbuild && cd .conanbuild && conan install ../ --build=missing -pr=${PROJECT_NAME} ${ENV_RUN} ${PYBB} conan-install ${PROJECT_NAME}
endif # USE_VCPKG #@mkdir -p .conanbuild && cd .conanbuild && conan install ../ --build=missing -pr=${PROJECT_NAME}
endif # USE_VCPKG ###############################################
.PHONY: configure-xcode .PHONY: configure-xcode
configure-xcode: configure-xcode: