From a37e6a3625e33860959b1a90cd588e5e5f584f3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 2 Aug 2015 17:08:33 +0200 Subject: [PATCH 1/3] fix TS mod not being versioned --- Makefile | 2 +- make.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e6bc54600c..5cf6a802fd 100644 --- a/Makefile +++ b/Makefile @@ -311,7 +311,7 @@ dependencies: $(os-dependencies) all-dependencies: cli-dependencies windows-dependencies osx-dependencies -version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/modchooser/mod.yaml mods/all/mod.yaml +version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mod.yaml mods/modchooser/mod.yaml mods/all/mod.yaml @for i in $? ; do \ awk '{sub("Version:.*$$","Version: $(VERSION)"); print $0}' $${i} > $${i}.tmp && \ mv -f $${i}.tmp $${i} ; \ diff --git a/make.ps1 b/make.ps1 index 4d52f0f340..661c0f25eb 100644 --- a/make.ps1 +++ b/make.ps1 @@ -107,7 +107,7 @@ elseif ($command -eq "version") if ($version -ne $null) { - $mods = @("mods/ra/mod.yaml", "mods/cnc/mod.yaml", "mods/d2k/mod.yaml", "mods/modchooser/mod.yaml") + $mods = @("mods/ra/mod.yaml", "mods/cnc/mod.yaml", "mods/d2k/mod.yaml", "mods/ts/mod.yaml", "mods/modchooser/mod.yaml") foreach ($mod in $mods) { $replacement = (gc $mod) -Replace "Version:.*", ("Version: {0}" -f $version) From f2073d18aa446c6860184b15c95da64d8e4525c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 2 Aug 2015 17:11:47 +0200 Subject: [PATCH 2/3] fix documentation not being versioned on Windows --- make.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.ps1 b/make.ps1 index 661c0f25eb..1c76c3c314 100644 --- a/make.ps1 +++ b/make.ps1 @@ -107,7 +107,7 @@ elseif ($command -eq "version") if ($version -ne $null) { - $mods = @("mods/ra/mod.yaml", "mods/cnc/mod.yaml", "mods/d2k/mod.yaml", "mods/ts/mod.yaml", "mods/modchooser/mod.yaml") + $mods = @("mods/ra/mod.yaml", "mods/cnc/mod.yaml", "mods/d2k/mod.yaml", "mods/ts/mod.yaml", "mods/modchooser/mod.yaml", "mods/all/mod.yaml") foreach ($mod in $mods) { $replacement = (gc $mod) -Replace "Version:.*", ("Version: {0}" -f $version) From 7c9a333ac4f8c479e93755100e10a9e5887a311a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 2 Aug 2015 17:12:06 +0200 Subject: [PATCH 3/3] also use the combined mod for Lua API doc generation --- Makefile | 2 +- make.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5cf6a802fd..e45b3e8b2f 100644 --- a/Makefile +++ b/Makefile @@ -319,7 +319,7 @@ version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/ts/mod.yaml m docs: utility mods version @mono --debug OpenRA.Utility.exe all --docs > DOCUMENTATION.md - @mono --debug OpenRA.Utility.exe ra --lua-docs > Lua-API.md + @mono --debug OpenRA.Utility.exe all --lua-docs > Lua-API.md man-page: utility mods @mono --debug OpenRA.Utility.exe all --man-page > openra.6 diff --git a/make.ps1 b/make.ps1 index 1c76c3c314..64ca0c800f 100644 --- a/make.ps1 +++ b/make.ps1 @@ -190,7 +190,7 @@ elseif ($command -eq "docs") { ./make.ps1 version ./OpenRA.Utility.exe all --docs | Out-File -Encoding "UTF8" DOCUMENTATION.md - ./OpenRA.Utility.exe ra --lua-docs | Out-File -Encoding "UTF8" Lua-API.md + ./OpenRA.Utility.exe all --lua-docs | Out-File -Encoding "UTF8" Lua-API.md } else {