From 2ed47b042550dc607e0a4e8afdd30752c1cf6ed4 Mon Sep 17 00:00:00 2001
From: Aki <please@ignore.pl>
Date: Fri, 5 Apr 2024 19:40:36 +0200
Subject: CMake will now generate vdf with version in description

---
 .gitlab-ci.yml   |  6 +++++-
 CMakeLists.txt   |  3 ++-
 default.vdf.conf | 29 +++++++++++++++++++++++++++++
 gitlab.vdf       | 29 -----------------------------
 4 files changed, 36 insertions(+), 31 deletions(-)
 create mode 100644 default.vdf.conf
 delete mode 100644 gitlab.vdf

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dbf9a1e..6bc8f59 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,9 +67,13 @@ package-windows:
 
 steam:
   stage: deploy
+  # All build-*/ will have matching vdfs generated as they are configured from scratch against same revision.
   needs: ["build-linux", "package-linux", "package-windows"]
   script:
-    - steamcmd +login "$STEAM_USERNAME" "$STEAM_PASSWORD" $STEAM_GUARD +run_app_build "$CI_PROJECT_DIR/build-linux/gitlab.vdf" +quit
+    - steamcmd
+      +login "$STEAM_USERNAME" "$STEAM_PASSWORD" $STEAM_GUARD
+      +run_app_build "$CI_PROJECT_DIR/build-linux/default.vdf"
+      +quit
   artifacts:
     paths:
       - .steam_cache/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0245b2c..55fdcc3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,5 +23,6 @@ add_subdirectory(sim)
 add_subdirectory(stats)
 add_subdirectory(universe)
 add_version_file(version.txt version.txt.conf)
-add_version_file(gitlab.vdf gitlab.vdf.conf)
+add_version_file(default.vdf default.vdf.conf)
 add_custom_target(version ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/version.txt")
+add_custom_target(vdfs ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/default.vdf")
diff --git a/default.vdf.conf b/default.vdf.conf
new file mode 100644
index 0000000..7db6435
--- /dev/null
+++ b/default.vdf.conf
@@ -0,0 +1,29 @@
+"AppBuild"
+{
+	"AppID" "@STEAM_APPID@"
+	"Desc" "Default build: @VERSION@"
+	"BuildOutput" "../.steam_cache/"
+	"Depots"
+	{
+		"@STEAM_DEPOTID_WINDOWS@"
+		{
+			"ContentRoot" "../kurator-x86_64-windows/"
+			"FileMapping"
+			{
+				"LocalPath" "*"
+				"DepotPath" "."
+				"recursive" "1"
+			}
+		}
+		"@STEAM_DEPOTID_LINUX@"
+		{
+			"ContentRoot" "../kurator-x86_64-linux/"
+			"FileMapping"
+			{
+				"LocalPath" "*"
+				"DepotPath" "."
+				"recursive" "1"
+			}
+		}
+	}
+}
diff --git a/gitlab.vdf b/gitlab.vdf
deleted file mode 100644
index e2f99df..0000000
--- a/gitlab.vdf
+++ /dev/null
@@ -1,29 +0,0 @@
-"AppBuild"
-{
-	"AppID" "@STEAM_APPID@"
-	"Desc" "Default app build matching GitLab configuration"
-	"BuildOutput" ".steam_cache/"
-	"Depots"
-	{
-		"@STEAM_DEPOTID_WINDOWS@"
-		{
-			"ContentRoot" "kurator-x86_64-windows/"
-			"FileMapping"
-			{
-				"LocalPath" "*"
-				"DepotPath" "."
-				"recursive" "1"
-			}
-		}
-		"@STEAM_DEPOTID_LINUX@"
-		{
-			"ContentRoot" "kurator-x86_64-linux/"
-			"FileMapping"
-			{
-				"LocalPath" "*"
-				"DepotPath" "."
-				"recursive" "1"
-			}
-		}
-	}
-}
-- 
cgit v1.1