diff --git a/Makefile b/Makefile index 0df1be3..209abcd 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ # make check # -.PHONY: utility build clean engine version check-scripts check test +.PHONY: utility stylecheck build clean engine version check-scripts check test .DEFAULT_GOAL := build VERSION = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`) @@ -47,6 +47,9 @@ engine: utility: engine @test -f "$(ENGINE_DIRECTORY)/OpenRA.Utility.exe" || (printf "OpenRA.Utility.exe not found!\n"; exit 1) +stylecheck: engine + @test -f "$(ENGINE_DIRECTORY)/OpenRA.StyleCheck.exe" || (cd $(ENGINE_DIRECTORY) && make stylecheck) + build: engine ifeq ("$(HAS_MSBUILD)","") @find . -maxdepth 1 -name '*.sln' -exec xbuild /nologo /verbosity:quiet /p:TreatWarningsAsErrors=true \; @@ -81,11 +84,11 @@ ifneq ("$(LUA_FILES)","") @luac -p $(LUA_FILES) endif -check: utility +check: utility stylecheck @echo "Checking for explicit interface violations..." @MOD_SEARCH_PATHS="$(MOD_SEARCH_PATHS)" mono --debug "$(ENGINE_DIRECTORY)/OpenRA.Utility.exe" $(MOD_ID) --check-explicit-interfaces @echo "Checking for code style violations in OpenRA.Mods.$(MOD_ID)..." - @MOD_SEARCH_PATHS="$(MOD_SEARCH_PATHS)" mono --debug "$(ENGINE_DIRECTORY)/OpenRA.Utility.exe" $(MOD_ID) --check-code-style OpenRA.Mods.$(MOD_ID) + @mono --debug "$(ENGINE_DIRECTORY)/OpenRA.StyleCheck.exe" OpenRA.Mods.$(MOD_ID) test: utility @echo "Testing $(MOD_ID) mod MiniYAML..." diff --git a/mod.config b/mod.config index 382b2df..d924e65 100644 --- a/mod.config +++ b/mod.config @@ -1,7 +1,7 @@ # The id of the mod to launch by default. This must exist as a directory in the mods directory MOD_ID="example" -ENGINE_VERSION="f75115a" +ENGINE_VERSION="1b0ae1e" # Import the default OpenRA mods for use as external mod references # in your mod.yaml. Accepts values "True" or "False".