From 84e82b224b4361fa6cc2c82fb92aca133793230b Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Fri, 25 Aug 2023 00:12:40 -0500
Subject: [PATCH] [buildcore] Update buildcore

---
 deps/buildcore/base.mk                | 150 +++++++++++++-------------
 deps/buildcore/scripts/pybb.py        |  36 +++----
 deps/buildcore/scripts/setup-build.py |  12 +--
 3 files changed, 97 insertions(+), 101 deletions(-)

diff --git a/deps/buildcore/base.mk b/deps/buildcore/base.mk
index e962ee14..c75e6ec0 100644
--- a/deps/buildcore/base.mk
+++ b/deps/buildcore/base.mk
@@ -9,87 +9,76 @@
 ifeq (${OS},Windows_NT)
 	SHELL := powershell.exe
 	.SHELLFLAGS := -NoProfile -Command
-	BC_OS=windows
-	BC_HOST_ENV=${BC_OS}
+	BC_VAR_OS=windows
 else
-	BC_OS=$(shell uname | tr [:upper:] [:lower:])
-	BC_HOST_ENV=${BC_OS}-$(shell uname -m)
+	BC_VAR_OS=$(shell uname | tr [:upper:] [:lower:])
 endif
 
 ifdef BC_USE_DOCKER_DEVENV
 	ifneq ($(shell which docker 2> /dev/null),)
-		BC_DEVENV=devenv$(shell pwd | sed 's/\//-/g')
-		BC_DEVENV_IMAGE=${BC_PROJECT_NAME}-devenv
-		ifeq ($(shell docker inspect --format="{{.State.Status}}" ${BC_DEVENV} 2>&1),running)
-			BC_ENVRUN=docker exec -i -t --user $(shell id -u ${USER}) ${BC_DEVENV}
+		BC_VAR_DEVENV=devenv$(shell pwd | sed 's/\//-/g')
+		BC_VAR_DEVENV_IMAGE=${BC_VAR_PROJECT_NAME}-devenv
+		ifeq ($(shell docker inspect --format="{{.State.Status}}" ${BC_VAR_DEVENV} 2>&1),running)
+			BC_CMD_ENVRUN=docker exec -i -t --user $(shell id -u ${USER}) ${BC_VAR_DEVENV}
 		endif
 	endif
 endif
 
-ifneq ($(shell ${BC_ENVRUN} which python3 2> /dev/null),)
-	BC_PY3=${BC_ENVRUN} python3
+ifneq ($(shell ${BC_CMD_ENVRUN} which python3 2> /dev/null),)
+	BC_PY3=${BC_CMD_ENVRUN} python3
 else
-	ifeq ($(shell ${BC_ENVRUN} python -c 'import sys; print(sys.version_info[0])'),3)
-		BC_PY3=${BC_ENVRUN} python
+	ifeq ($(shell ${BC_CMD_ENVRUN} python -c 'import sys; print(sys.version_info[0])'),3)
+		BC_PY3=${BC_CMD_ENVRUN} python
 	else
 		echo 'Please install Python3'
 		exit 1
 	endif
 endif
 
-BC_SCRIPTS=${BUILDCORE_PATH}/scripts
-BC_SETUP_BUILD=${BC_PY3} ${BC_SCRIPTS}/setup-build.py
-BC_PYBB=${BC_PY3} ${BC_SCRIPTS}/pybb.py
-BC_CMAKE_BUILD=${BC_PYBB} cmake-build
-BC_GETENV=${BC_PYBB} getenv
-BC_CTEST=${BC_PYBB} ctest-all
-BC_RM_RF=${BC_PYBB} rm
-BC_CAT=${BC_PYBB} cat
-BC_BUILD_PATH=build
-ifdef BC_USE_VCPKG
-	ifndef BC_VCPKG_DIR_BASE
-		BC_VCPKG_DIR_BASE=.vcpkg
-	endif
-	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)
+BC_VAR_SCRIPTS=${BUILDCORE_PATH}/scripts
+BC_CMD_SETUP_BUILD=${BC_PY3} ${BC_VAR_SCRIPTS}/setup-build.py
+BC_CMD_PYBB=${BC_PY3} ${BC_VAR_SCRIPTS}/pybb.py
+BC_CMD_CMAKE_BUILD=${BC_CMD_PYBB} cmake-build
+BC_CMD_GETENV=${BC_CMD_PYBB} getenv
+BC_CMD_CTEST=${BC_CMD_PYBB} ctest-all
+BC_CMD_RM_RF=${BC_CMD_PYBB} rm
+BC_CMD_MKDIR_P=${BC_CMD_PYBB} mkdir
+BC_CMD_CAT=${BC_CMD_PYBB} cat
+BC_CMD_DEBUGGER=${BC_CMD_PYBB} debug
+BC_VAR_HOSTENV=$(shell ${BC_CMD_ENVRUN} ${BC_CMD_PYBB} hostenv)
+BC_VAR_BUILD_PATH=build
+BC_VAR_CURRENT_BUILD=$(BC_VAR_HOSTENV)-$(shell ${BC_CMD_ENVRUN} ${BC_CMD_CAT} .current_build)
 
 .PHONY: build
 build:
-	${BC_ENVRUN} ${BC_CMAKE_BUILD} ${BC_BUILD_PATH}
+	${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH}
 .PHONY: install
 install:
-	${BC_ENVRUN} ${BC_CMAKE_BUILD} ${BC_BUILD_PATH} install
+	${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH} install
 .PHONY: clean
 clean:
-	${BC_ENVRUN} ${BC_CMAKE_BUILD} ${BC_BUILD_PATH} clean
+	${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH} clean
 .PHONY: purge
 purge:
-	${BC_ENVRUN} ${BC_RM_RF} .current_build
-	${BC_ENVRUN} ${BC_RM_RF} ${BC_BUILD_PATH}
-	${BC_ENVRUN} ${BC_RM_RF} dist
-	${BC_ENVRUN} ${BC_RM_RF} compile_commands.json
+	${BC_CMD_RM_RF} .current_build
+	${BC_CMD_RM_RF} ${BC_VAR_BUILD_PATH}
+	${BC_CMD_RM_RF} dist
+	${BC_CMD_RM_RF} compile_commands.json
 .PHONY: test
 test: build
-	${BC_ENVRUN} mypy ${BC_SCRIPTS}
-	${BC_ENVRUN} ${BC_CMAKE_BUILD} ${BC_BUILD_PATH} test
+	${BC_CMD_ENVRUN} mypy ${BC_VAR_SCRIPTS}
+	${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH} test
 .PHONY: test-verbose
 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
 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
 devenv-image:
-	docker build . -t ${BC_DEVENV_IMAGE}
+	docker build . -t ${BC_VAR_DEVENV_IMAGE}
 .PHONY: devenv-create
 devenv-create:
 	docker run -d \
@@ -101,74 +90,83 @@ devenv-create:
 		-v $(shell pwd):/usr/src/project \
 		-v /dev/shm:/dev/shm \
 		--restart=always \
-		--name ${BC_DEVENV} \
-		-t ${BC_DEVENV_IMAGE} bash
+		--name ${BC_VAR_DEVENV} \
+		-t ${BC_VAR_DEVENV_IMAGE} bash
 .PHONY: devenv-destroy
 devenv-destroy:
-	docker rm -f ${BC_DEVENV}
-ifdef BC_ENVRUN
+	docker rm -f ${BC_VAR_DEVENV}
+ifdef BC_CMD_ENVRUN
 .PHONY: devenv-shell
 devenv-shell:
-	${BC_ENVRUN} bash
+	${BC_CMD_ENVRUN} bash
 endif
 endif
 
 ifdef BC_USE_VCPKG
 
-.PHONY: vcpkg
-vcpkg: ${BC_VCPKG_DIR} vcpkg-install
+ifndef BC_VCPKG_DIR_BASE
+	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}:
-	${BC_ENVRUN} ${BC_RM_RF} ${BC_VCPKG_DIR}
-	${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}
-ifneq (${BC_OS},windows)
-	${BC_ENVRUN} ${BC_VCPKG_DIR}/bootstrap-vcpkg.sh
+.PHONY: vcpkg
+vcpkg: ${BC_VAR_VCPKG_DIR} vcpkg-install
+
+${BC_VAR_VCPKG_DIR}:
+	${BC_CMD_RM_RF} ${BC_VAR_VCPKG_DIR}
+	${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
-	${BC_ENVRUN} ${BC_VCPKG_DIR}/bootstrap-vcpkg.bat
+	${BC_CMD_ENVRUN} ${BC_VAR_VCPKG_DIR}/bootstrap-vcpkg.bat
 endif
 
 .PHONY: vcpkg-install
 vcpkg-install:
-ifneq (${BC_OS},windows)
-	${BC_ENVRUN} ${BC_VCPKG_DIR}/vcpkg install ${BC_VCPKG_PKGS}
+ifneq (${BC_VAR_OS},windows)
+	${BC_CMD_ENVRUN} ${BC_VAR_VCPKG_DIR}/vcpkg install ${BC_VCPKG_PKGS}
 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
 
-else ifdef USE_CONAN # USE_CONAN ################################################
+else ifdef USE_CONAN # USE_VCPKG / USE_CONAN ####################################
 .PHONY: setup-conan
 conan-config:
-	${BC_ENVRUN} conan profile new ${BC_PROJECT_NAME} --detect --force
-ifeq ($(BC_OS),linux)
-	${BC_ENVRUN} conan profile update settings.compiler.libcxx=libstdc++11 ${BC_PROJECT_NAME}
+	${BC_CMD_ENVRUN} conan profile new ${BC_VAR_PROJECT_NAME} --detect --force
+ifeq ($(BC_VAR_OS),linux)
+	${BC_CMD_ENVRUN} conan profile update settings.compiler.libcxx=libstdc++11 ${BC_VAR_PROJECT_NAME}
 else
-	${BC_ENVRUN} conan profile update settings.compiler.cppstd=20 ${BC_PROJECT_NAME}
-ifeq ($(BC_OS),windows)
-	${BC_ENVRUN} conan profile update settings.compiler.runtime=static ${BC_PROJECT_NAME}
+	${BC_CMD_ENVRUN} conan profile update settings.compiler.cppstd=20 ${BC_VAR_PROJECT_NAME}
+ifeq ($(BC_VAR_OS),windows)
+	${BC_CMD_ENVRUN} conan profile update settings.compiler.runtime=static ${BC_VAR_PROJECT_NAME}
 endif
 endif
 
 .PHONY: conan
 conan:
-	${BC_ENVRUN} ${BC_PYBB} conan-install ${BC_PROJECT_NAME}
+	${BC_CMD_PYBB} conan-install ${BC_VAR_PROJECT_NAME}
 endif # USE_CONAN ###############################################
 
-ifeq (${BC_OS},darwin)
+ifeq (${BC_VAR_OS},darwin)
 .PHONY: 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
 
 .PHONY: 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
 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
 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}
 
diff --git a/deps/buildcore/scripts/pybb.py b/deps/buildcore/scripts/pybb.py
index a0a52c6d..cb253ec5 100755
--- a/deps/buildcore/scripts/pybb.py
+++ b/deps/buildcore/scripts/pybb.py
@@ -18,30 +18,20 @@ import subprocess
 import sys
 from typing import List, Optional
 
+import util
+
 
 def mkdir(path: str) -> int:
     try:
-        if not os.path.exists(path):
-            os.mkdir(path)
+        util.mkdir_p(path)
     except Exception:
         return 1
     return 0
 
 
-# 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 rm_multi(paths: List[str]):
     for path in paths:
-        rm(path)
+        util.rm(path)
 
 
 def ctest_all() -> int:
@@ -96,11 +86,10 @@ def cat(paths: List[str]) -> int:
         try:
             with open(path) as f:
                 data = f.read()
-                sys.stdout.write(data)
+                print(data)
         except FileNotFoundError:
             sys.stderr.write(f'cat: {path}: no such file or directory\n')
             return 1
-    sys.stdout.write('\n')
     return 0
 
 
@@ -116,12 +105,21 @@ def debug(paths: List[str]) -> int:
 def get_env(var_name: str) -> int:
     if var_name not in os.environ:
         return 1
-    sys.stdout.write(os.environ[var_name])
+    print(os.environ[var_name])
     return 0
 
 
 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
 
 
@@ -149,6 +147,8 @@ def main() -> int:
         err = get_env(sys.argv[2])
     elif sys.argv[1] == 'hostname':
         err = hostname()
+    elif sys.argv[1] == 'hostenv':
+        err = host_env()
     else:
         sys.stderr.write('Command not found\n')
         err = 1
diff --git a/deps/buildcore/scripts/setup-build.py b/deps/buildcore/scripts/setup-build.py
index 2f235fd6..3df28cd4 100755
--- a/deps/buildcore/scripts/setup-build.py
+++ b/deps/buildcore/scripts/setup-build.py
@@ -15,9 +15,7 @@ import shutil
 import subprocess
 import sys
 
-from pybb import mkdir, rm
-
-os_name = os.uname().sysname.lower()
+import util
 
 
 def main() -> int:
@@ -25,7 +23,7 @@ def main() -> int:
     parser.add_argument(
             '--target',
             help='Platform target',
-            default=f'{os_name}-{platform.machine()}')
+            default=f'{util.get_os()}-{util.get_arch()}')
     parser.add_argument(
             '--build_type',
             help='Build type (asan,debug,release)',
@@ -84,7 +82,7 @@ def main() -> int:
 
     project_dir = os.getcwd()
     build_dir = f'{project_dir}/{args.build_root}/{build_config}'
-    rm(build_dir)
+    util.rm(build_dir)
     cmake_cmd = [
         'cmake', '-S', project_dir, '-B', build_dir, build_tool,
         '-DCMAKE_EXPORT_COMPILE_COMMANDS=ON',
@@ -101,13 +99,13 @@ def main() -> int:
 
     subprocess.run(cmake_cmd)
 
-    mkdir('dist')
+    util.mkdir_p('dist')
     if int(args.current_build) != 0:
         cb = open('.current_build', 'w')
         cb.write(args.build_type)
         cb.close()
 
-    rm('compile_commands.json')
+    util.rm('compile_commands.json')
     if platform.system() != 'Windows':
         os.symlink(f'{build_dir}/compile_commands.json',
                    'compile_commands.json')