Add a make file for tools and update stuff accordingly

3 files changed, 40 insertions, 2 deletions

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..7c24164
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,37 @@
+XSLTPROC = xsltproc
+
+all:
+	@echo "Current makes:"
+	@echo "contrib - makes contributors list for wiki and client-data"
+	@echo "testxml - performs a minimal XML test"
+	@echo "wiki    - makes wiki automated databases"
+	@echo "maps    - makes server-data information"
+	@echo "update  - makes update and propagate web information (untested)"
+
+contrib:
+	cd contrib_xsl ; make
+	@echo "Please commit the result on wiki and clientdata."
+
+.PHONY: testxml
+testxml:
+	cd testxml ; ./testxml.py silent |grep -v "Checking"
+
+.PHONY: wiki
+wiki:
+	cd wiki ; ./wikigen.py
+	cd wiki ; mv *.md ../../wiki/
+	@echo "Wiki files updated, please commit the result on wiki."
+
+.PHONY: maps
+maps:
+	cd hercules ; ./tmx_converter.py ../../client-data/ ../../server-data
+	cd hercules ; ./convert_tmx_to_mapcache.py
+	@echo "Please commit the result on serverdata."
+
+.PHONY: update
+update:
+	@cd ../web ; echo "Checking for web/ folder..." # check if web directory exists
+	cd update ; ./update.sh
+	cd web ; ./deploy.sh
+	@echo "Update deployed, please move upload/ and commit result on web."
+
diff --git a/update/update.sh b/update/update.sh
index 768b5c7..5a986ff 100755
--- a/update/update.sh
+++ b/update/update.sh
@@ -35,4 +35,6 @@ if [ -f TMW2-${u1}..${u2}.zip ]; then
     cp resources2.txt ../upload/
     cp resources.xml ../upload/
     cp ../news.txt ../upload
+
+    echo "Update ID: ${u1}..${u2}"
 fi
diff --git a/wiki/wikigen.py b/wiki/wikigen.py
index f8d5006..025031f 100755
--- a/wiki/wikigen.py
+++ b/wiki/wikigen.py
@@ -837,5 +837,4 @@ testMobs()
 wikia.close()
 wikib.close()
 showFooter()
-if errors > 0 or warnings > 0:
-    exit(1)
+exit(0)