From 0223f68d51505c36e6132fab40f8a47110a2f03c Mon Sep 17 00:00:00 2001 From: ccpgames-carbon Date: Tue, 12 May 2026 09:14:05 +0000 Subject: [PATCH 01/12] Merge commit 49910ec9943f481f33687880cccf064f88b85883 from carbon-template branch=carbonengine/resources-updates: Merge pull request #32 from ccpgames/correct-vcpkg-root-env-var Correct vcpkg root env variable name --- .clang-format | 11 +++ .editorconfig | 27 ++++++ .gitignore | 9 ++ .teamcity/MacOS/Project.kt | 4 + .teamcity/Windows/Project.kt | 14 +++ .teamcity/_Self.kt/Project.kt | 4 + .../buildTypes/CreateUniversalBuilds.kt | 4 + .../_Self.kt/buildTypes/PublishToPerforce.kt | 10 +- .teamcity/pom.xml | 6 ++ CMakeLists.txt | 97 +++++++++++++++++++ CMakePresets.json | 22 +++++ doc/Doxyfile.in | 4 + doc/source/conf.py | 5 + doc/source/index.rst | 31 ++++++ include/include.md | 6 ++ package_nameConfig.cmake | 34 +++++++ tests/tests.md | 7 ++ vcpkg-configuration.json | 16 +++ vcpkg.json | 12 +++ 19 files changed, 322 insertions(+), 1 deletion(-) create mode 100644 include/include.md create mode 100644 package_nameConfig.cmake diff --git a/.clang-format b/.clang-format index 039810c..7269284 100644 --- a/.clang-format +++ b/.clang-format @@ -70,7 +70,11 @@ SpacesInCStyleCastParentheses: false SpacesInContainerLiterals: false SpacesInParentheses: true SpacesInSquareBrackets: false +<<<<<<< HEAD Standard: Cpp11 +======= +Standard: Cpp17 +>>>>>>> template/carbonengine/resources-updates TabWidth: 4 UseTab: ForContinuationAndIndentation --- @@ -146,7 +150,14 @@ SpacesInCStyleCastParentheses: false SpacesInContainerLiterals: false SpacesInParentheses: true SpacesInSquareBrackets: false +<<<<<<< HEAD Standard: Cpp11 TabWidth: 4 UseTab: ForContinuationAndIndentation ... +======= +Standard: Cpp17 +TabWidth: 4 +UseTab: ForContinuationAndIndentation +... +>>>>>>> template/carbonengine/resources-updates diff --git a/.editorconfig b/.editorconfig index de4c453..4149c84 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,11 +1,16 @@ [*] charset = utf-8 +<<<<<<< HEAD end_of_line = crlf +======= +end_of_line = lf +>>>>>>> template/carbonengine/resources-updates indent_size = 4 indent_style = space insert_final_newline = false max_line_length = 120 tab_width = 4 +<<<<<<< HEAD ij_continuation_indent_size = 8 ij_formatter_off_tag = @formatter:off ij_formatter_on_tag = @formatter:on @@ -946,3 +951,25 @@ ij_python_wrap_long_lines = false [{*.toml,Cargo.lock,Cargo.toml.orig,Gopkg.lock,Pipfile,poetry.lock}] ij_toml_keep_indents_on_empty_lines = false +======= +trim_trailing_whitespace = true + +[{*.yaml,*.yml,.clang-format,.clang-tidy,_clang-format}] +# In yaml, a two-space indent is used by default in many of the solutions we integrate with. +# Examples are GitHub Actions and Kubernetes +indent_size = 2 + +[{*.h,*.hpp,*.hxx,*.c,*.cpp,*.cxx}] +# .clang-format should take precedence, but for editors which do not do that we're adding those settings here, too. +indent_style = tab + +[*.red] +# Those are yaml files, but do use a 4 space indent +indent_size = 4 + +[{*.markdown,*.md}] +# In markdown a [double whitespace at the end of a line acts as a line break](https://www.markdownguide.org/basic-syntax/#line-breaks). +# Even though it's controversial to use it for that purpose (there are alternatives like using the `
` html tag), +# let's not break it accidentally in files that already use the double whitespace. +trim_trailing_whitespace = false +>>>>>>> template/carbonengine/resources-updates diff --git a/.gitignore b/.gitignore index 25185dc..81b89fe 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,10 @@ *.pch # Compiled Dynamic libraries +<<<<<<< HEAD +======= +binaryCache/ +>>>>>>> template/carbonengine/resources-updates *.so *.dylib *.dll @@ -29,6 +33,7 @@ __pycache__/ # User generated local cmake configuration CMakeUserPresets.json +<<<<<<< HEAD ### IDE ### # User generated local IDE configuration @@ -37,3 +42,7 @@ CMakeUserPresets.json ### VCPKG ### # Temporary measure which fixes build agent issue vcpkg_registry_cache/ +======= +.cmake-build* +cmake-build* +>>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/MacOS/Project.kt b/.teamcity/MacOS/Project.kt index db04686..fce626e 100644 --- a/.teamcity/MacOS/Project.kt +++ b/.teamcity/MacOS/Project.kt @@ -73,7 +73,11 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag param("env.VCPKG_BINARY_SOURCES", "clear;x-aws,s3://vcpkg-binary-cache-static/cache/,readwrite") param("env.X_VCPKG_REGISTRIES_CACHE", "%teamcity.build.checkoutDir%/%github_checkout_folder%/regcache") param("env.CMAKE_BUILD_PARALLEL_LEVEL", "8") +<<<<<<< HEAD param("env.CTEST_PARALLEL_LEVEL", "1") +======= + param("env.CTEST_PARALLEL_LEVEL", "8") +>>>>>>> template/carbonengine/resources-updates } diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt index 6433401..dd600a9 100644 --- a/.teamcity/Windows/Project.kt +++ b/.teamcity/Windows/Project.kt @@ -24,7 +24,10 @@ val Debug = CarbonBuildWindows("Debug Windows", "Debug", "x64-windows-debug") val Internal = CarbonBuildWindows("Internal Windows", "Internal", "x64-windows-internal") val TrinityDev = CarbonBuildWindows("TrinityDev Windows", "TrinityDev", "x64-windows-trinitydev") val Release = CarbonBuildWindows("Release Windows", "Release", "x64-windows-release") +<<<<<<< HEAD val ReleaseDevFeatures = CarbonBuildWindows("Release Windows with Dev Features", "Release", "x64-windows-release-with-dev-features") +======= +>>>>>>> template/carbonengine/resources-updates object Project : Project({ id("Windows") @@ -34,7 +37,10 @@ object Project : Project({ buildType(Internal) buildType(TrinityDev) buildType(Release) +<<<<<<< HEAD buildType(ReleaseDevFeatures) +======= +>>>>>>> template/carbonengine/resources-updates }) @@ -63,7 +69,11 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) param("env.VCPKG_BINARY_SOURCES", "clear;x-aws,s3://vcpkg-binary-cache-static/cache/,readwrite") param("env.X_VCPKG_REGISTRIES_CACHE", "%teamcity.build.checkoutDir%/%github_checkout_folder%/regcache") param("env.CMAKE_BUILD_PARALLEL_LEVEL", "8") +<<<<<<< HEAD param("env.CTEST_PARALLEL_LEVEL", "1") +======= + param("env.CTEST_PARALLEL_LEVEL", "8") +>>>>>>> template/carbonengine/resources-updates } vcs { @@ -91,7 +101,11 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) scriptContent = """ REM unfortunately ninja does not find the VS environment otherwise REM NB: the exported PATH also contains the location where we installed sentry-cli, e.g. teamcity.agent.work.dir +<<<<<<< HEAD call "%%ProgramFiles(x86)%%\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\vsdevcmd.bat" -arch=x64 +======= + call "%env.VSDEV_BAT_PATH%" -arch=x64 +>>>>>>> template/carbonengine/resources-updates echo ##teamcity[setParameter name='env.INCLUDE' value='%%INCLUDE%%'] echo ##teamcity[setParameter name='env.LIB' value='%%LIB%%'] echo ##teamcity[setParameter name='env.LIBPATH' value='%%LIBPATH%%'] diff --git a/.teamcity/_Self.kt/Project.kt b/.teamcity/_Self.kt/Project.kt index 6780beb..fc7086e 100644 --- a/.teamcity/_Self.kt/Project.kt +++ b/.teamcity/_Self.kt/Project.kt @@ -8,7 +8,11 @@ import jetbrains.buildServer.configs.kotlin.vcs.GitVcsRoot object Project : Project({ +<<<<<<< HEAD description = "Build / Publish pipeline for https://github.com/carbonengine/resources" +======= + description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" +>>>>>>> template/carbonengine/resources-updates params { /* before changing carbon_ref, make sure to disable automatic settings synchronization on teamcity */ diff --git a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt index 034dbb1..552c757 100644 --- a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt +++ b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt @@ -20,7 +20,11 @@ class UniversalBuild() : BuildType({ param("x64-bin-path", "bin/macOS/x64") param("arm64-bin-path", "bin/macOS/arm64") text("file-matchers", +<<<<<<< HEAD "-m 'resources:%system.teamcity.build.workingDir%/bin' -m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", +======= + "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", +>>>>>>> template/carbonengine/resources-updates label = "lipo-build matchers", description = """ -m '*.so:lib' to tell the tool to lipo together .so files and output the fat binaries to lib/. diff --git a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt index 05f72b9..e0eea92 100644 --- a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt +++ b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt @@ -27,7 +27,11 @@ class Publish(perforce_publish_path: String) : BuildType({ param("env.TC_BUILD_URL", "%teamcity.serverUrl%/viewLog.html?buildId=%teamcity.build.id%") text("eve_branch_shortname", "", label = "Branch Name", description = """The name of the branch, for example MAINLINE""", display = ParameterDisplay.PROMPT, allowEmpty = false) param("env.TC_BUILDID", "%teamcity.build.id%") +<<<<<<< HEAD param("env.TC_BUILD_NUMBER", "Carbon Resources #%build.number%") +======= + param("env.TC_BUILD_NUMBER", "Carbon Template #%build.number%") +>>>>>>> template/carbonengine/resources-updates param("env.P4PORT", "p4is.ccp.ad.local:1666") param("env.TC_EVE_BRANCH_SHORTNAME", "%eve_branch_shortname%") param("env.TC_EVE_PROJECT", "%project%") @@ -259,4 +263,8 @@ class Publish(perforce_publish_path: String) : BuildType({ } }) -val PublishToPerforce = Publish("vendor/github.com/carbonengine/resources") \ No newline at end of file +<<<<<<< HEAD +val PublishToPerforce = Publish("vendor/github.com/carbonengine/resources") +======= +val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") +>>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml index a67ddd6..995e568 100644 --- a/.teamcity/pom.xml +++ b/.teamcity/pom.xml @@ -1,9 +1,15 @@ 4.0.0 +<<<<<<< HEAD Carbon Resources Config DSL Script Carbon_Resources Carbon_Resources_dsl +======= + Carbon Template Config DSL Script + Carbon_Template + Carbon_Template_dsl +>>>>>>> template/carbonengine/resources-updates 1.0-SNAPSHOT diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b78a72..797f9c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,4 @@ +<<<<<<< HEAD # Copyright © 2025 CCP ehf. cmake_minimum_required(VERSION 3.31.0) @@ -78,11 +79,23 @@ target_include_directories(resources ) get_target_property(_SOURCES resources SOURCES) +======= +cmake_minimum_required(VERSION 3.16) +project(CarbonTemplateProject VERSION 1.0.0) + +include(cmake/CcpBuildConfigurations.cmake) +include(cmake/CcpTargetConfigurations.cmake) + +ccp_add_library(target_name SHARED) + +get_target_property(_SOURCES target_name SOURCES) +>>>>>>> template/carbonengine/resources-updates source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" PREFIX "Sources" FILES ${_SOURCES} ) +<<<<<<< HEAD add_subdirectory(cli) # Enable testing based on option set (on by default) @@ -96,11 +109,24 @@ endif () # Provide an install target if this is the top level project only if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) +======= +set_target_properties(target_name PROPERTIES OUTPUT_NAME "_target_name") + +target_include_directories(target_name + PUBLIC + $ + $ +) + +# Provide an install target if this is the top level project only +if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) +>>>>>>> template/carbonengine/resources-updates # Determine if/when to generate/build documentation. The rules are as follows: # - If running locally - Build documentation is OFF by default # - If running on a build agent (TeamCity) - Build documentation is ON by default # - If -DBUILD_DOCUMENTATION=ON/OFF flag is explicitly set, use it. set(BUILD_DOCUMENTATION_DEFAULT_FLAG OFF) +<<<<<<< HEAD if (DEFINED ENV{TEAMCITY_VERSION}) set(BUILD_DOCUMENTATION_DEFAULT_FLAG ON) endif () @@ -114,6 +140,22 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) set(SPHINX_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/doc/source) set(SPHINX_BUILD ${CMAKE_CURRENT_BINARY_DIR}/doc/build) +======= + if(DEFINED ENV{TEAMCITY_VERSION}) + set(BUILD_DOCUMENTATION_DEFAULT_FLAG ON) + endif() + message(STATUS "Document generation settings: default=${BUILD_DOCUMENTATION_DEFAULT_FLAG}, option BUILD_DOCUMENTATION=${BUILD_DOCUMENTATION}") + option(BUILD_DOCUMENTATION "Build Documentation" ${BUILD_DOCUMENTATION_DEFAULT_FLAG}) + + if(BUILD_DOCUMENTATION) + # Set up sphinx build for Python autodoc comments. + set(SPHINX_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/doc/source) + set(SPHINX_BUILD ${CMAKE_CURRENT_BINARY_DIR}/doc/build) + + find_package(Python3 COMPONENTS Interpreter REQUIRED) + include(cmake/CcpDocsGenerator.cmake) + +>>>>>>> template/carbonengine/resources-updates create_carbon_docs_sphinx_target( PYTHON_EXE ${Python3_EXECUTABLE} VENV_NAME docs_generation_venv @@ -126,6 +168,7 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) INSTALL_DESTINATION documentation ) +<<<<<<< HEAD # Ensure that resources is built before Spinx target add_dependencies(Sphinx resources) endif () @@ -150,3 +193,57 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) ) endif () +======= + add_dependencies(Sphinx target_name) + endif() + + + option(INSTALL_TO_MONOLITH "Install this package to a perforce branch vendor folder - provided for backwards compatability" OFF) + if (INSTALL_TO_MONOLITH) + include(cmake/CcpMonolithVendorConfig.cmake) + include(cmake/CcpPackageConfigHelpers.cmake) + + # Install rule to ensure that our runtime and linker files are in the expected, platform-specific folders + install( + TARGETS target_name + EXPORT package_nameTarget + CONFIGURATIONS ${CMAKE_CONFIGURATION_TYPES} + LIBRARY DESTINATION ${CCP_VENDOR_LIB_PATH} + ARCHIVE DESTINATION ${CCP_VENDOR_LIB_PATH} + RUNTIME DESTINATION ${CCP_VENDOR_BIN_PATH} + ) + + # Generate target configuration for the monolith + configure_ccp_vendor_config_file( + TARGET target_name + DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/package_nameConfig.cmake" + DEPENDENCIES "" + ) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/package_nameConfig.cmake DESTINATION .) + install(DIRECTORY python DESTINATION . FILES_MATCHING PATTERN "*.py") + else () + # Install rule for available public headers + install( + TARGETS target_name + EXPORT package_nameTarget + CONFIGURATIONS ${CMAKE_CONFIGURATION_TYPES} + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/package_name + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin + ) + + install(EXPORT package_nameTarget + DESTINATION share/package_name + FILE package_name.cmake + ) + + install( + FILES package_nameConfig.cmake + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/package_name) + endif() + + install(DIRECTORY include DESTINATION . FILES_MATCHING PATTERN "*.h") + +endif() +>>>>>>> template/carbonengine/resources-updates diff --git a/CMakePresets.json b/CMakePresets.json index b1daeae..f3a8160 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -12,6 +12,7 @@ "binaryDir": "${sourceDir}/.cmake-build-${presetName}", "cacheVariables": { "VCPKG_USE_HOST_TOOLS": "ON", +<<<<<<< HEAD "CMAKE_COMPILE_WARNING_AS_ERROR": "ON", "VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/customized_toolchain/triplets", "BUILD_DOCUMENTATION": "ON", @@ -20,6 +21,12 @@ }, "environment": { "VCPKG_ROOT": "${sourceDir}/vendor/github.com/microsoft/vcpkg" +======= + "VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/triplets" + }, + "environment": { + "PATH_TO_VCPKG_ROOT": "${sourceDir}/vendor/github.com/microsoft/vcpkg" +>>>>>>> template/carbonengine/resources-updates }, "hidden": true }, @@ -47,7 +54,11 @@ "name": "x64-windows", "inherits": "windows", "cacheVariables": { +<<<<<<< HEAD "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/customized_toolchain/toolchains/x64-windows-carbon.cmake" +======= + "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" +>>>>>>> template/carbonengine/resources-updates }, "hidden": true }, @@ -56,7 +67,11 @@ "inherits": "osx", "cacheVariables": { "CMAKE_OSX_ARCHITECTURES": "arm64", +<<<<<<< HEAD "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/customized_toolchain/toolchains/arm64-osx-carbon.cmake" +======= + "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/arm64-osx-carbon.cmake" +>>>>>>> template/carbonengine/resources-updates }, "hidden": true }, @@ -65,7 +80,11 @@ "inherits": "osx", "cacheVariables": { "CMAKE_OSX_ARCHITECTURES": "x86_64", +<<<<<<< HEAD "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/customized_toolchain/toolchains/x64-osx-carbon.cmake" +======= + "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-osx-carbon.cmake" +>>>>>>> template/carbonengine/resources-updates }, "hidden": true }, @@ -106,6 +125,7 @@ } }, { +<<<<<<< HEAD "name": "x64-windows-release-with-dev-features", "inherits": "x64-windows-release", "cacheVariables": { @@ -113,6 +133,8 @@ } }, { +======= +>>>>>>> template/carbonengine/resources-updates "name": "arm64-osx-internal", "inherits": "arm64-osx", "cacheVariables": { diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 76ca7f5..48845e1 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -74,7 +74,11 @@ PROJECT_ICON = # entered, it will be relative to the location where doxygen was started. If # left blank the current directory will be used. +<<<<<<< HEAD OUTPUT_DIRECTORY = @CMAKE_CURRENT_BINARY_DIR@/docs/ +======= +OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ +>>>>>>> template/carbonengine/resources-updates # If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 # sub-directories (in 2 levels) under the output directory of each output format diff --git a/doc/source/conf.py b/doc/source/conf.py index 7e65f15..bdf4393 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -6,8 +6,13 @@ # -- Project information ----------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information +<<<<<<< HEAD project = 'resources' copyright = 'Copyright © 2025 CCP ehf' +======= +project = 'project_name' +copyright = '2024, CCP Games' +>>>>>>> template/carbonengine/resources-updates author = 'CCP Games' release = '0.1' diff --git a/doc/source/index.rst b/doc/source/index.rst index f0f0b8f..05af601 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -1,3 +1,4 @@ +<<<<<<< HEAD resources Documentation ============================== @@ -42,3 +43,33 @@ Contents This project is under active development. +======= +project_name Documentation +========================== + +*project_name* is generated from `carbon-template`. + +.. + Top-level table of contents + List documentation sources below + +.. toctree:: + :maxdepth: 1 + :caption: Contents + +.. hint:: + This project supports documentation authoring using *reStructuredText* and the *MyST* markdown language. + + Python docstrings are pulled in automatically using *autodoc* + +.. seealso:: + + `reST usages`_ + For authoring documentation using *reStructuredText*. + + `MyST with Sphinx`_ + For authoring documentation using *MyST* flavored markdown. + +.. _reST usages: https://www.sphinx-doc.org/en/master/usage/restructuredtext +.. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html +>>>>>>> template/carbonengine/resources-updates diff --git a/include/include.md b/include/include.md new file mode 100644 index 0000000..1cdda44 --- /dev/null +++ b/include/include.md @@ -0,0 +1,6 @@ +# /include + +This folder is where all relevant includes for the project should be stored, such as `.h` files. + +[See an example here](https://github.com/ccpgames/carbon-blueexposure/tree/main/include) + diff --git a/package_nameConfig.cmake b/package_nameConfig.cmake new file mode 100644 index 0000000..8255c9c --- /dev/null +++ b/package_nameConfig.cmake @@ -0,0 +1,34 @@ +include(CMakeFindDependencyMacro) + +# ${CMAKE_CURRENT_LIST_DIR}/project_name.cmake is generated automatically by cmake as part of the install step +include(${CMAKE_CURRENT_LIST_DIR}/package_name.cmake) + +# Please specify all of this projects transitive dependencies here +# In order for a consuming cmake project system to locate any transitive dependencies of this project, they must be +# specified here in a call to find_dependency(...) +# +# Example: +# +# My project CMakeLists.txt file looks like this: +# ------------------------ +# MyProject/CMakeLists.txt +# ------------------------ +# +# find_package(a CONFIG NO_CMAKE_PATH REQUIRED) +# find_package(b CONFIG NO_CMAKE_PATH REQUIRED) +# find_package(c CONFIG NO_CMAKE_PATH REQUIRED) +# target_link_libraries(MyProjectTarget PRIVATE package_a PUBLIC package_b INTERFACE package_c) +# . . . +# + +# Then the myprojectConfig file (this file) looks like this: +#-------------------------------- +# MyProject/myprojectConfig.cmake +# ------------------------------- +# +# include(CMakeFindDependencyMacro) +# include(${CMAKE_CURRENT_LIST_DIR}/myproject.cmake) +# +# find_dependency(b CONFIG NO_CMAKE_PATH REQUIRED) +# find_dependency(c CONFIG NO_CMAKE_PATH REQUIRED) +# \ No newline at end of file diff --git a/tests/tests.md b/tests/tests.md index f2ffc7d..4d1f61a 100644 --- a/tests/tests.md +++ b/tests/tests.md @@ -2,4 +2,11 @@ This folder is where all the tests for the project should be stored, whether they be Python tests or C++ tests. +<<<<<<< HEAD [See a C++ example here](https://github.com/carbonengine/resources/tree/main/tests/src) +======= +[See a C++ example here](https://github.com/ccpgames/carbon-destiny/tree/main/tests) + +[See a Python example here](https://github.com/ccpgames/carbon-fsd/tree/main/tests) + +>>>>>>> template/carbonengine/resources-updates diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index 9c0fca4..bdb758e 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -1,15 +1,31 @@ { "default-registry": { "kind": "git", +<<<<<<< HEAD "baseline": "bea476a80218a581bcb5318595849520217c825e", +======= + "baseline": "242ac6932a9cd2607332969129e9572516f28d65", +>>>>>>> template/carbonengine/resources-updates "repository": "https://github.com/microsoft/vcpkg.git" }, "registries": [ { "kind": "git", +<<<<<<< HEAD "repository": "git@github.com:carbonengine/vcpkg-registry.git", "baseline": "addd8867a1553f4b7866bb7a36deb84bd59bd1f9", "packages": ["carbon-*", "python3", "bsdiff-drake127"] +======= + "repository": "git@github.com:ccpgames/carbon-vcpkg-registry.git", + "baseline": "bd0e4644d7d8a7ce9bfa426192cdf37a23e61b5f", + "packages": ["carbon-pdmprotowrapper", "carbon-pdm", "carbon-blueexposure", "carbon-blue", "carbon-exefile", "carbon-exefile-interpreter", "carbon-io", "carbon-math"] + }, + { + "kind": "git", + "repository": "git@github.com:carbonengine/vcpkg-registry.git", + "baseline": "303eacceb8ce9a0aa9a061f00ab2c11e8725ab2d", + "packages": ["python3", "carbon-core", "carbon-scheduler", "tracy", "greenlet", "ccp-debug-info", "crashpad", "zlib"] +>>>>>>> template/carbonengine/resources-updates } ] } diff --git a/vcpkg.json b/vcpkg.json index 02c947d..ad38e87 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,7 @@ { "dependencies": [ { +<<<<<<< HEAD "name": "argparse", "version>=": "2.2" }, @@ -63,6 +64,17 @@ { "name": "argparse", "version": "2.2" +======= + "name": "python3", + "version>=": "3.12.9#1", + "host": true + } + ], + "overrides": [ + { + "name": "protobuf", + "version": "3.6.0.1" +>>>>>>> template/carbonengine/resources-updates } ] } From 5870a2cc7631c024234cc975717a613e41b87e29 Mon Sep 17 00:00:00 2001 From: ccpgames-carbon Date: Wed, 27 May 2026 13:43:24 +0000 Subject: [PATCH 02/12] Merge commit 9f0a73dad8c0a2916d65b7a8b2e82e087b9903d5 from carbon-template branch=carbonengine/resources-updates: Add Artifact Zipping to Reduce HTTP Transport time --- .clang-format | 11 ++++++ .editorconfig | 10 ++++++ .gitignore | 9 +++++ .teamcity/MacOS/Project.kt | 8 +++++ .teamcity/Windows/Project.kt | 18 ++++++++++ .teamcity/_Self.kt/Project.kt | 4 +++ .../buildTypes/CreateUniversalBuilds.kt | 36 +++++++++++++++++++ .../_Self.kt/buildTypes/PublishToPerforce.kt | 28 +++++++++++++++ .teamcity/pom.xml | 6 ++++ CMakeLists.txt | 25 +++++++++++++ CMakePresets.json | 21 +++++++++++ doc/Doxyfile.in | 4 +++ doc/source/conf.py | 5 +++ doc/source/index.rst | 7 ++++ tests/tests.md | 6 ++++ vcpkg-configuration.json | 10 ++++++ vcpkg.json | 6 ++++ 17 files changed, 214 insertions(+) diff --git a/.clang-format b/.clang-format index 7269284..e300f08 100644 --- a/.clang-format +++ b/.clang-format @@ -71,10 +71,14 @@ SpacesInContainerLiterals: false SpacesInParentheses: true SpacesInSquareBrackets: false <<<<<<< HEAD +<<<<<<< HEAD Standard: Cpp11 ======= Standard: Cpp17 >>>>>>> template/carbonengine/resources-updates +======= +Standard: Cpp17 +>>>>>>> template/carbonengine/resources-updates TabWidth: 4 UseTab: ForContinuationAndIndentation --- @@ -151,6 +155,7 @@ SpacesInContainerLiterals: false SpacesInParentheses: true SpacesInSquareBrackets: false <<<<<<< HEAD +<<<<<<< HEAD Standard: Cpp11 TabWidth: 4 UseTab: ForContinuationAndIndentation @@ -161,3 +166,9 @@ TabWidth: 4 UseTab: ForContinuationAndIndentation ... >>>>>>> template/carbonengine/resources-updates +======= +Standard: Cpp17 +TabWidth: 4 +UseTab: ForContinuationAndIndentation +... +>>>>>>> template/carbonengine/resources-updates diff --git a/.editorconfig b/.editorconfig index 4149c84..f4a9431 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,16 +1,21 @@ [*] charset = utf-8 <<<<<<< HEAD +<<<<<<< HEAD end_of_line = crlf ======= end_of_line = lf >>>>>>> template/carbonengine/resources-updates +======= +end_of_line = lf +>>>>>>> template/carbonengine/resources-updates indent_size = 4 indent_style = space insert_final_newline = false max_line_length = 120 tab_width = 4 <<<<<<< HEAD +<<<<<<< HEAD ij_continuation_indent_size = 8 ij_formatter_off_tag = @formatter:off ij_formatter_on_tag = @formatter:on @@ -952,6 +957,8 @@ ij_python_wrap_long_lines = false [{*.toml,Cargo.lock,Cargo.toml.orig,Gopkg.lock,Pipfile,poetry.lock}] ij_toml_keep_indents_on_empty_lines = false ======= +======= +>>>>>>> template/carbonengine/resources-updates trim_trailing_whitespace = true [{*.yaml,*.yml,.clang-format,.clang-tidy,_clang-format}] @@ -972,4 +979,7 @@ indent_size = 4 # Even though it's controversial to use it for that purpose (there are alternatives like using the `
` html tag), # let's not break it accidentally in files that already use the double whitespace. trim_trailing_whitespace = false +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates diff --git a/.gitignore b/.gitignore index 81b89fe..71b78dd 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,10 @@ # Compiled Dynamic libraries <<<<<<< HEAD +<<<<<<< HEAD +======= +binaryCache/ +>>>>>>> template/carbonengine/resources-updates ======= binaryCache/ >>>>>>> template/carbonengine/resources-updates @@ -33,6 +37,7 @@ __pycache__/ # User generated local cmake configuration CMakeUserPresets.json +<<<<<<< HEAD <<<<<<< HEAD ### IDE ### @@ -46,3 +51,7 @@ vcpkg_registry_cache/ .cmake-build* cmake-build* >>>>>>> template/carbonengine/resources-updates +======= +.cmake-build* +cmake-build* +>>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/MacOS/Project.kt b/.teamcity/MacOS/Project.kt index fce626e..968487c 100644 --- a/.teamcity/MacOS/Project.kt +++ b/.teamcity/MacOS/Project.kt @@ -51,7 +51,11 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag id(buildName.toId()) name = buildName +<<<<<<< HEAD artifactRules = "%env.CMAKE_INSTALL_PREFIX%" +======= + artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" +>>>>>>> template/carbonengine/resources-updates params { param("env.SENTRY_CLI_DEBUG_SYMBOL_TYPE", "dsym") @@ -73,8 +77,12 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag param("env.VCPKG_BINARY_SOURCES", "clear;x-aws,s3://vcpkg-binary-cache-static/cache/,readwrite") param("env.X_VCPKG_REGISTRIES_CACHE", "%teamcity.build.checkoutDir%/%github_checkout_folder%/regcache") param("env.CMAKE_BUILD_PARALLEL_LEVEL", "8") +<<<<<<< HEAD <<<<<<< HEAD param("env.CTEST_PARALLEL_LEVEL", "1") +======= + param("env.CTEST_PARALLEL_LEVEL", "8") +>>>>>>> template/carbonengine/resources-updates ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt index dd600a9..d75d99a 100644 --- a/.teamcity/Windows/Project.kt +++ b/.teamcity/Windows/Project.kt @@ -25,9 +25,12 @@ val Internal = CarbonBuildWindows("Internal Windows", "Internal", "x64-windows-i val TrinityDev = CarbonBuildWindows("TrinityDev Windows", "TrinityDev", "x64-windows-trinitydev") val Release = CarbonBuildWindows("Release Windows", "Release", "x64-windows-release") <<<<<<< HEAD +<<<<<<< HEAD val ReleaseDevFeatures = CarbonBuildWindows("Release Windows with Dev Features", "Release", "x64-windows-release-with-dev-features") ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates object Project : Project({ id("Windows") @@ -37,10 +40,13 @@ object Project : Project({ buildType(Internal) buildType(TrinityDev) buildType(Release) +<<<<<<< HEAD <<<<<<< HEAD buildType(ReleaseDevFeatures) ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates }) @@ -48,7 +54,11 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) id(buildName.toId()) this.name = buildName +<<<<<<< HEAD artifactRules = "%env.CMAKE_INSTALL_PREFIX%" +======= + artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" +>>>>>>> template/carbonengine/resources-updates params { param("env.GIT_TAG_HASH_OVERRIDE", "") @@ -69,8 +79,12 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) param("env.VCPKG_BINARY_SOURCES", "clear;x-aws,s3://vcpkg-binary-cache-static/cache/,readwrite") param("env.X_VCPKG_REGISTRIES_CACHE", "%teamcity.build.checkoutDir%/%github_checkout_folder%/regcache") param("env.CMAKE_BUILD_PARALLEL_LEVEL", "8") +<<<<<<< HEAD <<<<<<< HEAD param("env.CTEST_PARALLEL_LEVEL", "1") +======= + param("env.CTEST_PARALLEL_LEVEL", "8") +>>>>>>> template/carbonengine/resources-updates ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates @@ -101,8 +115,12 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) scriptContent = """ REM unfortunately ninja does not find the VS environment otherwise REM NB: the exported PATH also contains the location where we installed sentry-cli, e.g. teamcity.agent.work.dir +<<<<<<< HEAD <<<<<<< HEAD call "%%ProgramFiles(x86)%%\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\vsdevcmd.bat" -arch=x64 +======= + call "%env.VSDEV_BAT_PATH%" -arch=x64 +>>>>>>> template/carbonengine/resources-updates ======= call "%env.VSDEV_BAT_PATH%" -arch=x64 >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/_Self.kt/Project.kt b/.teamcity/_Self.kt/Project.kt index fc7086e..65f2d11 100644 --- a/.teamcity/_Self.kt/Project.kt +++ b/.teamcity/_Self.kt/Project.kt @@ -8,8 +8,12 @@ import jetbrains.buildServer.configs.kotlin.vcs.GitVcsRoot object Project : Project({ +<<<<<<< HEAD <<<<<<< HEAD description = "Build / Publish pipeline for https://github.com/carbonengine/resources" +======= + description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" +>>>>>>> template/carbonengine/resources-updates ======= description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt index 552c757..9fe27ac 100644 --- a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt +++ b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt @@ -20,8 +20,12 @@ class UniversalBuild() : BuildType({ param("x64-bin-path", "bin/macOS/x64") param("arm64-bin-path", "bin/macOS/arm64") text("file-matchers", +<<<<<<< HEAD <<<<<<< HEAD "-m 'resources:%system.teamcity.build.workingDir%/bin' -m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", +======= + "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", +>>>>>>> template/carbonengine/resources-updates ======= "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", >>>>>>> template/carbonengine/resources-updates @@ -90,7 +94,11 @@ class UniversalBuild() : BuildType({ } artifacts { +<<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates } } dependency(MacOS.x64_Debug) { @@ -99,7 +107,11 @@ class UniversalBuild() : BuildType({ } artifacts { +<<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates } } @@ -109,7 +121,11 @@ class UniversalBuild() : BuildType({ } artifacts { +<<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates } } dependency(MacOS.x64_Release) { @@ -118,7 +134,11 @@ class UniversalBuild() : BuildType({ } artifacts { +<<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates } } @@ -128,7 +148,11 @@ class UniversalBuild() : BuildType({ } artifacts { +<<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates } } dependency(MacOS.x64_Internal) { @@ -137,7 +161,11 @@ class UniversalBuild() : BuildType({ } artifacts { +<<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates } } @@ -147,7 +175,11 @@ class UniversalBuild() : BuildType({ } artifacts { +<<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates } } dependency(MacOS.x64_TrinityDev) { @@ -156,7 +188,11 @@ class UniversalBuild() : BuildType({ } artifacts { +<<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates } } } diff --git a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt index e0eea92..8d7afa8 100644 --- a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt +++ b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt @@ -27,8 +27,12 @@ class Publish(perforce_publish_path: String) : BuildType({ param("env.TC_BUILD_URL", "%teamcity.serverUrl%/viewLog.html?buildId=%teamcity.build.id%") text("eve_branch_shortname", "", label = "Branch Name", description = """The name of the branch, for example MAINLINE""", display = ParameterDisplay.PROMPT, allowEmpty = false) param("env.TC_BUILDID", "%teamcity.build.id%") +<<<<<<< HEAD <<<<<<< HEAD param("env.TC_BUILD_NUMBER", "Carbon Resources #%build.number%") +======= + param("env.TC_BUILD_NUMBER", "Carbon Template #%build.number%") +>>>>>>> template/carbonengine/resources-updates ======= param("env.TC_BUILD_NUMBER", "Carbon Template #%build.number%") >>>>>>> template/carbonengine/resources-updates @@ -212,7 +216,11 @@ class Publish(perforce_publish_path: String) : BuildType({ } artifacts { +<<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates } } dependency(Windows.Debug) { @@ -221,7 +229,11 @@ class Publish(perforce_publish_path: String) : BuildType({ } artifacts { +<<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates } } dependency(Windows.Internal) { @@ -230,7 +242,11 @@ class Publish(perforce_publish_path: String) : BuildType({ } artifacts { +<<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates } } dependency(Windows.Release) { @@ -239,7 +255,11 @@ class Publish(perforce_publish_path: String) : BuildType({ } artifacts { +<<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates } } dependency(Windows.TrinityDev) { @@ -248,7 +268,11 @@ class Publish(perforce_publish_path: String) : BuildType({ } artifacts { +<<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates } } artifacts(AbsoluteId("Infrastructure_MetaTeamCity_Tools_TeamcityChanges")) { @@ -263,8 +287,12 @@ class Publish(perforce_publish_path: String) : BuildType({ } }) +<<<<<<< HEAD <<<<<<< HEAD val PublishToPerforce = Publish("vendor/github.com/carbonengine/resources") ======= val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") >>>>>>> template/carbonengine/resources-updates +======= +val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") +>>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml index 995e568..9db518d 100644 --- a/.teamcity/pom.xml +++ b/.teamcity/pom.xml @@ -1,10 +1,16 @@ 4.0.0 +<<<<<<< HEAD <<<<<<< HEAD Carbon Resources Config DSL Script Carbon_Resources Carbon_Resources_dsl +======= + Carbon Template Config DSL Script + Carbon_Template + Carbon_Template_dsl +>>>>>>> template/carbonengine/resources-updates ======= Carbon Template Config DSL Script Carbon_Template diff --git a/CMakeLists.txt b/CMakeLists.txt index 797f9c6..41e6177 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD # Copyright © 2025 CCP ehf. cmake_minimum_required(VERSION 3.31.0) @@ -80,6 +81,8 @@ target_include_directories(resources get_target_property(_SOURCES resources SOURCES) ======= +======= +>>>>>>> template/carbonengine/resources-updates cmake_minimum_required(VERSION 3.16) project(CarbonTemplateProject VERSION 1.0.0) @@ -89,12 +92,16 @@ include(cmake/CcpTargetConfigurations.cmake) ccp_add_library(target_name SHARED) get_target_property(_SOURCES target_name SOURCES) +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" PREFIX "Sources" FILES ${_SOURCES} ) +<<<<<<< HEAD <<<<<<< HEAD add_subdirectory(cli) @@ -110,6 +117,8 @@ endif () # Provide an install target if this is the top level project only if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) ======= +======= +>>>>>>> template/carbonengine/resources-updates set_target_properties(target_name PROPERTIES OUTPUT_NAME "_target_name") target_include_directories(target_name @@ -120,12 +129,16 @@ target_include_directories(target_name # Provide an install target if this is the top level project only if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates # Determine if/when to generate/build documentation. The rules are as follows: # - If running locally - Build documentation is OFF by default # - If running on a build agent (TeamCity) - Build documentation is ON by default # - If -DBUILD_DOCUMENTATION=ON/OFF flag is explicitly set, use it. set(BUILD_DOCUMENTATION_DEFAULT_FLAG OFF) +<<<<<<< HEAD <<<<<<< HEAD if (DEFINED ENV{TEAMCITY_VERSION}) set(BUILD_DOCUMENTATION_DEFAULT_FLAG ON) @@ -141,6 +154,8 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) set(SPHINX_BUILD ${CMAKE_CURRENT_BINARY_DIR}/doc/build) ======= +======= +>>>>>>> template/carbonengine/resources-updates if(DEFINED ENV{TEAMCITY_VERSION}) set(BUILD_DOCUMENTATION_DEFAULT_FLAG ON) endif() @@ -155,6 +170,9 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) find_package(Python3 COMPONENTS Interpreter REQUIRED) include(cmake/CcpDocsGenerator.cmake) +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates create_carbon_docs_sphinx_target( PYTHON_EXE ${Python3_EXECUTABLE} @@ -168,6 +186,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) INSTALL_DESTINATION documentation ) +<<<<<<< HEAD <<<<<<< HEAD # Ensure that resources is built before Spinx target add_dependencies(Sphinx resources) @@ -194,6 +213,8 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) endif () ======= +======= +>>>>>>> template/carbonengine/resources-updates add_dependencies(Sphinx target_name) endif() @@ -245,5 +266,9 @@ endif () install(DIRECTORY include DESTINATION . FILES_MATCHING PATTERN "*.h") +<<<<<<< HEAD +endif() +>>>>>>> template/carbonengine/resources-updates +======= endif() >>>>>>> template/carbonengine/resources-updates diff --git a/CMakePresets.json b/CMakePresets.json index f3a8160..d60e6b1 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -12,6 +12,7 @@ "binaryDir": "${sourceDir}/.cmake-build-${presetName}", "cacheVariables": { "VCPKG_USE_HOST_TOOLS": "ON", +<<<<<<< HEAD <<<<<<< HEAD "CMAKE_COMPILE_WARNING_AS_ERROR": "ON", "VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/customized_toolchain/triplets", @@ -22,10 +23,15 @@ "environment": { "VCPKG_ROOT": "${sourceDir}/vendor/github.com/microsoft/vcpkg" ======= +======= +>>>>>>> template/carbonengine/resources-updates "VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/triplets" }, "environment": { "PATH_TO_VCPKG_ROOT": "${sourceDir}/vendor/github.com/microsoft/vcpkg" +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates }, "hidden": true @@ -54,8 +60,12 @@ "name": "x64-windows", "inherits": "windows", "cacheVariables": { +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/customized_toolchain/toolchains/x64-windows-carbon.cmake" +======= + "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" >>>>>>> template/carbonengine/resources-updates @@ -67,8 +77,12 @@ "inherits": "osx", "cacheVariables": { "CMAKE_OSX_ARCHITECTURES": "arm64", +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/customized_toolchain/toolchains/arm64-osx-carbon.cmake" +======= + "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/arm64-osx-carbon.cmake" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/arm64-osx-carbon.cmake" >>>>>>> template/carbonengine/resources-updates @@ -80,8 +94,12 @@ "inherits": "osx", "cacheVariables": { "CMAKE_OSX_ARCHITECTURES": "x86_64", +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/customized_toolchain/toolchains/x64-osx-carbon.cmake" +======= + "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-osx-carbon.cmake" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-osx-carbon.cmake" >>>>>>> template/carbonengine/resources-updates @@ -125,6 +143,7 @@ } }, { +<<<<<<< HEAD <<<<<<< HEAD "name": "x64-windows-release-with-dev-features", "inherits": "x64-windows-release", @@ -134,6 +153,8 @@ }, { ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "name": "arm64-osx-internal", "inherits": "arm64-osx", diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 48845e1..dd921e2 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -74,11 +74,15 @@ PROJECT_ICON = # entered, it will be relative to the location where doxygen was started. If # left blank the current directory will be used. +<<<<<<< HEAD <<<<<<< HEAD OUTPUT_DIRECTORY = @CMAKE_CURRENT_BINARY_DIR@/docs/ ======= OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ >>>>>>> template/carbonengine/resources-updates +======= +OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ +>>>>>>> template/carbonengine/resources-updates # If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 # sub-directories (in 2 levels) under the output directory of each output format diff --git a/doc/source/conf.py b/doc/source/conf.py index bdf4393..22b71a5 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -6,6 +6,7 @@ # -- Project information ----------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information +<<<<<<< HEAD <<<<<<< HEAD project = 'resources' copyright = 'Copyright © 2025 CCP ehf' @@ -13,6 +14,10 @@ project = 'project_name' copyright = '2024, CCP Games' >>>>>>> template/carbonengine/resources-updates +======= +project = 'project_name' +copyright = '2024, CCP Games' +>>>>>>> template/carbonengine/resources-updates author = 'CCP Games' release = '0.1' diff --git a/doc/source/index.rst b/doc/source/index.rst index 05af601..e1f7b3e 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD resources Documentation ============================== @@ -44,6 +45,8 @@ Contents ======= +======= +>>>>>>> template/carbonengine/resources-updates project_name Documentation ========================== @@ -71,5 +74,9 @@ project_name Documentation For authoring documentation using *MyST* flavored markdown. .. _reST usages: https://www.sphinx-doc.org/en/master/usage/restructuredtext +<<<<<<< HEAD +.. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html +>>>>>>> template/carbonengine/resources-updates +======= .. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html >>>>>>> template/carbonengine/resources-updates diff --git a/tests/tests.md b/tests/tests.md index 4d1f61a..ace431f 100644 --- a/tests/tests.md +++ b/tests/tests.md @@ -2,11 +2,17 @@ This folder is where all the tests for the project should be stored, whether they be Python tests or C++ tests. +<<<<<<< HEAD <<<<<<< HEAD [See a C++ example here](https://github.com/carbonengine/resources/tree/main/tests/src) ======= +======= +>>>>>>> template/carbonengine/resources-updates [See a C++ example here](https://github.com/ccpgames/carbon-destiny/tree/main/tests) [See a Python example here](https://github.com/ccpgames/carbon-fsd/tree/main/tests) +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index bdb758e..01526d5 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -1,8 +1,12 @@ { "default-registry": { "kind": "git", +<<<<<<< HEAD <<<<<<< HEAD "baseline": "bea476a80218a581bcb5318595849520217c825e", +======= + "baseline": "242ac6932a9cd2607332969129e9572516f28d65", +>>>>>>> template/carbonengine/resources-updates ======= "baseline": "242ac6932a9cd2607332969129e9572516f28d65", >>>>>>> template/carbonengine/resources-updates @@ -11,11 +15,14 @@ "registries": [ { "kind": "git", +<<<<<<< HEAD <<<<<<< HEAD "repository": "git@github.com:carbonengine/vcpkg-registry.git", "baseline": "addd8867a1553f4b7866bb7a36deb84bd59bd1f9", "packages": ["carbon-*", "python3", "bsdiff-drake127"] ======= +======= +>>>>>>> template/carbonengine/resources-updates "repository": "git@github.com:ccpgames/carbon-vcpkg-registry.git", "baseline": "bd0e4644d7d8a7ce9bfa426192cdf37a23e61b5f", "packages": ["carbon-pdmprotowrapper", "carbon-pdm", "carbon-blueexposure", "carbon-blue", "carbon-exefile", "carbon-exefile-interpreter", "carbon-io", "carbon-math"] @@ -25,6 +32,9 @@ "repository": "git@github.com:carbonengine/vcpkg-registry.git", "baseline": "303eacceb8ce9a0aa9a061f00ab2c11e8725ab2d", "packages": ["python3", "carbon-core", "carbon-scheduler", "tracy", "greenlet", "ccp-debug-info", "crashpad", "zlib"] +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates } ] diff --git a/vcpkg.json b/vcpkg.json index ad38e87..ecdf5a8 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,7 @@ { "dependencies": [ { +<<<<<<< HEAD <<<<<<< HEAD "name": "argparse", "version>=": "2.2" @@ -65,6 +66,8 @@ "name": "argparse", "version": "2.2" ======= +======= +>>>>>>> template/carbonengine/resources-updates "name": "python3", "version>=": "3.12.9#1", "host": true @@ -74,6 +77,9 @@ { "name": "protobuf", "version": "3.6.0.1" +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates } ] From 2687e8f8e285b16a285776a3e29f99682ddbfbb5 Mon Sep 17 00:00:00 2001 From: ccpgames-carbon Date: Wed, 27 May 2026 13:50:25 +0000 Subject: [PATCH 03/12] Merge commit 320ddd3d5736b4dfe0579bea1537f5d1183e6743 from carbon-template branch=carbonengine/resources-updates: Add Zip Artifact Rules to LIPO Config --- .clang-format | 11 +++++ .editorconfig | 10 +++++ .gitignore | 9 +++++ .teamcity/MacOS/Project.kt | 8 ++++ .teamcity/Windows/Project.kt | 18 +++++++++ .teamcity/_Self.kt/Project.kt | 4 ++ .../buildTypes/CreateUniversalBuilds.kt | 40 +++++++++++++++++++ .../_Self.kt/buildTypes/PublishToPerforce.kt | 28 +++++++++++++ .teamcity/pom.xml | 6 +++ CMakeLists.txt | 25 ++++++++++++ CMakePresets.json | 21 ++++++++++ doc/Doxyfile.in | 4 ++ doc/source/conf.py | 5 +++ doc/source/index.rst | 7 ++++ tests/tests.md | 6 +++ vcpkg-configuration.json | 10 +++++ vcpkg.json | 6 +++ 17 files changed, 218 insertions(+) diff --git a/.clang-format b/.clang-format index e300f08..2b9fec3 100644 --- a/.clang-format +++ b/.clang-format @@ -72,6 +72,7 @@ SpacesInParentheses: true SpacesInSquareBrackets: false <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Standard: Cpp11 ======= Standard: Cpp17 @@ -79,6 +80,9 @@ Standard: Cpp17 ======= Standard: Cpp17 >>>>>>> template/carbonengine/resources-updates +======= +Standard: Cpp17 +>>>>>>> template/carbonengine/resources-updates TabWidth: 4 UseTab: ForContinuationAndIndentation --- @@ -156,6 +160,7 @@ SpacesInParentheses: true SpacesInSquareBrackets: false <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Standard: Cpp11 TabWidth: 4 UseTab: ForContinuationAndIndentation @@ -172,3 +177,9 @@ TabWidth: 4 UseTab: ForContinuationAndIndentation ... >>>>>>> template/carbonengine/resources-updates +======= +Standard: Cpp17 +TabWidth: 4 +UseTab: ForContinuationAndIndentation +... +>>>>>>> template/carbonengine/resources-updates diff --git a/.editorconfig b/.editorconfig index f4a9431..1d1cd9c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,6 +2,7 @@ charset = utf-8 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD end_of_line = crlf ======= end_of_line = lf @@ -9,6 +10,9 @@ end_of_line = lf ======= end_of_line = lf >>>>>>> template/carbonengine/resources-updates +======= +end_of_line = lf +>>>>>>> template/carbonengine/resources-updates indent_size = 4 indent_style = space insert_final_newline = false @@ -16,6 +20,7 @@ max_line_length = 120 tab_width = 4 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ij_continuation_indent_size = 8 ij_formatter_off_tag = @formatter:off ij_formatter_on_tag = @formatter:on @@ -959,6 +964,8 @@ ij_toml_keep_indents_on_empty_lines = false ======= ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates trim_trailing_whitespace = true [{*.yaml,*.yml,.clang-format,.clang-tidy,_clang-format}] @@ -980,6 +987,9 @@ indent_size = 4 # let's not break it accidentally in files that already use the double whitespace. trim_trailing_whitespace = false <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/.gitignore b/.gitignore index 71b78dd..33941ac 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,10 @@ # Compiled Dynamic libraries <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +binaryCache/ +>>>>>>> template/carbonengine/resources-updates ======= binaryCache/ >>>>>>> template/carbonengine/resources-updates @@ -37,6 +41,7 @@ __pycache__/ # User generated local cmake configuration CMakeUserPresets.json +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -55,3 +60,7 @@ cmake-build* .cmake-build* cmake-build* >>>>>>> template/carbonengine/resources-updates +======= +.cmake-build* +cmake-build* +>>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/MacOS/Project.kt b/.teamcity/MacOS/Project.kt index 968487c..34f943d 100644 --- a/.teamcity/MacOS/Project.kt +++ b/.teamcity/MacOS/Project.kt @@ -51,8 +51,12 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag id(buildName.toId()) name = buildName +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "%env.CMAKE_INSTALL_PREFIX%" +======= + artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" >>>>>>> template/carbonengine/resources-updates @@ -78,11 +82,15 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag param("env.X_VCPKG_REGISTRIES_CACHE", "%teamcity.build.checkoutDir%/%github_checkout_folder%/regcache") param("env.CMAKE_BUILD_PARALLEL_LEVEL", "8") <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.CTEST_PARALLEL_LEVEL", "1") ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates +======= + param("env.CTEST_PARALLEL_LEVEL", "8") +>>>>>>> template/carbonengine/resources-updates ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt index d75d99a..8cb17f5 100644 --- a/.teamcity/Windows/Project.kt +++ b/.teamcity/Windows/Project.kt @@ -26,11 +26,14 @@ val TrinityDev = CarbonBuildWindows("TrinityDev Windows", "TrinityDev", "x64-win val Release = CarbonBuildWindows("Release Windows", "Release", "x64-windows-release") <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD val ReleaseDevFeatures = CarbonBuildWindows("Release Windows with Dev Features", "Release", "x64-windows-release-with-dev-features") ======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates object Project : Project({ id("Windows") @@ -41,12 +44,15 @@ object Project : Project({ buildType(TrinityDev) buildType(Release) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD buildType(ReleaseDevFeatures) ======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates }) @@ -54,8 +60,12 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) id(buildName.toId()) this.name = buildName +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "%env.CMAKE_INSTALL_PREFIX%" +======= + artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" >>>>>>> template/carbonengine/resources-updates @@ -80,11 +90,15 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) param("env.X_VCPKG_REGISTRIES_CACHE", "%teamcity.build.checkoutDir%/%github_checkout_folder%/regcache") param("env.CMAKE_BUILD_PARALLEL_LEVEL", "8") <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.CTEST_PARALLEL_LEVEL", "1") ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates +======= + param("env.CTEST_PARALLEL_LEVEL", "8") +>>>>>>> template/carbonengine/resources-updates ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates @@ -116,11 +130,15 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) REM unfortunately ninja does not find the VS environment otherwise REM NB: the exported PATH also contains the location where we installed sentry-cli, e.g. teamcity.agent.work.dir <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD call "%%ProgramFiles(x86)%%\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\vsdevcmd.bat" -arch=x64 ======= call "%env.VSDEV_BAT_PATH%" -arch=x64 >>>>>>> template/carbonengine/resources-updates +======= + call "%env.VSDEV_BAT_PATH%" -arch=x64 +>>>>>>> template/carbonengine/resources-updates ======= call "%env.VSDEV_BAT_PATH%" -arch=x64 >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/_Self.kt/Project.kt b/.teamcity/_Self.kt/Project.kt index 65f2d11..8b850a9 100644 --- a/.teamcity/_Self.kt/Project.kt +++ b/.teamcity/_Self.kt/Project.kt @@ -8,12 +8,16 @@ import jetbrains.buildServer.configs.kotlin.vcs.GitVcsRoot object Project : Project({ +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD description = "Build / Publish pipeline for https://github.com/carbonengine/resources" ======= description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" >>>>>>> template/carbonengine/resources-updates +======= + description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" +>>>>>>> template/carbonengine/resources-updates ======= description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt index 9fe27ac..4007096 100644 --- a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt +++ b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt @@ -21,11 +21,15 @@ class UniversalBuild() : BuildType({ param("arm64-bin-path", "bin/macOS/arm64") text("file-matchers", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "-m 'resources:%system.teamcity.build.workingDir%/bin' -m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", ======= "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", >>>>>>> template/carbonengine/resources-updates +======= + "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", +>>>>>>> template/carbonengine/resources-updates ======= "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", >>>>>>> template/carbonengine/resources-updates @@ -38,7 +42,11 @@ class UniversalBuild() : BuildType({ ) } +<<<<<<< HEAD artifactRules = "%universal-output-dir%" +======= + artifactRules = "%universal-output-dir% => artifact.zip" +>>>>>>> template/carbonengine/resources-updates vcs { root(AbsoluteId("CarbonPipelineTools"), "+:carbon/.=>carbon") @@ -94,8 +102,12 @@ class UniversalBuild() : BuildType({ } artifacts { +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -107,8 +119,12 @@ class UniversalBuild() : BuildType({ } artifacts { +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -121,8 +137,12 @@ class UniversalBuild() : BuildType({ } artifacts { +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -134,8 +154,12 @@ class UniversalBuild() : BuildType({ } artifacts { +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -148,8 +172,12 @@ class UniversalBuild() : BuildType({ } artifacts { +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -161,8 +189,12 @@ class UniversalBuild() : BuildType({ } artifacts { +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -175,8 +207,12 @@ class UniversalBuild() : BuildType({ } artifacts { +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -188,8 +224,12 @@ class UniversalBuild() : BuildType({ } artifacts { +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt index 8d7afa8..b0a0f46 100644 --- a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt +++ b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt @@ -28,11 +28,15 @@ class Publish(perforce_publish_path: String) : BuildType({ text("eve_branch_shortname", "", label = "Branch Name", description = """The name of the branch, for example MAINLINE""", display = ParameterDisplay.PROMPT, allowEmpty = false) param("env.TC_BUILDID", "%teamcity.build.id%") <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.TC_BUILD_NUMBER", "Carbon Resources #%build.number%") ======= param("env.TC_BUILD_NUMBER", "Carbon Template #%build.number%") >>>>>>> template/carbonengine/resources-updates +======= + param("env.TC_BUILD_NUMBER", "Carbon Template #%build.number%") +>>>>>>> template/carbonengine/resources-updates ======= param("env.TC_BUILD_NUMBER", "Carbon Template #%build.number%") >>>>>>> template/carbonengine/resources-updates @@ -216,8 +220,12 @@ class Publish(perforce_publish_path: String) : BuildType({ } artifacts { +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -229,8 +237,12 @@ class Publish(perforce_publish_path: String) : BuildType({ } artifacts { +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -242,8 +254,12 @@ class Publish(perforce_publish_path: String) : BuildType({ } artifacts { +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -255,8 +271,12 @@ class Publish(perforce_publish_path: String) : BuildType({ } artifacts { +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -268,8 +288,12 @@ class Publish(perforce_publish_path: String) : BuildType({ } artifacts { +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -287,6 +311,7 @@ class Publish(perforce_publish_path: String) : BuildType({ } }) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD val PublishToPerforce = Publish("vendor/github.com/carbonengine/resources") @@ -296,3 +321,6 @@ val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") ======= val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") >>>>>>> template/carbonengine/resources-updates +======= +val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") +>>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml index 9db518d..9ab811e 100644 --- a/.teamcity/pom.xml +++ b/.teamcity/pom.xml @@ -2,6 +2,7 @@ 4.0.0 <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Carbon Resources Config DSL Script Carbon_Resources @@ -11,6 +12,11 @@ Carbon_Template Carbon_Template_dsl >>>>>>> template/carbonengine/resources-updates +======= + Carbon Template Config DSL Script + Carbon_Template + Carbon_Template_dsl +>>>>>>> template/carbonengine/resources-updates ======= Carbon Template Config DSL Script Carbon_Template diff --git a/CMakeLists.txt b/CMakeLists.txt index 41e6177..4e02f9b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,6 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # Copyright © 2025 CCP ehf. cmake_minimum_required(VERSION 3.31.0) @@ -83,6 +84,8 @@ get_target_property(_SOURCES resources SOURCES) ======= ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates cmake_minimum_required(VERSION 3.16) project(CarbonTemplateProject VERSION 1.0.0) @@ -93,6 +96,9 @@ ccp_add_library(target_name SHARED) get_target_property(_SOURCES target_name SOURCES) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -101,6 +107,7 @@ source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES ${_SOURCES} ) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD add_subdirectory(cli) @@ -119,6 +126,8 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) ======= ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates set_target_properties(target_name PROPERTIES OUTPUT_NAME "_target_name") target_include_directories(target_name @@ -130,6 +139,9 @@ target_include_directories(target_name # Provide an install target if this is the top level project only if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -139,6 +151,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) # - If -DBUILD_DOCUMENTATION=ON/OFF flag is explicitly set, use it. set(BUILD_DOCUMENTATION_DEFAULT_FLAG OFF) <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD if (DEFINED ENV{TEAMCITY_VERSION}) set(BUILD_DOCUMENTATION_DEFAULT_FLAG ON) @@ -155,6 +168,8 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) ======= ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates if(DEFINED ENV{TEAMCITY_VERSION}) set(BUILD_DOCUMENTATION_DEFAULT_FLAG ON) @@ -170,9 +185,12 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) find_package(Python3 COMPONENTS Interpreter REQUIRED) include(cmake/CcpDocsGenerator.cmake) +<<<<<<< HEAD <<<<<<< HEAD >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates create_carbon_docs_sphinx_target( PYTHON_EXE ${Python3_EXECUTABLE} @@ -186,6 +204,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) INSTALL_DESTINATION documentation ) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # Ensure that resources is built before Spinx target @@ -214,6 +233,8 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) endif () ======= ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates add_dependencies(Sphinx target_name) endif() @@ -267,6 +288,10 @@ endif () install(DIRECTORY include DESTINATION . FILES_MATCHING PATTERN "*.h") <<<<<<< HEAD +<<<<<<< HEAD +endif() +>>>>>>> template/carbonengine/resources-updates +======= endif() >>>>>>> template/carbonengine/resources-updates ======= diff --git a/CMakePresets.json b/CMakePresets.json index d60e6b1..425f488 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -13,6 +13,7 @@ "cacheVariables": { "VCPKG_USE_HOST_TOOLS": "ON", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "CMAKE_COMPILE_WARNING_AS_ERROR": "ON", "VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/customized_toolchain/triplets", @@ -24,12 +25,17 @@ "VCPKG_ROOT": "${sourceDir}/vendor/github.com/microsoft/vcpkg" ======= ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/triplets" }, "environment": { "PATH_TO_VCPKG_ROOT": "${sourceDir}/vendor/github.com/microsoft/vcpkg" <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -61,11 +67,15 @@ "inherits": "windows", "cacheVariables": { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/customized_toolchain/toolchains/x64-windows-carbon.cmake" ======= "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" >>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" >>>>>>> template/carbonengine/resources-updates @@ -78,11 +88,15 @@ "cacheVariables": { "CMAKE_OSX_ARCHITECTURES": "arm64", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/customized_toolchain/toolchains/arm64-osx-carbon.cmake" ======= "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/arm64-osx-carbon.cmake" >>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/arm64-osx-carbon.cmake" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/arm64-osx-carbon.cmake" >>>>>>> template/carbonengine/resources-updates @@ -95,11 +109,15 @@ "cacheVariables": { "CMAKE_OSX_ARCHITECTURES": "x86_64", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/customized_toolchain/toolchains/x64-osx-carbon.cmake" ======= "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-osx-carbon.cmake" >>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-osx-carbon.cmake" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-osx-carbon.cmake" >>>>>>> template/carbonengine/resources-updates @@ -144,6 +162,7 @@ }, { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "name": "x64-windows-release-with-dev-features", "inherits": "x64-windows-release", @@ -155,6 +174,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "name": "arm64-osx-internal", "inherits": "arm64-osx", diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index dd921e2..4db090e 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -74,6 +74,7 @@ PROJECT_ICON = # entered, it will be relative to the location where doxygen was started. If # left blank the current directory will be used. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD OUTPUT_DIRECTORY = @CMAKE_CURRENT_BINARY_DIR@/docs/ @@ -83,6 +84,9 @@ OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ ======= OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ >>>>>>> template/carbonengine/resources-updates +======= +OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ +>>>>>>> template/carbonengine/resources-updates # If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 # sub-directories (in 2 levels) under the output directory of each output format diff --git a/doc/source/conf.py b/doc/source/conf.py index 22b71a5..c473efe 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -6,6 +6,7 @@ # -- Project information ----------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD project = 'resources' @@ -18,6 +19,10 @@ project = 'project_name' copyright = '2024, CCP Games' >>>>>>> template/carbonengine/resources-updates +======= +project = 'project_name' +copyright = '2024, CCP Games' +>>>>>>> template/carbonengine/resources-updates author = 'CCP Games' release = '0.1' diff --git a/doc/source/index.rst b/doc/source/index.rst index e1f7b3e..8169ef7 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -1,5 +1,6 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD resources Documentation ============================== @@ -47,6 +48,8 @@ Contents ======= ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates project_name Documentation ========================== @@ -75,6 +78,10 @@ project_name Documentation .. _reST usages: https://www.sphinx-doc.org/en/master/usage/restructuredtext <<<<<<< HEAD +<<<<<<< HEAD +.. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html +>>>>>>> template/carbonengine/resources-updates +======= .. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html >>>>>>> template/carbonengine/resources-updates ======= diff --git a/tests/tests.md b/tests/tests.md index ace431f..3843f32 100644 --- a/tests/tests.md +++ b/tests/tests.md @@ -2,17 +2,23 @@ This folder is where all the tests for the project should be stored, whether they be Python tests or C++ tests. +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD [See a C++ example here](https://github.com/carbonengine/resources/tree/main/tests/src) ======= ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates [See a C++ example here](https://github.com/ccpgames/carbon-destiny/tree/main/tests) [See a Python example here](https://github.com/ccpgames/carbon-fsd/tree/main/tests) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index 01526d5..8335daa 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -2,11 +2,15 @@ "default-registry": { "kind": "git", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "baseline": "bea476a80218a581bcb5318595849520217c825e", ======= "baseline": "242ac6932a9cd2607332969129e9572516f28d65", >>>>>>> template/carbonengine/resources-updates +======= + "baseline": "242ac6932a9cd2607332969129e9572516f28d65", +>>>>>>> template/carbonengine/resources-updates ======= "baseline": "242ac6932a9cd2607332969129e9572516f28d65", >>>>>>> template/carbonengine/resources-updates @@ -16,12 +20,15 @@ { "kind": "git", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "repository": "git@github.com:carbonengine/vcpkg-registry.git", "baseline": "addd8867a1553f4b7866bb7a36deb84bd59bd1f9", "packages": ["carbon-*", "python3", "bsdiff-drake127"] ======= ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "repository": "git@github.com:ccpgames/carbon-vcpkg-registry.git", "baseline": "bd0e4644d7d8a7ce9bfa426192cdf37a23e61b5f", @@ -33,6 +40,9 @@ "baseline": "303eacceb8ce9a0aa9a061f00ab2c11e8725ab2d", "packages": ["python3", "carbon-core", "carbon-scheduler", "tracy", "greenlet", "ccp-debug-info", "crashpad", "zlib"] <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/vcpkg.json b/vcpkg.json index ecdf5a8..ed6b037 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -2,6 +2,7 @@ "dependencies": [ { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "name": "argparse", "version>=": "2.2" @@ -67,6 +68,8 @@ "version": "2.2" ======= ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "name": "python3", "version>=": "3.12.9#1", @@ -78,6 +81,9 @@ "name": "protobuf", "version": "3.6.0.1" <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates From efb3c021b3476853a8904cc8ffd7146dd2ed4b2d Mon Sep 17 00:00:00 2001 From: ccpgames-carbon Date: Tue, 21 Jul 2026 11:55:43 +0000 Subject: [PATCH 04/12] Merge commit 6105f3a8ee156045d11dc986017c23a2fce72ca4 from carbon-template branch=carbonengine/resources-updates: Merge pull request #35 from ccp-serpent/update-vcpkg-submodule Update vcpkg submodule to latest --- .clang-format | 11 +++++ .editorconfig | 10 +++++ .gitignore | 9 +++++ .teamcity/MacOS/Project.kt | 12 ++++++ .teamcity/Windows/Project.kt | 35 ++++++++++++++++ .teamcity/_Self.kt/Project.kt | 4 ++ .../buildTypes/CreateUniversalBuilds.kt | 40 +++++++++++++++++++ .../_Self.kt/buildTypes/PublishToPerforce.kt | 28 +++++++++++++ .teamcity/pom.xml | 6 +++ CMakeLists.txt | 34 ++++++++++++++++ CMakePresets.json | 33 +++++++++++++++ doc/Doxyfile.in | 4 ++ doc/source/conf.py | 5 +++ doc/source/index.rst | 7 ++++ tests/tests.md | 6 +++ vcpkg-configuration.json | 10 +++++ vcpkg.json | 14 +++++++ 17 files changed, 268 insertions(+) diff --git a/.clang-format b/.clang-format index 2b9fec3..585ff9e 100644 --- a/.clang-format +++ b/.clang-format @@ -73,6 +73,7 @@ SpacesInSquareBrackets: false <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Standard: Cpp11 ======= Standard: Cpp17 @@ -83,6 +84,9 @@ Standard: Cpp17 ======= Standard: Cpp17 >>>>>>> template/carbonengine/resources-updates +======= +Standard: Cpp17 +>>>>>>> template/carbonengine/resources-updates TabWidth: 4 UseTab: ForContinuationAndIndentation --- @@ -161,6 +165,7 @@ SpacesInSquareBrackets: false <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Standard: Cpp11 TabWidth: 4 UseTab: ForContinuationAndIndentation @@ -183,3 +188,9 @@ TabWidth: 4 UseTab: ForContinuationAndIndentation ... >>>>>>> template/carbonengine/resources-updates +======= +Standard: Cpp17 +TabWidth: 4 +UseTab: ForContinuationAndIndentation +... +>>>>>>> template/carbonengine/resources-updates diff --git a/.editorconfig b/.editorconfig index 1d1cd9c..888a63f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -3,6 +3,7 @@ charset = utf-8 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD end_of_line = crlf ======= end_of_line = lf @@ -13,6 +14,9 @@ end_of_line = lf ======= end_of_line = lf >>>>>>> template/carbonengine/resources-updates +======= +end_of_line = lf +>>>>>>> template/carbonengine/resources-updates indent_size = 4 indent_style = space insert_final_newline = false @@ -21,6 +25,7 @@ tab_width = 4 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ij_continuation_indent_size = 8 ij_formatter_off_tag = @formatter:off ij_formatter_on_tag = @formatter:on @@ -966,6 +971,8 @@ ij_toml_keep_indents_on_empty_lines = false >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates trim_trailing_whitespace = true [{*.yaml,*.yml,.clang-format,.clang-tidy,_clang-format}] @@ -988,6 +995,9 @@ indent_size = 4 trim_trailing_whitespace = false <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/.gitignore b/.gitignore index 33941ac..62ae323 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,10 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +binaryCache/ +>>>>>>> template/carbonengine/resources-updates ======= binaryCache/ >>>>>>> template/carbonengine/resources-updates @@ -44,6 +48,7 @@ CMakeUserPresets.json <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ### IDE ### # User generated local IDE configuration @@ -64,3 +69,7 @@ cmake-build* .cmake-build* cmake-build* >>>>>>> template/carbonengine/resources-updates +======= +.cmake-build* +cmake-build* +>>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/MacOS/Project.kt b/.teamcity/MacOS/Project.kt index 07d7074..c40b33c 100644 --- a/.teamcity/MacOS/Project.kt +++ b/.teamcity/MacOS/Project.kt @@ -51,12 +51,16 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag id(buildName.toId()) name = buildName +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD artifactRules = "%env.CMAKE_INSTALL_PREFIX%" ======= artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" >>>>>>> template/carbonengine/resources-updates @@ -83,6 +87,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag param("env.CMAKE_BUILD_PARALLEL_LEVEL", "8") <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.CTEST_PARALLEL_LEVEL", "1") ======= @@ -91,6 +96,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates +======= + param("env.CTEST_PARALLEL_LEVEL", "8") +>>>>>>> template/carbonengine/resources-updates ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates @@ -124,7 +132,11 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag exec { name = "Configure" path = "cmake" +<<<<<<< HEAD arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DBUILD_CLI=ON -DBUILD_TESTING=ON -DBUILD_DOCUMENTATION=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" +======= + arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" +>>>>>>> template/carbonengine/resources-updates } exec { name = "Build" diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt index a60e33c..8604b46 100644 --- a/.teamcity/Windows/Project.kt +++ b/.teamcity/Windows/Project.kt @@ -20,12 +20,19 @@ import jetbrains.buildServer.configs.kotlin.triggers.vcs import jetbrains.buildServer.configs.kotlin.vcs.GitVcsRoot import jetbrains.buildServer.configs.kotlin.buildFeatures.provideAwsCredentials +<<<<<<< HEAD val BuildParameters = "-arch=x64 -vcvars_ver=14.51" val Debug = CarbonBuildWindows("Debug Windows", "Debug", "x64-windows-debug",BuildParameters) val Internal = CarbonBuildWindows("Internal Windows", "Internal", "x64-windows-internal",BuildParameters) val TrinityDev = CarbonBuildWindows("TrinityDev Windows", "TrinityDev", "x64-windows-trinitydev",BuildParameters) val Release = CarbonBuildWindows("Release Windows", "Release", "x64-windows-release",BuildParameters) val ReleaseDevFeatures = CarbonBuildWindows("Release Windows with Dev Features", "Release", "x64-windows-release-with-dev-features",BuildParameters) +======= +val Debug = CarbonBuildWindows("Debug Windows", "Debug", "x64-windows-debug") +val Internal = CarbonBuildWindows("Internal Windows", "Internal", "x64-windows-internal") +val TrinityDev = CarbonBuildWindows("TrinityDev Windows", "TrinityDev", "x64-windows-trinitydev") +val Release = CarbonBuildWindows("Release Windows", "Release", "x64-windows-release") +>>>>>>> template/carbonengine/resources-updates object Project : Project({ id("Windows") @@ -37,6 +44,7 @@ object Project : Project({ buildType(Release) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD buildType(ReleaseDevFeatures) ======= @@ -61,12 +69,27 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, ======= artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" >>>>>>> template/carbonengine/resources-updates +======= +}) + + +class CarbonBuildWindows(buildName: String, configType: String, preset: String) : BuildType({ + id(buildName.toId()) + this.name = buildName + + artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" +>>>>>>> template/carbonengine/resources-updates params { param("env.GIT_TAG_HASH_OVERRIDE", "") param("github_checkout_folder", "github") param("env.CTEST_JUNIT_OUTPUT_FILE", "ctest_results.xml") +<<<<<<< HEAD param("VS_DEV_BAT_SWITCHES", vsDevBatSwitches) +======= + select("env.VISUAL_STUDIO_PLATFORM_TOOLSET", "v141", label = "Visual Studio Platform Toolset", description = "Specify the toolset for the build. e.g. v141 or v143.", + options = listOf("v141 (2017)" to "v141", "v143 (2022)" to "v143")) +>>>>>>> template/carbonengine/resources-updates param("env.CMAKE_BUILD_TARGETS", "all") param("env.CMAKE_INSTALL_PREFIX", ".build-artifact") param("env.CMAKE_CONFIG_TYPE", configType) @@ -82,6 +105,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, param("env.CMAKE_BUILD_PARALLEL_LEVEL", "8") <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.CTEST_PARALLEL_LEVEL", "1") ======= @@ -90,6 +114,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates +======= + param("env.CTEST_PARALLEL_LEVEL", "8") +>>>>>>> template/carbonengine/resources-updates ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates @@ -120,7 +147,11 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, scriptContent = """ REM unfortunately ninja does not find the VS environment otherwise REM NB: the exported PATH also contains the location where we installed sentry-cli, e.g. teamcity.agent.work.dir +<<<<<<< HEAD call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% +======= + call "%env.VSDEV_BAT_PATH%" -arch=x64 +>>>>>>> template/carbonengine/resources-updates echo ##teamcity[setParameter name='env.INCLUDE' value='%%INCLUDE%%'] echo ##teamcity[setParameter name='env.LIB' value='%%LIB%%'] echo ##teamcity[setParameter name='env.LIBPATH' value='%%LIBPATH%%'] @@ -130,7 +161,11 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, exec { name = "Configure" path = "cmake" +<<<<<<< HEAD arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DBUILD_CLI=ON -DBUILD_TESTING=ON -DBUILD_DOCUMENTATION=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" +======= + arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" +>>>>>>> template/carbonengine/resources-updates } exec { name = "Build" diff --git a/.teamcity/_Self.kt/Project.kt b/.teamcity/_Self.kt/Project.kt index 8b850a9..4d12cab 100644 --- a/.teamcity/_Self.kt/Project.kt +++ b/.teamcity/_Self.kt/Project.kt @@ -10,6 +10,7 @@ object Project : Project({ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description = "Build / Publish pipeline for https://github.com/carbonengine/resources" ======= @@ -18,6 +19,9 @@ object Project : Project({ ======= description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" >>>>>>> template/carbonengine/resources-updates +======= + description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" +>>>>>>> template/carbonengine/resources-updates ======= description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt index 4007096..f29e26a 100644 --- a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt +++ b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt @@ -22,6 +22,7 @@ class UniversalBuild() : BuildType({ text("file-matchers", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "-m 'resources:%system.teamcity.build.workingDir%/bin' -m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", ======= @@ -30,6 +31,9 @@ class UniversalBuild() : BuildType({ ======= "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", >>>>>>> template/carbonengine/resources-updates +======= + "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", +>>>>>>> template/carbonengine/resources-updates ======= "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", >>>>>>> template/carbonengine/resources-updates @@ -42,8 +46,12 @@ class UniversalBuild() : BuildType({ ) } +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "%universal-output-dir%" +======= + artifactRules = "%universal-output-dir% => artifact.zip" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "%universal-output-dir% => artifact.zip" >>>>>>> template/carbonengine/resources-updates @@ -103,11 +111,15 @@ class UniversalBuild() : BuildType({ artifacts { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -120,11 +132,15 @@ class UniversalBuild() : BuildType({ artifacts { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -138,11 +154,15 @@ class UniversalBuild() : BuildType({ artifacts { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -155,11 +175,15 @@ class UniversalBuild() : BuildType({ artifacts { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -173,11 +197,15 @@ class UniversalBuild() : BuildType({ artifacts { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -190,11 +218,15 @@ class UniversalBuild() : BuildType({ artifacts { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -208,11 +240,15 @@ class UniversalBuild() : BuildType({ artifacts { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -225,11 +261,15 @@ class UniversalBuild() : BuildType({ artifacts { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt index b0a0f46..7fe2e07 100644 --- a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt +++ b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt @@ -29,6 +29,7 @@ class Publish(perforce_publish_path: String) : BuildType({ param("env.TC_BUILDID", "%teamcity.build.id%") <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.TC_BUILD_NUMBER", "Carbon Resources #%build.number%") ======= @@ -37,6 +38,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= param("env.TC_BUILD_NUMBER", "Carbon Template #%build.number%") >>>>>>> template/carbonengine/resources-updates +======= + param("env.TC_BUILD_NUMBER", "Carbon Template #%build.number%") +>>>>>>> template/carbonengine/resources-updates ======= param("env.TC_BUILD_NUMBER", "Carbon Template #%build.number%") >>>>>>> template/carbonengine/resources-updates @@ -221,11 +225,15 @@ class Publish(perforce_publish_path: String) : BuildType({ artifacts { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -238,11 +246,15 @@ class Publish(perforce_publish_path: String) : BuildType({ artifacts { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -255,11 +267,15 @@ class Publish(perforce_publish_path: String) : BuildType({ artifacts { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -272,11 +288,15 @@ class Publish(perforce_publish_path: String) : BuildType({ artifacts { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -289,11 +309,15 @@ class Publish(perforce_publish_path: String) : BuildType({ artifacts { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -314,6 +338,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD val PublishToPerforce = Publish("vendor/github.com/carbonengine/resources") ======= val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") @@ -324,3 +349,6 @@ val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") ======= val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") >>>>>>> template/carbonengine/resources-updates +======= +val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") +>>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml index 9ab811e..e15827e 100644 --- a/.teamcity/pom.xml +++ b/.teamcity/pom.xml @@ -3,6 +3,7 @@ 4.0.0 <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Carbon Resources Config DSL Script Carbon_Resources @@ -17,6 +18,11 @@ Carbon_Template Carbon_Template_dsl >>>>>>> template/carbonengine/resources-updates +======= + Carbon Template Config DSL Script + Carbon_Template + Carbon_Template_dsl +>>>>>>> template/carbonengine/resources-updates ======= Carbon Template Config DSL Script Carbon_Template diff --git a/CMakeLists.txt b/CMakeLists.txt index d650129..8cd138b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # Copyright © 2025 CCP ehf. cmake_minimum_required(VERSION 3.31.1) @@ -105,6 +106,8 @@ get_target_property(_SOURCES resources SOURCES) >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates cmake_minimum_required(VERSION 3.16) project(CarbonTemplateProject VERSION 1.0.0) @@ -116,6 +119,9 @@ ccp_add_library(target_name SHARED) get_target_property(_SOURCES target_name SOURCES) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -126,6 +132,7 @@ source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES ${_SOURCES} ) +<<<<<<< HEAD if(BUILD_CLI) add_subdirectory(cli) endif() @@ -153,6 +160,23 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= +set_target_properties(target_name PROPERTIES OUTPUT_NAME "_target_name") + +target_include_directories(target_name + PUBLIC + $ + $ +) + +# Provide an install target if this is the top level project only +if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) + # Determine if/when to generate/build documentation. The rules are as follows: + # - If running locally - Build documentation is OFF by default + # - If running on a build agent (TeamCity) - Build documentation is ON by default + # - If -DBUILD_DOCUMENTATION=ON/OFF flag is explicitly set, use it. + set(BUILD_DOCUMENTATION_DEFAULT_FLAG OFF) >>>>>>> template/carbonengine/resources-updates if(DEFINED ENV{TEAMCITY_VERSION}) set(BUILD_DOCUMENTATION_DEFAULT_FLAG ON) @@ -168,12 +192,15 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) find_package(Python3 COMPONENTS Interpreter REQUIRED) include(cmake/CcpDocsGenerator.cmake) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates create_carbon_docs_sphinx_target( PYTHON_EXE ${Python3_EXECUTABLE} @@ -189,6 +216,7 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD # Ensure that resources is built before Spinx target add_dependencies(Sphinx resources) @@ -247,6 +275,8 @@ endif () ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates add_dependencies(Sphinx target_name) endif() @@ -301,6 +331,10 @@ endif () <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +endif() +>>>>>>> template/carbonengine/resources-updates +======= endif() >>>>>>> template/carbonengine/resources-updates ======= diff --git a/CMakePresets.json b/CMakePresets.json index f0ac901..09e33db 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -14,8 +14,11 @@ "VCPKG_USE_HOST_TOOLS": "ON", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "CMAKE_COMPILE_WARNING_AS_ERROR": "ON", +======= +>>>>>>> template/carbonengine/resources-updates "VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/triplets" }, "environment": { @@ -47,7 +50,11 @@ "name": "x64-windows", "inherits": "windows", "cacheVariables": { +<<<<<<< HEAD "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-145-carbon.cmake" +======= + "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" +>>>>>>> template/carbonengine/resources-updates }, "hidden": true }, @@ -69,14 +76,22 @@ }, "hidden": true }, +<<<<<<< HEAD +======= +>>>>>>> template/carbonengine/resources-updates { "name": "x64-windows-internal", "inherits": "x64-windows", "cacheVariables": { "CMAKE_BUILD_TYPE": "Internal", +<<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-internal", "VCPKG_HOST_TRIPLET": "x64-windows-145-internal" +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-internal", + "VCPKG_HOST_TRIPLET": "x64-windows-internal" +>>>>>>> template/carbonengine/resources-updates } }, { @@ -84,8 +99,13 @@ "inherits": "x64-windows", "cacheVariables": { "CMAKE_BUILD_TYPE": "Release", +<<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-release", "VCPKG_HOST_TRIPLET": "x64-windows-145-release" +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-release", + "VCPKG_HOST_TRIPLET": "x64-windows-release" +>>>>>>> template/carbonengine/resources-updates } }, { @@ -93,8 +113,13 @@ "inherits": "x64-windows", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", +<<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-debug", "VCPKG_HOST_TRIPLET": "x64-windows-145-debug" +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-debug", + "VCPKG_HOST_TRIPLET": "x64-windows-debug" +>>>>>>> template/carbonengine/resources-updates } }, { @@ -102,6 +127,7 @@ "inherits": "x64-windows", "cacheVariables": { "CMAKE_BUILD_TYPE": "TrinityDev", +<<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-trinitydev", "VCPKG_HOST_TRIPLET": "x64-windows-145-trinitydev" } @@ -122,6 +148,13 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-trinitydev", + "VCPKG_HOST_TRIPLET": "x64-windows-trinitydev" + } + }, + { >>>>>>> template/carbonengine/resources-updates "name": "arm64-osx-internal", "inherits": "arm64-osx", diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 4db090e..d488a70 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -77,6 +77,7 @@ PROJECT_ICON = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD OUTPUT_DIRECTORY = @CMAKE_CURRENT_BINARY_DIR@/docs/ ======= OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ @@ -87,6 +88,9 @@ OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ ======= OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ >>>>>>> template/carbonengine/resources-updates +======= +OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ +>>>>>>> template/carbonengine/resources-updates # If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 # sub-directories (in 2 levels) under the output directory of each output format diff --git a/doc/source/conf.py b/doc/source/conf.py index c473efe..aa4bc76 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -9,6 +9,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD project = 'resources' copyright = 'Copyright © 2025 CCP ehf' ======= @@ -23,6 +24,10 @@ project = 'project_name' copyright = '2024, CCP Games' >>>>>>> template/carbonengine/resources-updates +======= +project = 'project_name' +copyright = '2024, CCP Games' +>>>>>>> template/carbonengine/resources-updates author = 'CCP Games' release = '0.1' diff --git a/doc/source/index.rst b/doc/source/index.rst index 8169ef7..82ce9b2 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -1,6 +1,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD resources Documentation ============================== @@ -50,6 +51,8 @@ Contents >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates project_name Documentation ========================== @@ -79,6 +82,10 @@ project_name Documentation .. _reST usages: https://www.sphinx-doc.org/en/master/usage/restructuredtext <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +.. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html +>>>>>>> template/carbonengine/resources-updates +======= .. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html >>>>>>> template/carbonengine/resources-updates ======= diff --git a/tests/tests.md b/tests/tests.md index 3843f32..69f2ae8 100644 --- a/tests/tests.md +++ b/tests/tests.md @@ -5,18 +5,24 @@ This folder is where all the tests for the project should be stored, whether the <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD [See a C++ example here](https://github.com/carbonengine/resources/tree/main/tests/src) ======= ======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates [See a C++ example here](https://github.com/ccpgames/carbon-destiny/tree/main/tests) [See a Python example here](https://github.com/ccpgames/carbon-fsd/tree/main/tests) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index 1d5e2c2..17370f4 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -3,6 +3,7 @@ "kind": "git", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "baseline": "bea476a80218a581bcb5318595849520217c825e", ======= @@ -11,6 +12,9 @@ ======= "baseline": "242ac6932a9cd2607332969129e9572516f28d65", >>>>>>> template/carbonengine/resources-updates +======= + "baseline": "242ac6932a9cd2607332969129e9572516f28d65", +>>>>>>> template/carbonengine/resources-updates ======= "baseline": "242ac6932a9cd2607332969129e9572516f28d65", >>>>>>> template/carbonengine/resources-updates @@ -21,6 +25,7 @@ "kind": "git", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "repository": "git@github.com:carbonengine/vcpkg-registry.git", "baseline": "b3b922c476b0dedfa8342a75e89975c74441fc75", @@ -29,6 +34,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "repository": "git@github.com:ccpgames/carbon-vcpkg-registry.git", "baseline": "bd0e4644d7d8a7ce9bfa426192cdf37a23e61b5f", @@ -41,6 +48,9 @@ "packages": ["python3", "carbon-core", "carbon-scheduler", "tracy", "greenlet", "ccp-debug-info", "crashpad", "zlib"] <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/vcpkg.json b/vcpkg.json index 3ef0af4..e852b60 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,7 @@ { "dependencies": [ { +<<<<<<< HEAD "name": "bsdiff-drake127", "version>=": "4.3.3#2" }, @@ -61,4 +62,17 @@ ] } } +======= + "name": "python3", + "version>=": "3.12.9#1", + "host": true + } + ], + "overrides": [ + { + "name": "protobuf", + "version": "3.6.0.1" + } + ] +>>>>>>> template/carbonengine/resources-updates } From 39226cb8ebc41bd71dfafa54d83f939019d68aca Mon Sep 17 00:00:00 2001 From: ccpgames-carbon Date: Tue, 11 Aug 2026 09:31:44 +0000 Subject: [PATCH 05/12] Merge commit 64e4db12e89b70ebd08a81bccfd5c2e7a3b4c59f from carbon-template branch=carbonengine/resources-updates: Merge pull request #34 from ccpgames/cpt-version-pin Rely on Tag for sourcing Carbon Pipeline Tools branch --- .clang-format | 11 +++++ .editorconfig | 10 +++++ .gitignore | 9 ++++ .teamcity/MacOS/Project.kt | 16 +++++++ .teamcity/Windows/Project.kt | 33 ++++++++++++++ .teamcity/_Self.kt/Project.kt | 8 ++++ .../buildTypes/CreateUniversalBuilds.kt | 44 +++++++++++++++++++ .../_Self.kt/buildTypes/PublishToPerforce.kt | 32 ++++++++++++++ .teamcity/pom.xml | 6 +++ CMakeLists.txt | 22 ++++++++++ CMakePresets.json | 31 +++++++++++++ doc/Doxyfile.in | 4 ++ doc/source/conf.py | 5 +++ doc/source/index.rst | 7 +++ tests/tests.md | 6 +++ vcpkg-configuration.json | 10 +++++ vcpkg.json | 6 +++ 17 files changed, 260 insertions(+) diff --git a/.clang-format b/.clang-format index 585ff9e..3e07f96 100644 --- a/.clang-format +++ b/.clang-format @@ -74,6 +74,7 @@ SpacesInSquareBrackets: false <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Standard: Cpp11 ======= Standard: Cpp17 @@ -87,6 +88,9 @@ Standard: Cpp17 ======= Standard: Cpp17 >>>>>>> template/carbonengine/resources-updates +======= +Standard: Cpp17 +>>>>>>> template/carbonengine/resources-updates TabWidth: 4 UseTab: ForContinuationAndIndentation --- @@ -166,6 +170,7 @@ SpacesInSquareBrackets: false <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Standard: Cpp11 TabWidth: 4 UseTab: ForContinuationAndIndentation @@ -194,3 +199,9 @@ TabWidth: 4 UseTab: ForContinuationAndIndentation ... >>>>>>> template/carbonengine/resources-updates +======= +Standard: Cpp17 +TabWidth: 4 +UseTab: ForContinuationAndIndentation +... +>>>>>>> template/carbonengine/resources-updates diff --git a/.editorconfig b/.editorconfig index 888a63f..37e60bb 100644 --- a/.editorconfig +++ b/.editorconfig @@ -4,6 +4,7 @@ charset = utf-8 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD end_of_line = crlf ======= end_of_line = lf @@ -17,6 +18,9 @@ end_of_line = lf ======= end_of_line = lf >>>>>>> template/carbonengine/resources-updates +======= +end_of_line = lf +>>>>>>> template/carbonengine/resources-updates indent_size = 4 indent_style = space insert_final_newline = false @@ -26,6 +30,7 @@ tab_width = 4 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ij_continuation_indent_size = 8 ij_formatter_off_tag = @formatter:off ij_formatter_on_tag = @formatter:on @@ -973,6 +978,8 @@ ij_toml_keep_indents_on_empty_lines = false >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates trim_trailing_whitespace = true [{*.yaml,*.yml,.clang-format,.clang-tidy,_clang-format}] @@ -996,6 +1003,9 @@ trim_trailing_whitespace = false <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/.gitignore b/.gitignore index 62ae323..8be61eb 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,10 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +binaryCache/ +>>>>>>> template/carbonengine/resources-updates ======= binaryCache/ >>>>>>> template/carbonengine/resources-updates @@ -49,6 +53,7 @@ CMakeUserPresets.json <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ### IDE ### # User generated local IDE configuration @@ -73,3 +78,7 @@ cmake-build* .cmake-build* cmake-build* >>>>>>> template/carbonengine/resources-updates +======= +.cmake-build* +cmake-build* +>>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/MacOS/Project.kt b/.teamcity/MacOS/Project.kt index c40b33c..896806d 100644 --- a/.teamcity/MacOS/Project.kt +++ b/.teamcity/MacOS/Project.kt @@ -53,6 +53,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "%env.CMAKE_INSTALL_PREFIX%" ======= @@ -61,6 +62,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" >>>>>>> template/carbonengine/resources-updates @@ -88,6 +92,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.CTEST_PARALLEL_LEVEL", "1") ======= @@ -99,6 +104,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates +======= + param("env.CTEST_PARALLEL_LEVEL", "8") +>>>>>>> template/carbonengine/resources-updates ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates @@ -132,8 +140,12 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag exec { name = "Configure" path = "cmake" +<<<<<<< HEAD <<<<<<< HEAD arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DBUILD_CLI=ON -DBUILD_TESTING=ON -DBUILD_DOCUMENTATION=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" +======= + arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" +>>>>>>> template/carbonengine/resources-updates ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates @@ -184,7 +196,11 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag authType = token { token = "%GITHUB_CARBON_PAT%" } +<<<<<<< HEAD filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER +======= + filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY +>>>>>>> template/carbonengine/resources-updates } } commitStatusPublisher { diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt index 8604b46..0e0f49a 100644 --- a/.teamcity/Windows/Project.kt +++ b/.teamcity/Windows/Project.kt @@ -20,6 +20,7 @@ import jetbrains.buildServer.configs.kotlin.triggers.vcs import jetbrains.buildServer.configs.kotlin.vcs.GitVcsRoot import jetbrains.buildServer.configs.kotlin.buildFeatures.provideAwsCredentials +<<<<<<< HEAD <<<<<<< HEAD val BuildParameters = "-arch=x64 -vcvars_ver=14.51" val Debug = CarbonBuildWindows("Debug Windows", "Debug", "x64-windows-debug",BuildParameters) @@ -28,10 +29,15 @@ val TrinityDev = CarbonBuildWindows("TrinityDev Windows", "TrinityDev", "x64-win val Release = CarbonBuildWindows("Release Windows", "Release", "x64-windows-release",BuildParameters) val ReleaseDevFeatures = CarbonBuildWindows("Release Windows with Dev Features", "Release", "x64-windows-release-with-dev-features",BuildParameters) ======= +======= +>>>>>>> template/carbonengine/resources-updates val Debug = CarbonBuildWindows("Debug Windows", "Debug", "x64-windows-debug") val Internal = CarbonBuildWindows("Internal Windows", "Internal", "x64-windows-internal") val TrinityDev = CarbonBuildWindows("TrinityDev Windows", "TrinityDev", "x64-windows-trinitydev") val Release = CarbonBuildWindows("Release Windows", "Release", "x64-windows-release") +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates object Project : Project({ @@ -45,6 +51,7 @@ object Project : Project({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD buildType(ReleaseDevFeatures) ======= @@ -70,6 +77,8 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" >>>>>>> template/carbonengine/resources-updates ======= +======= +>>>>>>> template/carbonengine/resources-updates }) @@ -78,14 +87,22 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) this.name = buildName artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates params { param("env.GIT_TAG_HASH_OVERRIDE", "") param("github_checkout_folder", "github") param("env.CTEST_JUNIT_OUTPUT_FILE", "ctest_results.xml") +<<<<<<< HEAD <<<<<<< HEAD param("VS_DEV_BAT_SWITCHES", vsDevBatSwitches) +======= + select("env.VISUAL_STUDIO_PLATFORM_TOOLSET", "v141", label = "Visual Studio Platform Toolset", description = "Specify the toolset for the build. e.g. v141 or v143.", + options = listOf("v141 (2017)" to "v141", "v143 (2022)" to "v143")) +>>>>>>> template/carbonengine/resources-updates ======= select("env.VISUAL_STUDIO_PLATFORM_TOOLSET", "v141", label = "Visual Studio Platform Toolset", description = "Specify the toolset for the build. e.g. v141 or v143.", options = listOf("v141 (2017)" to "v141", "v143 (2022)" to "v143")) @@ -106,6 +123,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.CTEST_PARALLEL_LEVEL", "1") ======= @@ -117,6 +135,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates +======= + param("env.CTEST_PARALLEL_LEVEL", "8") +>>>>>>> template/carbonengine/resources-updates ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates @@ -147,8 +168,12 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) scriptContent = """ REM unfortunately ninja does not find the VS environment otherwise REM NB: the exported PATH also contains the location where we installed sentry-cli, e.g. teamcity.agent.work.dir +<<<<<<< HEAD <<<<<<< HEAD call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% +======= + call "%env.VSDEV_BAT_PATH%" -arch=x64 +>>>>>>> template/carbonengine/resources-updates ======= call "%env.VSDEV_BAT_PATH%" -arch=x64 >>>>>>> template/carbonengine/resources-updates @@ -161,8 +186,12 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) exec { name = "Configure" path = "cmake" +<<<<<<< HEAD <<<<<<< HEAD arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DBUILD_CLI=ON -DBUILD_TESTING=ON -DBUILD_DOCUMENTATION=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" +======= + arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" +>>>>>>> template/carbonengine/resources-updates ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates @@ -274,7 +303,11 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) authType = token { token = "%GITHUB_CARBON_PAT%" } +<<<<<<< HEAD filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER +======= + filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY +>>>>>>> template/carbonengine/resources-updates } } commitStatusPublisher { diff --git a/.teamcity/_Self.kt/Project.kt b/.teamcity/_Self.kt/Project.kt index 4d12cab..72f4a51 100644 --- a/.teamcity/_Self.kt/Project.kt +++ b/.teamcity/_Self.kt/Project.kt @@ -11,6 +11,7 @@ object Project : Project({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description = "Build / Publish pipeline for https://github.com/carbonengine/resources" ======= @@ -22,6 +23,9 @@ object Project : Project({ ======= description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" >>>>>>> template/carbonengine/resources-updates +======= + description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" +>>>>>>> template/carbonengine/resources-updates ======= description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" >>>>>>> template/carbonengine/resources-updates @@ -29,7 +33,11 @@ object Project : Project({ params { /* before changing carbon_ref, make sure to disable automatic settings synchronization on teamcity */ param("carbon_ref", "refs/heads/main") +<<<<<<< HEAD param("carbon-pipeline-tools-ref", "refs/heads/main") +======= + param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") +>>>>>>> template/carbonengine/resources-updates } subProject(Windows.Project) diff --git a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt index f29e26a..e0a5c04 100644 --- a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt +++ b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt @@ -11,7 +11,11 @@ class UniversalBuild() : BuildType({ name = "Create MacOS Universal Binaries" params{ +<<<<<<< HEAD param("carbon-pipeline-tools-ref", "refs/heads/main") +======= + param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") +>>>>>>> template/carbonengine/resources-updates param("universal-output-dir", "%system.teamcity.build.workingDir%/output_build") param("universal-lib-path", "lib/macOS/universal/AppleClang/") param("universal-bin-path", "bin/macOS/universal/AppleClang/") @@ -23,6 +27,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "-m 'resources:%system.teamcity.build.workingDir%/bin' -m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", ======= @@ -34,6 +39,9 @@ class UniversalBuild() : BuildType({ ======= "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", >>>>>>> template/carbonengine/resources-updates +======= + "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", +>>>>>>> template/carbonengine/resources-updates ======= "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", >>>>>>> template/carbonengine/resources-updates @@ -46,12 +54,16 @@ class UniversalBuild() : BuildType({ ) } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD artifactRules = "%universal-output-dir%" ======= artifactRules = "%universal-output-dir% => artifact.zip" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "%universal-output-dir% => artifact.zip" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "%universal-output-dir% => artifact.zip" >>>>>>> template/carbonengine/resources-updates @@ -112,6 +124,7 @@ class UniversalBuild() : BuildType({ artifacts { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -120,6 +133,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -133,6 +149,7 @@ class UniversalBuild() : BuildType({ artifacts { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -141,6 +158,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -155,6 +175,7 @@ class UniversalBuild() : BuildType({ artifacts { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -163,6 +184,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -176,6 +200,7 @@ class UniversalBuild() : BuildType({ artifacts { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -184,6 +209,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -198,6 +226,7 @@ class UniversalBuild() : BuildType({ artifacts { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -206,6 +235,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -219,6 +251,7 @@ class UniversalBuild() : BuildType({ artifacts { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -227,6 +260,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -241,6 +277,7 @@ class UniversalBuild() : BuildType({ artifacts { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -249,6 +286,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -262,6 +302,7 @@ class UniversalBuild() : BuildType({ artifacts { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -270,6 +311,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt index 7fe2e07..e550d30 100644 --- a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt +++ b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt @@ -30,6 +30,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.TC_BUILD_NUMBER", "Carbon Resources #%build.number%") ======= @@ -48,6 +49,13 @@ class Publish(perforce_publish_path: String) : BuildType({ param("env.TC_EVE_BRANCH_SHORTNAME", "%eve_branch_shortname%") param("env.TC_EVE_PROJECT", "%project%") param("carbon-pipeline-tools-ref", "refs/heads/main") +======= + param("env.TC_BUILD_NUMBER", "Carbon Template #%build.number%") + param("env.P4PORT", "p4is.ccp.ad.local:1666") + param("env.TC_EVE_BRANCH_SHORTNAME", "%eve_branch_shortname%") + param("env.TC_EVE_PROJECT", "%project%") + param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") +>>>>>>> template/carbonengine/resources-updates select("eve_branch_path", "//%project%/%eve_branch_shortname%/", label = "Perforce branch", description = "Is this a regular perforce branch or a perforce stream? Used for setting the proper branch path.", display = ParameterDisplay.PROMPT, options = listOf("Regular" to "//%project%/branches/%eve_branch_type%/%eve_branch_shortname%/", "Frontier Stream" to "//%project%/%eve_branch_shortname%/")) select("eve_branch_type", "sandbox", label = "Branch type", description = "The type of branch to publish into", display = ParameterDisplay.PROMPT, @@ -226,6 +234,7 @@ class Publish(perforce_publish_path: String) : BuildType({ artifacts { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -234,6 +243,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -247,6 +259,7 @@ class Publish(perforce_publish_path: String) : BuildType({ artifacts { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -255,6 +268,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -268,6 +284,7 @@ class Publish(perforce_publish_path: String) : BuildType({ artifacts { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -276,6 +293,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -289,6 +309,7 @@ class Publish(perforce_publish_path: String) : BuildType({ artifacts { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -297,6 +318,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -310,6 +334,7 @@ class Publish(perforce_publish_path: String) : BuildType({ artifacts { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -318,6 +343,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -339,6 +367,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD val PublishToPerforce = Publish("vendor/github.com/carbonengine/resources") ======= val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") @@ -352,3 +381,6 @@ val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") ======= val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") >>>>>>> template/carbonengine/resources-updates +======= +val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") +>>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml index e15827e..734feeb 100644 --- a/.teamcity/pom.xml +++ b/.teamcity/pom.xml @@ -4,6 +4,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Carbon Resources Config DSL Script Carbon_Resources @@ -23,6 +24,11 @@ Carbon_Template Carbon_Template_dsl >>>>>>> template/carbonengine/resources-updates +======= + Carbon Template Config DSL Script + Carbon_Template + Carbon_Template_dsl +>>>>>>> template/carbonengine/resources-updates ======= Carbon Template Config DSL Script Carbon_Template diff --git a/CMakeLists.txt b/CMakeLists.txt index 8cd138b..083281b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # Copyright © 2025 CCP ehf. cmake_minimum_required(VERSION 3.31.1) @@ -108,6 +109,8 @@ get_target_property(_SOURCES resources SOURCES) >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates cmake_minimum_required(VERSION 3.16) project(CarbonTemplateProject VERSION 1.0.0) @@ -120,6 +123,9 @@ get_target_property(_SOURCES target_name SOURCES) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -132,6 +138,7 @@ source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES ${_SOURCES} ) +<<<<<<< HEAD <<<<<<< HEAD if(BUILD_CLI) add_subdirectory(cli) @@ -162,6 +169,8 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) ======= >>>>>>> template/carbonengine/resources-updates ======= +======= +>>>>>>> template/carbonengine/resources-updates set_target_properties(target_name PROPERTIES OUTPUT_NAME "_target_name") target_include_directories(target_name @@ -177,6 +186,9 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) # - If running on a build agent (TeamCity) - Build documentation is ON by default # - If -DBUILD_DOCUMENTATION=ON/OFF flag is explicitly set, use it. set(BUILD_DOCUMENTATION_DEFAULT_FLAG OFF) +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates if(DEFINED ENV{TEAMCITY_VERSION}) set(BUILD_DOCUMENTATION_DEFAULT_FLAG ON) @@ -195,6 +207,9 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -217,6 +232,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD # Ensure that resources is built before Spinx target add_dependencies(Sphinx resources) @@ -277,6 +293,8 @@ endif () ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates add_dependencies(Sphinx target_name) endif() @@ -332,6 +350,10 @@ endif () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +endif() +>>>>>>> template/carbonengine/resources-updates +======= endif() >>>>>>> template/carbonengine/resources-updates ======= diff --git a/CMakePresets.json b/CMakePresets.json index 09e33db..34f0e43 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -15,9 +15,12 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "CMAKE_COMPILE_WARNING_AS_ERROR": "ON", ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/triplets" }, @@ -50,8 +53,12 @@ "name": "x64-windows", "inherits": "windows", "cacheVariables": { +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-145-carbon.cmake" +======= + "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" >>>>>>> template/carbonengine/resources-updates @@ -77,7 +84,10 @@ "hidden": true }, <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates { @@ -85,9 +95,14 @@ "inherits": "x64-windows", "cacheVariables": { "CMAKE_BUILD_TYPE": "Internal", +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-internal", "VCPKG_HOST_TRIPLET": "x64-windows-145-internal" +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-internal", + "VCPKG_HOST_TRIPLET": "x64-windows-internal" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_TARGET_TRIPLET": "x64-windows-internal", "VCPKG_HOST_TRIPLET": "x64-windows-internal" @@ -99,9 +114,14 @@ "inherits": "x64-windows", "cacheVariables": { "CMAKE_BUILD_TYPE": "Release", +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-release", "VCPKG_HOST_TRIPLET": "x64-windows-145-release" +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-release", + "VCPKG_HOST_TRIPLET": "x64-windows-release" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_TARGET_TRIPLET": "x64-windows-release", "VCPKG_HOST_TRIPLET": "x64-windows-release" @@ -113,9 +133,14 @@ "inherits": "x64-windows", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-debug", "VCPKG_HOST_TRIPLET": "x64-windows-145-debug" +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-debug", + "VCPKG_HOST_TRIPLET": "x64-windows-debug" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_TARGET_TRIPLET": "x64-windows-debug", "VCPKG_HOST_TRIPLET": "x64-windows-debug" @@ -127,6 +152,7 @@ "inherits": "x64-windows", "cacheVariables": { "CMAKE_BUILD_TYPE": "TrinityDev", +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-trinitydev", "VCPKG_HOST_TRIPLET": "x64-windows-145-trinitydev" @@ -150,11 +176,16 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +======= +>>>>>>> template/carbonengine/resources-updates "VCPKG_TARGET_TRIPLET": "x64-windows-trinitydev", "VCPKG_HOST_TRIPLET": "x64-windows-trinitydev" } }, { +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "name": "arm64-osx-internal", "inherits": "arm64-osx", diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index d488a70..8dbe50c 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -78,6 +78,7 @@ PROJECT_ICON = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD OUTPUT_DIRECTORY = @CMAKE_CURRENT_BINARY_DIR@/docs/ ======= OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ @@ -91,6 +92,9 @@ OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ ======= OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ >>>>>>> template/carbonengine/resources-updates +======= +OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ +>>>>>>> template/carbonengine/resources-updates # If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 # sub-directories (in 2 levels) under the output directory of each output format diff --git a/doc/source/conf.py b/doc/source/conf.py index aa4bc76..72ef05e 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -10,6 +10,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD project = 'resources' copyright = 'Copyright © 2025 CCP ehf' ======= @@ -28,6 +29,10 @@ project = 'project_name' copyright = '2024, CCP Games' >>>>>>> template/carbonengine/resources-updates +======= +project = 'project_name' +copyright = '2024, CCP Games' +>>>>>>> template/carbonengine/resources-updates author = 'CCP Games' release = '0.1' diff --git a/doc/source/index.rst b/doc/source/index.rst index 82ce9b2..8866e80 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -2,6 +2,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD resources Documentation ============================== @@ -53,6 +54,8 @@ Contents >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates project_name Documentation ========================== @@ -83,6 +86,10 @@ project_name Documentation <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +.. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html +>>>>>>> template/carbonengine/resources-updates +======= .. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html >>>>>>> template/carbonengine/resources-updates ======= diff --git a/tests/tests.md b/tests/tests.md index 69f2ae8..6f66537 100644 --- a/tests/tests.md +++ b/tests/tests.md @@ -6,6 +6,7 @@ This folder is where all the tests for the project should be stored, whether the <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD [See a C++ example here](https://github.com/carbonengine/resources/tree/main/tests/src) ======= ======= @@ -14,6 +15,8 @@ This folder is where all the tests for the project should be stored, whether the >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates [See a C++ example here](https://github.com/ccpgames/carbon-destiny/tree/main/tests) [See a Python example here](https://github.com/ccpgames/carbon-fsd/tree/main/tests) @@ -21,6 +24,9 @@ This folder is where all the tests for the project should be stored, whether the <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index 17370f4..f0584b3 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -4,6 +4,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "baseline": "bea476a80218a581bcb5318595849520217c825e", ======= @@ -15,6 +16,9 @@ ======= "baseline": "242ac6932a9cd2607332969129e9572516f28d65", >>>>>>> template/carbonengine/resources-updates +======= + "baseline": "242ac6932a9cd2607332969129e9572516f28d65", +>>>>>>> template/carbonengine/resources-updates ======= "baseline": "242ac6932a9cd2607332969129e9572516f28d65", >>>>>>> template/carbonengine/resources-updates @@ -26,6 +30,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "repository": "git@github.com:carbonengine/vcpkg-registry.git", "baseline": "b3b922c476b0dedfa8342a75e89975c74441fc75", @@ -36,6 +41,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "repository": "git@github.com:ccpgames/carbon-vcpkg-registry.git", "baseline": "bd0e4644d7d8a7ce9bfa426192cdf37a23e61b5f", @@ -49,6 +56,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/vcpkg.json b/vcpkg.json index e852b60..dda53da 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,7 @@ { "dependencies": [ { +<<<<<<< HEAD <<<<<<< HEAD "name": "bsdiff-drake127", "version>=": "4.3.3#2" @@ -63,6 +64,8 @@ } } ======= +======= +>>>>>>> template/carbonengine/resources-updates "name": "python3", "version>=": "3.12.9#1", "host": true @@ -74,5 +77,8 @@ "version": "3.6.0.1" } ] +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates } From 2229843287a5482ab244ad64cb8b512b4fccae5c Mon Sep 17 00:00:00 2001 From: ccpgames-carbon Date: Tue, 11 Aug 2026 10:32:11 +0000 Subject: [PATCH 06/12] Merge commit 1b204c086bd5b0dd43ece40d21d1952f13ebd3c0 from carbon-template branch=carbonengine/resources-updates: Merge pull request #33 from ccpgames/vsdev-bat-switches-as-env-var Pass switches to vs-bootstrap script from env var --- .clang-format | 11 ++++ .editorconfig | 10 ++++ .gitignore | 9 +++ .teamcity/MacOS/Project.kt | 16 ++++++ .teamcity/Windows/Project.kt | 55 +++++++++++++++++++ .teamcity/_Self.kt/Project.kt | 8 +++ .../buildTypes/CreateUniversalBuilds.kt | 44 +++++++++++++++ .../_Self.kt/buildTypes/PublishToPerforce.kt | 30 ++++++++++ .teamcity/pom.xml | 6 ++ CMakeLists.txt | 22 ++++++++ CMakePresets.json | 31 +++++++++++ doc/Doxyfile.in | 4 ++ doc/source/conf.py | 5 ++ doc/source/index.rst | 7 +++ tests/tests.md | 6 ++ vcpkg-configuration.json | 10 ++++ vcpkg.json | 6 ++ 17 files changed, 280 insertions(+) diff --git a/.clang-format b/.clang-format index 3e07f96..79151e4 100644 --- a/.clang-format +++ b/.clang-format @@ -75,6 +75,7 @@ SpacesInSquareBrackets: false <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Standard: Cpp11 ======= Standard: Cpp17 @@ -91,6 +92,9 @@ Standard: Cpp17 ======= Standard: Cpp17 >>>>>>> template/carbonengine/resources-updates +======= +Standard: Cpp17 +>>>>>>> template/carbonengine/resources-updates TabWidth: 4 UseTab: ForContinuationAndIndentation --- @@ -171,6 +175,7 @@ SpacesInSquareBrackets: false <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Standard: Cpp11 TabWidth: 4 UseTab: ForContinuationAndIndentation @@ -205,3 +210,9 @@ TabWidth: 4 UseTab: ForContinuationAndIndentation ... >>>>>>> template/carbonengine/resources-updates +======= +Standard: Cpp17 +TabWidth: 4 +UseTab: ForContinuationAndIndentation +... +>>>>>>> template/carbonengine/resources-updates diff --git a/.editorconfig b/.editorconfig index 37e60bb..d11156c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -5,6 +5,7 @@ charset = utf-8 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD end_of_line = crlf ======= end_of_line = lf @@ -21,6 +22,9 @@ end_of_line = lf ======= end_of_line = lf >>>>>>> template/carbonengine/resources-updates +======= +end_of_line = lf +>>>>>>> template/carbonengine/resources-updates indent_size = 4 indent_style = space insert_final_newline = false @@ -31,6 +35,7 @@ tab_width = 4 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ij_continuation_indent_size = 8 ij_formatter_off_tag = @formatter:off ij_formatter_on_tag = @formatter:on @@ -980,6 +985,8 @@ ij_toml_keep_indents_on_empty_lines = false >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates trim_trailing_whitespace = true [{*.yaml,*.yml,.clang-format,.clang-tidy,_clang-format}] @@ -1004,6 +1011,9 @@ trim_trailing_whitespace = false <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/.gitignore b/.gitignore index 8be61eb..70a5e81 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,10 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +binaryCache/ +>>>>>>> template/carbonengine/resources-updates ======= binaryCache/ >>>>>>> template/carbonengine/resources-updates @@ -54,6 +58,7 @@ CMakeUserPresets.json <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ### IDE ### # User generated local IDE configuration @@ -82,3 +87,7 @@ cmake-build* .cmake-build* cmake-build* >>>>>>> template/carbonengine/resources-updates +======= +.cmake-build* +cmake-build* +>>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/MacOS/Project.kt b/.teamcity/MacOS/Project.kt index 896806d..eda522c 100644 --- a/.teamcity/MacOS/Project.kt +++ b/.teamcity/MacOS/Project.kt @@ -54,6 +54,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "%env.CMAKE_INSTALL_PREFIX%" ======= @@ -65,6 +66,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" >>>>>>> template/carbonengine/resources-updates @@ -93,6 +97,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.CTEST_PARALLEL_LEVEL", "1") ======= @@ -107,6 +112,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates +======= + param("env.CTEST_PARALLEL_LEVEL", "8") +>>>>>>> template/carbonengine/resources-updates ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates @@ -141,11 +149,15 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag name = "Configure" path = "cmake" <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DBUILD_CLI=ON -DBUILD_TESTING=ON -DBUILD_DOCUMENTATION=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates +======= + arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" +>>>>>>> template/carbonengine/resources-updates ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates @@ -196,8 +208,12 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag authType = token { token = "%GITHUB_CARBON_PAT%" } +<<<<<<< HEAD <<<<<<< HEAD filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER +======= + filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY +>>>>>>> template/carbonengine/resources-updates ======= filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt index 0e0f49a..ec41e1b 100644 --- a/.teamcity/Windows/Project.kt +++ b/.teamcity/Windows/Project.kt @@ -20,6 +20,7 @@ import jetbrains.buildServer.configs.kotlin.triggers.vcs import jetbrains.buildServer.configs.kotlin.vcs.GitVcsRoot import jetbrains.buildServer.configs.kotlin.buildFeatures.provideAwsCredentials +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD val BuildParameters = "-arch=x64 -vcvars_ver=14.51" @@ -31,11 +32,16 @@ val ReleaseDevFeatures = CarbonBuildWindows("Release Windows with Dev Features", ======= ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates val Debug = CarbonBuildWindows("Debug Windows", "Debug", "x64-windows-debug") val Internal = CarbonBuildWindows("Internal Windows", "Internal", "x64-windows-internal") val TrinityDev = CarbonBuildWindows("TrinityDev Windows", "TrinityDev", "x64-windows-trinitydev") val Release = CarbonBuildWindows("Release Windows", "Release", "x64-windows-release") <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -52,6 +58,7 @@ object Project : Project({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD buildType(ReleaseDevFeatures) ======= @@ -79,6 +86,8 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, ======= ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates }) @@ -88,6 +97,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -97,6 +109,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) param("github_checkout_folder", "github") param("env.CTEST_JUNIT_OUTPUT_FILE", "ctest_results.xml") <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("VS_DEV_BAT_SWITCHES", vsDevBatSwitches) ======= @@ -106,6 +119,11 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= select("env.VISUAL_STUDIO_PLATFORM_TOOLSET", "v141", label = "Visual Studio Platform Toolset", description = "Specify the toolset for the build. e.g. v141 or v143.", options = listOf("v141 (2017)" to "v141", "v143 (2022)" to "v143")) +>>>>>>> template/carbonengine/resources-updates +======= + select("env.VISUAL_STUDIO_PLATFORM_TOOLSET", "v141", label = "Visual Studio Platform Toolset", description = "Specify the toolset for the build. e.g. v141 or v143.", + options = listOf("v141 (2017)" to "v141", "v143 (2022)" to "v143")) + param("VS_DEV_BAT_SWITCHES", "-arch=x64") >>>>>>> template/carbonengine/resources-updates param("env.CMAKE_BUILD_TARGETS", "all") param("env.CMAKE_INSTALL_PREFIX", ".build-artifact") @@ -124,6 +142,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.CTEST_PARALLEL_LEVEL", "1") ======= @@ -138,6 +157,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates +======= + param("env.CTEST_PARALLEL_LEVEL", "8") +>>>>>>> template/carbonengine/resources-updates ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates @@ -169,6 +191,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) REM unfortunately ninja does not find the VS environment otherwise REM NB: the exported PATH also contains the location where we installed sentry-cli, e.g. teamcity.agent.work.dir <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% ======= @@ -176,6 +199,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) >>>>>>> template/carbonengine/resources-updates ======= call "%env.VSDEV_BAT_PATH%" -arch=x64 +>>>>>>> template/carbonengine/resources-updates +======= + call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% >>>>>>> template/carbonengine/resources-updates echo ##teamcity[setParameter name='env.INCLUDE' value='%%INCLUDE%%'] echo ##teamcity[setParameter name='env.LIB' value='%%LIB%%'] @@ -187,11 +213,15 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) name = "Configure" path = "cmake" <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DBUILD_CLI=ON -DBUILD_TESTING=ON -DBUILD_DOCUMENTATION=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates +======= + arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" +>>>>>>> template/carbonengine/resources-updates ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates @@ -233,7 +263,11 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) echo ${'$'}Credential = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList ${'$'}User, ${'$'}Password echo New-PSDrive -Name "symbols" -PSProvider FileSystem -Root ${'$'}Env:TC_SYMBOL_STORE_PATH -Credential ${'$'}Credential echo Write-Host "##teamcity[progressMessage 'Storing symbols']" +<<<<<<< HEAD echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) +======= + echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) +>>>>>>> template/carbonengine/resources-updates echo ^& ${'$'}Env:TC_SYMSTORE_PATH ${'$'}symstoreFlags ^| Tee-Object -file symstore.txt echo ${'$'}stored = get-content symstore.txt ^| Select-String "^SYMSTORE: Number of files stored = (.*)${'$'}" echo ${'$'}stored = ${'$'}stored.Matches.Groups[1].Value @@ -259,7 +293,11 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ${'$'}Password = ConvertTo-SecureString -String "%DOMAIN_USER_PASSWORD%" -AsPlainText -Force ${'$'}Credential = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList ${'$'}User, ${'$'}Password New-PSDrive -Name "symbols" -PSProvider FileSystem -Root ${'$'}Env:TC_SYMBOL_STORE_PATH -Credential ${'$'}Credential +<<<<<<< HEAD +======= + +>>>>>>> template/carbonengine/resources-updates Write-Host "##teamcity[progressMessage 'Storing symbols']" ${'$'}symstoreFlags = @("add", "/compress", @@ -270,6 +308,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) "/r", # Recursive "/f", "%env.CMAKE_BUILD_FOLDER%") # source folder & ${'$'}Env:TC_SYMSTORE_PATH ${'$'}symstoreFlags | Tee-Object -file symstore.txt +<<<<<<< HEAD ${'$'}stored = get-content symstore.txt | Select-String "^SYMSTORE: Number of files stored = (.*)${'$'}" ${'$'}stored = ${'$'}stored.Matches.Groups[1].Value @@ -280,6 +319,18 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ${'$'}ignored = get-content symstore.txt | Select-String "^SYMSTORE: Number of files ignored = (.*)${'$'}" ${'$'}ignored = ${'$'}ignored.Matches.Groups[1].Value +======= + + ${'$'}stored = get-content symstore.txt | Select-String "^SYMSTORE: Number of files stored = (.*)${'$'}" + ${'$'}stored = ${'$'}stored.Matches.Groups[1].Value + + ${'$'}errors = get-content symstore.txt | Select-String "^SYMSTORE: Number of errors = (.*)${'$'}" + ${'$'}errors = ${'$'}errors.Matches.Groups[1].Value + + ${'$'}ignored = get-content symstore.txt | Select-String "^SYMSTORE: Number of files ignored = (.*)${'$'}" + ${'$'}ignored = ${'$'}ignored.Matches.Groups[1].Value + +>>>>>>> template/carbonengine/resources-updates Write-Host "##teamcity[buildStatus text='Stored: ${'$'}stored, Errors: ${'$'}errors, Ignored: ${'$'}ignored']" """.trimIndent() } @@ -303,8 +354,12 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) authType = token { token = "%GITHUB_CARBON_PAT%" } +<<<<<<< HEAD <<<<<<< HEAD filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER +======= + filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY +>>>>>>> template/carbonengine/resources-updates ======= filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/_Self.kt/Project.kt b/.teamcity/_Self.kt/Project.kt index 72f4a51..ecfb10c 100644 --- a/.teamcity/_Self.kt/Project.kt +++ b/.teamcity/_Self.kt/Project.kt @@ -12,6 +12,7 @@ object Project : Project({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description = "Build / Publish pipeline for https://github.com/carbonengine/resources" ======= @@ -26,6 +27,9 @@ object Project : Project({ ======= description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" >>>>>>> template/carbonengine/resources-updates +======= + description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" +>>>>>>> template/carbonengine/resources-updates ======= description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" >>>>>>> template/carbonengine/resources-updates @@ -33,8 +37,12 @@ object Project : Project({ params { /* before changing carbon_ref, make sure to disable automatic settings synchronization on teamcity */ param("carbon_ref", "refs/heads/main") +<<<<<<< HEAD <<<<<<< HEAD param("carbon-pipeline-tools-ref", "refs/heads/main") +======= + param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") +>>>>>>> template/carbonengine/resources-updates ======= param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt index e0a5c04..c91e657 100644 --- a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt +++ b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt @@ -11,8 +11,12 @@ class UniversalBuild() : BuildType({ name = "Create MacOS Universal Binaries" params{ +<<<<<<< HEAD <<<<<<< HEAD param("carbon-pipeline-tools-ref", "refs/heads/main") +======= + param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") +>>>>>>> template/carbonengine/resources-updates ======= param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") >>>>>>> template/carbonengine/resources-updates @@ -28,6 +32,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "-m 'resources:%system.teamcity.build.workingDir%/bin' -m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", ======= @@ -42,6 +47,9 @@ class UniversalBuild() : BuildType({ ======= "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", >>>>>>> template/carbonengine/resources-updates +======= + "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", +>>>>>>> template/carbonengine/resources-updates ======= "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", >>>>>>> template/carbonengine/resources-updates @@ -56,6 +64,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "%universal-output-dir%" ======= @@ -64,6 +73,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "%universal-output-dir% => artifact.zip" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "%universal-output-dir% => artifact.zip" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "%universal-output-dir% => artifact.zip" >>>>>>> template/carbonengine/resources-updates @@ -125,6 +137,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -136,6 +149,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -150,6 +166,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -161,6 +178,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -176,6 +196,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -187,6 +208,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -201,6 +225,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -212,6 +237,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -227,6 +255,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -238,6 +267,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -252,6 +284,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -263,6 +296,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -278,6 +314,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -289,6 +326,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -303,6 +343,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -314,6 +355,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt index e550d30..992d49a 100644 --- a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt +++ b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt @@ -31,6 +31,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.TC_BUILD_NUMBER", "Carbon Resources #%build.number%") ======= @@ -50,11 +51,16 @@ class Publish(perforce_publish_path: String) : BuildType({ param("env.TC_EVE_PROJECT", "%project%") param("carbon-pipeline-tools-ref", "refs/heads/main") ======= +======= +>>>>>>> template/carbonengine/resources-updates param("env.TC_BUILD_NUMBER", "Carbon Template #%build.number%") param("env.P4PORT", "p4is.ccp.ad.local:1666") param("env.TC_EVE_BRANCH_SHORTNAME", "%eve_branch_shortname%") param("env.TC_EVE_PROJECT", "%project%") param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates select("eve_branch_path", "//%project%/%eve_branch_shortname%/", label = "Perforce branch", description = "Is this a regular perforce branch or a perforce stream? Used for setting the proper branch path.", display = ParameterDisplay.PROMPT, options = listOf("Regular" to "//%project%/branches/%eve_branch_type%/%eve_branch_shortname%/", "Frontier Stream" to "//%project%/%eve_branch_shortname%/")) @@ -235,6 +241,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -246,6 +253,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -260,6 +270,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -271,6 +282,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -285,6 +299,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -296,6 +311,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -310,6 +328,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -321,6 +340,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -335,6 +357,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -346,6 +369,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -368,6 +394,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD val PublishToPerforce = Publish("vendor/github.com/carbonengine/resources") ======= val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") @@ -384,3 +411,6 @@ val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") ======= val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") >>>>>>> template/carbonengine/resources-updates +======= +val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") +>>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml index 734feeb..af61283 100644 --- a/.teamcity/pom.xml +++ b/.teamcity/pom.xml @@ -5,6 +5,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Carbon Resources Config DSL Script Carbon_Resources @@ -29,6 +30,11 @@ Carbon_Template Carbon_Template_dsl >>>>>>> template/carbonengine/resources-updates +======= + Carbon Template Config DSL Script + Carbon_Template + Carbon_Template_dsl +>>>>>>> template/carbonengine/resources-updates ======= Carbon Template Config DSL Script Carbon_Template diff --git a/CMakeLists.txt b/CMakeLists.txt index 083281b..bbbebd4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # Copyright © 2025 CCP ehf. cmake_minimum_required(VERSION 3.31.1) @@ -111,6 +112,8 @@ get_target_property(_SOURCES resources SOURCES) >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates cmake_minimum_required(VERSION 3.16) project(CarbonTemplateProject VERSION 1.0.0) @@ -124,6 +127,9 @@ get_target_property(_SOURCES target_name SOURCES) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -138,6 +144,7 @@ source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES ${_SOURCES} ) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if(BUILD_CLI) @@ -171,6 +178,8 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) ======= ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates set_target_properties(target_name PROPERTIES OUTPUT_NAME "_target_name") target_include_directories(target_name @@ -187,6 +196,9 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) # - If -DBUILD_DOCUMENTATION=ON/OFF flag is explicitly set, use it. set(BUILD_DOCUMENTATION_DEFAULT_FLAG OFF) <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -208,6 +220,9 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -233,6 +248,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD # Ensure that resources is built before Spinx target add_dependencies(Sphinx resources) @@ -295,6 +311,8 @@ endif () ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates add_dependencies(Sphinx target_name) endif() @@ -351,6 +369,10 @@ endif () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +endif() +>>>>>>> template/carbonengine/resources-updates +======= endif() >>>>>>> template/carbonengine/resources-updates ======= diff --git a/CMakePresets.json b/CMakePresets.json index 34f0e43..6e62729 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -16,11 +16,14 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "CMAKE_COMPILE_WARNING_AS_ERROR": "ON", ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/triplets" }, @@ -54,11 +57,15 @@ "inherits": "windows", "cacheVariables": { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-145-carbon.cmake" ======= "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" >>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" >>>>>>> template/carbonengine/resources-updates @@ -85,10 +92,13 @@ }, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates { "name": "x64-windows-internal", @@ -96,6 +106,7 @@ "cacheVariables": { "CMAKE_BUILD_TYPE": "Internal", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-internal", "VCPKG_HOST_TRIPLET": "x64-windows-145-internal" @@ -103,6 +114,10 @@ "VCPKG_TARGET_TRIPLET": "x64-windows-internal", "VCPKG_HOST_TRIPLET": "x64-windows-internal" >>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-internal", + "VCPKG_HOST_TRIPLET": "x64-windows-internal" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_TARGET_TRIPLET": "x64-windows-internal", "VCPKG_HOST_TRIPLET": "x64-windows-internal" @@ -115,6 +130,7 @@ "cacheVariables": { "CMAKE_BUILD_TYPE": "Release", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-release", "VCPKG_HOST_TRIPLET": "x64-windows-145-release" @@ -122,6 +138,10 @@ "VCPKG_TARGET_TRIPLET": "x64-windows-release", "VCPKG_HOST_TRIPLET": "x64-windows-release" >>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-release", + "VCPKG_HOST_TRIPLET": "x64-windows-release" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_TARGET_TRIPLET": "x64-windows-release", "VCPKG_HOST_TRIPLET": "x64-windows-release" @@ -134,6 +154,7 @@ "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-debug", "VCPKG_HOST_TRIPLET": "x64-windows-145-debug" @@ -141,6 +162,10 @@ "VCPKG_TARGET_TRIPLET": "x64-windows-debug", "VCPKG_HOST_TRIPLET": "x64-windows-debug" >>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-debug", + "VCPKG_HOST_TRIPLET": "x64-windows-debug" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_TARGET_TRIPLET": "x64-windows-debug", "VCPKG_HOST_TRIPLET": "x64-windows-debug" @@ -153,6 +178,7 @@ "cacheVariables": { "CMAKE_BUILD_TYPE": "TrinityDev", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-trinitydev", "VCPKG_HOST_TRIPLET": "x64-windows-145-trinitydev" @@ -177,6 +203,8 @@ >>>>>>> template/carbonengine/resources-updates ======= ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "VCPKG_TARGET_TRIPLET": "x64-windows-trinitydev", "VCPKG_HOST_TRIPLET": "x64-windows-trinitydev" @@ -184,6 +212,9 @@ }, { <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 8dbe50c..272f48a 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -79,6 +79,7 @@ PROJECT_ICON = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD OUTPUT_DIRECTORY = @CMAKE_CURRENT_BINARY_DIR@/docs/ ======= OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ @@ -95,6 +96,9 @@ OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ ======= OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ >>>>>>> template/carbonengine/resources-updates +======= +OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ +>>>>>>> template/carbonengine/resources-updates # If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 # sub-directories (in 2 levels) under the output directory of each output format diff --git a/doc/source/conf.py b/doc/source/conf.py index 72ef05e..623723c 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -11,6 +11,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD project = 'resources' copyright = 'Copyright © 2025 CCP ehf' ======= @@ -33,6 +34,10 @@ project = 'project_name' copyright = '2024, CCP Games' >>>>>>> template/carbonengine/resources-updates +======= +project = 'project_name' +copyright = '2024, CCP Games' +>>>>>>> template/carbonengine/resources-updates author = 'CCP Games' release = '0.1' diff --git a/doc/source/index.rst b/doc/source/index.rst index 8866e80..bb045b3 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -3,6 +3,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD resources Documentation ============================== @@ -56,6 +57,8 @@ Contents >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates project_name Documentation ========================== @@ -87,6 +90,10 @@ project_name Documentation <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +.. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html +>>>>>>> template/carbonengine/resources-updates +======= .. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html >>>>>>> template/carbonengine/resources-updates ======= diff --git a/tests/tests.md b/tests/tests.md index 6f66537..16a7729 100644 --- a/tests/tests.md +++ b/tests/tests.md @@ -7,6 +7,7 @@ This folder is where all the tests for the project should be stored, whether the <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD [See a C++ example here](https://github.com/carbonengine/resources/tree/main/tests/src) ======= ======= @@ -17,6 +18,8 @@ This folder is where all the tests for the project should be stored, whether the >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates [See a C++ example here](https://github.com/ccpgames/carbon-destiny/tree/main/tests) [See a Python example here](https://github.com/ccpgames/carbon-fsd/tree/main/tests) @@ -25,6 +28,9 @@ This folder is where all the tests for the project should be stored, whether the <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index f0584b3..be80a62 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -5,6 +5,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "baseline": "bea476a80218a581bcb5318595849520217c825e", ======= @@ -19,6 +20,9 @@ ======= "baseline": "242ac6932a9cd2607332969129e9572516f28d65", >>>>>>> template/carbonengine/resources-updates +======= + "baseline": "242ac6932a9cd2607332969129e9572516f28d65", +>>>>>>> template/carbonengine/resources-updates ======= "baseline": "242ac6932a9cd2607332969129e9572516f28d65", >>>>>>> template/carbonengine/resources-updates @@ -31,6 +35,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "repository": "git@github.com:carbonengine/vcpkg-registry.git", "baseline": "b3b922c476b0dedfa8342a75e89975c74441fc75", @@ -43,6 +48,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "repository": "git@github.com:ccpgames/carbon-vcpkg-registry.git", "baseline": "bd0e4644d7d8a7ce9bfa426192cdf37a23e61b5f", @@ -57,6 +64,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/vcpkg.json b/vcpkg.json index dda53da..896d8dd 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -2,6 +2,7 @@ "dependencies": [ { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "name": "bsdiff-drake127", "version>=": "4.3.3#2" @@ -65,6 +66,8 @@ } ======= ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "name": "python3", "version>=": "3.12.9#1", @@ -78,6 +81,9 @@ } ] <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates From af7611d15fae8ab6643e21661cf4e411f526eef5 Mon Sep 17 00:00:00 2001 From: ccpgames-carbon Date: Fri, 25 Sep 2026 15:46:04 +0000 Subject: [PATCH 07/12] Merge commit 273275de7d546dcaced8f6e52e0f7ea4082a9065 from carbon-template branch=carbonengine/resources-updates: Merge pull request #39 from ccpgames/syncstep Add Sync to Mirror logic and update to use ccpgames-carbon --- .clang-format | 11 +++ .editorconfig | 10 +++ .gitignore | 9 +++ .teamcity/MacOS/Project.kt | 20 ++++++ .teamcity/Windows/Project.kt | 52 ++++++++++++++ .teamcity/_Self.kt/Project.kt | 12 ++++ .../buildTypes/CreateUniversalBuilds.kt | 62 ++++++++++++++++ .../_Self.kt/buildTypes/PublishToPerforce.kt | 49 +++++++++++++ .teamcity/_Self.kt/buildTypes/SyncToMirror.kt | 71 +++++++++++++++++++ .teamcity/pom.xml | 6 ++ CMakeLists.txt | 22 ++++++ CMakePresets.json | 31 ++++++++ doc/Doxyfile.in | 4 ++ doc/source/conf.py | 5 ++ doc/source/index.rst | 7 ++ tests/tests.md | 6 ++ vcpkg-configuration.json | 10 +++ vcpkg.json | 6 ++ 18 files changed, 393 insertions(+) create mode 100644 .teamcity/_Self.kt/buildTypes/SyncToMirror.kt diff --git a/.clang-format b/.clang-format index 79151e4..298d2ae 100644 --- a/.clang-format +++ b/.clang-format @@ -76,6 +76,7 @@ SpacesInSquareBrackets: false <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Standard: Cpp11 ======= Standard: Cpp17 @@ -95,6 +96,9 @@ Standard: Cpp17 ======= Standard: Cpp17 >>>>>>> template/carbonengine/resources-updates +======= +Standard: Cpp17 +>>>>>>> template/carbonengine/resources-updates TabWidth: 4 UseTab: ForContinuationAndIndentation --- @@ -176,6 +180,7 @@ SpacesInSquareBrackets: false <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Standard: Cpp11 TabWidth: 4 UseTab: ForContinuationAndIndentation @@ -216,3 +221,9 @@ TabWidth: 4 UseTab: ForContinuationAndIndentation ... >>>>>>> template/carbonengine/resources-updates +======= +Standard: Cpp17 +TabWidth: 4 +UseTab: ForContinuationAndIndentation +... +>>>>>>> template/carbonengine/resources-updates diff --git a/.editorconfig b/.editorconfig index d11156c..26837c1 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,6 +6,7 @@ charset = utf-8 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD end_of_line = crlf ======= end_of_line = lf @@ -25,6 +26,9 @@ end_of_line = lf ======= end_of_line = lf >>>>>>> template/carbonengine/resources-updates +======= +end_of_line = lf +>>>>>>> template/carbonengine/resources-updates indent_size = 4 indent_style = space insert_final_newline = false @@ -36,6 +40,7 @@ tab_width = 4 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ij_continuation_indent_size = 8 ij_formatter_off_tag = @formatter:off ij_formatter_on_tag = @formatter:on @@ -987,6 +992,8 @@ ij_toml_keep_indents_on_empty_lines = false >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates trim_trailing_whitespace = true [{*.yaml,*.yml,.clang-format,.clang-tidy,_clang-format}] @@ -1012,6 +1019,9 @@ trim_trailing_whitespace = false <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/.gitignore b/.gitignore index 70a5e81..f9b7375 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,10 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +binaryCache/ +>>>>>>> template/carbonengine/resources-updates ======= binaryCache/ >>>>>>> template/carbonengine/resources-updates @@ -59,6 +63,7 @@ CMakeUserPresets.json <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ### IDE ### # User generated local IDE configuration @@ -91,3 +96,7 @@ cmake-build* .cmake-build* cmake-build* >>>>>>> template/carbonengine/resources-updates +======= +.cmake-build* +cmake-build* +>>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/MacOS/Project.kt b/.teamcity/MacOS/Project.kt index eda522c..fc61ac4 100644 --- a/.teamcity/MacOS/Project.kt +++ b/.teamcity/MacOS/Project.kt @@ -55,6 +55,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "%env.CMAKE_INSTALL_PREFIX%" ======= @@ -69,6 +70,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" >>>>>>> template/carbonengine/resources-updates @@ -98,6 +102,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.CTEST_PARALLEL_LEVEL", "1") ======= @@ -115,6 +120,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates +======= + param("env.CTEST_PARALLEL_LEVEL", "8") +>>>>>>> template/carbonengine/resources-updates ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates @@ -150,6 +158,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag path = "cmake" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DBUILD_CLI=ON -DBUILD_TESTING=ON -DBUILD_DOCUMENTATION=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" ======= @@ -158,6 +167,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates +======= + arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" +>>>>>>> template/carbonengine/resources-updates ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates @@ -209,11 +221,15 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag token = "%GITHUB_CARBON_PAT%" } <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER ======= filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates +======= + filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY +>>>>>>> template/carbonengine/resources-updates ======= filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates @@ -239,7 +255,11 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag failBuild = true } sshAgent { +<<<<<<< HEAD teamcitySshKey = "ccpgames-evetech GitHub" +======= + teamcitySshKey = "ccpgames-carbon" +>>>>>>> template/carbonengine/resources-updates } provideAwsCredentials { awsConnectionId = "Carbon_AwsVcpkgBinaryCacheServiceAccount" diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt index ec41e1b..bc79248 100644 --- a/.teamcity/Windows/Project.kt +++ b/.teamcity/Windows/Project.kt @@ -23,6 +23,7 @@ import jetbrains.buildServer.configs.kotlin.buildFeatures.provideAwsCredentials <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD val BuildParameters = "-arch=x64 -vcvars_ver=14.51" val Debug = CarbonBuildWindows("Debug Windows", "Debug", "x64-windows-debug",BuildParameters) val Internal = CarbonBuildWindows("Internal Windows", "Internal", "x64-windows-internal",BuildParameters) @@ -34,12 +35,17 @@ val ReleaseDevFeatures = CarbonBuildWindows("Release Windows with Dev Features", >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates val Debug = CarbonBuildWindows("Debug Windows", "Debug", "x64-windows-debug") val Internal = CarbonBuildWindows("Internal Windows", "Internal", "x64-windows-internal") val TrinityDev = CarbonBuildWindows("TrinityDev Windows", "TrinityDev", "x64-windows-trinitydev") val Release = CarbonBuildWindows("Release Windows", "Release", "x64-windows-release") <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -59,6 +65,7 @@ object Project : Project({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD buildType(ReleaseDevFeatures) ======= @@ -88,6 +95,8 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates }) @@ -98,6 +107,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -110,6 +122,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) param("env.CTEST_JUNIT_OUTPUT_FILE", "ctest_results.xml") <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("VS_DEV_BAT_SWITCHES", vsDevBatSwitches) ======= @@ -120,6 +133,11 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) select("env.VISUAL_STUDIO_PLATFORM_TOOLSET", "v141", label = "Visual Studio Platform Toolset", description = "Specify the toolset for the build. e.g. v141 or v143.", options = listOf("v141 (2017)" to "v141", "v143 (2022)" to "v143")) >>>>>>> template/carbonengine/resources-updates +======= + select("env.VISUAL_STUDIO_PLATFORM_TOOLSET", "v141", label = "Visual Studio Platform Toolset", description = "Specify the toolset for the build. e.g. v141 or v143.", + options = listOf("v141 (2017)" to "v141", "v143 (2022)" to "v143")) + param("VS_DEV_BAT_SWITCHES", "-arch=x64") +>>>>>>> template/carbonengine/resources-updates ======= select("env.VISUAL_STUDIO_PLATFORM_TOOLSET", "v141", label = "Visual Studio Platform Toolset", description = "Specify the toolset for the build. e.g. v141 or v143.", options = listOf("v141 (2017)" to "v141", "v143 (2022)" to "v143")) @@ -143,6 +161,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.CTEST_PARALLEL_LEVEL", "1") ======= @@ -160,6 +179,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates +======= + param("env.CTEST_PARALLEL_LEVEL", "8") +>>>>>>> template/carbonengine/resources-updates ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates @@ -192,6 +214,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) REM NB: the exported PATH also contains the location where we installed sentry-cli, e.g. teamcity.agent.work.dir <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% ======= @@ -200,6 +223,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= call "%env.VSDEV_BAT_PATH%" -arch=x64 >>>>>>> template/carbonengine/resources-updates +======= + call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% +>>>>>>> template/carbonengine/resources-updates ======= call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% >>>>>>> template/carbonengine/resources-updates @@ -214,6 +240,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) path = "cmake" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DBUILD_CLI=ON -DBUILD_TESTING=ON -DBUILD_DOCUMENTATION=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" ======= @@ -222,6 +249,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates +======= + arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" +>>>>>>> template/carbonengine/resources-updates ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates @@ -263,8 +293,12 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) echo ${'$'}Credential = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList ${'$'}User, ${'$'}Password echo New-PSDrive -Name "symbols" -PSProvider FileSystem -Root ${'$'}Env:TC_SYMBOL_STORE_PATH -Credential ${'$'}Credential echo Write-Host "##teamcity[progressMessage 'Storing symbols']" +<<<<<<< HEAD <<<<<<< HEAD echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) +======= + echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) +>>>>>>> template/carbonengine/resources-updates ======= echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) >>>>>>> template/carbonengine/resources-updates @@ -294,9 +328,13 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ${'$'}Credential = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList ${'$'}User, ${'$'}Password New-PSDrive -Name "symbols" -PSProvider FileSystem -Root ${'$'}Env:TC_SYMBOL_STORE_PATH -Credential ${'$'}Credential <<<<<<< HEAD +<<<<<<< HEAD ======= +>>>>>>> template/carbonengine/resources-updates +======= + >>>>>>> template/carbonengine/resources-updates Write-Host "##teamcity[progressMessage 'Storing symbols']" ${'$'}symstoreFlags = @("add", @@ -308,6 +346,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) "/r", # Recursive "/f", "%env.CMAKE_BUILD_FOLDER%") # source folder & ${'$'}Env:TC_SYMSTORE_PATH ${'$'}symstoreFlags | Tee-Object -file symstore.txt +<<<<<<< HEAD <<<<<<< HEAD ${'$'}stored = get-content symstore.txt | Select-String "^SYMSTORE: Number of files stored = (.*)${'$'}" @@ -320,6 +359,8 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ${'$'}ignored = ${'$'}ignored.Matches.Groups[1].Value ======= +======= +>>>>>>> template/carbonengine/resources-updates ${'$'}stored = get-content symstore.txt | Select-String "^SYMSTORE: Number of files stored = (.*)${'$'}" ${'$'}stored = ${'$'}stored.Matches.Groups[1].Value @@ -330,6 +371,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ${'$'}ignored = get-content symstore.txt | Select-String "^SYMSTORE: Number of files ignored = (.*)${'$'}" ${'$'}ignored = ${'$'}ignored.Matches.Groups[1].Value +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates Write-Host "##teamcity[buildStatus text='Stored: ${'$'}stored, Errors: ${'$'}errors, Ignored: ${'$'}ignored']" """.trimIndent() @@ -355,11 +399,15 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) token = "%GITHUB_CARBON_PAT%" } <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER ======= filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates +======= + filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY +>>>>>>> template/carbonengine/resources-updates ======= filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates @@ -385,7 +433,11 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) failBuild = true } sshAgent { +<<<<<<< HEAD teamcitySshKey = "ccpgames-evetech GitHub" +======= + teamcitySshKey = "ccpgames-carbon" +>>>>>>> template/carbonengine/resources-updates } provideAwsCredentials { awsConnectionId = "Carbon_AwsVcpkgBinaryCacheServiceAccount" diff --git a/.teamcity/_Self.kt/Project.kt b/.teamcity/_Self.kt/Project.kt index ecfb10c..894cf0a 100644 --- a/.teamcity/_Self.kt/Project.kt +++ b/.teamcity/_Self.kt/Project.kt @@ -13,6 +13,7 @@ object Project : Project({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description = "Build / Publish pipeline for https://github.com/carbonengine/resources" ======= @@ -30,6 +31,9 @@ object Project : Project({ ======= description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" >>>>>>> template/carbonengine/resources-updates +======= + description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" +>>>>>>> template/carbonengine/resources-updates ======= description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" >>>>>>> template/carbonengine/resources-updates @@ -38,11 +42,15 @@ object Project : Project({ /* before changing carbon_ref, make sure to disable automatic settings synchronization on teamcity */ param("carbon_ref", "refs/heads/main") <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("carbon-pipeline-tools-ref", "refs/heads/main") ======= param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") >>>>>>> template/carbonengine/resources-updates +======= + param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") +>>>>>>> template/carbonengine/resources-updates ======= param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") >>>>>>> template/carbonengine/resources-updates @@ -52,4 +60,8 @@ object Project : Project({ subProject(MacOS.Project) buildType(PublishToPerforce) +<<<<<<< HEAD +======= + buildType(SyncToMirror) +>>>>>>> template/carbonengine/resources-updates }) diff --git a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt index c91e657..42853c0 100644 --- a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt +++ b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt @@ -12,11 +12,15 @@ class UniversalBuild() : BuildType({ params{ <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("carbon-pipeline-tools-ref", "refs/heads/main") ======= param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") >>>>>>> template/carbonengine/resources-updates +======= + param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") +>>>>>>> template/carbonengine/resources-updates ======= param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") >>>>>>> template/carbonengine/resources-updates @@ -33,6 +37,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "-m 'resources:%system.teamcity.build.workingDir%/bin' -m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", ======= @@ -50,6 +55,9 @@ class UniversalBuild() : BuildType({ ======= "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", >>>>>>> template/carbonengine/resources-updates +======= + "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", +>>>>>>> template/carbonengine/resources-updates ======= "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", >>>>>>> template/carbonengine/resources-updates @@ -65,6 +73,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "%universal-output-dir%" ======= @@ -81,6 +90,12 @@ class UniversalBuild() : BuildType({ >>>>>>> template/carbonengine/resources-updates vcs { +======= + artifactRules = "%universal-output-dir% => artifact.zip" + + vcs { + root(DslContext.settingsRootId, "-:.") +>>>>>>> template/carbonengine/resources-updates root(AbsoluteId("CarbonPipelineTools"), "+:carbon/.=>carbon") checkoutMode = CheckoutMode.ON_AGENT @@ -138,6 +153,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -152,6 +168,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -167,6 +186,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -181,6 +201,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -197,6 +220,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -211,6 +235,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -226,6 +253,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -240,6 +268,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -256,6 +287,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -270,6 +302,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -285,6 +320,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -299,6 +335,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -315,6 +354,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -329,6 +369,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -344,6 +387,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -358,6 +402,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -365,6 +412,21 @@ class UniversalBuild() : BuildType({ } } +<<<<<<< HEAD +======= + features { + pullRequests { + vcsRootExtId = "${DslContext.settingsRootId.id}" + provider = github { + authType = token { + token = "%GITHUB_CARBON_PAT%" + } + filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY + } + } + } + +>>>>>>> template/carbonengine/resources-updates requirements { startsWith("teamcity.agent.jvm.os.name", "Mac OS X") } diff --git a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt index 992d49a..5cf37f3 100644 --- a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt +++ b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt @@ -32,6 +32,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.TC_BUILD_NUMBER", "Carbon Resources #%build.number%") ======= @@ -52,6 +53,8 @@ class Publish(perforce_publish_path: String) : BuildType({ param("carbon-pipeline-tools-ref", "refs/heads/main") ======= ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates param("env.TC_BUILD_NUMBER", "Carbon Template #%build.number%") param("env.P4PORT", "p4is.ccp.ad.local:1666") @@ -59,6 +62,9 @@ class Publish(perforce_publish_path: String) : BuildType({ param("env.TC_EVE_PROJECT", "%project%") param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -75,6 +81,10 @@ class Publish(perforce_publish_path: String) : BuildType({ } vcs { +<<<<<<< HEAD +======= + root(DslContext.settingsRootId, "-:.") +>>>>>>> template/carbonengine/resources-updates root(AbsoluteId("CarbonPipelineTools"), "+:carbon/.=>carbon") checkoutMode = CheckoutMode.ON_AGENT @@ -242,6 +252,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -256,6 +267,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -271,6 +285,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -285,6 +300,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -300,6 +318,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -314,6 +333,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -329,6 +351,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -343,6 +366,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -358,6 +384,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -372,6 +399,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -383,6 +413,21 @@ class Publish(perforce_publish_path: String) : BuildType({ } } +<<<<<<< HEAD +======= + features { + pullRequests { + vcsRootExtId = "${DslContext.settingsRootId.id}" + provider = github { + authType = token { + token = "%GITHUB_CARBON_PAT%" + } + filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY + } + } + } + +>>>>>>> template/carbonengine/resources-updates requirements { contains("teamcity.agent.jvm.os.name", "Windows") doesNotContain("teamcity.agent.name", "TEST-AUTOM") @@ -395,6 +440,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD val PublishToPerforce = Publish("vendor/github.com/carbonengine/resources") ======= val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") @@ -414,3 +460,6 @@ val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") ======= val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") >>>>>>> template/carbonengine/resources-updates +======= +val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") +>>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/_Self.kt/buildTypes/SyncToMirror.kt b/.teamcity/_Self.kt/buildTypes/SyncToMirror.kt new file mode 100644 index 0000000..2f83e4b --- /dev/null +++ b/.teamcity/_Self.kt/buildTypes/SyncToMirror.kt @@ -0,0 +1,71 @@ +// Copyright © 2026 CCP ehf. + +package _Self.buildTypes + +import jetbrains.buildServer.configs.kotlin.BuildType +import jetbrains.buildServer.configs.kotlin.CheckoutMode +import jetbrains.buildServer.configs.kotlin.DslContext +import jetbrains.buildServer.configs.kotlin.buildFeatures.sshAgent +import jetbrains.buildServer.configs.kotlin.buildSteps.script +import jetbrains.buildServer.configs.kotlin.triggers.vcs + +object SyncToMirror : BuildType({ + name = "Sync to Mirror" + + enablePersonalBuilds = false + maxRunningBuilds = 1 + + params { + param("github_mirror_repository", "ccpgames/carbon-*-mirror TYPE IN NAME HERE") + param("teamcity.vcsTrigger.runBuildInNewEmptyBranch", "true") + } + + vcs { + root(DslContext.settingsRootId) + checkoutMode = CheckoutMode.ON_AGENT + cleanCheckout = true + } + + steps { + script { + name = "Mirror branches and tags to GitHub" + // TeamCity gives us only the tag that triggered the build, not a full repository + // TeamCity delivery state is also not trustworthy or intented to be manipulated for these purposes + // Rather than relying on that checkout state, fetch all branches and tags ourselves + scriptContent = """ + set -euo pipefail + + source_url="$(git -C "%teamcity.build.checkoutDir%" remote get-url origin)" + mirror_dir="%teamcity.build.workingDir%/github-mirror.git" + + rm -rf "${'$'}mirror_dir" + git init --bare "${'$'}mirror_dir" + git -C "${'$'}mirror_dir" fetch --prune "${'$'}source_url" \ + '+refs/heads/*:refs/heads/*' \ + '+refs/tags/*:refs/tags/*' + git -C "${'$'}mirror_dir" remote add destination \ + "git@github.com:%github_mirror_repository%.git" + git -C "${'$'}mirror_dir" push --mirror destination + """.trimIndent() + } + } + + triggers { + vcs { + branchFilter = """ + +:* + -: + """.trimIndent() + } + } + + features { + sshAgent { + teamcitySshKey = "ccpgames-carbon" + } + } + + requirements { + contains("teamcity.agent.jvm.os.name", "Linux") + } +}) diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml index af61283..a7c94d3 100644 --- a/.teamcity/pom.xml +++ b/.teamcity/pom.xml @@ -6,6 +6,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Carbon Resources Config DSL Script Carbon_Resources @@ -35,6 +36,11 @@ Carbon_Template Carbon_Template_dsl >>>>>>> template/carbonengine/resources-updates +======= + Carbon Template Config DSL Script + Carbon_Template + Carbon_Template_dsl +>>>>>>> template/carbonengine/resources-updates ======= Carbon Template Config DSL Script Carbon_Template diff --git a/CMakeLists.txt b/CMakeLists.txt index 189e6d6..d6fba34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # Copyright © 2025 CCP ehf. cmake_minimum_required(VERSION 3.31.1) @@ -114,6 +115,8 @@ get_target_property(_SOURCES resources SOURCES) >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates cmake_minimum_required(VERSION 3.16) project(CarbonTemplateProject VERSION 1.0.0) @@ -128,6 +131,9 @@ get_target_property(_SOURCES target_name SOURCES) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -147,6 +153,7 @@ source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if(BUILD_CLI) add_subdirectory(cli) endif() @@ -180,6 +187,8 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates set_target_properties(target_name PROPERTIES OUTPUT_NAME "_target_name") target_include_directories(target_name @@ -197,6 +206,9 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) set(BUILD_DOCUMENTATION_DEFAULT_FLAG OFF) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -221,6 +233,9 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -249,6 +264,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD # Ensure that resources is built before Spinx target add_dependencies(Sphinx resources) @@ -313,6 +329,8 @@ endif () ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates add_dependencies(Sphinx target_name) endif() @@ -370,6 +388,10 @@ endif () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +endif() +>>>>>>> template/carbonengine/resources-updates +======= endif() >>>>>>> template/carbonengine/resources-updates ======= diff --git a/CMakePresets.json b/CMakePresets.json index 6e62729..5ad3c5e 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -17,6 +17,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "CMAKE_COMPILE_WARNING_AS_ERROR": "ON", ======= @@ -24,6 +25,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/triplets" }, @@ -58,6 +61,7 @@ "cacheVariables": { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-145-carbon.cmake" ======= @@ -66,6 +70,9 @@ ======= "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" >>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" >>>>>>> template/carbonengine/resources-updates @@ -93,12 +100,15 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates { "name": "x64-windows-internal", @@ -107,6 +117,7 @@ "CMAKE_BUILD_TYPE": "Internal", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-internal", "VCPKG_HOST_TRIPLET": "x64-windows-145-internal" @@ -118,6 +129,10 @@ "VCPKG_TARGET_TRIPLET": "x64-windows-internal", "VCPKG_HOST_TRIPLET": "x64-windows-internal" >>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-internal", + "VCPKG_HOST_TRIPLET": "x64-windows-internal" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_TARGET_TRIPLET": "x64-windows-internal", "VCPKG_HOST_TRIPLET": "x64-windows-internal" @@ -131,6 +146,7 @@ "CMAKE_BUILD_TYPE": "Release", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-release", "VCPKG_HOST_TRIPLET": "x64-windows-145-release" @@ -142,6 +158,10 @@ "VCPKG_TARGET_TRIPLET": "x64-windows-release", "VCPKG_HOST_TRIPLET": "x64-windows-release" >>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-release", + "VCPKG_HOST_TRIPLET": "x64-windows-release" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_TARGET_TRIPLET": "x64-windows-release", "VCPKG_HOST_TRIPLET": "x64-windows-release" @@ -155,6 +175,7 @@ "CMAKE_BUILD_TYPE": "Debug", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-debug", "VCPKG_HOST_TRIPLET": "x64-windows-145-debug" @@ -166,6 +187,10 @@ "VCPKG_TARGET_TRIPLET": "x64-windows-debug", "VCPKG_HOST_TRIPLET": "x64-windows-debug" >>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-debug", + "VCPKG_HOST_TRIPLET": "x64-windows-debug" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_TARGET_TRIPLET": "x64-windows-debug", "VCPKG_HOST_TRIPLET": "x64-windows-debug" @@ -179,6 +204,7 @@ "CMAKE_BUILD_TYPE": "TrinityDev", <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-trinitydev", "VCPKG_HOST_TRIPLET": "x64-windows-145-trinitydev" @@ -205,6 +231,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "VCPKG_TARGET_TRIPLET": "x64-windows-trinitydev", "VCPKG_HOST_TRIPLET": "x64-windows-trinitydev" @@ -213,6 +241,9 @@ { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 272f48a..5ed9208 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -80,6 +80,7 @@ PROJECT_ICON = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD OUTPUT_DIRECTORY = @CMAKE_CURRENT_BINARY_DIR@/docs/ ======= OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ @@ -99,6 +100,9 @@ OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ ======= OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ >>>>>>> template/carbonengine/resources-updates +======= +OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ +>>>>>>> template/carbonengine/resources-updates # If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 # sub-directories (in 2 levels) under the output directory of each output format diff --git a/doc/source/conf.py b/doc/source/conf.py index 623723c..ec89d1e 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -12,6 +12,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD project = 'resources' copyright = 'Copyright © 2025 CCP ehf' ======= @@ -38,6 +39,10 @@ project = 'project_name' copyright = '2024, CCP Games' >>>>>>> template/carbonengine/resources-updates +======= +project = 'project_name' +copyright = '2024, CCP Games' +>>>>>>> template/carbonengine/resources-updates author = 'CCP Games' release = '0.1' diff --git a/doc/source/index.rst b/doc/source/index.rst index bb045b3..89f615f 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -4,6 +4,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD resources Documentation ============================== @@ -59,6 +60,8 @@ Contents >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates project_name Documentation ========================== @@ -91,6 +94,10 @@ project_name Documentation <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +.. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html +>>>>>>> template/carbonengine/resources-updates +======= .. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html >>>>>>> template/carbonengine/resources-updates ======= diff --git a/tests/tests.md b/tests/tests.md index 16a7729..bfaf755 100644 --- a/tests/tests.md +++ b/tests/tests.md @@ -8,6 +8,7 @@ This folder is where all the tests for the project should be stored, whether the <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD [See a C++ example here](https://github.com/carbonengine/resources/tree/main/tests/src) ======= ======= @@ -20,6 +21,8 @@ This folder is where all the tests for the project should be stored, whether the >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates [See a C++ example here](https://github.com/ccpgames/carbon-destiny/tree/main/tests) [See a Python example here](https://github.com/ccpgames/carbon-fsd/tree/main/tests) @@ -29,6 +32,9 @@ This folder is where all the tests for the project should be stored, whether the <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index be80a62..bb4ab85 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -6,6 +6,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "baseline": "bea476a80218a581bcb5318595849520217c825e", ======= @@ -23,6 +24,9 @@ ======= "baseline": "242ac6932a9cd2607332969129e9572516f28d65", >>>>>>> template/carbonengine/resources-updates +======= + "baseline": "242ac6932a9cd2607332969129e9572516f28d65", +>>>>>>> template/carbonengine/resources-updates ======= "baseline": "242ac6932a9cd2607332969129e9572516f28d65", >>>>>>> template/carbonengine/resources-updates @@ -36,6 +40,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "repository": "git@github.com:carbonengine/vcpkg-registry.git", "baseline": "b3b922c476b0dedfa8342a75e89975c74441fc75", @@ -50,6 +55,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "repository": "git@github.com:ccpgames/carbon-vcpkg-registry.git", "baseline": "bd0e4644d7d8a7ce9bfa426192cdf37a23e61b5f", @@ -65,6 +72,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/vcpkg.json b/vcpkg.json index 896d8dd..4c7051e 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -3,6 +3,7 @@ { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "name": "bsdiff-drake127", "version>=": "4.3.3#2" @@ -68,6 +69,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "name": "python3", "version>=": "3.12.9#1", @@ -82,6 +85,9 @@ ] <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates From a635f29b817f6702f0db8bfd3cf6303ebaf7d93b Mon Sep 17 00:00:00 2001 From: ccpgames-carbon Date: Fri, 25 Sep 2026 17:00:06 +0000 Subject: [PATCH 08/12] Merge commit 89063a618f4f44146f9a805457e8cc3f5e2774c0 from carbon-template branch=carbonengine/resources-updates: Merge branch 'main' of github.com:ccpgames/carbon-template --- .clang-format | 11 ++++ .editorconfig | 10 ++++ .gitignore | 9 +++ .teamcity/MacOS/Project.kt | 20 +++++++ .teamcity/Windows/Project.kt | 52 +++++++++++++++++ .teamcity/_Self.kt/Project.kt | 12 ++++ .../buildTypes/CreateUniversalBuilds.kt | 56 +++++++++++++++++++ .../_Self.kt/buildTypes/PublishToPerforce.kt | 44 +++++++++++++++ .teamcity/pom.xml | 6 ++ CMakeLists.txt | 22 ++++++++ CMakePresets.json | 31 ++++++++++ doc/Doxyfile.in | 4 ++ doc/source/conf.py | 5 ++ doc/source/index.rst | 7 +++ tests/tests.md | 6 ++ vcpkg-configuration.json | 10 ++++ vcpkg.json | 6 ++ 17 files changed, 311 insertions(+) diff --git a/.clang-format b/.clang-format index 298d2ae..67e30e3 100644 --- a/.clang-format +++ b/.clang-format @@ -77,6 +77,7 @@ SpacesInSquareBrackets: false <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Standard: Cpp11 ======= Standard: Cpp17 @@ -99,6 +100,9 @@ Standard: Cpp17 ======= Standard: Cpp17 >>>>>>> template/carbonengine/resources-updates +======= +Standard: Cpp17 +>>>>>>> template/carbonengine/resources-updates TabWidth: 4 UseTab: ForContinuationAndIndentation --- @@ -181,6 +185,7 @@ SpacesInSquareBrackets: false <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Standard: Cpp11 TabWidth: 4 UseTab: ForContinuationAndIndentation @@ -227,3 +232,9 @@ TabWidth: 4 UseTab: ForContinuationAndIndentation ... >>>>>>> template/carbonengine/resources-updates +======= +Standard: Cpp17 +TabWidth: 4 +UseTab: ForContinuationAndIndentation +... +>>>>>>> template/carbonengine/resources-updates diff --git a/.editorconfig b/.editorconfig index 26837c1..29c428e 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,6 +7,7 @@ charset = utf-8 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD end_of_line = crlf ======= end_of_line = lf @@ -29,6 +30,9 @@ end_of_line = lf ======= end_of_line = lf >>>>>>> template/carbonengine/resources-updates +======= +end_of_line = lf +>>>>>>> template/carbonengine/resources-updates indent_size = 4 indent_style = space insert_final_newline = false @@ -41,6 +45,7 @@ tab_width = 4 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ij_continuation_indent_size = 8 ij_formatter_off_tag = @formatter:off ij_formatter_on_tag = @formatter:on @@ -994,6 +999,8 @@ ij_toml_keep_indents_on_empty_lines = false >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates trim_trailing_whitespace = true [{*.yaml,*.yml,.clang-format,.clang-tidy,_clang-format}] @@ -1020,6 +1027,9 @@ trim_trailing_whitespace = false <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/.gitignore b/.gitignore index f9b7375..019d8f8 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,10 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +binaryCache/ +>>>>>>> template/carbonengine/resources-updates ======= binaryCache/ >>>>>>> template/carbonengine/resources-updates @@ -64,6 +68,7 @@ CMakeUserPresets.json <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ### IDE ### # User generated local IDE configuration @@ -100,3 +105,7 @@ cmake-build* .cmake-build* cmake-build* >>>>>>> template/carbonengine/resources-updates +======= +.cmake-build* +cmake-build* +>>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/MacOS/Project.kt b/.teamcity/MacOS/Project.kt index fc61ac4..ffb85c4 100644 --- a/.teamcity/MacOS/Project.kt +++ b/.teamcity/MacOS/Project.kt @@ -56,6 +56,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "%env.CMAKE_INSTALL_PREFIX%" ======= @@ -73,6 +74,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" >>>>>>> template/carbonengine/resources-updates @@ -103,6 +107,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.CTEST_PARALLEL_LEVEL", "1") ======= @@ -123,6 +128,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates +======= + param("env.CTEST_PARALLEL_LEVEL", "8") +>>>>>>> template/carbonengine/resources-updates ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates @@ -159,6 +167,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DBUILD_CLI=ON -DBUILD_TESTING=ON -DBUILD_DOCUMENTATION=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" ======= @@ -170,6 +179,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates +======= + arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" +>>>>>>> template/carbonengine/resources-updates ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates @@ -222,6 +234,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER ======= @@ -230,6 +243,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates +======= + filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY +>>>>>>> template/carbonengine/resources-updates ======= filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates @@ -255,8 +271,12 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag failBuild = true } sshAgent { +<<<<<<< HEAD <<<<<<< HEAD teamcitySshKey = "ccpgames-evetech GitHub" +======= + teamcitySshKey = "ccpgames-carbon" +>>>>>>> template/carbonengine/resources-updates ======= teamcitySshKey = "ccpgames-carbon" >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt index bc79248..6f4feda 100644 --- a/.teamcity/Windows/Project.kt +++ b/.teamcity/Windows/Project.kt @@ -24,6 +24,7 @@ import jetbrains.buildServer.configs.kotlin.buildFeatures.provideAwsCredentials <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD val BuildParameters = "-arch=x64 -vcvars_ver=14.51" val Debug = CarbonBuildWindows("Debug Windows", "Debug", "x64-windows-debug",BuildParameters) val Internal = CarbonBuildWindows("Internal Windows", "Internal", "x64-windows-internal",BuildParameters) @@ -37,6 +38,8 @@ val ReleaseDevFeatures = CarbonBuildWindows("Release Windows with Dev Features", >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates val Debug = CarbonBuildWindows("Debug Windows", "Debug", "x64-windows-debug") val Internal = CarbonBuildWindows("Internal Windows", "Internal", "x64-windows-internal") val TrinityDev = CarbonBuildWindows("TrinityDev Windows", "TrinityDev", "x64-windows-trinitydev") @@ -44,6 +47,9 @@ val Release = CarbonBuildWindows("Release Windows", "Release", "x64-windows-rele <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -66,6 +72,7 @@ object Project : Project({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD buildType(ReleaseDevFeatures) ======= @@ -97,6 +104,8 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates }) @@ -108,6 +117,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -123,6 +135,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("VS_DEV_BAT_SWITCHES", vsDevBatSwitches) ======= @@ -138,6 +151,11 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) options = listOf("v141 (2017)" to "v141", "v143 (2022)" to "v143")) param("VS_DEV_BAT_SWITCHES", "-arch=x64") >>>>>>> template/carbonengine/resources-updates +======= + select("env.VISUAL_STUDIO_PLATFORM_TOOLSET", "v141", label = "Visual Studio Platform Toolset", description = "Specify the toolset for the build. e.g. v141 or v143.", + options = listOf("v141 (2017)" to "v141", "v143 (2022)" to "v143")) + param("VS_DEV_BAT_SWITCHES", "-arch=x64") +>>>>>>> template/carbonengine/resources-updates ======= select("env.VISUAL_STUDIO_PLATFORM_TOOLSET", "v141", label = "Visual Studio Platform Toolset", description = "Specify the toolset for the build. e.g. v141 or v143.", options = listOf("v141 (2017)" to "v141", "v143 (2022)" to "v143")) @@ -162,6 +180,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.CTEST_PARALLEL_LEVEL", "1") ======= @@ -182,6 +201,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates +======= + param("env.CTEST_PARALLEL_LEVEL", "8") +>>>>>>> template/carbonengine/resources-updates ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates @@ -215,6 +237,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% ======= @@ -226,6 +249,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% >>>>>>> template/carbonengine/resources-updates +======= + call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% +>>>>>>> template/carbonengine/resources-updates ======= call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% >>>>>>> template/carbonengine/resources-updates @@ -241,6 +267,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DBUILD_CLI=ON -DBUILD_TESTING=ON -DBUILD_DOCUMENTATION=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" ======= @@ -252,6 +279,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates +======= + arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" +>>>>>>> template/carbonengine/resources-updates ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates @@ -294,11 +324,15 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) echo New-PSDrive -Name "symbols" -PSProvider FileSystem -Root ${'$'}Env:TC_SYMBOL_STORE_PATH -Credential ${'$'}Credential echo Write-Host "##teamcity[progressMessage 'Storing symbols']" <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) ======= echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) >>>>>>> template/carbonengine/resources-updates +======= + echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) +>>>>>>> template/carbonengine/resources-updates ======= echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) >>>>>>> template/carbonengine/resources-updates @@ -329,12 +363,16 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) New-PSDrive -Name "symbols" -PSProvider FileSystem -Root ${'$'}Env:TC_SYMBOL_STORE_PATH -Credential ${'$'}Credential <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= + >>>>>>> template/carbonengine/resources-updates Write-Host "##teamcity[progressMessage 'Storing symbols']" ${'$'}symstoreFlags = @("add", @@ -347,6 +385,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) "/f", "%env.CMAKE_BUILD_FOLDER%") # source folder & ${'$'}Env:TC_SYMSTORE_PATH ${'$'}symstoreFlags | Tee-Object -file symstore.txt <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ${'$'}stored = get-content symstore.txt | Select-String "^SYMSTORE: Number of files stored = (.*)${'$'}" @@ -360,6 +399,8 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ${'$'}stored = get-content symstore.txt | Select-String "^SYMSTORE: Number of files stored = (.*)${'$'}" @@ -371,9 +412,12 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ${'$'}ignored = get-content symstore.txt | Select-String "^SYMSTORE: Number of files ignored = (.*)${'$'}" ${'$'}ignored = ${'$'}ignored.Matches.Groups[1].Value +<<<<<<< HEAD <<<<<<< HEAD >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates Write-Host "##teamcity[buildStatus text='Stored: ${'$'}stored, Errors: ${'$'}errors, Ignored: ${'$'}ignored']" """.trimIndent() @@ -400,6 +444,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER ======= @@ -408,6 +453,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates +======= + filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY +>>>>>>> template/carbonengine/resources-updates ======= filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates @@ -433,8 +481,12 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) failBuild = true } sshAgent { +<<<<<<< HEAD <<<<<<< HEAD teamcitySshKey = "ccpgames-evetech GitHub" +======= + teamcitySshKey = "ccpgames-carbon" +>>>>>>> template/carbonengine/resources-updates ======= teamcitySshKey = "ccpgames-carbon" >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/_Self.kt/Project.kt b/.teamcity/_Self.kt/Project.kt index 894cf0a..9fa4ffa 100644 --- a/.teamcity/_Self.kt/Project.kt +++ b/.teamcity/_Self.kt/Project.kt @@ -14,6 +14,7 @@ object Project : Project({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description = "Build / Publish pipeline for https://github.com/carbonengine/resources" ======= @@ -34,6 +35,9 @@ object Project : Project({ ======= description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" >>>>>>> template/carbonengine/resources-updates +======= + description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" +>>>>>>> template/carbonengine/resources-updates ======= description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" >>>>>>> template/carbonengine/resources-updates @@ -43,6 +47,7 @@ object Project : Project({ param("carbon_ref", "refs/heads/main") <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("carbon-pipeline-tools-ref", "refs/heads/main") ======= @@ -51,6 +56,9 @@ object Project : Project({ ======= param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") >>>>>>> template/carbonengine/resources-updates +======= + param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") +>>>>>>> template/carbonengine/resources-updates ======= param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") >>>>>>> template/carbonengine/resources-updates @@ -61,6 +69,10 @@ object Project : Project({ buildType(PublishToPerforce) <<<<<<< HEAD +<<<<<<< HEAD +======= + buildType(SyncToMirror) +>>>>>>> template/carbonengine/resources-updates ======= buildType(SyncToMirror) >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt index 42853c0..f097bc5 100644 --- a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt +++ b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt @@ -1,6 +1,10 @@ package _Self.buildTypes import jetbrains.buildServer.configs.kotlin.* +<<<<<<< HEAD +======= +import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests +>>>>>>> template/carbonengine/resources-updates import jetbrains.buildServer.configs.kotlin.buildFeatures.vcsLabeling import jetbrains.buildServer.configs.kotlin.triggers.vcs import jetbrains.buildServer.configs.kotlin.buildSteps.python @@ -13,6 +17,7 @@ class UniversalBuild() : BuildType({ params{ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("carbon-pipeline-tools-ref", "refs/heads/main") ======= @@ -21,6 +26,9 @@ class UniversalBuild() : BuildType({ ======= param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") >>>>>>> template/carbonengine/resources-updates +======= + param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") +>>>>>>> template/carbonengine/resources-updates ======= param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") >>>>>>> template/carbonengine/resources-updates @@ -38,6 +46,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "-m 'resources:%system.teamcity.build.workingDir%/bin' -m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", ======= @@ -58,6 +67,9 @@ class UniversalBuild() : BuildType({ ======= "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", >>>>>>> template/carbonengine/resources-updates +======= + "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", +>>>>>>> template/carbonengine/resources-updates ======= "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", >>>>>>> template/carbonengine/resources-updates @@ -74,6 +86,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "%universal-output-dir%" ======= @@ -91,10 +104,15 @@ class UniversalBuild() : BuildType({ vcs { ======= +======= +>>>>>>> template/carbonengine/resources-updates artifactRules = "%universal-output-dir% => artifact.zip" vcs { root(DslContext.settingsRootId, "-:.") +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates root(AbsoluteId("CarbonPipelineTools"), "+:carbon/.=>carbon") @@ -154,6 +172,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -171,6 +190,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -187,6 +209,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -204,6 +227,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -221,6 +247,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -238,6 +265,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -254,6 +284,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -271,6 +302,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -288,6 +322,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -305,6 +340,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -321,6 +359,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -338,6 +377,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -355,6 +397,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -372,6 +415,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -388,6 +434,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -405,6 +452,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -413,7 +463,10 @@ class UniversalBuild() : BuildType({ } <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> template/carbonengine/resources-updates features { pullRequests { vcsRootExtId = "${DslContext.settingsRootId.id}" @@ -426,6 +479,9 @@ class UniversalBuild() : BuildType({ } } +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates requirements { startsWith("teamcity.agent.jvm.os.name", "Mac OS X") diff --git a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt index 5cf37f3..bcd298b 100644 --- a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt +++ b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt @@ -1,6 +1,10 @@ package _Self.buildTypes import jetbrains.buildServer.configs.kotlin.* +<<<<<<< HEAD +======= +import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests +>>>>>>> template/carbonengine/resources-updates import jetbrains.buildServer.configs.kotlin.buildFeatures.vcsLabeling import jetbrains.buildServer.configs.kotlin.triggers.vcs import jetbrains.buildServer.configs.kotlin.buildSteps.python @@ -33,6 +37,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.TC_BUILD_NUMBER", "Carbon Resources #%build.number%") ======= @@ -55,6 +60,8 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates param("env.TC_BUILD_NUMBER", "Carbon Template #%build.number%") param("env.P4PORT", "p4is.ccp.ad.local:1666") @@ -63,6 +70,9 @@ class Publish(perforce_publish_path: String) : BuildType({ param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -82,6 +92,10 @@ class Publish(perforce_publish_path: String) : BuildType({ vcs { <<<<<<< HEAD +<<<<<<< HEAD +======= + root(DslContext.settingsRootId, "-:.") +>>>>>>> template/carbonengine/resources-updates ======= root(DslContext.settingsRootId, "-:.") >>>>>>> template/carbonengine/resources-updates @@ -253,6 +267,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -270,6 +285,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -286,6 +304,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -303,6 +322,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -319,6 +341,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -336,6 +359,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -352,6 +378,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -369,6 +396,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -385,6 +415,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -402,6 +433,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -414,7 +448,10 @@ class Publish(perforce_publish_path: String) : BuildType({ } <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> template/carbonengine/resources-updates features { pullRequests { vcsRootExtId = "${DslContext.settingsRootId.id}" @@ -427,6 +464,9 @@ class Publish(perforce_publish_path: String) : BuildType({ } } +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates requirements { contains("teamcity.agent.jvm.os.name", "Windows") @@ -441,6 +481,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD val PublishToPerforce = Publish("vendor/github.com/carbonengine/resources") ======= val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") @@ -463,3 +504,6 @@ val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") ======= val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") >>>>>>> template/carbonengine/resources-updates +======= +val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") +>>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml index a7c94d3..cb40ca6 100644 --- a/.teamcity/pom.xml +++ b/.teamcity/pom.xml @@ -7,6 +7,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Carbon Resources Config DSL Script Carbon_Resources @@ -41,6 +42,11 @@ Carbon_Template Carbon_Template_dsl >>>>>>> template/carbonengine/resources-updates +======= + Carbon Template Config DSL Script + Carbon_Template + Carbon_Template_dsl +>>>>>>> template/carbonengine/resources-updates ======= Carbon Template Config DSL Script Carbon_Template diff --git a/CMakeLists.txt b/CMakeLists.txt index d6fba34..b663535 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # Copyright © 2025 CCP ehf. cmake_minimum_required(VERSION 3.31.1) @@ -117,6 +118,8 @@ get_target_property(_SOURCES resources SOURCES) >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates cmake_minimum_required(VERSION 3.16) project(CarbonTemplateProject VERSION 1.0.0) @@ -132,6 +135,9 @@ get_target_property(_SOURCES target_name SOURCES) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -154,6 +160,7 @@ source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if(BUILD_CLI) add_subdirectory(cli) endif() @@ -189,6 +196,8 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates set_target_properties(target_name PROPERTIES OUTPUT_NAME "_target_name") target_include_directories(target_name @@ -207,6 +216,9 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -234,6 +246,9 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -265,6 +280,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD # Ensure that resources is built before Spinx target add_dependencies(Sphinx resources) @@ -331,6 +347,8 @@ endif () ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates add_dependencies(Sphinx target_name) endif() @@ -389,6 +407,10 @@ endif () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +endif() +>>>>>>> template/carbonengine/resources-updates +======= endif() >>>>>>> template/carbonengine/resources-updates ======= diff --git a/CMakePresets.json b/CMakePresets.json index 5ad3c5e..1474067 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -18,6 +18,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "CMAKE_COMPILE_WARNING_AS_ERROR": "ON", ======= @@ -27,6 +28,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/triplets" }, @@ -62,6 +65,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-145-carbon.cmake" ======= @@ -73,6 +77,9 @@ ======= "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" >>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" >>>>>>> template/carbonengine/resources-updates @@ -101,6 +108,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> template/carbonengine/resources-updates @@ -109,6 +117,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates { "name": "x64-windows-internal", @@ -118,6 +128,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-internal", "VCPKG_HOST_TRIPLET": "x64-windows-145-internal" @@ -133,6 +144,10 @@ "VCPKG_TARGET_TRIPLET": "x64-windows-internal", "VCPKG_HOST_TRIPLET": "x64-windows-internal" >>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-internal", + "VCPKG_HOST_TRIPLET": "x64-windows-internal" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_TARGET_TRIPLET": "x64-windows-internal", "VCPKG_HOST_TRIPLET": "x64-windows-internal" @@ -147,6 +162,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-release", "VCPKG_HOST_TRIPLET": "x64-windows-145-release" @@ -162,6 +178,10 @@ "VCPKG_TARGET_TRIPLET": "x64-windows-release", "VCPKG_HOST_TRIPLET": "x64-windows-release" >>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-release", + "VCPKG_HOST_TRIPLET": "x64-windows-release" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_TARGET_TRIPLET": "x64-windows-release", "VCPKG_HOST_TRIPLET": "x64-windows-release" @@ -176,6 +196,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-debug", "VCPKG_HOST_TRIPLET": "x64-windows-145-debug" @@ -191,6 +212,10 @@ "VCPKG_TARGET_TRIPLET": "x64-windows-debug", "VCPKG_HOST_TRIPLET": "x64-windows-debug" >>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-debug", + "VCPKG_HOST_TRIPLET": "x64-windows-debug" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_TARGET_TRIPLET": "x64-windows-debug", "VCPKG_HOST_TRIPLET": "x64-windows-debug" @@ -205,6 +230,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-trinitydev", "VCPKG_HOST_TRIPLET": "x64-windows-145-trinitydev" @@ -233,6 +259,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "VCPKG_TARGET_TRIPLET": "x64-windows-trinitydev", "VCPKG_HOST_TRIPLET": "x64-windows-trinitydev" @@ -242,6 +270,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 5ed9208..c2aa67a 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -81,6 +81,7 @@ PROJECT_ICON = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD OUTPUT_DIRECTORY = @CMAKE_CURRENT_BINARY_DIR@/docs/ ======= OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ @@ -103,6 +104,9 @@ OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ ======= OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ >>>>>>> template/carbonengine/resources-updates +======= +OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ +>>>>>>> template/carbonengine/resources-updates # If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 # sub-directories (in 2 levels) under the output directory of each output format diff --git a/doc/source/conf.py b/doc/source/conf.py index ec89d1e..3690496 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -13,6 +13,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD project = 'resources' copyright = 'Copyright © 2025 CCP ehf' ======= @@ -43,6 +44,10 @@ project = 'project_name' copyright = '2024, CCP Games' >>>>>>> template/carbonengine/resources-updates +======= +project = 'project_name' +copyright = '2024, CCP Games' +>>>>>>> template/carbonengine/resources-updates author = 'CCP Games' release = '0.1' diff --git a/doc/source/index.rst b/doc/source/index.rst index 89f615f..76d0974 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -5,6 +5,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD resources Documentation ============================== @@ -62,6 +63,8 @@ Contents >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates project_name Documentation ========================== @@ -95,6 +98,10 @@ project_name Documentation <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +.. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html +>>>>>>> template/carbonengine/resources-updates +======= .. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html >>>>>>> template/carbonengine/resources-updates ======= diff --git a/tests/tests.md b/tests/tests.md index bfaf755..8ab6a11 100644 --- a/tests/tests.md +++ b/tests/tests.md @@ -9,6 +9,7 @@ This folder is where all the tests for the project should be stored, whether the <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD [See a C++ example here](https://github.com/carbonengine/resources/tree/main/tests/src) ======= ======= @@ -23,6 +24,8 @@ This folder is where all the tests for the project should be stored, whether the >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates [See a C++ example here](https://github.com/ccpgames/carbon-destiny/tree/main/tests) [See a Python example here](https://github.com/ccpgames/carbon-fsd/tree/main/tests) @@ -33,6 +36,9 @@ This folder is where all the tests for the project should be stored, whether the <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index bb4ab85..8237769 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -7,6 +7,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "baseline": "bea476a80218a581bcb5318595849520217c825e", ======= @@ -27,6 +28,9 @@ ======= "baseline": "242ac6932a9cd2607332969129e9572516f28d65", >>>>>>> template/carbonengine/resources-updates +======= + "baseline": "242ac6932a9cd2607332969129e9572516f28d65", +>>>>>>> template/carbonengine/resources-updates ======= "baseline": "242ac6932a9cd2607332969129e9572516f28d65", >>>>>>> template/carbonengine/resources-updates @@ -41,6 +45,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "repository": "git@github.com:carbonengine/vcpkg-registry.git", "baseline": "b3b922c476b0dedfa8342a75e89975c74441fc75", @@ -57,6 +62,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "repository": "git@github.com:ccpgames/carbon-vcpkg-registry.git", "baseline": "bd0e4644d7d8a7ce9bfa426192cdf37a23e61b5f", @@ -73,6 +80,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/vcpkg.json b/vcpkg.json index 4c7051e..a392c3c 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -4,6 +4,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "name": "bsdiff-drake127", "version>=": "4.3.3#2" @@ -71,6 +72,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "name": "python3", "version>=": "3.12.9#1", @@ -86,6 +89,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates From 60ea146e93c8eb0baea16b69fa8053b2f5fcad86 Mon Sep 17 00:00:00 2001 From: ccpgames-carbon Date: Fri, 25 Sep 2026 17:14:38 +0000 Subject: [PATCH 09/12] Merge commit ccfad9156c2bdfbeed1eb35c10cb38ce6c3247ba from carbon-template branch=carbonengine/resources-updates: Fix import naming casing --- .clang-format | 11 ++++ .editorconfig | 10 ++++ .gitignore | 9 +++ .teamcity/MacOS/Project.kt | 23 +++++++ .teamcity/Windows/Project.kt | 55 +++++++++++++++++ .teamcity/_Self.kt/Project.kt | 12 ++++ .../buildTypes/CreateUniversalBuilds.kt | 60 +++++++++++++++++++ .../_Self.kt/buildTypes/PublishToPerforce.kt | 48 +++++++++++++++ .teamcity/pom.xml | 6 ++ CMakeLists.txt | 22 +++++++ CMakePresets.json | 31 ++++++++++ doc/Doxyfile.in | 4 ++ doc/source/conf.py | 5 ++ doc/source/index.rst | 7 +++ tests/tests.md | 6 ++ vcpkg-configuration.json | 10 ++++ vcpkg.json | 6 ++ 17 files changed, 325 insertions(+) diff --git a/.clang-format b/.clang-format index 67e30e3..d4846eb 100644 --- a/.clang-format +++ b/.clang-format @@ -78,6 +78,7 @@ SpacesInSquareBrackets: false <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Standard: Cpp11 ======= Standard: Cpp17 @@ -103,6 +104,9 @@ Standard: Cpp17 ======= Standard: Cpp17 >>>>>>> template/carbonengine/resources-updates +======= +Standard: Cpp17 +>>>>>>> template/carbonengine/resources-updates TabWidth: 4 UseTab: ForContinuationAndIndentation --- @@ -186,6 +190,7 @@ SpacesInSquareBrackets: false <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Standard: Cpp11 TabWidth: 4 UseTab: ForContinuationAndIndentation @@ -238,3 +243,9 @@ TabWidth: 4 UseTab: ForContinuationAndIndentation ... >>>>>>> template/carbonengine/resources-updates +======= +Standard: Cpp17 +TabWidth: 4 +UseTab: ForContinuationAndIndentation +... +>>>>>>> template/carbonengine/resources-updates diff --git a/.editorconfig b/.editorconfig index 29c428e..8855709 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,6 +8,7 @@ charset = utf-8 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD end_of_line = crlf ======= end_of_line = lf @@ -33,6 +34,9 @@ end_of_line = lf ======= end_of_line = lf >>>>>>> template/carbonengine/resources-updates +======= +end_of_line = lf +>>>>>>> template/carbonengine/resources-updates indent_size = 4 indent_style = space insert_final_newline = false @@ -46,6 +50,7 @@ tab_width = 4 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ij_continuation_indent_size = 8 ij_formatter_off_tag = @formatter:off ij_formatter_on_tag = @formatter:on @@ -1001,6 +1006,8 @@ ij_toml_keep_indents_on_empty_lines = false >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates trim_trailing_whitespace = true [{*.yaml,*.yml,.clang-format,.clang-tidy,_clang-format}] @@ -1028,6 +1035,9 @@ trim_trailing_whitespace = false <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/.gitignore b/.gitignore index 019d8f8..ce70839 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,10 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +binaryCache/ +>>>>>>> template/carbonengine/resources-updates ======= binaryCache/ >>>>>>> template/carbonengine/resources-updates @@ -69,6 +73,7 @@ CMakeUserPresets.json <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ### IDE ### # User generated local IDE configuration @@ -109,3 +114,7 @@ cmake-build* .cmake-build* cmake-build* >>>>>>> template/carbonengine/resources-updates +======= +.cmake-build* +cmake-build* +>>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/MacOS/Project.kt b/.teamcity/MacOS/Project.kt index ffb85c4..619d502 100644 --- a/.teamcity/MacOS/Project.kt +++ b/.teamcity/MacOS/Project.kt @@ -3,7 +3,10 @@ package MacOS import jetbrains.buildServer.configs.kotlin.DslContext import jetbrains.buildServer.configs.kotlin.Project import jetbrains.buildServer.configs.kotlin.* +<<<<<<< HEAD import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests +======= +>>>>>>> template/carbonengine/resources-updates import jetbrains.buildServer.configs.kotlin.buildFeatures.XmlReport import jetbrains.buildServer.configs.kotlin.buildFeatures.commitStatusPublisher import jetbrains.buildServer.configs.kotlin.buildFeatures.freeDiskSpace @@ -57,6 +60,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "%env.CMAKE_INSTALL_PREFIX%" ======= @@ -77,6 +81,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" >>>>>>> template/carbonengine/resources-updates @@ -108,6 +115,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.CTEST_PARALLEL_LEVEL", "1") ======= @@ -131,6 +139,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates +======= + param("env.CTEST_PARALLEL_LEVEL", "8") +>>>>>>> template/carbonengine/resources-updates ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates @@ -168,6 +179,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DBUILD_CLI=ON -DBUILD_TESTING=ON -DBUILD_DOCUMENTATION=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" ======= @@ -182,6 +194,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates +======= + arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" +>>>>>>> template/carbonengine/resources-updates ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates @@ -235,6 +250,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER ======= @@ -248,6 +264,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag >>>>>>> template/carbonengine/resources-updates ======= filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY +>>>>>>> template/carbonengine/resources-updates +======= + filterAuthorRole = GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates } } @@ -272,11 +291,15 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag } sshAgent { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD teamcitySshKey = "ccpgames-evetech GitHub" ======= teamcitySshKey = "ccpgames-carbon" >>>>>>> template/carbonengine/resources-updates +======= + teamcitySshKey = "ccpgames-carbon" +>>>>>>> template/carbonengine/resources-updates ======= teamcitySshKey = "ccpgames-carbon" >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt index 6f4feda..122908b 100644 --- a/.teamcity/Windows/Project.kt +++ b/.teamcity/Windows/Project.kt @@ -3,7 +3,10 @@ package Windows import jetbrains.buildServer.configs.kotlin.DslContext import jetbrains.buildServer.configs.kotlin.Project import jetbrains.buildServer.configs.kotlin.* +<<<<<<< HEAD import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests +======= +>>>>>>> template/carbonengine/resources-updates import jetbrains.buildServer.configs.kotlin.buildFeatures.XmlReport import jetbrains.buildServer.configs.kotlin.buildFeatures.commitStatusPublisher import jetbrains.buildServer.configs.kotlin.buildFeatures.freeDiskSpace @@ -25,6 +28,7 @@ import jetbrains.buildServer.configs.kotlin.buildFeatures.provideAwsCredentials <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD val BuildParameters = "-arch=x64 -vcvars_ver=14.51" val Debug = CarbonBuildWindows("Debug Windows", "Debug", "x64-windows-debug",BuildParameters) val Internal = CarbonBuildWindows("Internal Windows", "Internal", "x64-windows-internal",BuildParameters) @@ -40,6 +44,8 @@ val ReleaseDevFeatures = CarbonBuildWindows("Release Windows with Dev Features", >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates val Debug = CarbonBuildWindows("Debug Windows", "Debug", "x64-windows-debug") val Internal = CarbonBuildWindows("Internal Windows", "Internal", "x64-windows-internal") val TrinityDev = CarbonBuildWindows("TrinityDev Windows", "TrinityDev", "x64-windows-trinitydev") @@ -48,6 +54,9 @@ val Release = CarbonBuildWindows("Release Windows", "Release", "x64-windows-rele <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -73,6 +82,7 @@ object Project : Project({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD buildType(ReleaseDevFeatures) ======= @@ -106,6 +116,8 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates }) @@ -118,6 +130,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -136,6 +151,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("VS_DEV_BAT_SWITCHES", vsDevBatSwitches) ======= @@ -156,6 +172,11 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) options = listOf("v141 (2017)" to "v141", "v143 (2022)" to "v143")) param("VS_DEV_BAT_SWITCHES", "-arch=x64") >>>>>>> template/carbonengine/resources-updates +======= + select("env.VISUAL_STUDIO_PLATFORM_TOOLSET", "v141", label = "Visual Studio Platform Toolset", description = "Specify the toolset for the build. e.g. v141 or v143.", + options = listOf("v141 (2017)" to "v141", "v143 (2022)" to "v143")) + param("VS_DEV_BAT_SWITCHES", "-arch=x64") +>>>>>>> template/carbonengine/resources-updates ======= select("env.VISUAL_STUDIO_PLATFORM_TOOLSET", "v141", label = "Visual Studio Platform Toolset", description = "Specify the toolset for the build. e.g. v141 or v143.", options = listOf("v141 (2017)" to "v141", "v143 (2022)" to "v143")) @@ -181,6 +202,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.CTEST_PARALLEL_LEVEL", "1") ======= @@ -204,6 +226,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates +======= + param("env.CTEST_PARALLEL_LEVEL", "8") +>>>>>>> template/carbonengine/resources-updates ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates @@ -238,6 +263,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% ======= @@ -252,6 +278,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% >>>>>>> template/carbonengine/resources-updates +======= + call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% +>>>>>>> template/carbonengine/resources-updates ======= call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% >>>>>>> template/carbonengine/resources-updates @@ -268,6 +297,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DBUILD_CLI=ON -DBUILD_TESTING=ON -DBUILD_DOCUMENTATION=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" ======= @@ -282,6 +312,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates +======= + arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" +>>>>>>> template/carbonengine/resources-updates ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates @@ -325,6 +358,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) echo Write-Host "##teamcity[progressMessage 'Storing symbols']" <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) ======= @@ -333,6 +367,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) >>>>>>> template/carbonengine/resources-updates +======= + echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) +>>>>>>> template/carbonengine/resources-updates ======= echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) >>>>>>> template/carbonengine/resources-updates @@ -364,6 +401,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= @@ -373,6 +411,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= + >>>>>>> template/carbonengine/resources-updates Write-Host "##teamcity[progressMessage 'Storing symbols']" ${'$'}symstoreFlags = @("add", @@ -386,6 +427,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) & ${'$'}Env:TC_SYMSTORE_PATH ${'$'}symstoreFlags | Tee-Object -file symstore.txt <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ${'$'}stored = get-content symstore.txt | Select-String "^SYMSTORE: Number of files stored = (.*)${'$'}" @@ -401,6 +443,8 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ${'$'}stored = get-content symstore.txt | Select-String "^SYMSTORE: Number of files stored = (.*)${'$'}" @@ -412,12 +456,15 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ${'$'}ignored = get-content symstore.txt | Select-String "^SYMSTORE: Number of files ignored = (.*)${'$'}" ${'$'}ignored = ${'$'}ignored.Matches.Groups[1].Value +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates Write-Host "##teamcity[buildStatus text='Stored: ${'$'}stored, Errors: ${'$'}errors, Ignored: ${'$'}ignored']" """.trimIndent() @@ -445,6 +492,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER ======= @@ -458,6 +506,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) >>>>>>> template/carbonengine/resources-updates ======= filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY +>>>>>>> template/carbonengine/resources-updates +======= + filterAuthorRole = GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates } } @@ -482,11 +533,15 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) } sshAgent { <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD teamcitySshKey = "ccpgames-evetech GitHub" ======= teamcitySshKey = "ccpgames-carbon" >>>>>>> template/carbonengine/resources-updates +======= + teamcitySshKey = "ccpgames-carbon" +>>>>>>> template/carbonengine/resources-updates ======= teamcitySshKey = "ccpgames-carbon" >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/_Self.kt/Project.kt b/.teamcity/_Self.kt/Project.kt index 9fa4ffa..55940e3 100644 --- a/.teamcity/_Self.kt/Project.kt +++ b/.teamcity/_Self.kt/Project.kt @@ -15,6 +15,7 @@ object Project : Project({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description = "Build / Publish pipeline for https://github.com/carbonengine/resources" ======= @@ -38,6 +39,9 @@ object Project : Project({ ======= description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" >>>>>>> template/carbonengine/resources-updates +======= + description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" +>>>>>>> template/carbonengine/resources-updates ======= description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" >>>>>>> template/carbonengine/resources-updates @@ -48,6 +52,7 @@ object Project : Project({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("carbon-pipeline-tools-ref", "refs/heads/main") ======= @@ -59,6 +64,9 @@ object Project : Project({ ======= param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") >>>>>>> template/carbonengine/resources-updates +======= + param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") +>>>>>>> template/carbonengine/resources-updates ======= param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") >>>>>>> template/carbonengine/resources-updates @@ -70,6 +78,10 @@ object Project : Project({ buildType(PublishToPerforce) <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= + buildType(SyncToMirror) +>>>>>>> template/carbonengine/resources-updates ======= buildType(SyncToMirror) >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt index f097bc5..10ccb91 100644 --- a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt +++ b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt @@ -2,6 +2,10 @@ package _Self.buildTypes import jetbrains.buildServer.configs.kotlin.* <<<<<<< HEAD +<<<<<<< HEAD +======= +import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests +>>>>>>> template/carbonengine/resources-updates ======= import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests >>>>>>> template/carbonengine/resources-updates @@ -18,6 +22,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("carbon-pipeline-tools-ref", "refs/heads/main") ======= @@ -29,6 +34,9 @@ class UniversalBuild() : BuildType({ ======= param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") >>>>>>> template/carbonengine/resources-updates +======= + param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") +>>>>>>> template/carbonengine/resources-updates ======= param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") >>>>>>> template/carbonengine/resources-updates @@ -47,6 +55,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "-m 'resources:%system.teamcity.build.workingDir%/bin' -m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", ======= @@ -70,6 +79,9 @@ class UniversalBuild() : BuildType({ ======= "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", >>>>>>> template/carbonengine/resources-updates +======= + "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", +>>>>>>> template/carbonengine/resources-updates ======= "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", >>>>>>> template/carbonengine/resources-updates @@ -87,6 +99,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "%universal-output-dir%" ======= @@ -105,12 +118,17 @@ class UniversalBuild() : BuildType({ vcs { ======= ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates artifactRules = "%universal-output-dir% => artifact.zip" vcs { root(DslContext.settingsRootId, "-:.") <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -173,6 +191,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -193,6 +212,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -210,6 +232,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -230,6 +253,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -248,6 +274,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -268,6 +295,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -285,6 +315,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -305,6 +336,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -323,6 +357,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -343,6 +378,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -360,6 +398,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -380,6 +419,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -398,6 +440,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -418,6 +461,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -435,6 +481,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -455,6 +502,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -464,7 +514,10 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates features { @@ -474,12 +527,19 @@ class UniversalBuild() : BuildType({ authType = token { token = "%GITHUB_CARBON_PAT%" } +<<<<<<< HEAD filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY +======= + filterAuthorRole = GitHubRoleFilter.EVERYBODY +>>>>>>> template/carbonengine/resources-updates } } } <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt index bcd298b..4609503 100644 --- a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt +++ b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt @@ -2,6 +2,10 @@ package _Self.buildTypes import jetbrains.buildServer.configs.kotlin.* <<<<<<< HEAD +<<<<<<< HEAD +======= +import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests +>>>>>>> template/carbonengine/resources-updates ======= import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests >>>>>>> template/carbonengine/resources-updates @@ -38,6 +42,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.TC_BUILD_NUMBER", "Carbon Resources #%build.number%") ======= @@ -62,6 +67,8 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates param("env.TC_BUILD_NUMBER", "Carbon Template #%build.number%") param("env.P4PORT", "p4is.ccp.ad.local:1666") @@ -71,6 +78,9 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -93,6 +103,10 @@ class Publish(perforce_publish_path: String) : BuildType({ vcs { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= + root(DslContext.settingsRootId, "-:.") +>>>>>>> template/carbonengine/resources-updates ======= root(DslContext.settingsRootId, "-:.") >>>>>>> template/carbonengine/resources-updates @@ -268,6 +282,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -288,6 +303,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -305,6 +323,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -325,6 +344,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -342,6 +364,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -362,6 +385,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -379,6 +405,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -399,6 +426,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -416,6 +446,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -436,6 +467,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -447,10 +481,13 @@ class Publish(perforce_publish_path: String) : BuildType({ } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates features { pullRequests { @@ -459,14 +496,21 @@ class Publish(perforce_publish_path: String) : BuildType({ authType = token { token = "%GITHUB_CARBON_PAT%" } +<<<<<<< HEAD filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY +======= + filterAuthorRole = GitHubRoleFilter.EVERYBODY +>>>>>>> template/carbonengine/resources-updates } } } +<<<<<<< HEAD <<<<<<< HEAD >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates requirements { contains("teamcity.agent.jvm.os.name", "Windows") @@ -482,6 +526,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD val PublishToPerforce = Publish("vendor/github.com/carbonengine/resources") ======= val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") @@ -507,3 +552,6 @@ val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") ======= val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") >>>>>>> template/carbonengine/resources-updates +======= +val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") +>>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml index cb40ca6..8e00cdf 100644 --- a/.teamcity/pom.xml +++ b/.teamcity/pom.xml @@ -8,6 +8,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Carbon Resources Config DSL Script Carbon_Resources @@ -47,6 +48,11 @@ Carbon_Template Carbon_Template_dsl >>>>>>> template/carbonengine/resources-updates +======= + Carbon Template Config DSL Script + Carbon_Template + Carbon_Template_dsl +>>>>>>> template/carbonengine/resources-updates ======= Carbon Template Config DSL Script Carbon_Template diff --git a/CMakeLists.txt b/CMakeLists.txt index b663535..93d607f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # Copyright © 2025 CCP ehf. cmake_minimum_required(VERSION 3.31.1) @@ -120,6 +121,8 @@ get_target_property(_SOURCES resources SOURCES) >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates cmake_minimum_required(VERSION 3.16) project(CarbonTemplateProject VERSION 1.0.0) @@ -136,6 +139,9 @@ get_target_property(_SOURCES target_name SOURCES) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -161,6 +167,7 @@ source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if(BUILD_CLI) add_subdirectory(cli) endif() @@ -198,6 +205,8 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates set_target_properties(target_name PROPERTIES OUTPUT_NAME "_target_name") target_include_directories(target_name @@ -217,6 +226,9 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -247,6 +259,9 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -281,6 +296,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD # Ensure that resources is built before Spinx target add_dependencies(Sphinx resources) @@ -349,6 +365,8 @@ endif () ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates add_dependencies(Sphinx target_name) endif() @@ -408,6 +426,10 @@ endif () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +endif() +>>>>>>> template/carbonengine/resources-updates +======= endif() >>>>>>> template/carbonengine/resources-updates ======= diff --git a/CMakePresets.json b/CMakePresets.json index 1474067..e8593e2 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -19,6 +19,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "CMAKE_COMPILE_WARNING_AS_ERROR": "ON", ======= @@ -30,6 +31,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/triplets" }, @@ -66,6 +69,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-145-carbon.cmake" ======= @@ -80,6 +84,9 @@ ======= "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" >>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" >>>>>>> template/carbonengine/resources-updates @@ -109,6 +116,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> template/carbonengine/resources-updates @@ -119,6 +127,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates { "name": "x64-windows-internal", @@ -129,6 +139,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-internal", "VCPKG_HOST_TRIPLET": "x64-windows-145-internal" @@ -148,6 +159,10 @@ "VCPKG_TARGET_TRIPLET": "x64-windows-internal", "VCPKG_HOST_TRIPLET": "x64-windows-internal" >>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-internal", + "VCPKG_HOST_TRIPLET": "x64-windows-internal" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_TARGET_TRIPLET": "x64-windows-internal", "VCPKG_HOST_TRIPLET": "x64-windows-internal" @@ -163,6 +178,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-release", "VCPKG_HOST_TRIPLET": "x64-windows-145-release" @@ -182,6 +198,10 @@ "VCPKG_TARGET_TRIPLET": "x64-windows-release", "VCPKG_HOST_TRIPLET": "x64-windows-release" >>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-release", + "VCPKG_HOST_TRIPLET": "x64-windows-release" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_TARGET_TRIPLET": "x64-windows-release", "VCPKG_HOST_TRIPLET": "x64-windows-release" @@ -197,6 +217,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-debug", "VCPKG_HOST_TRIPLET": "x64-windows-145-debug" @@ -216,6 +237,10 @@ "VCPKG_TARGET_TRIPLET": "x64-windows-debug", "VCPKG_HOST_TRIPLET": "x64-windows-debug" >>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-debug", + "VCPKG_HOST_TRIPLET": "x64-windows-debug" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_TARGET_TRIPLET": "x64-windows-debug", "VCPKG_HOST_TRIPLET": "x64-windows-debug" @@ -231,6 +256,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-trinitydev", "VCPKG_HOST_TRIPLET": "x64-windows-145-trinitydev" @@ -261,6 +287,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "VCPKG_TARGET_TRIPLET": "x64-windows-trinitydev", "VCPKG_HOST_TRIPLET": "x64-windows-trinitydev" @@ -271,6 +299,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index c2aa67a..064ab14 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -82,6 +82,7 @@ PROJECT_ICON = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD OUTPUT_DIRECTORY = @CMAKE_CURRENT_BINARY_DIR@/docs/ ======= OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ @@ -107,6 +108,9 @@ OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ ======= OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ >>>>>>> template/carbonengine/resources-updates +======= +OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ +>>>>>>> template/carbonengine/resources-updates # If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 # sub-directories (in 2 levels) under the output directory of each output format diff --git a/doc/source/conf.py b/doc/source/conf.py index 3690496..ded2de9 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -14,6 +14,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD project = 'resources' copyright = 'Copyright © 2025 CCP ehf' ======= @@ -48,6 +49,10 @@ project = 'project_name' copyright = '2024, CCP Games' >>>>>>> template/carbonengine/resources-updates +======= +project = 'project_name' +copyright = '2024, CCP Games' +>>>>>>> template/carbonengine/resources-updates author = 'CCP Games' release = '0.1' diff --git a/doc/source/index.rst b/doc/source/index.rst index 76d0974..8ef404d 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -6,6 +6,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD resources Documentation ============================== @@ -65,6 +66,8 @@ Contents >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates project_name Documentation ========================== @@ -99,6 +102,10 @@ project_name Documentation <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +.. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html +>>>>>>> template/carbonengine/resources-updates +======= .. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html >>>>>>> template/carbonengine/resources-updates ======= diff --git a/tests/tests.md b/tests/tests.md index 8ab6a11..a599845 100644 --- a/tests/tests.md +++ b/tests/tests.md @@ -10,6 +10,7 @@ This folder is where all the tests for the project should be stored, whether the <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD [See a C++ example here](https://github.com/carbonengine/resources/tree/main/tests/src) ======= ======= @@ -26,6 +27,8 @@ This folder is where all the tests for the project should be stored, whether the >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates [See a C++ example here](https://github.com/ccpgames/carbon-destiny/tree/main/tests) [See a Python example here](https://github.com/ccpgames/carbon-fsd/tree/main/tests) @@ -37,6 +40,9 @@ This folder is where all the tests for the project should be stored, whether the <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index 8237769..933ef82 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -8,6 +8,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "baseline": "bea476a80218a581bcb5318595849520217c825e", ======= @@ -31,6 +32,9 @@ ======= "baseline": "242ac6932a9cd2607332969129e9572516f28d65", >>>>>>> template/carbonengine/resources-updates +======= + "baseline": "242ac6932a9cd2607332969129e9572516f28d65", +>>>>>>> template/carbonengine/resources-updates ======= "baseline": "242ac6932a9cd2607332969129e9572516f28d65", >>>>>>> template/carbonengine/resources-updates @@ -46,6 +50,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "repository": "git@github.com:carbonengine/vcpkg-registry.git", "baseline": "b3b922c476b0dedfa8342a75e89975c74441fc75", @@ -64,6 +69,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "repository": "git@github.com:ccpgames/carbon-vcpkg-registry.git", "baseline": "bd0e4644d7d8a7ce9bfa426192cdf37a23e61b5f", @@ -81,6 +88,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/vcpkg.json b/vcpkg.json index a392c3c..f2e68c5 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -5,6 +5,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "name": "bsdiff-drake127", "version>=": "4.3.3#2" @@ -74,6 +75,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "name": "python3", "version>=": "3.12.9#1", @@ -90,6 +93,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates From 66a600f1da610973e35c8c80f20dd31f8395e5e8 Mon Sep 17 00:00:00 2001 From: ccpgames-carbon Date: Fri, 25 Sep 2026 17:19:11 +0000 Subject: [PATCH 10/12] Merge commit 54c18b7d6a8459a68b1e07b46ee37386d3a4bc81 from carbon-template branch=carbonengine/resources-updates: Add back PullRequests in addition to pull Requests --- .clang-format | 11 ++++ .editorconfig | 10 +++ .gitignore | 9 +++ .teamcity/MacOS/Project.kt | 27 ++++++++ .teamcity/Windows/Project.kt | 59 ++++++++++++++++++ .teamcity/_Self.kt/Project.kt | 12 ++++ .../buildTypes/CreateUniversalBuilds.kt | 61 +++++++++++++++++++ .../_Self.kt/buildTypes/PublishToPerforce.kt | 49 +++++++++++++++ .teamcity/pom.xml | 6 ++ CMakeLists.txt | 22 +++++++ CMakePresets.json | 31 ++++++++++ doc/Doxyfile.in | 4 ++ doc/source/conf.py | 5 ++ doc/source/index.rst | 7 +++ tests/tests.md | 6 ++ vcpkg-configuration.json | 10 +++ vcpkg.json | 6 ++ 17 files changed, 335 insertions(+) diff --git a/.clang-format b/.clang-format index d4846eb..08872c4 100644 --- a/.clang-format +++ b/.clang-format @@ -79,6 +79,7 @@ SpacesInSquareBrackets: false <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Standard: Cpp11 ======= Standard: Cpp17 @@ -107,6 +108,9 @@ Standard: Cpp17 ======= Standard: Cpp17 >>>>>>> template/carbonengine/resources-updates +======= +Standard: Cpp17 +>>>>>>> template/carbonengine/resources-updates TabWidth: 4 UseTab: ForContinuationAndIndentation --- @@ -191,6 +195,7 @@ SpacesInSquareBrackets: false <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Standard: Cpp11 TabWidth: 4 UseTab: ForContinuationAndIndentation @@ -249,3 +254,9 @@ TabWidth: 4 UseTab: ForContinuationAndIndentation ... >>>>>>> template/carbonengine/resources-updates +======= +Standard: Cpp17 +TabWidth: 4 +UseTab: ForContinuationAndIndentation +... +>>>>>>> template/carbonengine/resources-updates diff --git a/.editorconfig b/.editorconfig index 8855709..475bbab 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,6 +9,7 @@ charset = utf-8 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD end_of_line = crlf ======= end_of_line = lf @@ -37,6 +38,9 @@ end_of_line = lf ======= end_of_line = lf >>>>>>> template/carbonengine/resources-updates +======= +end_of_line = lf +>>>>>>> template/carbonengine/resources-updates indent_size = 4 indent_style = space insert_final_newline = false @@ -51,6 +55,7 @@ tab_width = 4 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ij_continuation_indent_size = 8 ij_formatter_off_tag = @formatter:off ij_formatter_on_tag = @formatter:on @@ -1008,6 +1013,8 @@ ij_toml_keep_indents_on_empty_lines = false >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates trim_trailing_whitespace = true [{*.yaml,*.yml,.clang-format,.clang-tidy,_clang-format}] @@ -1036,6 +1043,9 @@ trim_trailing_whitespace = false <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/.gitignore b/.gitignore index ce70839..3587f4b 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,10 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +binaryCache/ +>>>>>>> template/carbonengine/resources-updates ======= binaryCache/ >>>>>>> template/carbonengine/resources-updates @@ -74,6 +78,7 @@ CMakeUserPresets.json <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ### IDE ### # User generated local IDE configuration @@ -118,3 +123,7 @@ cmake-build* .cmake-build* cmake-build* >>>>>>> template/carbonengine/resources-updates +======= +.cmake-build* +cmake-build* +>>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/MacOS/Project.kt b/.teamcity/MacOS/Project.kt index 619d502..2a3b4c5 100644 --- a/.teamcity/MacOS/Project.kt +++ b/.teamcity/MacOS/Project.kt @@ -4,14 +4,21 @@ import jetbrains.buildServer.configs.kotlin.DslContext import jetbrains.buildServer.configs.kotlin.Project import jetbrains.buildServer.configs.kotlin.* <<<<<<< HEAD +<<<<<<< HEAD import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates import jetbrains.buildServer.configs.kotlin.buildFeatures.XmlReport import jetbrains.buildServer.configs.kotlin.buildFeatures.commitStatusPublisher import jetbrains.buildServer.configs.kotlin.buildFeatures.freeDiskSpace import jetbrains.buildServer.configs.kotlin.buildFeatures.nuGetFeedCredentials import jetbrains.buildServer.configs.kotlin.buildFeatures.perfmon +<<<<<<< HEAD +======= +import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests +>>>>>>> template/carbonengine/resources-updates import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests import jetbrains.buildServer.configs.kotlin.buildFeatures.sshAgent import jetbrains.buildServer.configs.kotlin.buildFeatures.xmlReport @@ -61,6 +68,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "%env.CMAKE_INSTALL_PREFIX%" ======= @@ -84,6 +92,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" >>>>>>> template/carbonengine/resources-updates @@ -116,6 +127,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.CTEST_PARALLEL_LEVEL", "1") ======= @@ -142,6 +154,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates +======= + param("env.CTEST_PARALLEL_LEVEL", "8") +>>>>>>> template/carbonengine/resources-updates ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates @@ -180,6 +195,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DBUILD_CLI=ON -DBUILD_TESTING=ON -DBUILD_DOCUMENTATION=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" ======= @@ -197,6 +213,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates +======= + arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" +>>>>>>> template/carbonengine/resources-updates ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates @@ -251,6 +270,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER ======= @@ -267,6 +287,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag >>>>>>> template/carbonengine/resources-updates ======= filterAuthorRole = GitHubRoleFilter.EVERYBODY +>>>>>>> template/carbonengine/resources-updates +======= + filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates } } @@ -292,6 +315,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag sshAgent { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD teamcitySshKey = "ccpgames-evetech GitHub" ======= @@ -300,6 +324,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= teamcitySshKey = "ccpgames-carbon" >>>>>>> template/carbonengine/resources-updates +======= + teamcitySshKey = "ccpgames-carbon" +>>>>>>> template/carbonengine/resources-updates ======= teamcitySshKey = "ccpgames-carbon" >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt index 122908b..21199ef 100644 --- a/.teamcity/Windows/Project.kt +++ b/.teamcity/Windows/Project.kt @@ -4,14 +4,21 @@ import jetbrains.buildServer.configs.kotlin.DslContext import jetbrains.buildServer.configs.kotlin.Project import jetbrains.buildServer.configs.kotlin.* <<<<<<< HEAD +<<<<<<< HEAD import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates import jetbrains.buildServer.configs.kotlin.buildFeatures.XmlReport import jetbrains.buildServer.configs.kotlin.buildFeatures.commitStatusPublisher import jetbrains.buildServer.configs.kotlin.buildFeatures.freeDiskSpace import jetbrains.buildServer.configs.kotlin.buildFeatures.nuGetFeedCredentials import jetbrains.buildServer.configs.kotlin.buildFeatures.perfmon +<<<<<<< HEAD +======= +import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests +>>>>>>> template/carbonengine/resources-updates import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests import jetbrains.buildServer.configs.kotlin.buildFeatures.sshAgent import jetbrains.buildServer.configs.kotlin.buildFeatures.xmlReport @@ -29,6 +36,7 @@ import jetbrains.buildServer.configs.kotlin.buildFeatures.provideAwsCredentials <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD val BuildParameters = "-arch=x64 -vcvars_ver=14.51" val Debug = CarbonBuildWindows("Debug Windows", "Debug", "x64-windows-debug",BuildParameters) val Internal = CarbonBuildWindows("Internal Windows", "Internal", "x64-windows-internal",BuildParameters) @@ -46,6 +54,8 @@ val ReleaseDevFeatures = CarbonBuildWindows("Release Windows with Dev Features", >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates val Debug = CarbonBuildWindows("Debug Windows", "Debug", "x64-windows-debug") val Internal = CarbonBuildWindows("Internal Windows", "Internal", "x64-windows-internal") val TrinityDev = CarbonBuildWindows("TrinityDev Windows", "TrinityDev", "x64-windows-trinitydev") @@ -55,6 +65,9 @@ val Release = CarbonBuildWindows("Release Windows", "Release", "x64-windows-rele <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -83,6 +96,7 @@ object Project : Project({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD buildType(ReleaseDevFeatures) ======= @@ -118,6 +132,8 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates }) @@ -131,6 +147,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -152,6 +171,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("VS_DEV_BAT_SWITCHES", vsDevBatSwitches) ======= @@ -177,6 +197,11 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) options = listOf("v141 (2017)" to "v141", "v143 (2022)" to "v143")) param("VS_DEV_BAT_SWITCHES", "-arch=x64") >>>>>>> template/carbonengine/resources-updates +======= + select("env.VISUAL_STUDIO_PLATFORM_TOOLSET", "v141", label = "Visual Studio Platform Toolset", description = "Specify the toolset for the build. e.g. v141 or v143.", + options = listOf("v141 (2017)" to "v141", "v143 (2022)" to "v143")) + param("VS_DEV_BAT_SWITCHES", "-arch=x64") +>>>>>>> template/carbonengine/resources-updates ======= select("env.VISUAL_STUDIO_PLATFORM_TOOLSET", "v141", label = "Visual Studio Platform Toolset", description = "Specify the toolset for the build. e.g. v141 or v143.", options = listOf("v141 (2017)" to "v141", "v143 (2022)" to "v143")) @@ -203,6 +228,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.CTEST_PARALLEL_LEVEL", "1") ======= @@ -229,6 +255,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates +======= + param("env.CTEST_PARALLEL_LEVEL", "8") +>>>>>>> template/carbonengine/resources-updates ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates @@ -264,6 +293,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% ======= @@ -281,6 +311,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% >>>>>>> template/carbonengine/resources-updates +======= + call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% +>>>>>>> template/carbonengine/resources-updates ======= call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% >>>>>>> template/carbonengine/resources-updates @@ -298,6 +331,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DBUILD_CLI=ON -DBUILD_TESTING=ON -DBUILD_DOCUMENTATION=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" ======= @@ -315,6 +349,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates +======= + arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" +>>>>>>> template/carbonengine/resources-updates ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates @@ -359,6 +396,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) ======= @@ -370,6 +408,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) >>>>>>> template/carbonengine/resources-updates +======= + echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) +>>>>>>> template/carbonengine/resources-updates ======= echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) >>>>>>> template/carbonengine/resources-updates @@ -402,6 +443,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= @@ -414,6 +456,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= + >>>>>>> template/carbonengine/resources-updates Write-Host "##teamcity[progressMessage 'Storing symbols']" ${'$'}symstoreFlags = @("add", @@ -428,6 +473,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ${'$'}stored = get-content symstore.txt | Select-String "^SYMSTORE: Number of files stored = (.*)${'$'}" @@ -445,6 +491,8 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ${'$'}stored = get-content symstore.txt | Select-String "^SYMSTORE: Number of files stored = (.*)${'$'}" @@ -459,6 +507,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -493,6 +544,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER ======= @@ -509,6 +561,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) >>>>>>> template/carbonengine/resources-updates ======= filterAuthorRole = GitHubRoleFilter.EVERYBODY +>>>>>>> template/carbonengine/resources-updates +======= + filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates } } @@ -534,6 +589,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) sshAgent { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD teamcitySshKey = "ccpgames-evetech GitHub" ======= @@ -542,6 +598,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= teamcitySshKey = "ccpgames-carbon" >>>>>>> template/carbonengine/resources-updates +======= + teamcitySshKey = "ccpgames-carbon" +>>>>>>> template/carbonengine/resources-updates ======= teamcitySshKey = "ccpgames-carbon" >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/_Self.kt/Project.kt b/.teamcity/_Self.kt/Project.kt index 55940e3..407ba8e 100644 --- a/.teamcity/_Self.kt/Project.kt +++ b/.teamcity/_Self.kt/Project.kt @@ -16,6 +16,7 @@ object Project : Project({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description = "Build / Publish pipeline for https://github.com/carbonengine/resources" ======= @@ -42,6 +43,9 @@ object Project : Project({ ======= description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" >>>>>>> template/carbonengine/resources-updates +======= + description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" +>>>>>>> template/carbonengine/resources-updates ======= description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" >>>>>>> template/carbonengine/resources-updates @@ -53,6 +57,7 @@ object Project : Project({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("carbon-pipeline-tools-ref", "refs/heads/main") ======= @@ -67,6 +72,9 @@ object Project : Project({ ======= param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") >>>>>>> template/carbonengine/resources-updates +======= + param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") +>>>>>>> template/carbonengine/resources-updates ======= param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") >>>>>>> template/carbonengine/resources-updates @@ -79,6 +87,10 @@ object Project : Project({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= + buildType(SyncToMirror) +>>>>>>> template/carbonengine/resources-updates ======= buildType(SyncToMirror) >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt index 10ccb91..6af77a2 100644 --- a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt +++ b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt @@ -3,10 +3,15 @@ package _Self.buildTypes import jetbrains.buildServer.configs.kotlin.* <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests +>>>>>>> template/carbonengine/resources-updates ======= import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests >>>>>>> template/carbonengine/resources-updates ======= +import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests >>>>>>> template/carbonengine/resources-updates import jetbrains.buildServer.configs.kotlin.buildFeatures.vcsLabeling @@ -23,6 +28,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("carbon-pipeline-tools-ref", "refs/heads/main") ======= @@ -37,6 +43,9 @@ class UniversalBuild() : BuildType({ ======= param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") >>>>>>> template/carbonengine/resources-updates +======= + param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") +>>>>>>> template/carbonengine/resources-updates ======= param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") >>>>>>> template/carbonengine/resources-updates @@ -56,6 +65,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "-m 'resources:%system.teamcity.build.workingDir%/bin' -m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", ======= @@ -82,6 +92,9 @@ class UniversalBuild() : BuildType({ ======= "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", >>>>>>> template/carbonengine/resources-updates +======= + "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", +>>>>>>> template/carbonengine/resources-updates ======= "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", >>>>>>> template/carbonengine/resources-updates @@ -100,6 +113,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "%universal-output-dir%" ======= @@ -120,6 +134,8 @@ class UniversalBuild() : BuildType({ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates artifactRules = "%universal-output-dir% => artifact.zip" @@ -127,6 +143,9 @@ class UniversalBuild() : BuildType({ root(DslContext.settingsRootId, "-:.") <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -192,6 +211,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -215,6 +235,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -233,6 +256,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -256,6 +280,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -275,6 +302,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -298,6 +326,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -316,6 +347,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -339,6 +371,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -358,6 +393,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -381,6 +417,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -399,6 +438,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -422,6 +462,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -441,6 +484,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -464,6 +508,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -482,6 +529,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -505,6 +553,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -515,10 +566,13 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates features { pullRequests { @@ -527,10 +581,14 @@ class UniversalBuild() : BuildType({ authType = token { token = "%GITHUB_CARBON_PAT%" } +<<<<<<< HEAD <<<<<<< HEAD filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY ======= filterAuthorRole = GitHubRoleFilter.EVERYBODY +>>>>>>> template/carbonengine/resources-updates +======= + filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates } } @@ -538,6 +596,9 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt index 4609503..f504236 100644 --- a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt +++ b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt @@ -3,10 +3,15 @@ package _Self.buildTypes import jetbrains.buildServer.configs.kotlin.* <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests +>>>>>>> template/carbonengine/resources-updates ======= import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests >>>>>>> template/carbonengine/resources-updates ======= +import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests >>>>>>> template/carbonengine/resources-updates import jetbrains.buildServer.configs.kotlin.buildFeatures.vcsLabeling @@ -43,6 +48,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.TC_BUILD_NUMBER", "Carbon Resources #%build.number%") ======= @@ -69,6 +75,8 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates param("env.TC_BUILD_NUMBER", "Carbon Template #%build.number%") param("env.P4PORT", "p4is.ccp.ad.local:1666") @@ -79,6 +87,9 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -104,6 +115,10 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= + root(DslContext.settingsRootId, "-:.") +>>>>>>> template/carbonengine/resources-updates ======= root(DslContext.settingsRootId, "-:.") >>>>>>> template/carbonengine/resources-updates @@ -283,6 +298,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -306,6 +322,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -324,6 +343,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -347,6 +367,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -365,6 +388,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -388,6 +412,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -406,6 +433,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -429,6 +457,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -447,6 +478,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -470,6 +502,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -484,7 +519,10 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates ======= @@ -496,21 +534,28 @@ class Publish(perforce_publish_path: String) : BuildType({ authType = token { token = "%GITHUB_CARBON_PAT%" } +<<<<<<< HEAD <<<<<<< HEAD filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY ======= filterAuthorRole = GitHubRoleFilter.EVERYBODY +>>>>>>> template/carbonengine/resources-updates +======= + filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates } } } +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates requirements { contains("teamcity.agent.jvm.os.name", "Windows") @@ -527,6 +572,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD val PublishToPerforce = Publish("vendor/github.com/carbonengine/resources") ======= val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") @@ -555,3 +601,6 @@ val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") ======= val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") >>>>>>> template/carbonengine/resources-updates +======= +val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") +>>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml index 8e00cdf..ba5557d 100644 --- a/.teamcity/pom.xml +++ b/.teamcity/pom.xml @@ -9,6 +9,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Carbon Resources Config DSL Script Carbon_Resources @@ -53,6 +54,11 @@ Carbon_Template Carbon_Template_dsl >>>>>>> template/carbonengine/resources-updates +======= + Carbon Template Config DSL Script + Carbon_Template + Carbon_Template_dsl +>>>>>>> template/carbonengine/resources-updates ======= Carbon Template Config DSL Script Carbon_Template diff --git a/CMakeLists.txt b/CMakeLists.txt index 93d607f..f0abd07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # Copyright © 2025 CCP ehf. cmake_minimum_required(VERSION 3.31.1) @@ -123,6 +124,8 @@ get_target_property(_SOURCES resources SOURCES) >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates cmake_minimum_required(VERSION 3.16) project(CarbonTemplateProject VERSION 1.0.0) @@ -140,6 +143,9 @@ get_target_property(_SOURCES target_name SOURCES) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -168,6 +174,7 @@ source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if(BUILD_CLI) add_subdirectory(cli) endif() @@ -207,6 +214,8 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates set_target_properties(target_name PROPERTIES OUTPUT_NAME "_target_name") target_include_directories(target_name @@ -227,6 +236,9 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -260,6 +272,9 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -297,6 +312,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD # Ensure that resources is built before Spinx target add_dependencies(Sphinx resources) @@ -367,6 +383,8 @@ endif () ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates add_dependencies(Sphinx target_name) endif() @@ -427,6 +445,10 @@ endif () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +endif() +>>>>>>> template/carbonengine/resources-updates +======= endif() >>>>>>> template/carbonengine/resources-updates ======= diff --git a/CMakePresets.json b/CMakePresets.json index e8593e2..2217586 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -20,6 +20,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "CMAKE_COMPILE_WARNING_AS_ERROR": "ON", ======= @@ -33,6 +34,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/triplets" }, @@ -70,6 +73,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-145-carbon.cmake" ======= @@ -87,6 +91,9 @@ ======= "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" >>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" >>>>>>> template/carbonengine/resources-updates @@ -117,6 +124,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> template/carbonengine/resources-updates @@ -129,6 +137,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates { "name": "x64-windows-internal", @@ -140,6 +150,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-internal", "VCPKG_HOST_TRIPLET": "x64-windows-145-internal" @@ -163,6 +174,10 @@ "VCPKG_TARGET_TRIPLET": "x64-windows-internal", "VCPKG_HOST_TRIPLET": "x64-windows-internal" >>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-internal", + "VCPKG_HOST_TRIPLET": "x64-windows-internal" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_TARGET_TRIPLET": "x64-windows-internal", "VCPKG_HOST_TRIPLET": "x64-windows-internal" @@ -179,6 +194,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-release", "VCPKG_HOST_TRIPLET": "x64-windows-145-release" @@ -202,6 +218,10 @@ "VCPKG_TARGET_TRIPLET": "x64-windows-release", "VCPKG_HOST_TRIPLET": "x64-windows-release" >>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-release", + "VCPKG_HOST_TRIPLET": "x64-windows-release" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_TARGET_TRIPLET": "x64-windows-release", "VCPKG_HOST_TRIPLET": "x64-windows-release" @@ -218,6 +238,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-debug", "VCPKG_HOST_TRIPLET": "x64-windows-145-debug" @@ -241,6 +262,10 @@ "VCPKG_TARGET_TRIPLET": "x64-windows-debug", "VCPKG_HOST_TRIPLET": "x64-windows-debug" >>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-debug", + "VCPKG_HOST_TRIPLET": "x64-windows-debug" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_TARGET_TRIPLET": "x64-windows-debug", "VCPKG_HOST_TRIPLET": "x64-windows-debug" @@ -257,6 +282,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-trinitydev", "VCPKG_HOST_TRIPLET": "x64-windows-145-trinitydev" @@ -289,6 +315,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "VCPKG_TARGET_TRIPLET": "x64-windows-trinitydev", "VCPKG_HOST_TRIPLET": "x64-windows-trinitydev" @@ -300,6 +328,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 064ab14..d30f728 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -83,6 +83,7 @@ PROJECT_ICON = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD OUTPUT_DIRECTORY = @CMAKE_CURRENT_BINARY_DIR@/docs/ ======= OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ @@ -111,6 +112,9 @@ OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ ======= OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ >>>>>>> template/carbonengine/resources-updates +======= +OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ +>>>>>>> template/carbonengine/resources-updates # If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 # sub-directories (in 2 levels) under the output directory of each output format diff --git a/doc/source/conf.py b/doc/source/conf.py index ded2de9..8dd329b 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -15,6 +15,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD project = 'resources' copyright = 'Copyright © 2025 CCP ehf' ======= @@ -53,6 +54,10 @@ project = 'project_name' copyright = '2024, CCP Games' >>>>>>> template/carbonengine/resources-updates +======= +project = 'project_name' +copyright = '2024, CCP Games' +>>>>>>> template/carbonengine/resources-updates author = 'CCP Games' release = '0.1' diff --git a/doc/source/index.rst b/doc/source/index.rst index 8ef404d..89b64fe 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -7,6 +7,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD resources Documentation ============================== @@ -68,6 +69,8 @@ Contents >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates project_name Documentation ========================== @@ -103,6 +106,10 @@ project_name Documentation <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +.. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html +>>>>>>> template/carbonengine/resources-updates +======= .. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html >>>>>>> template/carbonengine/resources-updates ======= diff --git a/tests/tests.md b/tests/tests.md index a599845..31a5ad3 100644 --- a/tests/tests.md +++ b/tests/tests.md @@ -11,6 +11,7 @@ This folder is where all the tests for the project should be stored, whether the <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD [See a C++ example here](https://github.com/carbonengine/resources/tree/main/tests/src) ======= ======= @@ -29,6 +30,8 @@ This folder is where all the tests for the project should be stored, whether the >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates [See a C++ example here](https://github.com/ccpgames/carbon-destiny/tree/main/tests) [See a Python example here](https://github.com/ccpgames/carbon-fsd/tree/main/tests) @@ -41,6 +44,9 @@ This folder is where all the tests for the project should be stored, whether the <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index 933ef82..6284e41 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -9,6 +9,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "baseline": "bea476a80218a581bcb5318595849520217c825e", ======= @@ -35,6 +36,9 @@ ======= "baseline": "242ac6932a9cd2607332969129e9572516f28d65", >>>>>>> template/carbonengine/resources-updates +======= + "baseline": "242ac6932a9cd2607332969129e9572516f28d65", +>>>>>>> template/carbonengine/resources-updates ======= "baseline": "242ac6932a9cd2607332969129e9572516f28d65", >>>>>>> template/carbonengine/resources-updates @@ -51,6 +55,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "repository": "git@github.com:carbonengine/vcpkg-registry.git", "baseline": "b3b922c476b0dedfa8342a75e89975c74441fc75", @@ -71,6 +76,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "repository": "git@github.com:ccpgames/carbon-vcpkg-registry.git", "baseline": "bd0e4644d7d8a7ce9bfa426192cdf37a23e61b5f", @@ -89,6 +96,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/vcpkg.json b/vcpkg.json index f2e68c5..ea24985 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -6,6 +6,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "name": "bsdiff-drake127", "version>=": "4.3.3#2" @@ -77,6 +78,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "name": "python3", "version>=": "3.12.9#1", @@ -94,6 +97,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates From efa3d9339a279ab545262b8613cd665e9474035c Mon Sep 17 00:00:00 2001 From: ccpgames-carbon Date: Sat, 26 Sep 2026 13:16:18 +0000 Subject: [PATCH 11/12] Merge commit 5c6d9ce9165c417bef43a64d423791423ff3f80c from carbon-template branch=carbonengine/resources-updates: Merge pull request #38 from ccptoebeans/v145 Build project with MSVC v145 compiler by default on Windows --- .clang-format | 11 ++++ .editorconfig | 10 +++ .gitignore | 9 +++ .teamcity/MacOS/Project.kt | 27 ++++++++ .teamcity/Windows/Project.kt | 61 +++++++++++++++++++ .teamcity/_Self.kt/Project.kt | 12 ++++ .../buildTypes/CreateUniversalBuilds.kt | 61 +++++++++++++++++++ .../_Self.kt/buildTypes/PublishToPerforce.kt | 49 +++++++++++++++ .teamcity/pom.xml | 6 ++ CMakeLists.txt | 22 +++++++ CMakePresets.json | 31 ++++++++++ doc/Doxyfile.in | 4 ++ doc/source/conf.py | 5 ++ doc/source/index.rst | 7 +++ tests/tests.md | 6 ++ vcpkg-configuration.json | 21 +++++++ vcpkg.json | 10 +++ 17 files changed, 352 insertions(+) diff --git a/.clang-format b/.clang-format index 08872c4..0275e18 100644 --- a/.clang-format +++ b/.clang-format @@ -80,6 +80,7 @@ SpacesInSquareBrackets: false <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Standard: Cpp11 ======= Standard: Cpp17 @@ -111,6 +112,9 @@ Standard: Cpp17 ======= Standard: Cpp17 >>>>>>> template/carbonengine/resources-updates +======= +Standard: Cpp17 +>>>>>>> template/carbonengine/resources-updates TabWidth: 4 UseTab: ForContinuationAndIndentation --- @@ -196,6 +200,7 @@ SpacesInSquareBrackets: false <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Standard: Cpp11 TabWidth: 4 UseTab: ForContinuationAndIndentation @@ -260,3 +265,9 @@ TabWidth: 4 UseTab: ForContinuationAndIndentation ... >>>>>>> template/carbonengine/resources-updates +======= +Standard: Cpp17 +TabWidth: 4 +UseTab: ForContinuationAndIndentation +... +>>>>>>> template/carbonengine/resources-updates diff --git a/.editorconfig b/.editorconfig index 475bbab..efb4e84 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,6 +10,7 @@ charset = utf-8 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD end_of_line = crlf ======= end_of_line = lf @@ -41,6 +42,9 @@ end_of_line = lf ======= end_of_line = lf >>>>>>> template/carbonengine/resources-updates +======= +end_of_line = lf +>>>>>>> template/carbonengine/resources-updates indent_size = 4 indent_style = space insert_final_newline = false @@ -56,6 +60,7 @@ tab_width = 4 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ij_continuation_indent_size = 8 ij_formatter_off_tag = @formatter:off ij_formatter_on_tag = @formatter:on @@ -1015,6 +1020,8 @@ ij_toml_keep_indents_on_empty_lines = false >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates trim_trailing_whitespace = true [{*.yaml,*.yml,.clang-format,.clang-tidy,_clang-format}] @@ -1044,6 +1051,9 @@ trim_trailing_whitespace = false <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/.gitignore b/.gitignore index 3587f4b..5324da0 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,10 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +binaryCache/ +>>>>>>> template/carbonengine/resources-updates ======= binaryCache/ >>>>>>> template/carbonengine/resources-updates @@ -79,6 +83,7 @@ CMakeUserPresets.json <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ### IDE ### # User generated local IDE configuration @@ -127,3 +132,7 @@ cmake-build* .cmake-build* cmake-build* >>>>>>> template/carbonengine/resources-updates +======= +.cmake-build* +cmake-build* +>>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/MacOS/Project.kt b/.teamcity/MacOS/Project.kt index 2a3b4c5..6450046 100644 --- a/.teamcity/MacOS/Project.kt +++ b/.teamcity/MacOS/Project.kt @@ -5,17 +5,24 @@ import jetbrains.buildServer.configs.kotlin.Project import jetbrains.buildServer.configs.kotlin.* <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests ======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates import jetbrains.buildServer.configs.kotlin.buildFeatures.XmlReport import jetbrains.buildServer.configs.kotlin.buildFeatures.commitStatusPublisher import jetbrains.buildServer.configs.kotlin.buildFeatures.freeDiskSpace import jetbrains.buildServer.configs.kotlin.buildFeatures.nuGetFeedCredentials import jetbrains.buildServer.configs.kotlin.buildFeatures.perfmon <<<<<<< HEAD +<<<<<<< HEAD +======= +import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests +>>>>>>> template/carbonengine/resources-updates ======= import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests >>>>>>> template/carbonengine/resources-updates @@ -69,6 +76,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "%env.CMAKE_INSTALL_PREFIX%" ======= @@ -95,6 +103,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" >>>>>>> template/carbonengine/resources-updates @@ -128,6 +139,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.CTEST_PARALLEL_LEVEL", "1") ======= @@ -157,6 +169,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates +======= + param("env.CTEST_PARALLEL_LEVEL", "8") +>>>>>>> template/carbonengine/resources-updates ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates @@ -196,6 +211,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DBUILD_CLI=ON -DBUILD_TESTING=ON -DBUILD_DOCUMENTATION=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" ======= @@ -216,6 +232,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates +======= + arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" +>>>>>>> template/carbonengine/resources-updates ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates @@ -271,6 +290,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER ======= @@ -288,6 +308,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= filterAuthorRole = GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates +======= + filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY +>>>>>>> template/carbonengine/resources-updates ======= filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates @@ -316,6 +339,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD teamcitySshKey = "ccpgames-evetech GitHub" ======= @@ -327,6 +351,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= teamcitySshKey = "ccpgames-carbon" >>>>>>> template/carbonengine/resources-updates +======= + teamcitySshKey = "ccpgames-carbon" +>>>>>>> template/carbonengine/resources-updates ======= teamcitySshKey = "ccpgames-carbon" >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt index 21199ef..82543b2 100644 --- a/.teamcity/Windows/Project.kt +++ b/.teamcity/Windows/Project.kt @@ -5,17 +5,24 @@ import jetbrains.buildServer.configs.kotlin.Project import jetbrains.buildServer.configs.kotlin.* <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests ======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates import jetbrains.buildServer.configs.kotlin.buildFeatures.XmlReport import jetbrains.buildServer.configs.kotlin.buildFeatures.commitStatusPublisher import jetbrains.buildServer.configs.kotlin.buildFeatures.freeDiskSpace import jetbrains.buildServer.configs.kotlin.buildFeatures.nuGetFeedCredentials import jetbrains.buildServer.configs.kotlin.buildFeatures.perfmon <<<<<<< HEAD +<<<<<<< HEAD +======= +import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests +>>>>>>> template/carbonengine/resources-updates ======= import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests >>>>>>> template/carbonengine/resources-updates @@ -37,6 +44,7 @@ import jetbrains.buildServer.configs.kotlin.buildFeatures.provideAwsCredentials <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD val BuildParameters = "-arch=x64 -vcvars_ver=14.51" val Debug = CarbonBuildWindows("Debug Windows", "Debug", "x64-windows-debug",BuildParameters) val Internal = CarbonBuildWindows("Internal Windows", "Internal", "x64-windows-internal",BuildParameters) @@ -56,6 +64,8 @@ val ReleaseDevFeatures = CarbonBuildWindows("Release Windows with Dev Features", >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates val Debug = CarbonBuildWindows("Debug Windows", "Debug", "x64-windows-debug") val Internal = CarbonBuildWindows("Internal Windows", "Internal", "x64-windows-internal") val TrinityDev = CarbonBuildWindows("TrinityDev Windows", "TrinityDev", "x64-windows-trinitydev") @@ -66,6 +76,9 @@ val Release = CarbonBuildWindows("Release Windows", "Release", "x64-windows-rele <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -97,6 +110,7 @@ object Project : Project({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD buildType(ReleaseDevFeatures) ======= @@ -138,6 +152,12 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, class CarbonBuildWindows(buildName: String, configType: String, preset: String) : BuildType({ +======= +}) + + +class CarbonBuildWindows(buildName: String, configType: String, preset: String, vsDevBatSwitches: String = "-arch=x64 -vcvars_ver=14.51") : BuildType({ +>>>>>>> template/carbonengine/resources-updates id(buildName.toId()) this.name = buildName @@ -148,6 +168,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -172,6 +195,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("VS_DEV_BAT_SWITCHES", vsDevBatSwitches) ======= @@ -206,6 +230,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) select("env.VISUAL_STUDIO_PLATFORM_TOOLSET", "v141", label = "Visual Studio Platform Toolset", description = "Specify the toolset for the build. e.g. v141 or v143.", options = listOf("v141 (2017)" to "v141", "v143 (2022)" to "v143")) param("VS_DEV_BAT_SWITCHES", "-arch=x64") +>>>>>>> template/carbonengine/resources-updates +======= + param("VS_DEV_BAT_SWITCHES", vsDevBatSwitches) >>>>>>> template/carbonengine/resources-updates param("env.CMAKE_BUILD_TARGETS", "all") param("env.CMAKE_INSTALL_PREFIX", ".build-artifact") @@ -229,6 +256,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.CTEST_PARALLEL_LEVEL", "1") ======= @@ -258,6 +286,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates +======= + param("env.CTEST_PARALLEL_LEVEL", "8") +>>>>>>> template/carbonengine/resources-updates ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates @@ -294,6 +325,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% ======= @@ -314,6 +346,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% >>>>>>> template/carbonengine/resources-updates +======= + call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% +>>>>>>> template/carbonengine/resources-updates ======= call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% >>>>>>> template/carbonengine/resources-updates @@ -332,6 +367,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DBUILD_CLI=ON -DBUILD_TESTING=ON -DBUILD_DOCUMENTATION=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" ======= @@ -352,6 +388,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates +======= + arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" +>>>>>>> template/carbonengine/resources-updates ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates @@ -397,6 +436,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) ======= @@ -411,6 +451,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) >>>>>>> template/carbonengine/resources-updates +======= + echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) +>>>>>>> template/carbonengine/resources-updates ======= echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) >>>>>>> template/carbonengine/resources-updates @@ -444,6 +487,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= @@ -459,6 +503,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= + >>>>>>> template/carbonengine/resources-updates Write-Host "##teamcity[progressMessage 'Storing symbols']" ${'$'}symstoreFlags = @("add", @@ -474,6 +521,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ${'$'}stored = get-content symstore.txt | Select-String "^SYMSTORE: Number of files stored = (.*)${'$'}" @@ -493,6 +541,8 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ${'$'}stored = get-content symstore.txt | Select-String "^SYMSTORE: Number of files stored = (.*)${'$'}" @@ -508,6 +558,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -545,6 +598,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER ======= @@ -562,6 +616,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= filterAuthorRole = GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates +======= + filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY +>>>>>>> template/carbonengine/resources-updates ======= filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates @@ -590,6 +647,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD teamcitySshKey = "ccpgames-evetech GitHub" ======= @@ -601,6 +659,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) ======= teamcitySshKey = "ccpgames-carbon" >>>>>>> template/carbonengine/resources-updates +======= + teamcitySshKey = "ccpgames-carbon" +>>>>>>> template/carbonengine/resources-updates ======= teamcitySshKey = "ccpgames-carbon" >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/_Self.kt/Project.kt b/.teamcity/_Self.kt/Project.kt index 407ba8e..8d08d85 100644 --- a/.teamcity/_Self.kt/Project.kt +++ b/.teamcity/_Self.kt/Project.kt @@ -17,6 +17,7 @@ object Project : Project({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description = "Build / Publish pipeline for https://github.com/carbonengine/resources" ======= @@ -46,6 +47,9 @@ object Project : Project({ ======= description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" >>>>>>> template/carbonengine/resources-updates +======= + description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" +>>>>>>> template/carbonengine/resources-updates ======= description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" >>>>>>> template/carbonengine/resources-updates @@ -58,6 +62,7 @@ object Project : Project({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("carbon-pipeline-tools-ref", "refs/heads/main") ======= @@ -75,6 +80,9 @@ object Project : Project({ ======= param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") >>>>>>> template/carbonengine/resources-updates +======= + param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") +>>>>>>> template/carbonengine/resources-updates ======= param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") >>>>>>> template/carbonengine/resources-updates @@ -88,6 +96,10 @@ object Project : Project({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= + buildType(SyncToMirror) +>>>>>>> template/carbonengine/resources-updates ======= buildType(SyncToMirror) >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt index 6af77a2..e9b2f24 100644 --- a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt +++ b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt @@ -4,10 +4,15 @@ import jetbrains.buildServer.configs.kotlin.* <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests +>>>>>>> template/carbonengine/resources-updates ======= import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests >>>>>>> template/carbonengine/resources-updates ======= +import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests >>>>>>> template/carbonengine/resources-updates ======= @@ -29,6 +34,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("carbon-pipeline-tools-ref", "refs/heads/main") ======= @@ -46,6 +52,9 @@ class UniversalBuild() : BuildType({ ======= param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") >>>>>>> template/carbonengine/resources-updates +======= + param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") +>>>>>>> template/carbonengine/resources-updates ======= param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") >>>>>>> template/carbonengine/resources-updates @@ -66,6 +75,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "-m 'resources:%system.teamcity.build.workingDir%/bin' -m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", ======= @@ -95,6 +105,9 @@ class UniversalBuild() : BuildType({ ======= "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", >>>>>>> template/carbonengine/resources-updates +======= + "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", +>>>>>>> template/carbonengine/resources-updates ======= "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", >>>>>>> template/carbonengine/resources-updates @@ -114,6 +127,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "%universal-output-dir%" ======= @@ -136,6 +150,8 @@ class UniversalBuild() : BuildType({ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates artifactRules = "%universal-output-dir% => artifact.zip" @@ -144,6 +160,9 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -212,6 +231,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -238,6 +258,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -257,6 +280,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -283,6 +307,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -303,6 +330,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -329,6 +357,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -348,6 +379,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -374,6 +406,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -394,6 +429,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -420,6 +456,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -439,6 +478,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -465,6 +505,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -485,6 +528,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -511,6 +555,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -530,6 +577,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -556,6 +604,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -567,12 +618,15 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates features { pullRequests { @@ -582,11 +636,15 @@ class UniversalBuild() : BuildType({ token = "%GITHUB_CARBON_PAT%" } <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY ======= filterAuthorRole = GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates +======= + filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY +>>>>>>> template/carbonengine/resources-updates ======= filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates @@ -597,6 +655,9 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt index f504236..0397916 100644 --- a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt +++ b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt @@ -4,6 +4,7 @@ import jetbrains.buildServer.configs.kotlin.* <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests >>>>>>> template/carbonengine/resources-updates @@ -14,6 +15,10 @@ import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests >>>>>>> template/carbonengine/resources-updates +======= +import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests +import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests +>>>>>>> template/carbonengine/resources-updates import jetbrains.buildServer.configs.kotlin.buildFeatures.vcsLabeling import jetbrains.buildServer.configs.kotlin.triggers.vcs import jetbrains.buildServer.configs.kotlin.buildSteps.python @@ -49,6 +54,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.TC_BUILD_NUMBER", "Carbon Resources #%build.number%") ======= @@ -77,6 +83,8 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates param("env.TC_BUILD_NUMBER", "Carbon Template #%build.number%") param("env.P4PORT", "p4is.ccp.ad.local:1666") @@ -88,6 +96,9 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -116,6 +127,10 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= + root(DslContext.settingsRootId, "-:.") +>>>>>>> template/carbonengine/resources-updates ======= root(DslContext.settingsRootId, "-:.") >>>>>>> template/carbonengine/resources-updates @@ -299,6 +314,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -325,6 +341,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -344,6 +363,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -370,6 +390,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -389,6 +412,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -415,6 +439,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -434,6 +461,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -460,6 +488,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -479,6 +510,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -505,6 +537,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -520,7 +555,10 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates ======= @@ -535,11 +573,15 @@ class Publish(perforce_publish_path: String) : BuildType({ token = "%GITHUB_CARBON_PAT%" } <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY ======= filterAuthorRole = GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates +======= + filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY +>>>>>>> template/carbonengine/resources-updates ======= filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates @@ -550,6 +592,9 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -573,6 +618,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD val PublishToPerforce = Publish("vendor/github.com/carbonengine/resources") ======= val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") @@ -604,3 +650,6 @@ val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") ======= val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") >>>>>>> template/carbonengine/resources-updates +======= +val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") +>>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml index ba5557d..f9e8b3e 100644 --- a/.teamcity/pom.xml +++ b/.teamcity/pom.xml @@ -10,6 +10,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Carbon Resources Config DSL Script Carbon_Resources @@ -59,6 +60,11 @@ Carbon_Template Carbon_Template_dsl >>>>>>> template/carbonengine/resources-updates +======= + Carbon Template Config DSL Script + Carbon_Template + Carbon_Template_dsl +>>>>>>> template/carbonengine/resources-updates ======= Carbon Template Config DSL Script Carbon_Template diff --git a/CMakeLists.txt b/CMakeLists.txt index f0abd07..56564da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # Copyright © 2025 CCP ehf. cmake_minimum_required(VERSION 3.31.1) @@ -126,6 +127,8 @@ get_target_property(_SOURCES resources SOURCES) >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates cmake_minimum_required(VERSION 3.16) project(CarbonTemplateProject VERSION 1.0.0) @@ -144,6 +147,9 @@ get_target_property(_SOURCES target_name SOURCES) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -175,6 +181,7 @@ source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if(BUILD_CLI) add_subdirectory(cli) endif() @@ -216,6 +223,8 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates set_target_properties(target_name PROPERTIES OUTPUT_NAME "_target_name") target_include_directories(target_name @@ -237,6 +246,9 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -273,6 +285,9 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -313,6 +328,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD # Ensure that resources is built before Spinx target add_dependencies(Sphinx resources) @@ -385,6 +401,8 @@ endif () ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates add_dependencies(Sphinx target_name) endif() @@ -446,6 +464,10 @@ endif () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +endif() +>>>>>>> template/carbonengine/resources-updates +======= endif() >>>>>>> template/carbonengine/resources-updates ======= diff --git a/CMakePresets.json b/CMakePresets.json index 2217586..dc57adc 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -21,6 +21,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "CMAKE_COMPILE_WARNING_AS_ERROR": "ON", ======= @@ -36,6 +37,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/triplets" }, @@ -74,6 +77,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-145-carbon.cmake" ======= @@ -96,6 +100,9 @@ >>>>>>> template/carbonengine/resources-updates ======= "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" +>>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-145-carbon.cmake" >>>>>>> template/carbonengine/resources-updates }, "hidden": true @@ -125,6 +132,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> template/carbonengine/resources-updates @@ -139,6 +147,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates { "name": "x64-windows-internal", @@ -151,6 +161,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-internal", "VCPKG_HOST_TRIPLET": "x64-windows-145-internal" @@ -181,6 +192,10 @@ ======= "VCPKG_TARGET_TRIPLET": "x64-windows-internal", "VCPKG_HOST_TRIPLET": "x64-windows-internal" +>>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-145-internal", + "VCPKG_HOST_TRIPLET": "x64-windows-145-internal" >>>>>>> template/carbonengine/resources-updates } }, @@ -195,6 +210,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-release", "VCPKG_HOST_TRIPLET": "x64-windows-145-release" @@ -225,6 +241,10 @@ ======= "VCPKG_TARGET_TRIPLET": "x64-windows-release", "VCPKG_HOST_TRIPLET": "x64-windows-release" +>>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-145-release", + "VCPKG_HOST_TRIPLET": "x64-windows-145-release" >>>>>>> template/carbonengine/resources-updates } }, @@ -239,6 +259,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-debug", "VCPKG_HOST_TRIPLET": "x64-windows-145-debug" @@ -269,6 +290,10 @@ ======= "VCPKG_TARGET_TRIPLET": "x64-windows-debug", "VCPKG_HOST_TRIPLET": "x64-windows-debug" +>>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-145-debug", + "VCPKG_HOST_TRIPLET": "x64-windows-145-debug" >>>>>>> template/carbonengine/resources-updates } }, @@ -284,6 +309,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> template/carbonengine/resources-updates "VCPKG_TARGET_TRIPLET": "x64-windows-145-trinitydev", "VCPKG_HOST_TRIPLET": "x64-windows-145-trinitydev" } @@ -291,6 +319,7 @@ { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "name": "x64-windows-release-with-dev-features", "inherits": "x64-windows-release", @@ -341,6 +370,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "name": "arm64-osx-internal", "inherits": "arm64-osx", diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index d30f728..f8fea83 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -84,6 +84,7 @@ PROJECT_ICON = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD OUTPUT_DIRECTORY = @CMAKE_CURRENT_BINARY_DIR@/docs/ ======= OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ @@ -115,6 +116,9 @@ OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ ======= OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ >>>>>>> template/carbonengine/resources-updates +======= +OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ +>>>>>>> template/carbonengine/resources-updates # If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 # sub-directories (in 2 levels) under the output directory of each output format diff --git a/doc/source/conf.py b/doc/source/conf.py index 8dd329b..dad65cd 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -16,6 +16,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD project = 'resources' copyright = 'Copyright © 2025 CCP ehf' ======= @@ -58,6 +59,10 @@ project = 'project_name' copyright = '2024, CCP Games' >>>>>>> template/carbonengine/resources-updates +======= +project = 'project_name' +copyright = '2024, CCP Games' +>>>>>>> template/carbonengine/resources-updates author = 'CCP Games' release = '0.1' diff --git a/doc/source/index.rst b/doc/source/index.rst index 89b64fe..9c12f6f 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -8,6 +8,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD resources Documentation ============================== @@ -71,6 +72,8 @@ Contents >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates project_name Documentation ========================== @@ -107,6 +110,10 @@ project_name Documentation <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +.. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html +>>>>>>> template/carbonengine/resources-updates +======= .. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html >>>>>>> template/carbonengine/resources-updates ======= diff --git a/tests/tests.md b/tests/tests.md index 31a5ad3..bf357ba 100644 --- a/tests/tests.md +++ b/tests/tests.md @@ -12,6 +12,7 @@ This folder is where all the tests for the project should be stored, whether the <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD [See a C++ example here](https://github.com/carbonengine/resources/tree/main/tests/src) ======= ======= @@ -32,6 +33,8 @@ This folder is where all the tests for the project should be stored, whether the >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates [See a C++ example here](https://github.com/ccpgames/carbon-destiny/tree/main/tests) [See a Python example here](https://github.com/ccpgames/carbon-fsd/tree/main/tests) @@ -45,6 +48,9 @@ This folder is where all the tests for the project should be stored, whether the <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index 6284e41..ba3a2d1 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -10,6 +10,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "baseline": "bea476a80218a581bcb5318595849520217c825e", ======= @@ -39,6 +40,9 @@ ======= "baseline": "242ac6932a9cd2607332969129e9572516f28d65", >>>>>>> template/carbonengine/resources-updates +======= + "baseline": "242ac6932a9cd2607332969129e9572516f28d65", +>>>>>>> template/carbonengine/resources-updates ======= "baseline": "242ac6932a9cd2607332969129e9572516f28d65", >>>>>>> template/carbonengine/resources-updates @@ -56,6 +60,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "repository": "git@github.com:carbonengine/vcpkg-registry.git", "baseline": "b3b922c476b0dedfa8342a75e89975c74441fc75", @@ -119,3 +124,19 @@ } ] } +======= + "repository": "https://github.com/carbonengine/vcpkg-registry.git", + "baseline": "bdd31d51ec7bb6e744b7c7c8871e84c2fd2296ec", + "packages": [ + "python3", + "carbon-*", + "tracy", + "greenlet", + "ccp-debug-info", + "crashpad", + "zlib" + ] + } + ] +} +>>>>>>> template/carbonengine/resources-updates diff --git a/vcpkg.json b/vcpkg.json index ea24985..adc8ea1 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -7,6 +7,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "name": "bsdiff-drake127", "version>=": "4.3.3#2" @@ -80,6 +81,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "name": "python3", "version>=": "3.12.9#1", @@ -88,6 +91,7 @@ ], "overrides": [ { +<<<<<<< HEAD "name": "protobuf", "version": "3.6.0.1" } @@ -111,4 +115,10 @@ >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= + "name": "openssl", + "version": "1.1.1k#8" + } + ] +>>>>>>> template/carbonengine/resources-updates } From 7129cb22bccdf5ca064437f0f0ac876adb81de72 Mon Sep 17 00:00:00 2001 From: ccpgames-carbon Date: Sat, 26 Sep 2026 13:17:39 +0000 Subject: [PATCH 12/12] Merge commit 39b92209b3de49a6f1acd531a58f21e047995a64 from carbon-template branch=carbonengine/resources-updates: Merge pull request #29 from ccptoebeans/dependabot Activate dependabot for vcpkg --- .clang-format | 11 ++++ .editorconfig | 10 +++ .github/dependabot.yaml | 6 ++ .gitignore | 9 +++ .teamcity/MacOS/Project.kt | 27 ++++++++ .teamcity/Windows/Project.kt | 60 ++++++++++++++++++ .teamcity/_Self.kt/Project.kt | 12 ++++ .../buildTypes/CreateUniversalBuilds.kt | 61 +++++++++++++++++++ .../_Self.kt/buildTypes/PublishToPerforce.kt | 49 +++++++++++++++ .teamcity/pom.xml | 6 ++ CMakeLists.txt | 22 +++++++ CMakePresets.json | 31 ++++++++++ doc/Doxyfile.in | 4 ++ doc/source/conf.py | 5 ++ doc/source/index.rst | 7 +++ tests/tests.md | 6 ++ vcpkg-configuration.json | 11 ++++ vcpkg.json | 9 +++ 18 files changed, 346 insertions(+) create mode 100644 .github/dependabot.yaml diff --git a/.clang-format b/.clang-format index 0275e18..1a6cd60 100644 --- a/.clang-format +++ b/.clang-format @@ -81,6 +81,7 @@ SpacesInSquareBrackets: false <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Standard: Cpp11 ======= Standard: Cpp17 @@ -115,6 +116,9 @@ Standard: Cpp17 ======= Standard: Cpp17 >>>>>>> template/carbonengine/resources-updates +======= +Standard: Cpp17 +>>>>>>> template/carbonengine/resources-updates TabWidth: 4 UseTab: ForContinuationAndIndentation --- @@ -201,6 +205,7 @@ SpacesInSquareBrackets: false <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD Standard: Cpp11 TabWidth: 4 UseTab: ForContinuationAndIndentation @@ -271,3 +276,9 @@ TabWidth: 4 UseTab: ForContinuationAndIndentation ... >>>>>>> template/carbonengine/resources-updates +======= +Standard: Cpp17 +TabWidth: 4 +UseTab: ForContinuationAndIndentation +... +>>>>>>> template/carbonengine/resources-updates diff --git a/.editorconfig b/.editorconfig index efb4e84..3806c60 100644 --- a/.editorconfig +++ b/.editorconfig @@ -11,6 +11,7 @@ charset = utf-8 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD end_of_line = crlf ======= end_of_line = lf @@ -45,6 +46,9 @@ end_of_line = lf ======= end_of_line = lf >>>>>>> template/carbonengine/resources-updates +======= +end_of_line = lf +>>>>>>> template/carbonengine/resources-updates indent_size = 4 indent_style = space insert_final_newline = false @@ -61,6 +65,7 @@ tab_width = 4 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ij_continuation_indent_size = 8 ij_formatter_off_tag = @formatter:off ij_formatter_on_tag = @formatter:on @@ -1022,6 +1027,8 @@ ij_toml_keep_indents_on_empty_lines = false >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates trim_trailing_whitespace = true [{*.yaml,*.yml,.clang-format,.clang-tidy,_clang-format}] @@ -1052,6 +1059,9 @@ trim_trailing_whitespace = false <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml new file mode 100644 index 0000000..0ae8b44 --- /dev/null +++ b/.github/dependabot.yaml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "vcpkg" + directory: "/" # The location of vcpkg.json + schedule: + interval: "monthly" diff --git a/.gitignore b/.gitignore index 5324da0..64b3b44 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,10 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +binaryCache/ +>>>>>>> template/carbonengine/resources-updates ======= binaryCache/ >>>>>>> template/carbonengine/resources-updates @@ -84,6 +88,7 @@ CMakeUserPresets.json <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ### IDE ### # User generated local IDE configuration @@ -136,3 +141,7 @@ cmake-build* .cmake-build* cmake-build* >>>>>>> template/carbonengine/resources-updates +======= +.cmake-build* +cmake-build* +>>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/MacOS/Project.kt b/.teamcity/MacOS/Project.kt index 6450046..da91a63 100644 --- a/.teamcity/MacOS/Project.kt +++ b/.teamcity/MacOS/Project.kt @@ -6,6 +6,7 @@ import jetbrains.buildServer.configs.kotlin.* <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests ======= >>>>>>> template/carbonengine/resources-updates @@ -13,6 +14,8 @@ import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates import jetbrains.buildServer.configs.kotlin.buildFeatures.XmlReport import jetbrains.buildServer.configs.kotlin.buildFeatures.commitStatusPublisher import jetbrains.buildServer.configs.kotlin.buildFeatures.freeDiskSpace @@ -20,6 +23,10 @@ import jetbrains.buildServer.configs.kotlin.buildFeatures.nuGetFeedCredentials import jetbrains.buildServer.configs.kotlin.buildFeatures.perfmon <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests +>>>>>>> template/carbonengine/resources-updates ======= import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests >>>>>>> template/carbonengine/resources-updates @@ -77,6 +84,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "%env.CMAKE_INSTALL_PREFIX%" ======= @@ -106,6 +114,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "%env.CMAKE_INSTALL_PREFIX% => artifact.zip" >>>>>>> template/carbonengine/resources-updates @@ -140,6 +151,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.CTEST_PARALLEL_LEVEL", "1") ======= @@ -172,6 +184,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates +======= + param("env.CTEST_PARALLEL_LEVEL", "8") +>>>>>>> template/carbonengine/resources-updates ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates @@ -212,6 +227,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DBUILD_CLI=ON -DBUILD_TESTING=ON -DBUILD_DOCUMENTATION=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" ======= @@ -235,6 +251,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates +======= + arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" +>>>>>>> template/carbonengine/resources-updates ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates @@ -291,6 +310,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER ======= @@ -311,6 +331,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates +======= + filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY +>>>>>>> template/carbonengine/resources-updates ======= filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates @@ -340,6 +363,7 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD teamcitySshKey = "ccpgames-evetech GitHub" ======= @@ -354,6 +378,9 @@ class CarbonBuildMacOS(buildName: String, configType: String, preset: String, ag ======= teamcitySshKey = "ccpgames-carbon" >>>>>>> template/carbonengine/resources-updates +======= + teamcitySshKey = "ccpgames-carbon" +>>>>>>> template/carbonengine/resources-updates ======= teamcitySshKey = "ccpgames-carbon" >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt index 82543b2..77ec3c7 100644 --- a/.teamcity/Windows/Project.kt +++ b/.teamcity/Windows/Project.kt @@ -6,6 +6,7 @@ import jetbrains.buildServer.configs.kotlin.* <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests ======= >>>>>>> template/carbonengine/resources-updates @@ -13,6 +14,8 @@ import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates import jetbrains.buildServer.configs.kotlin.buildFeatures.XmlReport import jetbrains.buildServer.configs.kotlin.buildFeatures.commitStatusPublisher import jetbrains.buildServer.configs.kotlin.buildFeatures.freeDiskSpace @@ -20,6 +23,10 @@ import jetbrains.buildServer.configs.kotlin.buildFeatures.nuGetFeedCredentials import jetbrains.buildServer.configs.kotlin.buildFeatures.perfmon <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests +>>>>>>> template/carbonengine/resources-updates ======= import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests >>>>>>> template/carbonengine/resources-updates @@ -45,6 +52,7 @@ import jetbrains.buildServer.configs.kotlin.buildFeatures.provideAwsCredentials <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD val BuildParameters = "-arch=x64 -vcvars_ver=14.51" val Debug = CarbonBuildWindows("Debug Windows", "Debug", "x64-windows-debug",BuildParameters) val Internal = CarbonBuildWindows("Internal Windows", "Internal", "x64-windows-internal",BuildParameters) @@ -66,6 +74,8 @@ val ReleaseDevFeatures = CarbonBuildWindows("Release Windows with Dev Features", >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates val Debug = CarbonBuildWindows("Debug Windows", "Debug", "x64-windows-debug") val Internal = CarbonBuildWindows("Internal Windows", "Internal", "x64-windows-internal") val TrinityDev = CarbonBuildWindows("TrinityDev Windows", "TrinityDev", "x64-windows-trinitydev") @@ -77,6 +87,9 @@ val Release = CarbonBuildWindows("Release Windows", "Release", "x64-windows-rele <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -111,6 +124,7 @@ object Project : Project({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD buildType(ReleaseDevFeatures) ======= @@ -153,10 +167,15 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, class CarbonBuildWindows(buildName: String, configType: String, preset: String) : BuildType({ ======= +======= +>>>>>>> template/carbonengine/resources-updates }) class CarbonBuildWindows(buildName: String, configType: String, preset: String, vsDevBatSwitches: String = "-arch=x64 -vcvars_ver=14.51") : BuildType({ +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates id(buildName.toId()) this.name = buildName @@ -169,6 +188,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -196,6 +218,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("VS_DEV_BAT_SWITCHES", vsDevBatSwitches) ======= @@ -231,6 +254,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, options = listOf("v141 (2017)" to "v141", "v143 (2022)" to "v143")) param("VS_DEV_BAT_SWITCHES", "-arch=x64") >>>>>>> template/carbonengine/resources-updates +======= + param("VS_DEV_BAT_SWITCHES", vsDevBatSwitches) +>>>>>>> template/carbonengine/resources-updates ======= param("VS_DEV_BAT_SWITCHES", vsDevBatSwitches) >>>>>>> template/carbonengine/resources-updates @@ -257,6 +283,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.CTEST_PARALLEL_LEVEL", "1") ======= @@ -289,6 +316,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates +======= + param("env.CTEST_PARALLEL_LEVEL", "8") +>>>>>>> template/carbonengine/resources-updates ======= param("env.CTEST_PARALLEL_LEVEL", "8") >>>>>>> template/carbonengine/resources-updates @@ -326,6 +356,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% ======= @@ -349,6 +380,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, ======= call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% >>>>>>> template/carbonengine/resources-updates +======= + call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% +>>>>>>> template/carbonengine/resources-updates ======= call "%env.VSDEV_BAT_PATH%" %VS_DEV_BAT_SWITCHES% >>>>>>> template/carbonengine/resources-updates @@ -368,6 +402,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DBUILD_CLI=ON -DBUILD_TESTING=ON -DBUILD_DOCUMENTATION=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" ======= @@ -391,6 +426,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates +======= + arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" +>>>>>>> template/carbonengine/resources-updates ======= arguments = "--preset %env.CMAKE_PRESET% -S %teamcity.build.checkoutDir%/%github_checkout_folder% -B %env.CMAKE_BUILD_FOLDER% -DINSTALL_TO_MONOLITH=ON -DCMAKE_INSTALL_PREFIX=%env.CMAKE_INSTALL_PREFIX% -DVCPKG_INSTALL_OPTIONS=--x-buildtrees-root=%teamcity.build.checkoutDir%/%github_checkout_folder%/buildtrees" >>>>>>> template/carbonengine/resources-updates @@ -437,6 +475,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) ======= @@ -454,6 +493,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, ======= echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) >>>>>>> template/carbonengine/resources-updates +======= + echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) +>>>>>>> template/carbonengine/resources-updates ======= echo ${'$'}symstoreFlags = ^@^("add","/compress","/t", "CCP Games", "/c", "TeamCity %build.number%", "/s", "${'$'}Env:TC_SYMBOL_STORE_PATH", "/o", "/r", "/f", "%env.CMAKE_BUILD_FOLDER%"^) >>>>>>> template/carbonengine/resources-updates @@ -488,6 +530,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= @@ -506,6 +549,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= + >>>>>>> template/carbonengine/resources-updates Write-Host "##teamcity[progressMessage 'Storing symbols']" ${'$'}symstoreFlags = @("add", @@ -522,6 +568,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD ${'$'}stored = get-content symstore.txt | Select-String "^SYMSTORE: Number of files stored = (.*)${'$'}" @@ -543,6 +590,8 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ${'$'}stored = get-content symstore.txt | Select-String "^SYMSTORE: Number of files stored = (.*)${'$'}" @@ -559,6 +608,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -599,6 +651,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD filterAuthorRole = PullRequests.GitHubRoleFilter.MEMBER ======= @@ -619,6 +672,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, ======= filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates +======= + filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY +>>>>>>> template/carbonengine/resources-updates ======= filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates @@ -648,6 +704,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD teamcitySshKey = "ccpgames-evetech GitHub" ======= @@ -662,6 +719,9 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String, ======= teamcitySshKey = "ccpgames-carbon" >>>>>>> template/carbonengine/resources-updates +======= + teamcitySshKey = "ccpgames-carbon" +>>>>>>> template/carbonengine/resources-updates ======= teamcitySshKey = "ccpgames-carbon" >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/_Self.kt/Project.kt b/.teamcity/_Self.kt/Project.kt index 8d08d85..df204b3 100644 --- a/.teamcity/_Self.kt/Project.kt +++ b/.teamcity/_Self.kt/Project.kt @@ -18,6 +18,7 @@ object Project : Project({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD description = "Build / Publish pipeline for https://github.com/carbonengine/resources" ======= @@ -50,6 +51,9 @@ object Project : Project({ ======= description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" >>>>>>> template/carbonengine/resources-updates +======= + description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" +>>>>>>> template/carbonengine/resources-updates ======= description = "Build / Publish pipeline for https://github.com/ccpgames/carbon-template" >>>>>>> template/carbonengine/resources-updates @@ -63,6 +67,7 @@ object Project : Project({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("carbon-pipeline-tools-ref", "refs/heads/main") ======= @@ -83,6 +88,9 @@ object Project : Project({ ======= param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") >>>>>>> template/carbonengine/resources-updates +======= + param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") +>>>>>>> template/carbonengine/resources-updates ======= param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") >>>>>>> template/carbonengine/resources-updates @@ -97,6 +105,10 @@ object Project : Project({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= + buildType(SyncToMirror) +>>>>>>> template/carbonengine/resources-updates ======= buildType(SyncToMirror) >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt index e9b2f24..1df9214 100644 --- a/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt +++ b/.teamcity/_Self.kt/buildTypes/CreateUniversalBuilds.kt @@ -5,10 +5,15 @@ import jetbrains.buildServer.configs.kotlin.* <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests +>>>>>>> template/carbonengine/resources-updates ======= import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests >>>>>>> template/carbonengine/resources-updates ======= +import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests >>>>>>> template/carbonengine/resources-updates ======= @@ -35,6 +40,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("carbon-pipeline-tools-ref", "refs/heads/main") ======= @@ -55,6 +61,9 @@ class UniversalBuild() : BuildType({ ======= param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") >>>>>>> template/carbonengine/resources-updates +======= + param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") +>>>>>>> template/carbonengine/resources-updates ======= param("carbon-pipeline-tools-ref", "refs/tags/v0.1.0") >>>>>>> template/carbonengine/resources-updates @@ -76,6 +85,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "-m 'resources:%system.teamcity.build.workingDir%/bin' -m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", ======= @@ -108,6 +118,9 @@ class UniversalBuild() : BuildType({ ======= "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", >>>>>>> template/carbonengine/resources-updates +======= + "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", +>>>>>>> template/carbonengine/resources-updates ======= "-m '*.so:%system.teamcity.build.workingDir%/lib' -m '*.dylib:%system.teamcity.build.workingDir%/lib' -m '*.a:%system.teamcity.build.workingDir%/lib'", >>>>>>> template/carbonengine/resources-updates @@ -128,6 +141,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "%universal-output-dir%" ======= @@ -152,6 +166,8 @@ class UniversalBuild() : BuildType({ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates artifactRules = "%universal-output-dir% => artifact.zip" @@ -161,6 +177,9 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -232,6 +251,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -261,6 +281,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -281,6 +304,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -310,6 +334,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -331,6 +358,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -360,6 +388,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -380,6 +411,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -409,6 +441,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -430,6 +465,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -459,6 +495,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -479,6 +518,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -508,6 +548,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -529,6 +572,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/arm64" ======= @@ -558,6 +602,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/arm64" >>>>>>> template/carbonengine/resources-updates @@ -578,6 +625,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%system.teamcity.build.workingDir%/x64" ======= @@ -607,6 +655,9 @@ class UniversalBuild() : BuildType({ ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%system.teamcity.build.workingDir%/x64" >>>>>>> template/carbonengine/resources-updates @@ -619,6 +670,7 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= ======= >>>>>>> template/carbonengine/resources-updates @@ -627,6 +679,8 @@ class UniversalBuild() : BuildType({ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates features { pullRequests { @@ -637,6 +691,7 @@ class UniversalBuild() : BuildType({ } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY ======= @@ -645,6 +700,9 @@ class UniversalBuild() : BuildType({ ======= filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates +======= + filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY +>>>>>>> template/carbonengine/resources-updates ======= filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates @@ -656,6 +714,9 @@ class UniversalBuild() : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt index 0397916..9f6f7ca 100644 --- a/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt +++ b/.teamcity/_Self.kt/buildTypes/PublishToPerforce.kt @@ -5,6 +5,7 @@ import jetbrains.buildServer.configs.kotlin.* <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests >>>>>>> template/carbonengine/resources-updates @@ -19,6 +20,10 @@ import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests >>>>>>> template/carbonengine/resources-updates +======= +import jetbrains.buildServer.configs.kotlin.buildFeatures.PullRequests +import jetbrains.buildServer.configs.kotlin.buildFeatures.pullRequests +>>>>>>> template/carbonengine/resources-updates import jetbrains.buildServer.configs.kotlin.buildFeatures.vcsLabeling import jetbrains.buildServer.configs.kotlin.triggers.vcs import jetbrains.buildServer.configs.kotlin.buildSteps.python @@ -55,6 +60,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD param("env.TC_BUILD_NUMBER", "Carbon Resources #%build.number%") ======= @@ -85,6 +91,8 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates param("env.TC_BUILD_NUMBER", "Carbon Template #%build.number%") param("env.P4PORT", "p4is.ccp.ad.local:1666") @@ -97,6 +105,9 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -128,6 +139,10 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= + root(DslContext.settingsRootId, "-:.") +>>>>>>> template/carbonengine/resources-updates ======= root(DslContext.settingsRootId, "-:.") >>>>>>> template/carbonengine/resources-updates @@ -315,6 +330,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -344,6 +360,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${MacOS.arm64_Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -364,6 +383,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -393,6 +413,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Debug.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -413,6 +436,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -442,6 +466,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Internal.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -462,6 +489,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -491,6 +519,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.Release.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -511,6 +542,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD artifactRules = "**/*=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" ======= @@ -540,6 +572,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates +======= + artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" +>>>>>>> template/carbonengine/resources-updates ======= artifactRules = "artifact.zip!**=>%perforce_path_to_publish_into%/${Windows.TrinityDev.depParamRefs["env.GIT_TAG_HASH"]}" >>>>>>> template/carbonengine/resources-updates @@ -556,7 +591,10 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= ======= +>>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates ======= @@ -574,6 +612,7 @@ class Publish(perforce_publish_path: String) : BuildType({ } <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY ======= @@ -582,6 +621,9 @@ class Publish(perforce_publish_path: String) : BuildType({ ======= filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates +======= + filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY +>>>>>>> template/carbonengine/resources-updates ======= filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY >>>>>>> template/carbonengine/resources-updates @@ -593,6 +635,9 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -619,6 +664,7 @@ class Publish(perforce_publish_path: String) : BuildType({ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD val PublishToPerforce = Publish("vendor/github.com/carbonengine/resources") ======= val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") @@ -653,3 +699,6 @@ val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") ======= val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") >>>>>>> template/carbonengine/resources-updates +======= +val PublishToPerforce = Publish("vendor/github.com/ccpgames/carbon-template") +>>>>>>> template/carbonengine/resources-updates diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml index f9e8b3e..9942e74 100644 --- a/.teamcity/pom.xml +++ b/.teamcity/pom.xml @@ -11,6 +11,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD Carbon Resources Config DSL Script Carbon_Resources @@ -65,6 +66,11 @@ Carbon_Template Carbon_Template_dsl >>>>>>> template/carbonengine/resources-updates +======= + Carbon Template Config DSL Script + Carbon_Template + Carbon_Template_dsl +>>>>>>> template/carbonengine/resources-updates ======= Carbon Template Config DSL Script Carbon_Template diff --git a/CMakeLists.txt b/CMakeLists.txt index 56564da..f15eaa0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # Copyright © 2025 CCP ehf. cmake_minimum_required(VERSION 3.31.1) @@ -129,6 +130,8 @@ get_target_property(_SOURCES resources SOURCES) >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates cmake_minimum_required(VERSION 3.16) project(CarbonTemplateProject VERSION 1.0.0) @@ -148,6 +151,9 @@ get_target_property(_SOURCES target_name SOURCES) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -182,6 +188,7 @@ source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD if(BUILD_CLI) add_subdirectory(cli) endif() @@ -225,6 +232,8 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates set_target_properties(target_name PROPERTIES OUTPUT_NAME "_target_name") target_include_directories(target_name @@ -247,6 +256,9 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -286,6 +298,9 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates @@ -329,6 +344,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD # Ensure that resources is built before Spinx target add_dependencies(Sphinx resources) @@ -403,6 +419,8 @@ endif () ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates add_dependencies(Sphinx target_name) endif() @@ -465,6 +483,10 @@ endif () <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +endif() +>>>>>>> template/carbonengine/resources-updates +======= endif() >>>>>>> template/carbonengine/resources-updates ======= diff --git a/CMakePresets.json b/CMakePresets.json index dc57adc..ab8be8e 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -22,6 +22,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "CMAKE_COMPILE_WARNING_AS_ERROR": "ON", ======= @@ -39,6 +40,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "VCPKG_OVERLAY_TRIPLETS": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/triplets" }, @@ -78,6 +81,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-145-carbon.cmake" ======= @@ -101,6 +105,9 @@ ======= "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" >>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-145-carbon.cmake" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-145-carbon.cmake" >>>>>>> template/carbonengine/resources-updates @@ -133,6 +140,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> template/carbonengine/resources-updates @@ -149,6 +157,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates { "name": "x64-windows-internal", @@ -162,6 +172,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-internal", "VCPKG_HOST_TRIPLET": "x64-windows-145-internal" @@ -193,6 +204,10 @@ "VCPKG_TARGET_TRIPLET": "x64-windows-internal", "VCPKG_HOST_TRIPLET": "x64-windows-internal" >>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-145-internal", + "VCPKG_HOST_TRIPLET": "x64-windows-145-internal" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_TARGET_TRIPLET": "x64-windows-145-internal", "VCPKG_HOST_TRIPLET": "x64-windows-145-internal" @@ -211,6 +226,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-release", "VCPKG_HOST_TRIPLET": "x64-windows-145-release" @@ -242,6 +258,10 @@ "VCPKG_TARGET_TRIPLET": "x64-windows-release", "VCPKG_HOST_TRIPLET": "x64-windows-release" >>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-145-release", + "VCPKG_HOST_TRIPLET": "x64-windows-145-release" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_TARGET_TRIPLET": "x64-windows-145-release", "VCPKG_HOST_TRIPLET": "x64-windows-145-release" @@ -260,6 +280,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "VCPKG_TARGET_TRIPLET": "x64-windows-145-debug", "VCPKG_HOST_TRIPLET": "x64-windows-145-debug" @@ -291,6 +312,10 @@ "VCPKG_TARGET_TRIPLET": "x64-windows-debug", "VCPKG_HOST_TRIPLET": "x64-windows-debug" >>>>>>> template/carbonengine/resources-updates +======= + "VCPKG_TARGET_TRIPLET": "x64-windows-145-debug", + "VCPKG_HOST_TRIPLET": "x64-windows-145-debug" +>>>>>>> template/carbonengine/resources-updates ======= "VCPKG_TARGET_TRIPLET": "x64-windows-145-debug", "VCPKG_HOST_TRIPLET": "x64-windows-145-debug" @@ -310,6 +335,9 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates "VCPKG_TARGET_TRIPLET": "x64-windows-145-trinitydev", @@ -320,6 +348,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "name": "x64-windows-release-with-dev-features", "inherits": "x64-windows-release", @@ -372,6 +401,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "name": "arm64-osx-internal", "inherits": "arm64-osx", diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index f8fea83..c0d95d4 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -85,6 +85,7 @@ PROJECT_ICON = <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD OUTPUT_DIRECTORY = @CMAKE_CURRENT_BINARY_DIR@/docs/ ======= OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ @@ -119,6 +120,9 @@ OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ ======= OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ >>>>>>> template/carbonengine/resources-updates +======= +OUTPUT_DIRECTORY = @DOCUMENTATION_OUT_DIR@ +>>>>>>> template/carbonengine/resources-updates # If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096 # sub-directories (in 2 levels) under the output directory of each output format diff --git a/doc/source/conf.py b/doc/source/conf.py index dad65cd..9d5ece2 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -17,6 +17,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD project = 'resources' copyright = 'Copyright © 2025 CCP ehf' ======= @@ -63,6 +64,10 @@ project = 'project_name' copyright = '2024, CCP Games' >>>>>>> template/carbonengine/resources-updates +======= +project = 'project_name' +copyright = '2024, CCP Games' +>>>>>>> template/carbonengine/resources-updates author = 'CCP Games' release = '0.1' diff --git a/doc/source/index.rst b/doc/source/index.rst index 9c12f6f..9c65140 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -9,6 +9,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD resources Documentation ============================== @@ -74,6 +75,8 @@ Contents >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates project_name Documentation ========================== @@ -111,6 +114,10 @@ project_name Documentation <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +.. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html +>>>>>>> template/carbonengine/resources-updates +======= .. _MyST with Sphinx: https://myst-parser.readthedocs.io/en/v0.17.1/sphinx/index.html >>>>>>> template/carbonengine/resources-updates ======= diff --git a/tests/tests.md b/tests/tests.md index bf357ba..a38db09 100644 --- a/tests/tests.md +++ b/tests/tests.md @@ -13,6 +13,7 @@ This folder is where all the tests for the project should be stored, whether the <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD [See a C++ example here](https://github.com/carbonengine/resources/tree/main/tests/src) ======= ======= @@ -35,6 +36,8 @@ This folder is where all the tests for the project should be stored, whether the >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates +======= +>>>>>>> template/carbonengine/resources-updates [See a C++ example here](https://github.com/ccpgames/carbon-destiny/tree/main/tests) [See a Python example here](https://github.com/ccpgames/carbon-fsd/tree/main/tests) @@ -49,6 +52,9 @@ This folder is where all the tests for the project should be stored, whether the <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates ======= >>>>>>> template/carbonengine/resources-updates diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index ba3a2d1..36c4af7 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -11,6 +11,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "baseline": "bea476a80218a581bcb5318595849520217c825e", ======= @@ -43,6 +44,9 @@ ======= "baseline": "242ac6932a9cd2607332969129e9572516f28d65", >>>>>>> template/carbonengine/resources-updates +======= + "baseline": "242ac6932a9cd2607332969129e9572516f28d65", +>>>>>>> template/carbonengine/resources-updates ======= "baseline": "242ac6932a9cd2607332969129e9572516f28d65", >>>>>>> template/carbonengine/resources-updates @@ -61,6 +65,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "repository": "git@github.com:carbonengine/vcpkg-registry.git", "baseline": "b3b922c476b0dedfa8342a75e89975c74441fc75", @@ -125,6 +130,8 @@ ] } ======= +======= +>>>>>>> template/carbonengine/resources-updates "repository": "https://github.com/carbonengine/vcpkg-registry.git", "baseline": "bdd31d51ec7bb6e744b7c7c8871e84c2fd2296ec", "packages": [ @@ -138,5 +145,9 @@ ] } ] +<<<<<<< HEAD +} +>>>>>>> template/carbonengine/resources-updates +======= } >>>>>>> template/carbonengine/resources-updates diff --git a/vcpkg.json b/vcpkg.json index adc8ea1..115fa40 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -8,6 +8,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "name": "bsdiff-drake127", "version>=": "4.3.3#2" @@ -83,6 +84,8 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates "name": "python3", "version>=": "3.12.9#1", @@ -91,6 +94,7 @@ ], "overrides": [ { +<<<<<<< HEAD <<<<<<< HEAD "name": "protobuf", "version": "3.6.0.1" @@ -116,9 +120,14 @@ ======= >>>>>>> template/carbonengine/resources-updates ======= +======= +>>>>>>> template/carbonengine/resources-updates "name": "openssl", "version": "1.1.1k#8" } ] +<<<<<<< HEAD +>>>>>>> template/carbonengine/resources-updates +======= >>>>>>> template/carbonengine/resources-updates }