Mercurial > hg > batmud > maputils

annotate maps/Makefile @ 950:72e53a705775

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add comments.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 17 May 2010 21:08:26 +0000
parents 9342d636bc21
children 25cf3cf2acc8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
842
f5dda74e6e07 Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents: 807
diff changeset
12 all:
f5dda74e6e07 Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents: 807
diff changeset
13 @echo "Usage: make <maps|fetch|diff|upload>"
f5dda74e6e07 Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents: 807
diff changeset
14 @echo
f5dda74e6e07 Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents: 807
diff changeset
15 @echo "maps : Build HTML, HTML+JS, PNG image and ANSI format maps."
f5dda74e6e07 Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents: 807
diff changeset
16 @echo "fetch : Fetch latest raw ASCII map data from bat.org."
f5dda74e6e07 Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents: 807
diff changeset
17 @echo "diff : Do special diff operation between new data (gotten via 'fetch')"
f5dda74e6e07 Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents: 807
diff changeset
18 @echo " and update .loc files for each continent with new locations."
f5dda74e6e07 Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents: 807
diff changeset
19 @echo " A diff -u of new and old location files is outputted."
f5dda74e6e07 Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents: 807
diff changeset
20 @echo "upload: Uploads map and loc-files via SCP to server specified in"
f5dda74e6e07 Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents: 807
diff changeset
21 @echo " ../config.mak"
f5dda74e6e07 Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents: 807
diff changeset
22
f5dda74e6e07 Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents: 807
diff changeset
23
f5dda74e6e07 Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents: 807
diff changeset
24 maps: $(patsubst %.map,%.ppm,$(MAPLIST)) $(TARGETS)
39
fa68caaf3c94 New maps
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
25
346
721bfe123726 Minor refactoring of the build files.
Matti Hamalainen <ccr@tnsp.org>
parents: 338
diff changeset
26
307
a3180d60d2a2 Fixes and tweakings.
Matti Hamalainen <ccr@tnsp.org>
parents: 303
diff changeset
27 #laenor.map:
a3180d60d2a2 Fixes and tweakings.
Matti Hamalainen <ccr@tnsp.org>
parents: 303
diff changeset
28 # cat ~/mapping.log | grep -v "^$$" > tmp
a3180d60d2a2 Fixes and tweakings.
Matti Hamalainen <ccr@tnsp.org>
parents: 303
diff changeset
29 # $(MKSPECIAL_BIN) -v -o $@ -r 100 -R 65 -m 40 tmp -a -d -I $(patsubst %.map,%.initial,$@)
215
Matti Hamalainen <ccr@tnsp.org>
parents: 155
diff changeset
30
346
721bfe123726 Minor refactoring of the build files.
Matti Hamalainen <ccr@tnsp.org>
parents: 338
diff changeset
31 include Makefile.inc
99
140dda7f853d Updates
Matti Hamalainen <ccr@tnsp.org>
parents: 95
diff changeset
32
950
72e53a705775 Add comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 937
diff changeset
33 ###
72e53a705775 Add comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 937
diff changeset
34 ### Special targets
72e53a705775 Add comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 937
diff changeset
35 ###
72e53a705775 Add comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 937
diff changeset
36
72e53a705775 Add comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 937
diff changeset
37 # Upload changed files to site
842
f5dda74e6e07 Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents: 807
diff changeset
38 upload: $(TARGETS) renardy.map *.loc util.js
432
611b19fba3be Use compression with scp transfers, duh.
Matti Hamalainen <ccr@tnsp.org>
parents: 405
diff changeset
39 scp -C $? $(UPURL)
141
Matti Hamalainen <ccr@tnsp.org>
parents: 136
diff changeset
40 touch $@
95
0d2b25e342df Also make PNG images from maps
Matti Hamalainen <ccr@tnsp.org>
parents: 90
diff changeset
41
950
72e53a705775 Add comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 937
diff changeset
42 # Upload only *.loc files
317
7b3b2eb09036 Coder information updates.
Matti Hamalainen <ccr@tnsp.org>
parents: 315
diff changeset
43 uploc: *.loc
800
8fbde52dfdfe Update lots of things.
Matti Hamalainen <ccr@tnsp.org>
parents: 798
diff changeset
44 scp $+ $(UPURL)
291
b78d089a0cf4 Upload target for location files only.
Matti Hamalainen <ccr@tnsp.org>
parents: 255
diff changeset
45
950
72e53a705775 Add comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 937
diff changeset
46 # Fetch raw ASCII maps from bat.org to *.new
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
950
72e53a705775 Add comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 937
diff changeset
50 # Diff target between .map file and .new file. Makes necessary changes in .map and .loc
459
30c9f70a554e Foo-bar.
Matti Hamalainen <ccr@tnsp.org>
parents: 436
diff changeset
51 %.diff: %.map %.new
670
8f16bf5c2f9e Do the diffs more intelligently.
Matti Hamalainen <ccr@tnsp.org>
parents: 653
diff changeset
52 @echo DIFFING $< ...
8f16bf5c2f9e Do the diffs more intelligently.
Matti Hamalainen <ccr@tnsp.org>
parents: 653
diff changeset
53 @if ! $(DIFFMAP_BIN) $+ -o $@ -a; then \
8f16bf5c2f9e Do the diffs more intelligently.
Matti Hamalainen <ccr@tnsp.org>
parents: 653
diff changeset
54 $(MAP2PPM_BIN) $@ -o $@.ppm -d; \
8f16bf5c2f9e Do the diffs more intelligently.
Matti Hamalainen <ccr@tnsp.org>
parents: 653
diff changeset
55 $(PATCHMAP_BIN) $< $@ -o $<; \
8f16bf5c2f9e Do the diffs more intelligently.
Matti Hamalainen <ccr@tnsp.org>
parents: 653
diff changeset
56 fi
674
02d23acc346d Fix updating of location markers.
Matti Hamalainen <ccr@tnsp.org>
parents: 672
diff changeset
57 @echo UPDATING LOCATIONS ...
798
11e3bed89e35 Use verbosity flag in accordance to changes in mkloc.
Matti Hamalainen <ccr@tnsp.org>
parents: 791
diff changeset
58 @$(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
59 @diff -ubB $(patsubst %.map,%.loc,$<) $(patsubst %.map,%.nloc,$<) | patch
459
30c9f70a554e Foo-bar.
Matti Hamalainen <ccr@tnsp.org>
parents: 436
diff changeset
60
950
72e53a705775 Add comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 937
diff changeset
61 # Remove all temporary .diff files
653
b5bd0d457481 Improved 'make diff' target.
Matti Hamalainen <ccr@tnsp.org>
parents: 605
diff changeset
62 cleardiff:
b5bd0d457481 Improved 'make diff' target.
Matti Hamalainen <ccr@tnsp.org>
parents: 605
diff changeset
63 $(RM) *.diff
b5bd0d457481 Improved 'make diff' target.
Matti Hamalainen <ccr@tnsp.org>
parents: 605
diff changeset
64
950
72e53a705775 Add comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 937
diff changeset
65 # Diff target - run diff for each .map and .new (fetched via 'fetch' target).
72e53a705775 Add comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 937
diff changeset
66 # Finally do 'svn diff' to show changes.
807
6f29704156db Improve diffing.
Matti Hamalainen <ccr@tnsp.org>
parents: 800
diff changeset
67 diff: cleardiff $(patsubst %.map,%.diff,$(MAPLIST))
6f29704156db Improve diffing.
Matti Hamalainen <ccr@tnsp.org>
parents: 800
diff changeset
68 @svn diff
459
30c9f70a554e Foo-bar.
Matti Hamalainen <ccr@tnsp.org>
parents: 436
diff changeset
69
950
72e53a705775 Add comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 937
diff changeset
70 # Clean temporary and generated targets
39
fa68caaf3c94 New maps
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
71 clean:
937
9342d636bc21 Remove *.script files on clean target.
Matti Hamalainen <ccr@tnsp.org>
parents: 911
diff changeset
72 $(RM) $(TARGETS) *.diff *.ppm *.o *.script
39
fa68caaf3c94 New maps
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
73
fa68caaf3c94 New maps
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
74 srcclean: clean
299
ed5dfa77511f Removed '-f' option.
Matti Hamalainen <ccr@tnsp.org>
parents: 297
diff changeset
75 $(RM) *~
39
fa68caaf3c94 New maps
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
76
297
5482736f3913 ChangeLog generation target added.
Matti Hamalainen <ccr@tnsp.org>
parents: 291
diff changeset
77 update:
5482736f3913 ChangeLog generation target added.
Matti Hamalainen <ccr@tnsp.org>
parents: 291
diff changeset
78 @echo "* Updating from SVN ..."
5482736f3913 ChangeLog generation target added.
Matti Hamalainen <ccr@tnsp.org>
parents: 291
diff changeset
79 @svn update
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: update
5482736f3913 ChangeLog generation target added.
Matti Hamalainen <ccr@tnsp.org>
parents: 291
diff changeset
82 @echo "* Making ChangeLog ..."
911
4a93a15728d7 Fix changelog building.
Matti Hamalainen <ccr@tnsp.org>
parents: 842
diff changeset
83 @svn2cl --strip-prefix "maputils/trunk/maps/" --include-rev
297
5482736f3913 ChangeLog generation target added.
Matti Hamalainen <ccr@tnsp.org>
parents: 291
diff changeset
84 @touch $@
5482736f3913 ChangeLog generation target added.
Matti Hamalainen <ccr@tnsp.org>
parents: 291
diff changeset
85
5482736f3913 ChangeLog generation target added.
Matti Hamalainen <ccr@tnsp.org>
parents: 291
diff changeset
86 ChangeLog: .changelog
5482736f3913 ChangeLog generation target added.
Matti Hamalainen <ccr@tnsp.org>
parents: 291
diff changeset
87