Merge branch 'R2Northstar:main' into main

.clang-format

@@ -3,6 +3,7 @@ Standard: Cpp11
 IndentWidth: 4
 TabWidth: 4
 UseCRLF: false
+AccessModifierOffset: -4
 AlignTrailingComments: false
 AllowAllConstructorInitializersOnNextLine: false
 AllowAllParametersOfDeclarationOnNextLine: true
@@ -34,3 +35,5 @@ IndentExternBlock: Indent
 PointerAlignment: Left
 SortIncludes: false
 NamespaceIndentation: All
+PackConstructorInitializers: NextLine
+BreakConstructorInitializersBeforeComma: true

.cmake-format.json

@@ -0,0 +1,26 @@
+{
+	"format": {
+		"line_width": 120,
+		"tab_size": 4,
+		"use_tabchars": false,
+		"fractional_tab_policy": "use-space",
+		"max_subgroups_hwrap": 2,
+		"max_pargs_hwrap": 2,
+		"max_rows_cmdline": 2,
+		"separate_ctrl_name_with_space": false,
+		"separate_fn_name_with_space": false,
+		"dangle_parens": true,
+		"dangle_align": "child",
+		"min_prefix_chars": 4,
+		"max_prefix_chars": 10,
+		"max_lines_hwrap": 2,
+		"line_ending": "unix",
+		"command_case": "canonical",
+		"keyword_case": "unchanged",
+		"always_wrap": [],
+		"enable_sort": true,
+		"autosort": false,
+		"require_valid_layout": false,
+		"layout_passes": {}
+	}
+}

.github/workflows/ci.yml

@@ -20,10 +20,10 @@ jobs:
       - name: Setup resource file version
         shell: bash
         run: |
-          sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' NorthstarLauncher/resources.rc
-          sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' NorthstarDLL/resources.rc
+          sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' primedev/primelauncher/resources.rc
+          sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' primedev/resources.rc
           FILEVERSION=$(echo ${{ env.NORTHSTAR_VERSION }} | tr '.' ',' | sed -E 's/-rc[0-9]+//' | tr -d '[:alpha:]')
-          sed -i "s/0,0,0,1/${FILEVERSION}/g" NorthstarDLL/ns_version.h
+          sed -i "s/0,0,0,1/${FILEVERSION}/g" primedev/ns_version.h
       - name: Build
         run: cmake --build .
       - name: Extract Short Commit Hash
@@ -41,10 +41,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - uses: DoozyX/clang-format-lint-action@v0.13
+    - uses: DoozyX/clang-format-lint-action@v0.16.2
       with:
-        source: 'NorthstarDLL NorthstarLauncher'
-        exclude: 'NorthstarDLL/include loader_launcher_proxy loader_wsock32_proxy'
+        source: 'primedev'
+        exclude: 'primedev/include primedev/thirdparty primedev/wsockproxy'
         extensions: 'h,cpp'
-        clangFormatVersion: 13
+        clangFormatVersion: 16
         style: file
+
+  format-check-cmake-files:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: puneetmatharu/[email protected]
+      with:
+        args: "--in-place"
+    - run: |
+        git diff --exit-code

.github/workflows/merge-conflict-auto-label.yml

@@ -0,0 +1,18 @@
+name: Merge Conflict Auto Label
+on:
+  push:
+    branches:
+      - main
+  schedule:
+    - cron: "10 21 * * *"
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mschilde/auto-label-merge-conflicts@master
+        with:
+          CONFLICT_LABEL_NAME: "merge conflicts"
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MAX_RETRIES: 5
+          WAIT_MS: 5000

.github/workflows/release.yml

@@ -25,10 +25,10 @@ jobs:
       - name: Setup resource file version
         shell: bash
         run: |
-          sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' NorthstarLauncher/resources.rc
-          sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' NorthstarDLL/resources.rc
+          sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' primedev/primelauncher/resources.rc
+          sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' primedev/resources.rc
           FILEVERSION=$(echo ${{ env.NORTHSTAR_VERSION }} | tr '.' ',' | sed -E 's/-rc[0-9]+//' | tr -d '[:alpha:]')
-          sed -i "s/0,0,0,1/${FILEVERSION}/g" NorthstarDLL/ns_version.h
+          sed -i "s/0,0,0,1/${FILEVERSION}/g" primedev/ns_version.h
       - name: Build
         run: cmake --build .
       - name: Upload launcher build as artifact

.gitmodules

@@ -1,11 +1,11 @@
 [submodule "thirdparty/libcurl"]
-	path = thirdparty/libcurl
+	path = primedev/thirdparty/libcurl
 	url = https://github.com/curl/curl
 	ignore = untracked
 [submodule "thirdparty/minhook"]
-	path = thirdparty/minhook
+	path = primedev/thirdparty/minhook
 	url = https://github.com/TsudaKageyu/minhook
 	ignore = untracked
 [submodule "thirdparty/minizip"]
-	path = thirdparty/minizip
+	path = primedev/thirdparty/minizip
 	url = https://github.com/zlib-ng/minizip-ng.git

CMakeLists.txt

@@ -1,10 +1,18 @@
 cmake_minimum_required(VERSION 3.15)
 
-project(Northstar CXX ASM_MASM)
+project(
+    Northstar
+    CXX
+    ASM_MASM
+    )
 
 if(NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE "Release" CACHE STRING
-        "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE)
+    set(CMAKE_BUILD_TYPE
+        "Release"
+        CACHE STRING
+              "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
+              FORCE
+        )
 endif()
 
 # Language specs
@@ -15,19 +23,22 @@ set(CMAKE_VS_PLATFORM_TOOLSET v143)
 
 # This determines the real binary root directory
 set(NS_BINARY_DIR ${CMAKE_BINARY_DIR}/game)
-# NOTE [Fifty]: Visual studio deems Build root with the value "${projectDir}"
-# in CMakeSettings.json as invalid and defaults to using a temporary dir
-# somewhere in %USER%/CMakeBuilds. To combat this we set it to "${projectDir}/build"
-# and then link binaries in ${CMAKE_BINARY_DIR}/game. This means you can copy your
-# game into ${CMAKE_BINARY_DIR}/game without it being cluttered up by cmake files.
+# NOTE [Fifty]: Visual studio deems Build root with the value "${projectDir}" in CMakeSettings.json as invalid and
+# defaults to using a temporary dir somewhere in %USER%/CMakeBuilds. To combat this we set it to "${projectDir}/build"
+# and then link binaries in ${CMAKE_BINARY_DIR}/game. This means you can copy your game into ${CMAKE_BINARY_DIR}/game
+# without it being cluttered up by cmake files.
 
 message(STATUS "NS: Building to ${NS_BINARY_DIR}")
 
-
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+list(
+    APPEND
+    CMAKE_MODULE_PATH
+    "${CMAKE_CURRENT_SOURCE_DIR}/primedev/cmake"
+    )
 include(utils)
 
+include_directories(primedev)
+include_directories(primedev/thirdparty)
+
 # Targets
-add_subdirectory(loader_wsock32_proxy)
-add_subdirectory(NorthstarDLL)
-add_subdirectory(NorthstarLauncher)
+add_subdirectory(primedev)