From 9aa16c95da0959b9d2834c3853c12395d04d385a Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Fri, 10 Apr 2015 00:13:19 +0200 Subject: [PATCH 1/2] Set version before creating docs Since the version string gets embedded into the created documentation. --- Makefile | 2 +- make.ps1 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 966eca4e00..604e31053d 100644 --- a/Makefile +++ b/Makefile @@ -309,7 +309,7 @@ version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/modchooser/mo done # Documentation (d2k depends on all mod libraries) -docs: utility mods +docs: utility mods version @mono --debug OpenRA.Utility.exe d2k --docs > DOCUMENTATION.md @mono --debug OpenRA.Utility.exe ra --lua-docs > Lua-API.md diff --git a/make.ps1 b/make.ps1 index 7bad85f6c2..41f4c6b7c0 100644 --- a/make.ps1 +++ b/make.ps1 @@ -157,6 +157,7 @@ elseif ($command -eq "check") } elseif ($command -eq "docs") { + ./make.ps1 version ./OpenRA.Utility.exe d2k --docs | Out-File -Encoding "UTF8" DOCUMENTATION.md ./OpenRA.Utility.exe ra --lua-docs | Out-File -Encoding "UTF8" Lua-API.md } From 8bb19defd6fd30f2f9935b02c242a5904e286c86 Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Fri, 10 Apr 2015 12:10:12 +0200 Subject: [PATCH 2/2] Only set the version once in appveyor.yaml --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 2eb9dea95f..ecaebb377f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,7 +16,6 @@ test_script: - nunit-console-x86.exe OpenRA.Test.dll after_test: - - make version - choco install pandoc -y - '%LOCALAPPDATA%\Pandoc\pandoc.exe -o README.html README.md' - '%LOCALAPPDATA%\Pandoc\pandoc.exe -o CONTRIBUTING.html CONTRIBUTING.md'