diff --git a/Makefile b/Makefile index f0aafad08d..f0df099c10 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,12 @@ -.PHONY: build client server lint deploy +.PHONY: build client server lint deploy noRL DOTNET_FLAGS+= -c Release -v quiet -maxcpucount:5 /property:WarningLevel=0 /p:WarningsAsErrors=nullable DOTNET_BUILD=dotnet build ${DOTNET_FLAGS} -fast: build fastserver fastclient +build: noRL + ${DOTNET_BUILD} -build: libRL +rlbuild: libRL ${DOTNET_BUILD} libRL: @@ -17,17 +18,10 @@ RL: client: cd ./bin/Content.Client && ../../linklibs && ./Content.Client -fastclient: - cd ./bin/Content.Client && ../../linklibs && ./Content.Client --connect-address localhost:1211 --connect && pkill -TERM Content.Server - server: cd ./bin/Content.Server && ./Content.Server --config-file ../../devel_config.toml -fastserver: - cd ./bin/Content.Server && ./Content.Server --config-file ../../fast_config.toml & - -lint: - rm -f Content.Server/RL/libRL/libRL.so +lint: noRL ${DOTNET_BUILD} Content.YAMLLinter cd bin/Content.YAMLLinter && ../../linklibs && ./Content.YAMLLinter @@ -36,9 +30,15 @@ test: cd bin/Content.Tests && ../../linklibs dotnet test ${DOTNET_FLAGS} -package: libRL RL +package: noRL + python3 Tools/package_server_build.py --hybrid-acz ${PACKAGE_BUILD_ARGS} + +rlpackage: libRL RL python3 Tools/package_server_build.py --hybrid-acz ${PACKAGE_BUILD_ARGS} deploy: package mv release/* ~ss14/downloads git push -f ms14 HEAD:ms/server + +noRL: + rm -f Content.Server/RL/libRL/libRL.so diff --git a/fast_config.toml b/fast_config.toml deleted file mode 100644 index 04d1a2bd56..0000000000 --- a/fast_config.toml +++ /dev/null @@ -1,62 +0,0 @@ -[log] -enabled = false - -[net] -tickrate = 30 -port = 1211 -log_late_msg = false - -[server] -id = "mining-devel" - -[game] -hostname = "Mining Station 14 DEVEL" -lobbyenabled = false -role_timers = false -lobbyduration = 3 -defaultpreset = "Mining" -min_players = 1 -map = "Mining" -map_pool = "MiningMapPool" - -[ic] -flavor_text = true - -[console] -# If this is true, people connecting from this machine (loopback) -# will automatically be elevated to full admin privileges. -# This literally works by checking if address == 127.0.0.1 || address == ::1 -loginlocal = true - -[auth] -# Authentication (accounts): -# 0 = Optional, 1 = Required, 2 = Disabled -# Presumably do require authentication on any public server. -mode = 0 - -[atmos] -space_wind = true -space_wind_max_velocity = 25.0 # from default 30 -superconduction = true - -[vote] -enabled = true -map_enabled = false -preset_enabled = false -restart_enabled = true -timermap = 30 - -[ooc] -enable_during_round = true - -[rules] -time = 0.0 - -[ghost] -role_time = 0.0 - -[adminlogs] -enabled = false - -[events] -enabled = true