Fix 'make run' and 'make debug'

.gitignore

@@ -2,6 +2,7 @@
 .clangd
 .conanbuild
 .current_build
+.idea
 __pycache__
 CMakeLists.txt.user
 Session.vim

.idea/misc.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
-  <component name="CompDBWorkspace">
-    <contentRoot DIR="$PROJECT_DIR$" />
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

.liccor.yml

@@ -2,7 +2,7 @@
 source:
 - .
 copyright_notice: |-
-  Copyright 2021 - 2023 gary@drinkingtea.net
+  Copyright 2021 - 2024 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

CMakeLists.txt

@@ -14,6 +14,10 @@ if(NOT MSVC)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-conversion")
 endif()
 
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
 set(CMAKE_INSTALL_RPATH "$ORIGIN" "$ORIGIN/../")
 if(QTDIR)
 	set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} "${QTDIR}/lib")

Makefile

@@ -3,15 +3,15 @@ BUILDCORE_PATH=deps/buildcore
 VCPKG_PKGS=
 include ${BUILDCORE_PATH}/base.mk
 
-ifeq ($(OS),darwin)
+ifeq ($(BC_VAR_OS),darwin)
-	PROJECT_EXECUTABLE=./dist/${CURRENT_BUILD}/${PROJECT_NAME}.app/Contents/MacOS/SlideController
+	PROJECT_EXECUTABLE=./build/${BC_VAR_CURRENT_BUILD}/bin/${PROJECT_NAME}.app/Contents/MacOS/SlideController
 else
-	PROJECT_EXECUTABLE=./dist/${CURRENT_BUILD}/bin/SlideController
+	PROJECT_EXECUTABLE=./build/${BC_VAR_CURRENT_BUILD}/bin/${PROJECT_NAME}
 endif
 
 .PHONY: run
-run: install
+run: build
 	${ENV_RUN} ${PROJECT_EXECUTABLE}
 .PHONY: debug
-debug: install
+debug: build
 	${DEBUGGER} ${PROJECT_EXECUTABLE}

deps/buildcore/base.mk

@@ -9,89 +9,103 @@
 ifeq (${OS},Windows_NT)
 	SHELL := powershell.exe
 	.SHELLFLAGS := -NoProfile -Command
-	OS=windows
+	BC_VAR_OS=windows
-	HOST_ENV=${OS}
+	BC_CMD_HOST_PY3=python
 else
-	OS=$(shell uname | tr [:upper:] [:lower:])
+	BC_VAR_OS=$(shell uname | tr [:upper:] [:lower:])
-	HOST_ENV=${OS}-$(shell uname -m)
+	ifneq ($(shell which python3 2> /dev/null),)
+		BC_CMD_HOST_PY3=python3
+	else
+		ifeq ($(shell python -c 'import sys; print(sys.version_info[0])'),3)
+			BC_CMD_HOST_PY3=python
+		else
+			echo 'Please install Python3 on host'
+			exit 1
+		endif
+	endif
 endif
 
-DEVENV=devenv$(shell pwd | sed 's/\//-/g')
+
-DEVENV_IMAGE=${PROJECT_NAME}-devenv
+ifdef BC_VAR_USE_DOCKER_DEVENV
 	ifneq ($(shell which docker 2> /dev/null),)
-	ifeq ($(shell docker inspect --format="{{.State.Status}}" ${DEVENV} 2>&1),running)
+		BC_VAR_DEVENV=devenv$(shell pwd | sed 's/\//-/g')
-		ENV_RUN=docker exec -i -t --user $(shell id -u ${USER}) ${DEVENV}
+		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
+	ifneq ($(shell ${BC_CMD_ENVRUN} which python3 2> /dev/null),)
+		BC_CMD_PY3=${BC_CMD_ENVRUN} python3
+	else
+		ifeq ($(shell ${BC_CMD_ENVRUN} python -c 'import sys; print(sys.version_info[0])'),3)
+			BC_CMD_PY3=${BC_CMD_ENVRUN} python
+		else
+			echo 'Please install Python3 in devenv'
+			exit 1
+		endif
+	endif
+	ifndef BC_VAR_DEVENV_ROOT
+		BC_VAR_DEVENV_ROOT="."
+	endif
+else
+	BC_CMD_PY3=${BC_CMD_HOST_PY3}
+endif
 
-ifneq ($(shell ${ENV_RUN} which python3 2> /dev/null),)
+BC_VAR_SCRIPTS=${BUILDCORE_PATH}/scripts
-	PYTHON3=python3
+BC_CMD_SETUP_BUILD=${BC_CMD_PY3} ${BC_VAR_SCRIPTS}/setup-build.py
-else
+BC_CMD_PYBB=${BC_CMD_PY3} ${BC_VAR_SCRIPTS}/pybb.py
-	ifeq ($(shell ${ENV_RUN} python -c 'import sys; print(sys.version_info[0])'),3)
+BC_CMD_HOST_PYBB=${BC_CMD_HOST_PY3} ${BC_VAR_SCRIPTS}/pybb.py
-		PYTHON3=python
+BC_CMD_CMAKE_BUILD=${BC_CMD_PYBB} cmake-build
-	endif
+BC_CMD_GETENV=${BC_CMD_PYBB} getenv
-endif
+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_CMD_HOST_DEBUGGER=${BC_CMD_HOST_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)
 
-SCRIPTS=${BUILDCORE_PATH}/scripts
+ifdef BC_VAR_USE_VCPKG
-SETUP_BUILD=${PYTHON3} ${SCRIPTS}/setup-build.py
+ifndef BC_VAR_VCPKG_DIR_BASE
-PYBB=${PYTHON3} ${SCRIPTS}/pybb.py
+	BC_VAR_VCPKG_DIR_BASE=.vcpkg
-CMAKE_BUILD=${PYBB} cmake-build
-GET_ENV=${PYBB} getenv
-CTEST=${PYBB} ctest-all
-RM_RF=${PYBB} rm
-HOST=$(shell ${PYBB} hostname)
-BUILDCORE_HOST_SPECIFIC_BUILDPATH=$(shell ${GET_ENV} BUILDCORE_HOST_SPECIFIC_BUILDPATH)
-ifneq (${BUILDCORE_HOST_SPECIFIC_BUILDPATH},)
-BUILD_PATH=build/${HOST}
-else
-BUILD_PATH=build
 endif
-ifdef USE_VCPKG
+ifndef BC_VAR_VCPKG_VERSION
-	ifndef VCPKG_DIR_BASE
+	BC_VAR_VCPKG_VERSION=2023.08.09
-		VCPKG_DIR_BASE=.vcpkg
 endif
-	ifndef VCPKG_VERSION
-		VCPKG_VERSION=2020.06
 endif
-	VCPKG_TOOLCHAIN=--toolchain=${VCPKG_DIR}/scripts/buildsystems/vcpkg.cmake
-endif
-ifeq ($(OS),darwin)
-	DEBUGGER=lldb --
-else
-	DEBUGGER=gdb --args
-endif
-
-VCPKG_DIR=$(VCPKG_DIR_BASE)/$(VCPKG_VERSION)-$(HOST_ENV)
-CURRENT_BUILD=$(HOST_ENV)-$(shell ${ENV_RUN} ${PYBB} cat .current_build)
 
 .PHONY: build
 build:
-	${ENV_RUN} ${CMAKE_BUILD} ${BUILD_PATH}
+	${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH}
 .PHONY: install
 install:
-	${ENV_RUN} ${CMAKE_BUILD} ${BUILD_PATH} install
+	${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH} install
 .PHONY: clean
 clean:
-	${ENV_RUN} ${CMAKE_BUILD} ${BUILD_PATH} clean
+	${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH} clean
 .PHONY: purge
 purge:
-	${ENV_RUN} ${RM_RF} .current_build
+	${BC_CMD_RM_RF} .current_build
-	${ENV_RUN} ${RM_RF} ${BUILD_PATH}
+	${BC_CMD_RM_RF} ${BC_VAR_BUILD_PATH}
-	${ENV_RUN} ${RM_RF} dist
+	${BC_CMD_RM_RF} dist
+	${BC_CMD_RM_RF} compile_commands.json
 .PHONY: test
 test: build
-	${ENV_RUN} mypy ${SCRIPTS}
+	${BC_CMD_ENVRUN} mypy ${BC_VAR_SCRIPTS}
-	${ENV_RUN} ${CMAKE_BUILD} ${BUILD_PATH} test
+	${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH} test
 .PHONY: test-verbose
 test-verbose: build
-	${ENV_RUN} ${CTEST} ${BUILD_PATH} --output-on-failure
+	${BC_CMD_CTEST} ${BC_VAR_BUILD_PATH} --output-on-failure
 .PHONY: test-rerun-verbose
 test-rerun-verbose: build
-	${ENV_RUN} ${CTEST} ${BUILD_PATH} --rerun-failed --output-on-failure
+	${BC_CMD_CTEST} ${BC_VAR_BUILD_PATH} --rerun-failed --output-on-failure
 
+ifdef BC_VAR_USE_DOCKER_DEVENV
 .PHONY: devenv-image
 devenv-image:
-	docker build . -t ${DEVENV_IMAGE}
+	docker build ${BC_VAR_DEVENV_ROOT} -t ${BC_VAR_DEVENV_IMAGE}
 .PHONY: devenv-create
 devenv-create:
 	docker run -d \
@@ -103,73 +117,77 @@ devenv-create:
 		-v $(shell pwd):/usr/src/project \
 		-v /dev/shm:/dev/shm \
 		--restart=always \
-		--name ${DEVENV} \
+		--name ${BC_VAR_DEVENV} \
-		-t ${DEVENV_IMAGE} bash
+		-t ${BC_VAR_DEVENV_IMAGE} bash
 .PHONY: devenv-destroy
 devenv-destroy:
-	docker rm -f ${DEVENV}
+	docker rm -f ${BC_VAR_DEVENV}
-ifdef ENV_RUN
+ifdef BC_CMD_ENVRUN
 .PHONY: devenv-shell
 devenv-shell:
-	${ENV_RUN} bash
+	${BC_CMD_ENVRUN} bash
+endif
 endif
 
-ifdef USE_VCPKG
+ifdef BC_VAR_USE_VCPKG
+
+BC_VAR_VCPKG_TOOLCHAIN=--toolchain=${BC_VAR_VCPKG_DIR}/scripts/buildsystems/vcpkg.cmake
+BC_VAR_VCPKG_DIR=$(BC_VAR_VCPKG_DIR_BASE)/$(BC_VAR_VCPKG_VERSION)-$(BC_VAR_HOSTENV)
 
 .PHONY: vcpkg
-vcpkg: ${VCPKG_DIR} vcpkg-install
+vcpkg: ${BC_VAR_VCPKG_DIR} vcpkg-install
 
-${VCPKG_DIR}:
+${BC_VAR_VCPKG_DIR}:
-	${ENV_RUN} ${RM_RF} ${VCPKG_DIR}
+	${BC_CMD_RM_RF} ${BC_VAR_VCPKG_DIR}
-	${ENV_RUN} mkdir -p ${VCPKG_DIR_BASE}
+	${BC_CMD_PYBB} mkdir ${BC_VAR_VCPKG_DIR_BASE}
-	${ENV_RUN} git clone -b release --depth 1 --branch ${VCPKG_VERSION} https://github.com/microsoft/vcpkg.git ${VCPKG_DIR}
+	${BC_CMD_ENVRUN} git clone -b release --depth 1 --branch ${BC_VAR_VCPKG_VERSION} https://github.com/microsoft/vcpkg.git ${BC_VAR_VCPKG_DIR}
-ifneq (${OS},windows)
+ifneq (${BC_VAR_OS},windows)
-	${ENV_RUN} ${VCPKG_DIR}/bootstrap-vcpkg.sh
+	${BC_CMD_ENVRUN} ${BC_VAR_VCPKG_DIR}/bootstrap-vcpkg.sh
 else
-	${ENV_RUN} ${VCPKG_DIR}/bootstrap-vcpkg.bat
+	${BC_CMD_ENVRUN} ${BC_VAR_VCPKG_DIR}/bootstrap-vcpkg.bat
 endif
 
 .PHONY: vcpkg-install
 vcpkg-install:
-ifneq (${OS},windows)
+ifneq (${BC_VAR_OS},windows)
-	${VCPKG_DIR}/vcpkg install ${VCPKG_PKGS}
+	${BC_CMD_ENVRUN} ${BC_VAR_VCPKG_DIR}/vcpkg install ${BC_VAR_VCPKG_PKGS}
 else
-	${VCPKG_DIR}/vcpkg install --triplet x64-windows ${VCPKG_PKGS}
+	${BC_CMD_ENVRUN} ${BC_VAR_VCPKG_DIR}/vcpkg install --triplet x64-windows ${BC_VAR_VCPKG_PKGS}
 endif
 
-else ifdef USE_CONAN # USE_VCPKG ################################################
+else ifdef USE_CONAN # USE_VCPKG / USE_CONAN ####################################
-
 .PHONY: setup-conan
 conan-config:
-	${ENV_RUN} conan profile new ${PROJECT_NAME} --detect --force
+	${BC_CMD_ENVRUN} conan profile new ${BC_VAR_PROJECT_NAME} --detect --force
-ifeq ($(OS),linux)
+ifeq ($(BC_VAR_OS),linux)
-	${ENV_RUN} conan profile update settings.compiler.libcxx=libstdc++11 ${PROJECT_NAME}
+	${BC_CMD_ENVRUN} conan profile update settings.compiler.libcxx=libstdc++11 ${BC_VAR_PROJECT_NAME}
 else
-	${ENV_RUN} conan profile update settings.compiler.cppstd=20 ${PROJECT_NAME}
+	${BC_CMD_ENVRUN} conan profile update settings.compiler.cppstd=20 ${BC_VAR_PROJECT_NAME}
-ifeq ($(OS),windows)
+ifeq ($(BC_VAR_OS),windows)
-	${ENV_RUN} conan profile update settings.compiler.runtime=static ${PROJECT_NAME}
+	${BC_CMD_ENVRUN} conan profile update settings.compiler.runtime=static ${BC_VAR_PROJECT_NAME}
 endif
 endif
+
 .PHONY: conan
 conan:
-	${ENV_RUN} ${PYBB} conan-install ${PROJECT_NAME}
+	${BC_CMD_PYBB} conan-install ${BC_VAR_PROJECT_NAME}
-endif # USE_VCPKG ###############################################
+endif # USE_CONAN ###############################################
 
-ifeq (${OS},darwin)
+ifeq (${BC_VAR_OS},darwin)
 .PHONY: configure-xcode
 configure-xcode:
-	${ENV_RUN} ${SETUP_BUILD} ${VCPKG_TOOLCHAIN} --build_tool=xcode --current_build=0 --build_root=${BUILD_PATH}
+	${BC_CMD_SETUP_BUILD} ${BC_VAR_VCPKG_TOOLCHAIN} --build_tool=xcode --current_build=0 --build_root=${BC_VAR_BUILD_PATH}
 endif
 
 .PHONY: configure-release
 configure-release:
-	${ENV_RUN} ${SETUP_BUILD} ${VCPKG_TOOLCHAIN} --build_type=release --build_root=${BUILD_PATH}
+	${BC_CMD_SETUP_BUILD} ${BC_VAR_VCPKG_TOOLCHAIN} --build_type=release --build_root=${BC_VAR_BUILD_PATH}
 
 .PHONY: configure-debug
 configure-debug:
-	${ENV_RUN} ${SETUP_BUILD} ${VCPKG_TOOLCHAIN} --build_type=debug --build_root=${BUILD_PATH}
+	${BC_CMD_SETUP_BUILD} ${BC_VAR_VCPKG_TOOLCHAIN} --build_type=debug --build_root=${BC_VAR_BUILD_PATH}
 
 .PHONY: configure-asan
 configure-asan:
-	${ENV_RUN} ${SETUP_BUILD} ${VCPKG_TOOLCHAIN} --build_type=asan --build_root=${BUILD_PATH}
+	${BC_CMD_SETUP_BUILD} ${BC_VAR_VCPKG_TOOLCHAIN} --build_type=asan --build_root=${BC_VAR_BUILD_PATH}
 

deps/buildcore/scripts/file_to_c.py

@@ -0,0 +1,28 @@
+#! /usr/bin/env python3
+
+#
+#  Copyright 2016 - 2022 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 argparse
+import sys
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--out-cpp', help='path to output cpp file')
+    parser.add_argument('--out-hpp', help='path to output hpp file')
+    args = parser.parse_args()
+    return 0
+
+
+if __name__ == '__main__':
+    try:
+        err = main()
+        sys.exit(err)
+    except KeyboardInterrupt:
+        sys.exit(1)

deps/buildcore/scripts/pybb.py

@@ -18,18 +18,20 @@ import subprocess
 import sys
 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:
-    if (os.path.exists(path) or os.path.islink(path)) and not os.path.isdir(path):
+        util.mkdir_p(path)
-        os.remove(path)
+    except Exception:
-    elif os.path.isdir(path):
+        return 1
-        shutil.rmtree(path)
+    return 0
+
+
+def rm_multi(paths: List[str]):
+    for path in paths:
+        util.rm(path)
 
 
 def ctest_all() -> int:
@@ -70,16 +72,13 @@ def conan() -> int:
     err = 0
     try:
         mkdir(conan_dir)
-    except:
+    except Exception:
         return 1
     if err != 0:
         return err
     args = ['conan', 'install', '../', '--build=missing', '-pr', project_name]
     os.chdir(conan_dir)
-    err = subprocess.run(args).returncode
+    return subprocess.run(args).returncode
-    if err != 0:
-        return err
-    return 0
 
 
 def cat(paths: List[str]) -> int:
@@ -87,48 +86,70 @@ 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('cat: {}: no such file or directory\n'.format(path))
+            sys.stderr.write(f'cat: {path}: no such file or directory\n')
             return 1
-    sys.stdout.write('\n')
     return 0
 
 
+def debug(paths: List[str]) -> int:
+    if shutil.which('gdb') is not None:
+        args = ['gdb', '--args']
+    elif shutil.which('lldb') is not None:
+        args = ['lldb', '--']
+    else:
+        sys.stderr.write('debug: could not find a supported debugger\n')
+        return 1
+    args.extend(paths)
+    return subprocess.run(args).returncode
+
+
 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 = platform.system().lower()
+    arch = util.get_arch()
+    print(f'{os_name}-{arch}')
+    return 0
+
+
+def clarg(idx: int) -> Optional[str]:
+    return sys.argv[idx] if len(sys.argv) > idx else None
+
+
 def main() -> int:
     err = 0
     if sys.argv[1] == 'mkdir':
-        try:
+        err = mkdir(sys.argv[2])
-            mkdir(sys.argv[2])
-        except:
-            err = 1
     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':
         err = conan()
     elif sys.argv[1] == 'ctest-all':
         err = ctest_all()
     elif sys.argv[1] == 'cmake-build':
-        err = cmake_build(sys.argv[2], sys.argv[3] if len(sys.argv) > 3 else None)
+        err = cmake_build(sys.argv[2], clarg(3))
     elif sys.argv[1] == 'cat':
         err = cat(sys.argv[2:])
+    elif sys.argv[1] == 'debug':
+        err = debug(sys.argv[2:])
     elif sys.argv[1] == 'getenv':
         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

deps/buildcore/scripts/setup-build.py

@@ -15,18 +15,35 @@ import shutil
 import subprocess
 import sys
 
-from pybb import mkdir, rm
+import util
 
 
 def main() -> int:
     parser = argparse.ArgumentParser()
-    parser.add_argument('--target', help='Platform target',
+    parser.add_argument(
-                        default='{:s}-{:s}'.format(sys.platform, 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()
 
     if args.build_type == 'asan':
@@ -64,10 +81,10 @@ def main() -> int:
         return 1
 
     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', '-S', project_dir, '-B', build_dir, build_tool,
+        'cmake', '-S', project_dir, '-B', build_dir,
         '-DCMAKE_EXPORT_COMPILE_COMMANDS=ON',
         '-DCMAKE_TOOLCHAIN_FILE={:s}'.format(args.toolchain),
         '-DCMAKE_BUILD_TYPE={:s}'.format(build_type_arg),
@@ -75,22 +92,27 @@ def main() -> int:
         '-DBUILDCORE_BUILD_CONFIG={:s}'.format(build_config),
         '-DBUILDCORE_TARGET={:s}'.format(args.target),
     ]
+    if build_tool != '':
+        cmake_cmd.append(build_tool)
     if qt_path != '':
         cmake_cmd.append(qt_path)
-    if platform.system() == 'Windows':
+    if platform.system() == 'Windows' and platform.system() == 'AMD64':
         cmake_cmd.append('-A x64')
 
-    subprocess.run(cmake_cmd)
+    cmake_err = subprocess.run(cmake_cmd).returncode
+    if cmake_err != 0:
+        return cmake_err
 
-    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('{:s}/compile_commands.json'.format(build_dir), 'compile_commands.json')
+        os.symlink(f'{build_dir}/compile_commands.json',
+                   'compile_commands.json')
     return 0
 
 

deps/buildcore/scripts/util.py

@@ -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 platform.system().lower()
+
+
+def get_arch() -> str:
+    arch = platform.machine().lower()
+    if arch == 'amd64':
+        arch = 'x86_64'
+    return arch

src/CMakeLists.txt

@@ -3,7 +3,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-find_package(QT NAMES Qt6 Qt5 COMPONENTS Network Widgets REQUIRED)
+find_package(QT NAMES Qt6 COMPONENTS Network Widgets REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Network Widgets REQUIRED)
 
 add_executable(

src/cameraclient.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 - 2023 gary@drinkingtea.net
+ * Copyright 2021 - 2024 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
@@ -8,8 +8,8 @@
 
 #include <QNetworkReply>
 #include <QSettings>
-#include <string_view>
 
+#include "consts.hpp"
 #include "settingsdata.hpp"
 #include "cameraclient.hpp"
 
@@ -43,6 +43,16 @@ void CameraClient::setPreset(int preset) {
 	}
 }
 
+void CameraClient::reboot() {
+	post("/cgi-bin/param.cgi?post_reboot");
+	emit pollFailed();
+}
+
+void CameraClient::setBaseUrl() {
+	auto const [host, port] = getCameraConnectionData();
+	m_baseUrl = QString("http://%1:%2").arg(host, QString::number(port));
+}
+
 void CameraClient::setBrightness(int val) {
 	if (val > -1) {
 		get(QString("/cgi-bin/ptzctrl.cgi?post_image_value&bright&%1").arg(val));
@@ -73,21 +83,22 @@ void CameraClient::setHue(int val) {
 	}
 }
 
-void CameraClient::setBaseUrl() {
+void CameraClient::get(QString const&urlExt) {
-	auto const [host, port] = getCameraConnectionData();
+	QUrl const url{QString{m_baseUrl} + urlExt};
-	m_baseUrl = QString("http://%1:%2").arg(host, QString::number(port));
+	QNetworkRequest rqst{url};
+	auto const reply = m_nam->get(rqst);
+	connect(reply, &QIODevice::readyRead, reply, &QObject::deleteLater);
 }
 
-void CameraClient::get(QString const&urlExt) {
+void CameraClient::post(QString const&urlExt) {
-	QUrl url(QString(m_baseUrl) + urlExt);
+	QNetworkRequest const rqst{QUrl{QString{m_baseUrl} + urlExt}};
-	QNetworkRequest rqst(url);
+	auto const reply = m_nam->post(rqst, QByteArray{});
-	auto reply = m_nam->get(rqst);
 	connect(reply, &QIODevice::readyRead, reply, &QObject::deleteLater);
 }
 
 void CameraClient::poll() {
-	QUrl url(QString(m_baseUrl) + "/cgi-bin/param.cgi?get_device_conf");
+	QUrl const url{QString{m_baseUrl} + "/cgi-bin/param.cgi?get_device_conf"};
-	QNetworkRequest rqst(url);
+	QNetworkRequest const rqst{url};
 	m_pollingNam->get(rqst);
 }
 

src/cameraclient.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 - 2023 gary@drinkingtea.net
+ * Copyright 2021 - 2024 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
@@ -12,8 +12,6 @@
 #include <QObject>
 #include <QTimer>
 
-#include "consts.hpp"
-
 class CameraClient: public QObject {
 	Q_OBJECT
 	private:
@@ -29,6 +27,12 @@ class CameraClient: public QObject {
 
 		void setPreset(int preset);
 
+		void reboot();
+
+	public slots:
+		void setBaseUrl();
+
+	private:
 		void setBrightness(int val);
 
 		void setSaturation(int val);
@@ -39,12 +43,10 @@ class CameraClient: public QObject {
 
 		void setHue(int val);
 
-	public slots:
-		void setBaseUrl();
-
-	private:
 		void get(QString const&url);
 
+		void post(QString const&url);
+
 		void poll();
 
 		void handlePollResponse(QNetworkReply *reply);

src/consts.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 - 2023 gary@drinkingtea.net
+ * Copyright 2021 - 2024 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
@@ -10,4 +10,5 @@
 
 constexpr auto MaxCameraPresets = 9;
 constexpr auto MaxViews = 9;
+constexpr auto Version = "1.0-beta5";
 

src/main.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 - 2023 gary@drinkingtea.net
+ * Copyright 2021 - 2024 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
@@ -13,8 +13,12 @@
 
 int main(int argc, char *argv[]) {
 	QSettings::setDefaultFormat(QSettings::Format::IniFormat);
+#ifndef __APPLE__
+	QApplication::setStyle("Fusion");
+#endif
 	QApplication a(argc, argv);
-	QApplication::setApplicationName(QObject::tr("Slide Controller 9000"));
+	QApplication::setOrganizationName("DrinkingTea");
+	QApplication::setApplicationName("Slide Controller 9000");
 	MainWindow w;
 	w.show();
 	return QApplication::exec();

src/mainwindow.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 - 2023 gary@drinkingtea.net
+ * Copyright 2021 - 2024 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
@@ -112,7 +112,7 @@ void MainWindow::setupMenu() {
 	}
 	// camera preset menu
 	{
-		auto const menu = menuBar()->addMenu(tr("&Camera Preset"));
+		auto const menu = menuBar()->addMenu(tr("&Camera"));
 		for (auto i = 0; i < std::min(9, MaxCameraPresets); ++i) {
 			auto const cameraPresetAct = new QAction(tr("Camera Preset &%1").arg(i + 1), this);
 			cameraPresetAct->setShortcut(Qt::ALT | static_cast<Qt::Key>(Qt::Key_1 + i));
@@ -121,6 +121,18 @@ void MainWindow::setupMenu() {
 			});
 			menu->addAction(cameraPresetAct);
 		}
+		menu->addSeparator();
+		auto const rebootAct = new QAction(tr("&Reboot"), this);
+		connect(rebootAct, &QAction::triggered, &m_cameraClient, [this] {
+			QMessageBox confirm(this);
+			confirm.setText(tr("Are you sure you want to reboot the camera? This will take about 20 seconds."));
+			confirm.addButton(tr("&No"), QMessageBox::ButtonRole::NoRole);
+			confirm.addButton(tr("&Yes"), QMessageBox::ButtonRole::YesRole);
+			if (confirm.exec()) {
+				m_cameraClient.reboot();
+			}
+		});
+		menu->addAction(rebootAct);
 	}
 	// help menu
 	{
@@ -129,12 +141,12 @@ void MainWindow::setupMenu() {
 		connect(aboutAct, &QAction::triggered, &m_cameraClient, [this] {
 			QMessageBox about(this);
 			about.setText(tr(
-R"(Slide Controller 9000 - 1.0-beta2
+R"(Slide Controller 9000 - %1
-Build date: %1
+Build date: %2
 
-Copyright 2021 - 2023 Gary Talent (gary@drinkingtea.net)
+Copyright 2021 - 2024 Gary Talent (gary@drinkingtea.net)
 Slide Controller 9000 is released under the MPL 2.0
-Built on Qt library under LGPL 2.0)").arg(__DATE__));
+Built on Qt library under LGPL 2.0)").arg(Version, __DATE__));
 			about.exec();
 		});
 		menu->addAction(aboutAct);
@@ -198,7 +210,7 @@ void MainWindow::setupViewControls(QVBoxLayout *rootLyt) {
 
 void MainWindow::openSettings() {
 	SettingsDialog d(this);
-	connect(&d, &SettingsDialog::previewPreset, &m_cameraClient, &CameraClient::setPreset);
+	connect(&d, &SettingsDialog::previewPreset, &m_cameraClient, &CameraClient::setPresetVC);
 	auto const result = d.exec();
 	if (result == QDialog::Accepted) {
 		m_cameraClient.setBaseUrl();

src/mainwindow.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 - 2023 gary@drinkingtea.net
+ * Copyright 2021 - 2024 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
@@ -8,8 +8,6 @@
 
 #pragma once
 
-#include <cstdint>
-
 #include <QMainWindow>
 
 #include "cameraclient.hpp"

src/obsclient.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 - 2023 gary@drinkingtea.net
+ * Copyright 2021 - 2024 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

src/obsclient.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 - 2023 gary@drinkingtea.net
+ * Copyright 2021 - 2024 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

src/openlpclient.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright 2021 - 2023 gary@drinkingtea.net
+ * Copyright 2021 - 2024 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/.
  */
 
+#include <QHttpPart>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
@@ -37,19 +38,19 @@ QString OpenLPClient::getNextSong() {
 }
 
 void OpenLPClient::nextSlide() {
-	get("/api/controller/live/next");
+	post("/api/v2/controller/progress", R"({"action":"next"})");
 }
 
 void OpenLPClient::prevSlide() {
-	get("/api/controller/live/previous");
+	post("/api/v2/controller/progress", R"({"action":"previous"})");
 }
 
 void OpenLPClient::nextSong() {
-	get("/api/service/next");
+	post("/api/v2/service/progress", R"({"action":"next"})");
 }
 
 void OpenLPClient::prevSong() {
-	get("/api/service/previous");
+	post("/api/v2/service/progress", R"({"action":"previous"})");
 }
 
 void OpenLPClient::blankScreen() {
@@ -91,6 +92,12 @@ void OpenLPClient::get(QString const&urlExt) {
 	m_nam->get(rqst);
 }
 
+void OpenLPClient::post(QString const&url, QString const&data) {
+	QNetworkRequest rqst(QUrl(m_baseUrl + url));
+	rqst.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+	m_nam->post(rqst, data.toUtf8());
+}
+
 void OpenLPClient::requestSongList() {
 	QUrl url(m_baseUrl + "/api/service/list?_=1626628079579");
 	QNetworkRequest rqst(url);
@@ -184,11 +191,11 @@ void OpenLPClient::handleSlideListResponse(QNetworkReply *reply) {
 	auto doc = QJsonDocument::fromJson(data);
 	auto items = doc.object()["results"].toObject()["slides"].toArray();
 	for (auto const&item : items) {
-		auto slide = item.toObject();
+		auto const slide = item.toObject();
 		auto text = slide["text"].toString();
 		auto tag = slide["tag"].toString();
-		slideList.push_back(text);
+		slideList.push_back(std::move(text));
-		tagList.push_back(tag);
+		tagList.push_back(std::move(tag));
 	}
 	emit slideListUpdate(tagList, slideList);
 }

src/openlpclient.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 - 2023 gary@drinkingtea.net
+ * Copyright 2021 - 2024 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
@@ -60,6 +60,8 @@ class OpenLPClient: public QObject {
 	private:
 		void get(QString const&url);
 
+		void post(QString const&url, QString const&data);
+
 		void requestSongList();
 
 		void requestSlideList();

src/settingsdata.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 - 2023 gary@drinkingtea.net
+ * Copyright 2021 - 2024 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

src/settingsdata.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 - 2023 gary@drinkingtea.net
+ * Copyright 2021 - 2024 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

src/settingsdialog.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 - 2023 gary@drinkingtea.net
+ * Copyright 2021 - 2024 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
@@ -56,7 +56,7 @@ QWidget *SettingsDialog::setupNetworkInputs(QWidget *parent) {
 		m_cameraHostLe->setText(c.host);
 		m_cameraPortLe->setText(QString::number(c.port));
 		m_cameraPortLe->setValidator(portValidator);
-		lyt->addRow(tr("C&amera Host:"), m_cameraHostLe);
+		lyt->addRow(tr("Camera &Host:"), m_cameraHostLe);
 		lyt->addRow(tr("Ca&mera Port:"), m_cameraPortLe);
 	}
 	// OpenLP settings
@@ -108,7 +108,7 @@ QWidget *SettingsDialog::setupImageConfig(QWidget *parent) {
 		m_vidBrightness = mkSb(tr("&Brightness:"));
 		m_vidSaturation = mkSb(tr("&Saturation:"));
 		m_vidContrast = mkSb(tr("Con&trast:"));
-		m_vidSharpness = mkSb(tr("Sh&arpness:"));
+		m_vidSharpness = mkSb(tr("Sharpn&ess:"));
 		m_vidHue = mkSb(tr("&Hue:"));
 		updateVidConfigPreset(0);
 	}
@@ -154,7 +154,7 @@ QWidget *SettingsDialog::setupViewConfig(QWidget *parent) {
 	}
 	{ // add/removes buttons
 		auto const btnsLyt = new QHBoxLayout(btnsRoot);
-		auto const addBtn = new QPushButton("&Add", btnsRoot);
+		auto const addBtn = new QPushButton("A&dd", btnsRoot);
 		auto const rmBtn = new QPushButton("&Remove", btnsRoot);
 		addBtn->setFixedWidth(70);
 		rmBtn->setFixedWidth(70);
@@ -192,17 +192,20 @@ QWidget *SettingsDialog::setupButtons(QWidget *parent) {
 	auto const lyt = new QHBoxLayout(root);
 	m_errLbl = new QLabel(root);
 	auto const okBtn = new QPushButton(tr("&OK"), root);
+	auto const applyBtn = new QPushButton(tr("&Apply"), root);
 	auto const cancelBtn = new QPushButton(tr("&Cancel"), root);
 	lyt->addWidget(m_errLbl);
 	lyt->addSpacerItem(new QSpacerItem(1000, 0, QSizePolicy::Expanding, QSizePolicy::Ignored));
 	lyt->addWidget(okBtn);
+	lyt->addWidget(applyBtn);
 	lyt->addWidget(cancelBtn);
 	connect(okBtn, &QPushButton::clicked, this, &SettingsDialog::handleOK);
+	connect(applyBtn, &QPushButton::clicked, this, &SettingsDialog::handleApply);
 	connect(cancelBtn, &QPushButton::clicked, this, &SettingsDialog::reject);
 	return root;
 }
 
-void SettingsDialog::handleOK() {
+void SettingsDialog::handleApply() {
 	QSettings settings;
 	QVector<View> views;
 	auto const viewsErr = collectViews(views);
@@ -224,6 +227,10 @@ void SettingsDialog::handleOK() {
 	});
 	collectVideoConfig();
 	setVideoConfig(settings, m_videoConfig);
+}
+
+void SettingsDialog::handleOK() {
+	handleApply();
 	accept();
 }
 

src/settingsdialog.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 - 2023 gary@drinkingtea.net
+ * Copyright 2021 - 2024 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
@@ -38,6 +38,7 @@ class SettingsDialog: public QDialog {
 		QWidget *setupViewConfig(QWidget *parent);
 		QWidget *setupImageConfig(QWidget *parent);
 		QWidget *setupButtons(QWidget *parent);
+		void handleApply();
 		void handleOK();
 		void setupViewRow(int row, View const&view = {});
 		/**

src/slideview.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 - 2023 gary@drinkingtea.net
+ * Copyright 2021 - 2024 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
@@ -43,7 +43,7 @@ QString SlideView::getNextSong() const {
 }
 
 void SlideView::pollUpdate(QString const&songName, int slide) {
-	auto songItems = m_songSelector->findItems(songName, Qt::MatchFixedString);
+	auto const songItems = m_songSelector->findItems(songName, Qt::MatchFixedString);
 	if (songItems.empty()) {
 		return;
 	}
@@ -68,7 +68,10 @@ void SlideView::changeSong(int song) {
 	}
 }
 
-void SlideView::slideListUpdate(QStringList const&tagList, QStringList const&slideList) {
+void SlideView::slideListUpdate(QStringList tagList, QStringList const&slideList) {
+	for (auto &tag : tagList) {
+		tag = tag.split("").join("\n");
+	}
 	m_currentSlide = 0;
 	m_slideTable->setRowCount(static_cast<int>(slideList.size()));
 	for (int i = 0; i < slideList.size(); ++i) {

src/slideview.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 - 2023 gary@drinkingtea.net
+ * Copyright 2021 - 2024 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
@@ -28,7 +28,7 @@ class SlideView: public QWidget {
 
 		void songListUpdate(QStringList const&songList);
 
-		void slideListUpdate(QStringList const&tagList, QStringList const&songList);
+		void slideListUpdate(QStringList tagList, QStringList const&songList);
 
 		void reset();