Merge branch 'master' into legacy

Override all files with 'master' version.

This version is meant to preserve git history as requested by bjorn.

1 files changed, 37 insertions, 0 deletions

diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..b66e50be
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,37 @@
+.PHONY: new server-update server-updatebuild maps build buildasan config updateconfig initdb updatedb givegm updates constdb
+
+new: build config initdb
+
+server-update: updateconfig updatedb
+
+server-updatebuild: build updateconfig updatedb
+
+maps:
+	cd ../tools/hercules/ ; ./tmx_converter.py ../../client-data/ ../../server-data ; ./convert_tmx_to_mapcache.py
+
+build:
+	cd ../tools/localserver/ ; ./build.sh
+
+buildasan:
+	cd ../tools/localserver/ ; ./buildasan.sh
+
+config:
+	cd ../tools/localserver/ ; ./installconfigs.sh
+
+updateconfig:
+	cd ../tools/localserver/ ; ./updateconfigs.sh
+
+initdb:
+	cd ../tools/localserver/ ; ./initdb.sh
+
+updatedb:
+	cd ../tools/localserver/ ; ./updatedb.sh
+
+givegm:
+	cd ../tools/localserver/ ; ./givegm.sh ${ID}
+
+updates:
+	cd ../tools/update/ ; ./createnew.sh ; ./create_music.sh
+
+constdb:
+	mkdir -p doc && ./map-server --run-once --load-plugin constdb2doc --constdb2doc && cp -f doc/constants.md ../docs/server/scripts/constants.md; rm -r doc