thumperward
diff --git a/‎.devcontainer/Dockerfile.linux
+38 b/‎.devcontainer/Dockerfile.linux
+38
diff --git a/‎.devcontainer/Dockerfile.windows
+25 b/‎.devcontainer/Dockerfile.windows
+25
diff --git a/‎.devcontainer/devcontainer.json
+32 b/‎.devcontainer/devcontainer.json
+32
diff --git a/‎CODE_OF_CONDUCT.md ‎.github/CODE_OF_CONDUCT.md b/‎CODE_OF_CONDUCT.md ‎.github/CODE_OF_CONDUCT.md
diff --git a/‎CONTRIBUTING.md ‎.github/CONTRIBUTING.md b/‎CONTRIBUTING.md ‎.github/CONTRIBUTING.md
diff --git a/‎.github/workflows/documentation.yml
+10-10 b/‎.github/workflows/documentation.yml
+10-10
diff --git a/‎.github/workflows/itch.yml
+1-1 b/‎.github/workflows/itch.yml
+1-1
diff --git a/‎.github/workflows/packaging.yml
+1-1 b/‎.github/workflows/packaging.yml
+1-1
diff --git a/‎.gitignore
+11-1 b/‎.gitignore
+11-1
diff --git a/‎Makefile
+18-18 b/‎Makefile
+18-18
diff --git a/‎OpenRA.sln
+10-10 b/‎OpenRA.sln
+10-10
diff --git a/‎TODO.md
+40 b/‎TODO.md
+40
diff --git a/‎fetch-geoip.sh
-24 b/‎fetch-geoip.sh
-24
@@ -0,0 +1,38 @@
+# FROM mcr.microsoft.com/devcontainers/dotnet:0-6.0
+FROM mcr.microsoft.com/devcontainers/base:debian-11
+
+# Add backports.
+RUN echo "deb http://deb.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list
+
+# Install dependencies.
+RUN apt-get update && apt-get install -y --no-install-recommends \
+  file \
+  nsis \
+  imagemagick \
+  wine64 \
+  shellcheck
+
+# Install dotnet SDK and PowerShell.
+RUN curl -SOL https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb \
+  && dpkg -i packages-microsoft-prod.deb \
+  && rm packages-microsoft-prod.deb \
+  && apt-get update \
+  && apt-get install -y --no-install-recommends \
+  dotnet-sdk-6.0 \
+  powershell
+
+# Install updated packages from backports.
+RUN apt-get update && sudo apt-get install -y --no-install-recommends \
+  curl/bullseye-backports \
+  wine64/bullseye-backports
+
+# Install AppImageTool.
+RUN curl -SLO https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage \
+  && install appimagetool-x86_64.AppImage /usr/local/bin \
+  && rm appimagetool-x86_64.AppImage
+
+
+# Download rcdedit.
+USER vscode
+RUN curl -SLo /home/vscode/rcedit-x64.exe https://github.com/electron/rcedit/releases/download/v1.1.1/rcedit-x64.exe
+ENV PATH=/usr/lib/wine/:$PATH
@@ -0,0 +1,25 @@
+# This file permits OpenRA to be built on Windows without the need to install
+# any local development tools or SDKs. From the repository root, build using:
+#
+# docker build -t openra .
+# 
+# You can then open the container and build interactively using:
+#
+# docker run -it -v .:C:\OpenRA openra
+#
+# You can now run `./make.cmd`: output will be shared to the host.
+#
+# Alternatively, build directly from the host by running:
+# 
+# docker run -it -v .:C:\OpenRA openra ./make.ps1 a
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2022
+
+RUN setx path "%path%;C:\Users\ContainerAdministrator\AppData\Local\Microsoft\dotnet"
+SHELL ["powershell", "-command"]
+
+RUN Invoke-WebRequest -Uri https://dot.net/v1/dotnet-install.ps1 -UseBasicParsing -OutFile dotnet-install.ps1
+RUN ./dotnet-install.ps1
+
+WORKDIR C:/OpenRA
+ENTRYPOINT ["powershell"]
@@ -0,0 +1,32 @@
+{
+	"name": "C# (.NET)",
+	"build": {
+		"dockerfile": "Dockerfile.linux"
+	},
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"EditorConfig.EditorConfig",
+				"foxundermoon.shell-format",
+				"GitHub.vscode-github-actions",
+				"idleberg.nsis",
+				"macabeus.vscode-fluent",
+				"ms-dotnettools.csdevkit",
+				"ms-dotnettools.csharp",
+				"ms-python.python",
+				"ms-vscode.cpptools-extension-pack",
+				"ms-vscode.makefile-tools",
+				"ms-vscode.powershell",
+				"nico-castell.linux-desktop-file",
+				"openra.oraide-vscode",
+				"openra.vscode-openra-lua",
+				"tamasfe.even-better-toml",
+				"timonwong.shellcheck"
+			]
+		}
+	},
+	"features": {},
+	"postAttachCommand": {
+		"safe-dir": "git config --global --add safe.directory ${containerWorkspaceFolder}"
+	}
+}
@@ -43,14 +43,14 @@ jobs:
         env:
           GIT_TAG: ${{ github.event.inputs.tag }}
         run: |
-          ./utility.sh all --settings-docs "${GIT_TAG}" > "wiki/Settings (playtest).md"
+          ./packaging/shared/utility.sh all --settings-docs "${GIT_TAG}" > "wiki/Settings (playtest).md"
 
       - name: Update Wiki (Release)
         if: startsWith(github.event.inputs.tag, 'release-')
         env:
           GIT_TAG: ${{ github.event.inputs.tag }}
         run: |
-          ./utility.sh all --settings-docs "${GIT_TAG}" > "wiki/Settings.md"
+          ./packaging/shared/utility.sh all --settings-docs "${GIT_TAG}" > "wiki/Settings.md"
 
       - name: Push Wiki
         env:
@@ -105,20 +105,20 @@ jobs:
         env:
           GIT_TAG: ${{ github.event.inputs.tag }}
         run: |
-          ./utility.sh all --docs "${GIT_TAG}" | python3 ./packaging/format-docs.py > "docs/api/traits.md"
-          ./utility.sh all --weapon-docs "${GIT_TAG}" | python3 ./packaging/format-docs.py > "docs/api/weapons.md"
-          ./utility.sh all --sprite-sequence-docs "${GIT_TAG}" | python3 ./packaging/format-docs.py > "docs/api/sprite-sequences.md"
-          ./utility.sh all --lua-docs "${GIT_TAG}" > "docs/api/lua.md"
+          ./packaging/shared/utility.sh all --docs "${GIT_TAG}" | python3 ./packaging/shared/format-docs.py > "docs/api/traits.md"
+          ./packaging/shared/utility.sh all --weapon-docs "${GIT_TAG}" | python3 ./packaging/shared/format-docs.py > "docs/api/weapons.md"
+          ./packaging/shared/utility.sh all --sprite-sequence-docs "${GIT_TAG}" | python3 ./packaging/shared/format-docs.py > "docs/api/sprite-sequences.md"
+          ./packaging/shared/utility.sh all --lua-docs "${GIT_TAG}" > "docs/api/lua.md"
 
       - name: Update docs.openra.net (Release)
         if: startsWith(github.event.inputs.tag, 'release-')
         env:
           GIT_TAG: ${{ github.event.inputs.tag }}
         run: |
-          ./utility.sh all --docs "${GIT_TAG}" | python3 ./packaging/format-docs.py > "docs/api/traits.md"
-          ./utility.sh all --weapon-docs "${GIT_TAG}" | python3 ./packaging/format-docs.py > "docs/api/weapons.md"
-          ./utility.sh all --sprite-sequence-docs "${GIT_TAG}" | python3 ./packaging/format-docs.py > "docs/api/sprite-sequences.md"
-          ./utility.sh all --lua-docs "${GIT_TAG}" > "docs/api/lua.md"
+          ./packaging/shared/utility.sh all --docs "${GIT_TAG}" | python3 ./packaging/shared/format-docs.py > "docs/api/traits.md"
+          ./packaging/shared/utility.sh all --weapon-docs "${GIT_TAG}" | python3 ./packaging/shared/format-docs.py > "docs/api/weapons.md"
+          ./packaging/shared/utility.sh all --sprite-sequence-docs "${GIT_TAG}" | python3 ./packaging/shared/format-docs.py > "docs/api/sprite-sequences.md"
+          ./packaging/shared/utility.sh all --lua-docs "${GIT_TAG}" > "docs/api/lua.md"
 
       - name: Commit docs.openra.net
         env:
 
@@ -23,7 +23,7 @@ jobs:
           wget -q "https://github.com/${{ github.repository }}/releases/download/${{ github.event.inputs.tag }}/OpenRA-Dune-2000-x86_64.AppImage"
           wget -q "https://github.com/${{ github.repository }}/releases/download/${{ github.event.inputs.tag }}/OpenRA-Red-Alert-x86_64.AppImage"
           wget -q "https://github.com/${{ github.repository }}/releases/download/${{ github.event.inputs.tag }}/OpenRA-Tiberian-Dawn-x86_64.AppImage"
-          wget -q "https://raw.githubusercontent.com/${{ github.repository }}/${{ github.event.inputs.tag }}/packaging/.itch.toml"
+          wget -q "https://raw.githubusercontent.com/${{ github.repository }}/${{ github.event.inputs.tag }}/packaging/shared/.itch.toml"
           zip -u "OpenRA-${{ github.event.inputs.tag }}-x64-win-itch.zip" .itch.toml
 
       - name: Publish Windows Installer
 
@@ -121,7 +121,7 @@ jobs:
       - name: Package Installers
         run: |
           mkdir -p build/windows
-          ./packaging/windows/buildpackage.sh "${GIT_TAG}" "${PWD}/build/windows"
+          ./packaging/windows_cross/buildpackage.sh "${GIT_TAG}" "${PWD}/build/windows"
 
       - name: Upload Packages
         uses: svenstaro/upload-release-action@v2
 
@@ -17,7 +17,7 @@ _ReSharper.*/
 /.vscode/settings.json
 
 # binaries
-IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP
+res/IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP
 
 # backup files by various editors
 *~
@@ -54,3 +54,13 @@ update.log
 
 # IntelliJ files
 .idea
+
+# Temporary packaging directories
+build/
+packaging/windows_cross/build/
+packaging/linux/ra/
+packaging/linux/ra.appdir/
+packaging/linux/cnc/
+packaging/linux/cnc.appdir/
+packaging/linux/d2k/
+packaging/linux/d2k.appdir/
@@ -98,15 +98,15 @@ else
 	@$(DOTNET) build -c ${CONFIGURATION} -nologo -p:TargetPlatform=$(TARGETPLATFORM)
 endif
 ifeq ($(TARGETPLATFORM), unix-generic)
-	@./configure-system-libraries.sh
+	@sh -c './packaging/shared/configure-system-libraries.sh'
 endif
-	@./fetch-geoip.sh
+	@sh -c './packaging/shared/fetch-geoip.sh'
 
 # dotnet clean and msbuild -t:Clean leave files that cause problems when switching between mono/dotnet
 # Deleting the intermediate / output directories ensures the build directory is actually clean
 clean:
-	@-$(RM_RF) ./bin ./*/obj
-	@-$(RM_F) IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP
+	@-$(RM_RF) ./src/bin ./src/*/obj ./build ./packaging/*/build
+	@-$(RM_F) ./res/IP2LOCATION-LITE-DB1.IPV6.BIN.ZIP
 
 check:
 	@echo
@@ -118,14 +118,14 @@ else
 	@$(DOTNET) build -c Debug -nologo -warnaserror -p:TargetPlatform=$(TARGETPLATFORM)
 endif
 ifeq ($(TARGETPLATFORM), unix-generic)
-	@./configure-system-libraries.sh
+	@sh -c './packaging/shared/configure-system-libraries.sh'
 endif
 	@echo
 	@echo "Checking for explicit interface violations..."
-	@./utility.sh all --check-explicit-interfaces
+	@sh -c './packaging/shared/utility.sh all --check-explicit-interfaces'
 	@echo
 	@echo "Checking for incorrect conditional trait interface overrides..."
-	@./utility.sh all --check-conditional-trait-interface-overrides
+	@sh -c './packaging/shared/utility.sh all --check-conditional-trait-interface-overrides'
 
 check-scripts:
 	@echo
@@ -135,16 +135,16 @@ check-scripts:
 test: all
 	@echo
 	@echo "Testing Tiberian Sun mod MiniYAML..."
-	@./utility.sh ts --check-yaml
+	@sh -c './packaging/shared/utility.sh ts --check-yaml'
 	@echo
 	@echo "Testing Dune 2000 mod MiniYAML..."
-	@./utility.sh d2k --check-yaml
+	@sh -c './packaging/shared/utility.sh d2k --check-yaml'
 	@echo
 	@echo "Testing Tiberian Dawn mod MiniYAML..."
-	@./utility.sh cnc --check-yaml
+	@sh -c './packaging/shared/utility.sh cnc --check-yaml'
 	@echo
 	@echo "Testing Red Alert mod MiniYAML..."
-	@./utility.sh ra --check-yaml
+	@sh -c './packaging/shared/utility.sh ra --check-yaml'
 
 tests:
 	@dotnet build OpenRA.Test/OpenRA.Test.csproj -c Debug --nologo -p:TargetPlatform=$(TARGETPLATFORM)
@@ -157,22 +157,22 @@ version: VERSION mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mo
 ifeq ($(VERSION),)
 	$(error Unable to determine new version (requires git or override of variable VERSION))
 endif
-	@sh -c '. ./packaging/functions.sh; set_engine_version "$(VERSION)" .'
-	@sh -c '. ./packaging/functions.sh; set_mod_version "$(VERSION)" mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mod.yaml mods/modcontent/mod.yaml mods/all/mod.yaml'
+	@sh -c 'echo "$(VERSION)" >"./VERSION"''
+	@sh -c ./packaging/shared/set-mod-version.sh "$(VERSION)" mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mod.yaml mods/modcontent/mod.yaml mods/all/mod.yaml'
 
 install:
-	@sh -c '. ./packaging/functions.sh; install_assemblies $(CWD) $(DESTDIR)$(gameinstalldir) $(TARGETPLATFORM) $(RUNTIME) True True True'
-	@sh -c '. ./packaging/functions.sh; install_data $(CWD) $(DESTDIR)$(gameinstalldir) cnc d2k ra'
+	@sh -c './packaging/shared/install-assemblies.sh $(CWD) "$(DESTDIR)" "$(gameinstalldir)" $(TARGETPLATFORM) $(RUNTIME) True True True'
+	@sh -c './packaging/shared/install-data.sh $(CWD) "$(DESTDIR)" "$(gameinstalldir)" cnc d2k ra'
 
 install-linux-shortcuts:
-	@sh -c '. ./packaging/functions.sh; install_linux_shortcuts $(CWD) "$(DESTDIR)" "$(gameinstalldir)" "$(bindir)" "$(datadir)" "$(shell head -n1 VERSION)" cnc d2k ra'
+	@sh -c '. ./packaging/linux/install-shortcuts.sh $(CWD) "$(DESTDIR)" "$(gameinstalldir)" "$(bindir)" "$(datadir)" "$(shell head -n1 VERSION)" cnc d2k ra'
 
 install-linux-appdata:
-	@sh -c '. ./packaging/functions.sh; install_linux_appdata $(CWD) "$(DESTDIR)" "$(datadir)" cnc d2k ra'
+	@sh -c './packaging/linux/install-appdata.sh $(CWD) "$(DESTDIR)" "$(datadir)" cnc d2k ra'
 
 install-man: all
 	@mkdir -p $(DESTDIR)$(mandir)/man6/
-	@./utility.sh all --man-page > $(DESTDIR)$(mandir)/man6/openra.6
+	@sh -c './packaging/shared/utility.sh all --man-page > $(DESTDIR)$(mandir)/man6/openra.6'
 
 help:
 	@echo 'to compile, run:'
 
@@ -3,25 +3,25 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28803.352
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.Game", "OpenRA.Game\OpenRA.Game.csproj", "{0DFB103F-2962-400F-8C6D-E2C28CCBA633}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.Game", "src\OpenRA.Game\OpenRA.Game.csproj", "{0DFB103F-2962-400F-8C6D-E2C28CCBA633}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.Mods.Cnc", "OpenRA.Mods.Cnc\OpenRA.Mods.Cnc.csproj", "{2881135D-4D62-493E-8F83-5EEE92CCC6BE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.Mods.Cnc", "src\OpenRA.Mods.Cnc\OpenRA.Mods.Cnc.csproj", "{2881135D-4D62-493E-8F83-5EEE92CCC6BE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.Utility", "OpenRA.Utility\OpenRA.Utility.csproj", "{F33337BE-CB69-4B24-850F-07D23E408DDF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.Utility", "src\OpenRA.Utility\OpenRA.Utility.csproj", "{F33337BE-CB69-4B24-850F-07D23E408DDF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.Server", "OpenRA.Server\OpenRA.Server.csproj", "{76F621A1-3D8E-4A99-9F7E-B071EB657817}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.Server", "src\OpenRA.Server\OpenRA.Server.csproj", "{76F621A1-3D8E-4A99-9F7E-B071EB657817}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.Mods.D2k", "OpenRA.Mods.D2k\OpenRA.Mods.D2k.csproj", "{C0B0465C-6BE2-409C-8770-3A9BF64C4344}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.Mods.D2k", "src\OpenRA.Mods.D2k\OpenRA.Mods.D2k.csproj", "{C0B0465C-6BE2-409C-8770-3A9BF64C4344}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.Platforms.Default", "OpenRA.Platforms.Default\OpenRA.Platforms.Default.csproj", "{33D03738-C154-4028-8EA8-63A3C488A651}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.Platforms.Default", "src\OpenRA.Platforms.Default\OpenRA.Platforms.Default.csproj", "{33D03738-C154-4028-8EA8-63A3C488A651}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.Mods.Common", "OpenRA.Mods.Common\OpenRA.Mods.Common.csproj", "{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.Mods.Common", "src\OpenRA.Mods.Common\OpenRA.Mods.Common.csproj", "{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.Test", "OpenRA.Test\OpenRA.Test.csproj", "{6CB8E1B7-6B36-4D93-8633-7C573E194AC4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.Test", "src\OpenRA.Test\OpenRA.Test.csproj", "{6CB8E1B7-6B36-4D93-8633-7C573E194AC4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.Launcher", "OpenRA.Launcher\OpenRA.Launcher.csproj", "{54DAE0E0-3125-49D3-992E-A0E931EB5FC8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.Launcher", "src\OpenRA.Launcher\OpenRA.Launcher.csproj", "{54DAE0E0-3125-49D3-992E-A0E931EB5FC8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.WindowsLauncher", "OpenRA.WindowsLauncher\OpenRA.WindowsLauncher.csproj", "{912B578E-0BC0-4987-807B-1E294A87DA37}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRA.WindowsLauncher", "src\OpenRA.WindowsLauncher\OpenRA.WindowsLauncher.csproj", "{912B578E-0BC0-4987-807B-1E294A87DA37}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 
@@ -0,0 +1,40 @@
+# TODO
+
+```sh
+packaging/windows_cross/buildpackage.sh
+```
+
+## Overall
+
+-   Totally reorganise build system so that it works the same way on all
+    platforms
+-   Have proper phases for each section, which can be linked to make targets,
+    and depend on one another
+-   ~Don't build multiple architectures at once at the script level~
+-   Unify makefiles (somehow)
+-   ~Clean up script litter everywhere~
+-   ~Move the C# source into one top level directory~
+-   Fix the launch scripts (easier when there is no more disparity between
+    regular and package builds)
+-   Verify that all builds still work
+-   Investigate a generic cross-platform build process
+-   Pre-commit
+-   Stop fetching anything at build time (kills reproduceability)
+
+## Windows
+
+-   ~Rename to windows_cross~
+-   Investigate native packaging etc as well
+-   Fix resource hacking
+
+## Linux
+
+-   ~Verify it works~
+    -   Fix crash on map launch
+-   Fix dedicated server launch script
+-   Add other packaging options
+
+## MacOS
+
+-   Verify it works
+-   Check if unsigned releases work at all