epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move the mod dependencies to the test/check rules.

Browse Source 
The utility does not require these at compile time, but the check and test commands are located inside the RA mod, which references all of the mod dlls at run time.
This commit is contained in:
Paul Chote
2015-01-10 10:20:11 +13:00
parent 5840e91908
commit e0e0fea152
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Makefile
View File

@@ -171,7 +171,7 @@ OpenRA.Editor.Form1.resources:
resgen2 OpenRA.Editor/Form1.resx OpenRA.Editor.Form1.resources 1> /dev/null resgen2 OpenRA.Editor/Form1.resx OpenRA.Editor.Form1.resources 1> /dev/null
editor: OpenRA.Editor.MapSelect.resources OpenRA.Editor.Form1.resources $(editor_TARGET) editor: OpenRA.Editor.MapSelect.resources OpenRA.Editor.Form1.resources $(editor_TARGET)
check: utility check: utility mods
@echo @echo
@echo "Checking for code style violations in OpenRA.Game..." @echo "Checking for code style violations in OpenRA.Game..."
@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Game @mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Game
@@ -189,30 +189,30 @@ check: utility
@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.RA @mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.RA
@echo @echo
@echo "Checking for code style violations in OpenRA.Mods.Cnc..." @echo "Checking for code style violations in OpenRA.Mods.Cnc..."
@mono --debug OpenRA.Utility.exe cnc --check-code-style OpenRA.Mods.Cnc @mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.Cnc
@echo @echo
@echo "Checking for code style violations in OpenRA.Mods.D2k..." @echo "Checking for code style violations in OpenRA.Mods.D2k..."
@mono --debug OpenRA.Utility.exe cnc --check-code-style OpenRA.Mods.D2k @mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.D2k
@echo @echo
@echo "Checking for code style violations in OpenRA.Mods.TS..." @echo "Checking for code style violations in OpenRA.Mods.TS..."
@mono --debug OpenRA.Utility.exe cnc --check-code-style OpenRA.Mods.TS @mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.TS
@echo @echo
@echo "Checking for code style violations in OpenRA.Editor..." @echo "Checking for code style violations in OpenRA.Editor..."
@mono --debug OpenRA.Utility.exe cnc --check-code-style OpenRA.Editor @mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Editor
@echo @echo
@echo "Checking for code style violations in OpenRA.Renderer.Sdl2..." @echo "Checking for code style violations in OpenRA.Renderer.Sdl2..."
@mono --debug OpenRA.Utility.exe cnc --check-code-style OpenRA.Renderer.Sdl2 @mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Renderer.Sdl2
@echo @echo
@echo "Checking for code style violations in OpenRA.Utility..." @echo "Checking for code style violations in OpenRA.Utility..."
@mono --debug OpenRA.Utility.exe cnc --check-code-style OpenRA.Utility @mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Utility
@echo @echo
@echo "Checking for code style violations in OpenRA.Test..." @echo "Checking for code style violations in OpenRA.Test..."
@mono --debug OpenRA.Utility.exe cnc --check-code-style OpenRA.Test @mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Test
@echo @echo
@echo "Checking for code style violations in OpenRA.TilesetBuilder..." @echo "Checking for code style violations in OpenRA.TilesetBuilder..."
@mono --debug OpenRA.Utility.exe cnc --check-code-style OpenRA.TilesetBuilder @mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.TilesetBuilder
test: utility test: utility mods
@echo @echo
@echo "Testing Tiberian Sun mod MiniYAML..." @echo "Testing Tiberian Sun mod MiniYAML..."
@mono --debug OpenRA.Utility.exe ts --check-yaml @mono --debug OpenRA.Utility.exe ts --check-yaml
@@ -261,8 +261,7 @@ utility_KIND = exe
utility_DEPS = $(game_TARGET) utility_DEPS = $(game_TARGET)
utility_LIBS = $(COMMON_LIBS) $(utility_DEPS) thirdparty/ICSharpCode.SharpZipLib.dll utility_LIBS = $(COMMON_LIBS) $(utility_DEPS) thirdparty/ICSharpCode.SharpZipLib.dll
PROGRAMS += utility PROGRAMS += utility
utility: $(utility_TARGET) mod_common mod_cnc mod_ra mod_d2k mod_ts utility: $(utility_TARGET)
# Patches binary headers to work around a mono bug # Patches binary headers to work around a mono bug
fixheader.exe: packaging/fixheader.cs fixheader.exe: packaging/fixheader.cs
@@ -326,7 +325,7 @@ version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/modchooser/mo
done done
# Documentation (d2k depends on all mod libraries) # Documentation (d2k depends on all mod libraries)
docs: utility docs: utility mods
@mono --debug OpenRA.Utility.exe d2k --docs > DOCUMENTATION.md @mono --debug OpenRA.Utility.exe d2k --docs > DOCUMENTATION.md
@mono --debug OpenRA.Utility.exe ra --lua-docs > Lua-API.md @mono --debug OpenRA.Utility.exe ra --lua-docs > Lua-API.md