Remove generated new from repo and add to post-merge script

themanaworld · Dec 19, 2013 · 91498af · 91498af
1 parent e34e49d
commit 91498af
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 947 deletions.
diff --git a/GNUmakefile b/GNUmakefile
@@ -25,6 +25,7 @@ indent-mobs: tools/aligncsv
 
 world/map/news.txt world/map/news.html: tools/news.py tools/_news_colors.py world/map/news.d/* world/map/news.d/
 	tools/news.py world/map/ world/map/news.d/
+	chmod a+r world/map/news.txt world/map/news.html
 
 news: world/map/news.txt world/map/news.html
 updates:

diff --git a/git/hooks/post-merge b/git/hooks/post-merge
@@ -9,6 +9,7 @@
 # (rebase is better but dangerous in some circumstances)
 # git submodule update --rebase
 git submodule update --merge
+make news
 
 # WARNING: to people with push access.
 # it is essential that changes to the client data be pushed before changes to server data

diff --git a/world/map/.gitignore b/world/map/.gitignore
@@ -0,0 +1,2 @@
+/news.html
+/news.txt