Add Windows export preset

Annoyingly this needed changes to the version-generator plugin, because
exporting generated this warning:

    WARNING: Invalid version number "v0.1.11-72-g29be516f2". The version
    number can only contain numeric characters (0-9) and non-consecutive
    periods (.).

I changed it so that "application/config/version" is "0.1.12" for the
tag "v0.1.12", and "0.1.11.72" for a build 72 commits ahead of v0.1.11.
The full `git describe --tags` output is now in
"application/config/full_version".

Explicitly qualify the export name with "x86_64". It is possible we will
one day add an arm64 export. Update the Linux export accordingly. Ensure
the target directory exists for both builds

Resolves #2155

Author: wjt

addons/threadbare_git_describe/export.gd

@@ -9,18 +9,20 @@ func _get_name() -> String:
 	return "threadbare_git_describe_exporter"
 
 
-func set_version(version: Variant) -> void:
-	ProjectSettings.set_setting("application/config/version", version)
-	var err := ProjectSettings.save()
-	if err != OK:
-		printerr("Failed to save project settings: %s" % error_string(err))
-
-
 func _export_begin(
 	_features: PackedStringArray, _is_debug: bool, _path: String, _flags: int
 ) -> void:
-	set_version(Version.git_describe(true))
+	var describe := Version.git_describe(true)
+	ProjectSettings.set_setting(Version.FULL_VERSION_KEY, describe)
+	ProjectSettings.set_setting(Version.VERSION_KEY, Version.simplify(describe))
+	var err := ProjectSettings.save()
+	if err != OK:
+		printerr("Failed to save project settings: %s" % error_string(err))
 
 
 func _export_end() -> void:
-	set_version(null)
+	ProjectSettings.set_setting(Version.FULL_VERSION_KEY, null)
+	ProjectSettings.set_setting(Version.VERSION_KEY, null)
+	var err := ProjectSettings.save()
+	if err != OK:
+		printerr("Failed to save project settings: %s" % error_string(err))

addons/threadbare_git_describe/version.gd

@@ -3,33 +3,54 @@
 extends Object
 ## Functions to determine the game version
 
+const FULL_VERSION_KEY := &"application/config/full_version"
+const VERSION_KEY := &"application/config/version"
+
 static var _initialized := false
+static var _full_version: String
 static var _version: String
 
 
 ## Gets the project version based on [code]git describe[/code],
-## or [code]""[/code] if this fails.
+## or [code]"v0.0.0"[/code] if this fails.
 static func git_describe(warn_on_error: bool) -> String:
 	var output: Array[String] = []
 	var ret := OS.execute("git", ["describe", "--tags"], output)
 	if ret != 0:
 		if warn_on_error:
 			printerr("git describe --tags failed: %d" % ret)
-		return ""
+		return "v0.0.0"
 
 	var version := output[0].strip_edges()
 	return version
 
 
-## Gets the game version from the project configuration, falling back to
-## calling [member git_describe].
-static func get_version() -> String:
-	if not _initialized:
-		_version = ProjectSettings.get(&"application/config/version")
+static func simplify(full_version: String) -> String:
+	var regex := RegEx.new()
+	regex.compile("^v(?<base>\\d+(?:\\.\\d+)+)(?:-(?<count>\\d+).*)?$")
+	var result := regex.search(full_version)
+	if not result:
+		return "0.0.0"
+	return ".".join(result.strings.slice(1))
+
+
+## Gets the full `git describe`-style version
+static func get_full_version() -> String:
+	if not _full_version:
+		_full_version = ProjectSettings.get_setting(FULL_VERSION_KEY, "")
 
-		if not _version:
-			_version = git_describe(false)
+	if not _full_version:
+		_full_version = git_describe(false)
+
+	return _full_version
+
+
+## Gets the game version in a Windows .exe-friendly x.y.z.w format
+static func get_version() -> String:
+	if not _version:
+		_version = ProjectSettings.get_setting(VERSION_KEY, "")
 
-		_initialized = true
+	if not _version:
+		_version = simplify(get_full_version())
 
 	return _version

addons/threadbare_git_describe/version_label.gd

@@ -8,4 +8,4 @@ extends Label
 
 
 func _ready() -> void:
-	text = preload("./version.gd").get_version()
+	text = preload("./version.gd").get_full_version()

build/linux-x86_64/.gdignore

@@ -63,15 +63,15 @@ threads/godot_pool_size=4
 
 [preset.1]
 
-name="Linux"
+name="Linux x86_64"
 platform="Linux"
 runnable=true
 dedicated_server=false
 custom_features=""
 export_filter="all_resources"
 include_filter=""
 exclude_filter=""
-export_path="build/threadbare.x86_64"
+export_path="build/linux-x86_64/threadbare.x86_64"
 patches=PackedStringArray()
 patch_delta_encoding=false
 patch_delta_compression_level_zstd=19
@@ -107,3 +107,75 @@ unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\"
 ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash
 kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\")
 rm -rf \"{temp_dir}\""
+
+[preset.2]
+
+name="Windows x86_64"
+platform="Windows Desktop"
+runnable=true
+dedicated_server=false
+custom_features=""
+export_filter="all_resources"
+include_filter=""
+exclude_filter=""
+export_path="build/windows-x86_64/threadbare.exe"
+patches=PackedStringArray()
+patch_delta_encoding=false
+patch_delta_compression_level_zstd=19
+patch_delta_min_reduction=0.1
+patch_delta_include_filters="*"
+patch_delta_exclude_filters=""
+encryption_include_filters=""
+encryption_exclude_filters=""
+seed=0
+encrypt_pck=false
+encrypt_directory=false
+script_export_mode=2
+
+[preset.2.options]
+
+custom_template/debug=""
+custom_template/release=""
+debug/export_console_wrapper=1
+binary_format/embed_pck=false
+texture_format/s3tc_bptc=true
+texture_format/etc2_astc=false
+shader_baker/enabled=false
+binary_format/architecture="x86_64"
+codesign/enable=false
+codesign/timestamp=true
+codesign/timestamp_server_url=""
+codesign/digest_algorithm=1
+codesign/description=""
+codesign/custom_options=PackedStringArray()
+application/modify_resources=true
+application/icon=""
+application/console_wrapper_icon=""
+application/icon_interpolation=4
+application/file_version=""
+application/product_version=""
+application/company_name="Endless Access"
+application/product_name="Threadbare"
+application/file_description=""
+application/copyright="Endless Access LLC & the Threadbare Authors"
+application/trademarks=""
+application/export_angle=0
+application/export_d3d12=0
+application/d3d12_agility_sdk_multiarch=true
+ssh_remote_deploy/enabled=false
+ssh_remote_deploy/host="user@host_ip"
+ssh_remote_deploy/port="22"
+ssh_remote_deploy/extra_args_ssh=""
+ssh_remote_deploy/extra_args_scp=""
+ssh_remote_deploy/run_script="Expand-Archive -LiteralPath '{temp_dir}\\{archive_name}' -DestinationPath '{temp_dir}'
+$action = New-ScheduledTaskAction -Execute '{temp_dir}\\{exe_name}' -Argument '{cmd_args}'
+$trigger = New-ScheduledTaskTrigger -Once -At 00:00
+$settings = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries
+$task = New-ScheduledTask -Action $action -Trigger $trigger -Settings $settings
+Register-ScheduledTask godot_remote_debug -InputObject $task -Force:$true
+Start-ScheduledTask -TaskName godot_remote_debug
+while (Get-ScheduledTask -TaskName godot_remote_debug | ? State -eq running) { Start-Sleep -Milliseconds 100 }
+Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue"
+ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue
+Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue
+Remove-Item -Recurse -Force '{temp_dir}'"