batmud/maputils: maps/Makefile annotate

annotate maps/Makefile @ 807:6f29704156db

Improve diffing.

author	Matti Hamalainen <ccr@tnsp.org>
date	Mon, 20 Jul 2009 11:51:36 +0000
parents	8fbde52dfdfe
children	f5dda74e6e07

rev	line source
346 721bfe123726 Minor refactoring of the build files. Matti Hamalainen <ccr@tnsp.org> parents: 338 diff changeset	1 include ../config.mak
721bfe123726 Minor refactoring of the build files. Matti Hamalainen <ccr@tnsp.org> parents: 338 diff changeset	2 include config.mak
721bfe123726 Minor refactoring of the build files. Matti Hamalainen <ccr@tnsp.org> parents: 338 diff changeset	3
721bfe123726 Minor refactoring of the build files. Matti Hamalainen <ccr@tnsp.org> parents: 338 diff changeset	4 #
347 56db61a254d4 Move things. Matti Hamalainen <ccr@tnsp.org> parents: 346 diff changeset	5 # Mangles and targets
346 721bfe123726 Minor refactoring of the build files. Matti Hamalainen <ccr@tnsp.org> parents: 338 diff changeset	6 #
721bfe123726 Minor refactoring of the build files. Matti Hamalainen <ccr@tnsp.org> parents: 338 diff changeset	7 TARGETS=$(patsubst %.map,%.html,$(MAPLIST)) \
721bfe123726 Minor refactoring of the build files. Matti Hamalainen <ccr@tnsp.org> parents: 338 diff changeset	8 $(patsubst %.map,%.htm,$(MAPLIST)) \
721bfe123726 Minor refactoring of the build files. Matti Hamalainen <ccr@tnsp.org> parents: 338 diff changeset	9 $(patsubst %.map,%.ansi,$(MAPLIST)) \
721bfe123726 Minor refactoring of the build files. Matti Hamalainen <ccr@tnsp.org> parents: 338 diff changeset	10 $(patsubst %.map,%.png,$(MAPLIST))
721bfe123726 Minor refactoring of the build files. Matti Hamalainen <ccr@tnsp.org> parents: 338 diff changeset	11
103 58a07f7c50b7 Updated locations; Makefile improvements. Matti Hamalainen <ccr@tnsp.org> parents: 99 diff changeset	12 all: $(patsubst %.map,%.ppm,$(MAPLIST)) $(TARGETS)
39 fa68caaf3c94 New maps Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	13
346 721bfe123726 Minor refactoring of the build files. Matti Hamalainen <ccr@tnsp.org> parents: 338 diff changeset	14
307 a3180d60d2a2 Fixes and tweakings. Matti Hamalainen <ccr@tnsp.org> parents: 303 diff changeset	15 #laenor.map:
a3180d60d2a2 Fixes and tweakings. Matti Hamalainen <ccr@tnsp.org> parents: 303 diff changeset	16 # cat ~/mapping.log \| grep -v "^$$" > tmp
a3180d60d2a2 Fixes and tweakings. Matti Hamalainen <ccr@tnsp.org> parents: 303 diff changeset	17 # $(MKSPECIAL_BIN) -v -o $@ -r 100 -R 65 -m 40 tmp -a -d -I $(patsubst %.map,%.initial,$@)
215 c794805da64f Hmm. Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	18
346 721bfe123726 Minor refactoring of the build files. Matti Hamalainen <ccr@tnsp.org> parents: 338 diff changeset	19 include Makefile.inc
99 140dda7f853d Updates Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	20
716 7a8af2da1c06 Clean up some rules. Matti Hamalainen <ccr@tnsp.org> parents: 676 diff changeset	21 world.map: $(MAPLIST)
99 140dda7f853d Updates Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	22 $(COMBINE_BIN) -v -f "~" $(MAPLISTOFFS) -o $@
140dda7f853d Updates Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	23
140dda7f853d Updates Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	24 world.loc: $(patsubst %.map,%.loc,$(MAPLIST))
140dda7f853d Updates Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	25 for i in $(MAPLISTOFFS); do $(MKLOC_BIN) -v -L -l `echo "$$i"\|sed "s/^$[^\.]$.map:./\1.loc/"` -m `echo "$$i"\|sed "s/^$[^:]$:$[0-9]$:$[0-9]*$/\1 -x \2 -y \3/"`; done > $@
140dda7f853d Updates Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	26
716 7a8af2da1c06 Clean up some rules. Matti Hamalainen <ccr@tnsp.org> parents: 676 diff changeset	27 world.ppm: world.map
791 7da5b551d9e2 Use ImageMagick for scaling the world map image. Matti Hamalainen <ccr@tnsp.org> parents: 785 diff changeset	28 $(MAP2PPM_BIN) $< \| convert ppm:- -resize "50%" $@
99 140dda7f853d Updates Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	29
716 7a8af2da1c06 Clean up some rules. Matti Hamalainen <ccr@tnsp.org> parents: 676 diff changeset	30 world.script: world.map world.loc
338 5df69bb02c9e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 331 diff changeset	31 $(MKLOC_BIN) -vnS -m $< -l $(patsubst %.map,%.loc,$<) -u $(WORLDUNITSIZE) -s $(WORLDMAPSCALE) \| \
405 17664dcbe722 Use a font setting in config.mak Matti Hamalainen <ccr@tnsp.org> parents: 387 diff changeset	32 sed -e "s/@OPTS_START@/-font $(WORLDFONT) -pointsize 10 -type TruecolorMatte/g" \
338 5df69bb02c9e Updates. Matti Hamalainen <ccr@tnsp.org> parents: 331 diff changeset	33 -e "s/@OPTS_END@/\t-geometry +220+15 title.png -composite -compose screen \\\\\n\t-pointsize 30 -fill white -box none -draw \"text 10,30 \'\n@PAF@\n\n/g" \| \
255 be481e1dca9e Updated and improved generation of image-format maps. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	34 sed -e "/@PAF@/r $(patsubst %.map,%.desc,$<)" -e "s/@PAF@//g" > $@
39 fa68caaf3c94 New maps Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	35
346 721bfe123726 Minor refactoring of the build files. Matti Hamalainen <ccr@tnsp.org> parents: 338 diff changeset	36
39 fa68caaf3c94 New maps Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	37 #
fa68caaf3c94 New maps Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	38 # Special targets
fa68caaf3c94 New maps Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	39 #
436 6f0874ebefdf Also upload renardy.map Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	40 upload: $(TARGETS) renardy.map *.loc world.jpg util.js
432 611b19fba3be Use compression with scp transfers, duh. Matti Hamalainen <ccr@tnsp.org> parents: 405 diff changeset	41 scp -C $? $(UPURL)
141 76c90fb0822f Use $@ Matti Hamalainen <ccr@tnsp.org> parents: 136 diff changeset	42 touch $@
95 0d2b25e342df Also make PNG images from maps Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	43
317 7b3b2eb09036 Coder information updates. Matti Hamalainen <ccr@tnsp.org> parents: 315 diff changeset	44 uploc: *.loc
800 8fbde52dfdfe Update lots of things. Matti Hamalainen <ccr@tnsp.org> parents: 798 diff changeset	45 scp $+ $(UPURL)
291 b78d089a0cf4 Upload target for location files only. Matti Hamalainen <ccr@tnsp.org> parents: 255 diff changeset	46
459 30c9f70a554e Foo-bar. Matti Hamalainen <ccr@tnsp.org> parents: 436 diff changeset	47 fetch:
531 8669c8fb85de Use urchin file option. Matti Hamalainen <ccr@tnsp.org> parents: 475 diff changeset	48 for i in $(MAPMAP); do wget `echo "$$i"\|sed "s\|^$[^:]$:$.$\|-O \2.new $(BATMAPURL)\1.txt\|"`; done
459 30c9f70a554e Foo-bar. Matti Hamalainen <ccr@tnsp.org> parents: 436 diff changeset	49
30c9f70a554e Foo-bar. Matti Hamalainen <ccr@tnsp.org> parents: 436 diff changeset	50 %.diff: %.map %.new
670 8f16bf5c2f9e Do the diffs more intelligently. Matti Hamalainen <ccr@tnsp.org> parents: 653 diff changeset	51 @echo DIFFING $< ...
8f16bf5c2f9e Do the diffs more intelligently. Matti Hamalainen <ccr@tnsp.org> parents: 653 diff changeset	52 @if ! $(DIFFMAP_BIN) $+ -o $@ -a; then \
8f16bf5c2f9e Do the diffs more intelligently. Matti Hamalainen <ccr@tnsp.org> parents: 653 diff changeset	53 $(MAP2PPM_BIN) $@ -o $@.ppm -d; \
8f16bf5c2f9e Do the diffs more intelligently. Matti Hamalainen <ccr@tnsp.org> parents: 653 diff changeset	54 $(PATCHMAP_BIN) $< $@ -o $<; \
8f16bf5c2f9e Do the diffs more intelligently. Matti Hamalainen <ccr@tnsp.org> parents: 653 diff changeset	55 fi
674 02d23acc346d Fix updating of location markers. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	56 @echo UPDATING LOCATIONS ...
798 11e3bed89e35 Use verbosity flag in accordance to changes in mkloc. Matti Hamalainen <ccr@tnsp.org> parents: 791 diff changeset	57 @$(MKLOC_BIN) -v -m $(patsubst %.map,%.new,$<) -l $(patsubst %.map,%.loc,$<) -L -g -o $(patsubst %.map,%.nloc,$<)
674 02d23acc346d Fix updating of location markers. Matti Hamalainen <ccr@tnsp.org> parents: 672 diff changeset	58 @diff -ubB $(patsubst %.map,%.loc,$<) $(patsubst %.map,%.nloc,$<) \| patch
459 30c9f70a554e Foo-bar. Matti Hamalainen <ccr@tnsp.org> parents: 436 diff changeset	59
653 b5bd0d457481 Improved 'make diff' target. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	60 cleardiff:
b5bd0d457481 Improved 'make diff' target. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	61 $(RM) *.diff
b5bd0d457481 Improved 'make diff' target. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	62
807 6f29704156db Improve diffing. Matti Hamalainen <ccr@tnsp.org> parents: 800 diff changeset	63 diff: cleardiff $(patsubst %.map,%.diff,$(MAPLIST))
6f29704156db Improve diffing. Matti Hamalainen <ccr@tnsp.org> parents: 800 diff changeset	64 @svn diff
459 30c9f70a554e Foo-bar. Matti Hamalainen <ccr@tnsp.org> parents: 436 diff changeset	65
39 fa68caaf3c94 New maps Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	66 clean:
460 f5c471820ff4 Paf. Matti Hamalainen <ccr@tnsp.org> parents: 459 diff changeset	67 $(RM) $(TARGETS) .diff .ppm *.o
39 fa68caaf3c94 New maps Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	68
fa68caaf3c94 New maps Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	69 srcclean: clean
299 ed5dfa77511f Removed '-f' option. Matti Hamalainen <ccr@tnsp.org> parents: 297 diff changeset	70 $(RM) *~
39 fa68caaf3c94 New maps Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	71
297 5482736f3913 ChangeLog generation target added. Matti Hamalainen <ccr@tnsp.org> parents: 291 diff changeset	72 update:
5482736f3913 ChangeLog generation target added. Matti Hamalainen <ccr@tnsp.org> parents: 291 diff changeset	73 @echo "* Updating from SVN ..."
5482736f3913 ChangeLog generation target added. Matti Hamalainen <ccr@tnsp.org> parents: 291 diff changeset	74 @svn update
5482736f3913 ChangeLog generation target added. Matti Hamalainen <ccr@tnsp.org> parents: 291 diff changeset	75
5482736f3913 ChangeLog generation target added. Matti Hamalainen <ccr@tnsp.org> parents: 291 diff changeset	76 .changelog: update
5482736f3913 ChangeLog generation target added. Matti Hamalainen <ccr@tnsp.org> parents: 291 diff changeset	77 @echo "* Making ChangeLog ..."
5482736f3913 ChangeLog generation target added. Matti Hamalainen <ccr@tnsp.org> parents: 291 diff changeset	78 @svn2cl --strip-prefix "maputils/trunk/maps/" --group-by-day --include-rev
5482736f3913 ChangeLog generation target added. Matti Hamalainen <ccr@tnsp.org> parents: 291 diff changeset	79 @touch $@
5482736f3913 ChangeLog generation target added. Matti Hamalainen <ccr@tnsp.org> parents: 291 diff changeset	80
5482736f3913 ChangeLog generation target added. Matti Hamalainen <ccr@tnsp.org> parents: 291 diff changeset	81 ChangeLog: .changelog
5482736f3913 ChangeLog generation target added. Matti Hamalainen <ccr@tnsp.org> parents: 291 diff changeset	82

Mercurial > hg > batmud > maputils

annotate maps/Makefile @ 807:6f29704156db