Mercurial > hg > batmud > maputils
changeset 800:8fbde52dfdfe
Update lots of things.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Mon, 13 Jul 2009 02:46:23 +0000 |
| parents | 60b5d86aabd6 |
| children | 723ddd5537d9 |
| files | Makefile.gen config.mak maps/Makefile maps/Makefile.inc old/Makefile www/Makefile |
| diffstat | 6 files changed, 8 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.gen Mon Jul 13 02:43:52 2009 +0000 +++ b/Makefile.gen Mon Jul 13 02:46:23 2009 +0000 @@ -96,8 +96,7 @@ @svn2cl --strip-prefix "maputils/trunk/" upload: $(MAPFILES) - @scp $? $(UPURL) - @scp $? $(UPURL2) + @scp -C $? $(UPURL) @touch $@ clean:
--- a/config.mak Mon Jul 13 02:43:52 2009 +0000 +++ b/config.mak Mon Jul 13 02:46:23 2009 +0000 @@ -1,5 +1,4 @@ # # Global settings # -UPURL=mhamalai@students.oamk.fi:public_html/maps/ -UPURL2=tnsp@irc.saitti.net:public_html/maps/ +UPURL=ccr@pet8032.tnsp.org:/var/www/tnsp.org/maps/
--- a/maps/Makefile Mon Jul 13 02:43:52 2009 +0000 +++ b/maps/Makefile Mon Jul 13 02:46:23 2009 +0000 @@ -39,11 +39,10 @@ # upload: $(TARGETS) renardy.map *.loc world.jpg util.js scp -C $? $(UPURL) - scp -C $? $(UPURL2) touch $@ uploc: *.loc - scp $+ $(UPURL2) + scp $+ $(UPURL) fetch: for i in $(MAPMAP); do wget `echo "$$i"|sed "s|^\([^:]*\):\(.*\)|-O \2.new $(BATMAPURL)\1.txt|"`; done
--- a/maps/Makefile.inc Mon Jul 13 02:43:52 2009 +0000 +++ b/maps/Makefile.inc Mon Jul 13 02:46:23 2009 +0000 @@ -3,7 +3,7 @@ MKSPECIAL_BIN=$(BINPATH)mkspecial$(EXEEXT) MAP2PPM_BIN=$(BINPATH)map2ppm$(EXEEXT) COMBINE_BIN=$(BINPATH)combine$(EXEEXT) -MAKEBCMAP_BIN=$(BINPATH)mkbcmap$(EXEEXT) +MKBCMAP_BIN=$(BINPATH)mkbcmap$(EXEEXT) DIFFMAP_BIN=$(BINPATH)diffmap$(EXEEXT) PATCHMAP_BIN=$(BINPATH)patchmap$(EXEEXT)
--- a/old/Makefile Mon Jul 13 02:43:52 2009 +0000 +++ b/old/Makefile Mon Jul 13 02:46:23 2009 +0000 @@ -13,7 +13,7 @@ # TARGETS=batmap.html batmap.htm batmap.ansi \ hcbat.html hcbat.htm hcbat.ansi \ - batcity.html batcity.txt + batcity.html all: $(TARGETS) @@ -34,10 +34,7 @@ batcity.html: batcity2.cmap batcity.cnam tooltip.js - $(MAKEBCMAP_BIN) "Old BatCity map" $< batcity.cnam -usetable > $@ - -batcity.txt: batcity2.cmap batcity.cnam - $(MAKEBCMAP_BIN) "Old BatCity map" $< batcity.cnam -ascii > $@ + $(MKBCMAP_BIN) -T -t "Old BatCity map" -u ../www/urchin.inc.php $< batcity.cnam -o "$@" twomi-batmap.ansi: twomi-batmap.tmp @@ -58,7 +55,6 @@ # upload: $(TARGETS) *.loc scp -C $? $(UPURL) - scp -C $? $(UPURL2) touch $@ clean:
--- a/www/Makefile Mon Jul 13 02:43:52 2009 +0000 +++ b/www/Makefile Mon Jul 13 02:46:23 2009 +0000 @@ -4,9 +4,9 @@ @echo "Use 'make upload' or 'make dload'." upload: *.php wizards.txt faq.xml - scp $? $(UPURL2) + scp $? $(UPURL) touch $@ dload: - scp $(UPURL2){*.php,wizards.txt,faq.xml,opensearch.xml} . + scp $(UPURL){*.php,wizards.txt,faq.xml,opensearch.xml} .