Mercurial > hg > batmud > maputils

annotate maps/Makefile @ 1515:677002de7795

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove unused target.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 08 Feb 2015 20:03:42 +0200
parents 835360392879
children 796cf56a9b0a
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 #
1237
3bbafec29fcb Change internal handling of some Makefile settings.
Matti Hamalainen <ccr@tnsp.org>
parents: 1226
diff changeset
7 TARGETS=$(addsuffix .html,$(MAPLIST)) \
3bbafec29fcb Change internal handling of some Makefile settings.
Matti Hamalainen <ccr@tnsp.org>
parents: 1226
diff changeset
8 $(addsuffix .htm,$(MAPLIST)) \
3bbafec29fcb Change internal handling of some Makefile settings.
Matti Hamalainen <ccr@tnsp.org>
parents: 1226
diff changeset
9 $(addsuffix .ansi,$(MAPLIST)) \
3bbafec29fcb Change internal handling of some Makefile settings.
Matti Hamalainen <ccr@tnsp.org>
parents: 1226
diff changeset
10 $(addsuffix .png,$(MAPLIST))
346
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:
1512
031708e1dcb9 Update help.
Matti Hamalainen <ccr@tnsp.org>
parents: 1237
diff changeset
13 @echo "Usage: make <maps|fetch|diff|upload|clean>"
842
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"
1514
835360392879 Add target for automatically running Gimp for PNG post-processing.
Matti Hamalainen <ccr@tnsp.org>
parents: 1512
diff changeset
22 @echo "gimp : Execute Gimp with all PNG targets for post-processing."
1512
031708e1dcb9 Update help.
Matti Hamalainen <ccr@tnsp.org>
parents: 1237
diff changeset
23 @echo "clean : Delete all the generated files."
031708e1dcb9 Update help.
Matti Hamalainen <ccr@tnsp.org>
parents: 1237
diff changeset
24 @echo
842
f5dda74e6e07 Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents: 807
diff changeset
25
f5dda74e6e07 Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents: 807
diff changeset
26
1237
3bbafec29fcb Change internal handling of some Makefile settings.
Matti Hamalainen <ccr@tnsp.org>
parents: 1226
diff changeset
27 maps: $(addsuffix .ppm,$(MAPLIST)) $(TARGETS)
39
fa68caaf3c94 New maps
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
28
346
721bfe123726 Minor refactoring of the build files.
Matti Hamalainen <ccr@tnsp.org>
parents: 338
diff changeset
29
721bfe123726 Minor refactoring of the build files.
Matti Hamalainen <ccr@tnsp.org>
parents: 338
diff changeset
30 include Makefile.inc
99
140dda7f853d Updates
Matti Hamalainen <ccr@tnsp.org>
parents: 95
diff changeset
31
950
72e53a705775 Add comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 937
diff changeset
32 ###
72e53a705775 Add comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 937
diff changeset
33 ### Special targets
72e53a705775 Add comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 937
diff changeset
34 ###
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 # Upload changed files to site
1226
bc4e47cf3090 Upload tormentas.map
Matti Hamalainen <ccr@tnsp.org>
parents: 1155
diff changeset
37 upload: $(TARGETS) renardy.map tormentas.map *.loc util.js
432
611b19fba3be Use compression with scp transfers, duh.
Matti Hamalainen <ccr@tnsp.org>
parents: 405
diff changeset
38 scp -C $? $(UPURL)
141
Matti Hamalainen <ccr@tnsp.org>
parents: 136
diff changeset
39 touch $@
95
0d2b25e342df Also make PNG images from maps
Matti Hamalainen <ccr@tnsp.org>
parents: 90
diff changeset
40
1514
835360392879 Add target for automatically running Gimp for PNG post-processing.
Matti Hamalainen <ccr@tnsp.org>
parents: 1512
diff changeset
41 # Open PNG files in Gimp
835360392879 Add target for automatically running Gimp for PNG post-processing.
Matti Hamalainen <ccr@tnsp.org>
parents: 1512
diff changeset
42 gimp: $(addsuffix .png,$(MAPLIST))
835360392879 Add target for automatically running Gimp for PNG post-processing.
Matti Hamalainen <ccr@tnsp.org>
parents: 1512
diff changeset
43 gimp $+
835360392879 Add target for automatically running Gimp for PNG post-processing.
Matti Hamalainen <ccr@tnsp.org>
parents: 1512
diff changeset
44 touch $@
835360392879 Add target for automatically running Gimp for PNG post-processing.
Matti Hamalainen <ccr@tnsp.org>
parents: 1512
diff changeset
45
950
72e53a705775 Add comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 937
diff changeset
46 # Upload only *.loc files
317
7b3b2eb09036 Coder information updates.
Matti Hamalainen <ccr@tnsp.org>
parents: 315
diff changeset
47 uploc: *.loc
800
8fbde52dfdfe Update lots of things.
Matti Hamalainen <ccr@tnsp.org>
parents: 798
diff changeset
48 scp $+ $(UPURL)
291
b78d089a0cf4 Upload target for location files only.
Matti Hamalainen <ccr@tnsp.org>
parents: 255
diff changeset
49
950
72e53a705775 Add comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 937
diff changeset
50 # Fetch raw ASCII maps from bat.org to *.new
459
30c9f70a554e Foo-bar.
Matti Hamalainen <ccr@tnsp.org>
parents: 436
diff changeset
51 fetch:
1237
3bbafec29fcb Change internal handling of some Makefile settings.
Matti Hamalainen <ccr@tnsp.org>
parents: 1226
diff changeset
52 for i in $(MAPMAP); do wget -O "$$i.new" "$(BATMAPURL)$$i.txt"; done
459
30c9f70a554e Foo-bar.
Matti Hamalainen <ccr@tnsp.org>
parents: 436
diff changeset
53
950
72e53a705775 Add comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 937
diff changeset
54 # 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
55 %.diff: %.map %.new
670
8f16bf5c2f9e Do the diffs more intelligently.
Matti Hamalainen <ccr@tnsp.org>
parents: 653
diff changeset
56 @echo DIFFING $< ...
8f16bf5c2f9e Do the diffs more intelligently.
Matti Hamalainen <ccr@tnsp.org>
parents: 653
diff changeset
57 @if ! $(DIFFMAP_BIN) $+ -o $@ -a; then \
8f16bf5c2f9e Do the diffs more intelligently.
Matti Hamalainen <ccr@tnsp.org>
parents: 653
diff changeset
58 $(MAP2PPM_BIN) $@ -o $@.ppm -d; \
8f16bf5c2f9e Do the diffs more intelligently.
Matti Hamalainen <ccr@tnsp.org>
parents: 653
diff changeset
59 $(PATCHMAP_BIN) $< $@ -o $<; \
8f16bf5c2f9e Do the diffs more intelligently.
Matti Hamalainen <ccr@tnsp.org>
parents: 653
diff changeset
60 fi
674
02d23acc346d Fix updating of location markers.
Matti Hamalainen <ccr@tnsp.org>
parents: 672
diff changeset
61 @echo UPDATING LOCATIONS ...
798
11e3bed89e35 Use verbosity flag in accordance to changes in mkloc.
Matti Hamalainen <ccr@tnsp.org>
parents: 791
diff changeset
62 @$(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
63 @diff -ubB $(patsubst %.map,%.loc,$<) $(patsubst %.map,%.nloc,$<) | patch
459
30c9f70a554e Foo-bar.
Matti Hamalainen <ccr@tnsp.org>
parents: 436
diff changeset
64
950
72e53a705775 Add comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 937
diff changeset
65 # Remove all temporary .diff files
653
b5bd0d457481 Improved 'make diff' target.
Matti Hamalainen <ccr@tnsp.org>
parents: 605
diff changeset
66 cleardiff:
b5bd0d457481 Improved 'make diff' target.
Matti Hamalainen <ccr@tnsp.org>
parents: 605
diff changeset
67 $(RM) *.diff
b5bd0d457481 Improved 'make diff' target.
Matti Hamalainen <ccr@tnsp.org>
parents: 605
diff changeset
68
950
72e53a705775 Add comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 937
diff changeset
69 # Diff target - run diff for each .map and .new (fetched via 'fetch' target).
1069
25cf3cf2acc8 Change to use Mercurial instead of Subversion.
Matti Hamalainen <ccr@tnsp.org>
parents: 950
diff changeset
70 # Finally do 'hg diff' to show changes.
1237
3bbafec29fcb Change internal handling of some Makefile settings.
Matti Hamalainen <ccr@tnsp.org>
parents: 1226
diff changeset
71 diff: cleardiff $(addsuffix .diff,$(MAPMAP))
1155
2f7ca3ec98e8 Only 'hg diff' current directory with 'make diff'.
Matti Hamalainen <ccr@tnsp.org>
parents: 1069
diff changeset
72 @hg diff .
459
30c9f70a554e Foo-bar.
Matti Hamalainen <ccr@tnsp.org>
parents: 436
diff changeset
73
950
72e53a705775 Add comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 937
diff changeset
74 # Clean temporary and generated targets
39
fa68caaf3c94 New maps
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
75 clean:
937
9342d636bc21 Remove *.script files on clean target.
Matti Hamalainen <ccr@tnsp.org>
parents: 911
diff changeset
76 $(RM) $(TARGETS) *.diff *.ppm *.o *.script
39
fa68caaf3c94 New maps
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
77
fa68caaf3c94 New maps
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
78 srcclean: clean
299
ed5dfa77511f Removed '-f' option.
Matti Hamalainen <ccr@tnsp.org>
parents: 297
diff changeset
79 $(RM) *~
39
fa68caaf3c94 New maps
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
80
297
5482736f3913 ChangeLog generation target added.
Matti Hamalainen <ccr@tnsp.org>
parents: 291
diff changeset
81 update:
1069
25cf3cf2acc8 Change to use Mercurial instead of Subversion.
Matti Hamalainen <ccr@tnsp.org>
parents: 950
diff changeset
82 @echo "* Updating from HG ..."
25cf3cf2acc8 Change to use Mercurial instead of Subversion.
Matti Hamalainen <ccr@tnsp.org>
parents: 950
diff changeset
83 @hg fetch
297
5482736f3913 ChangeLog generation target added.
Matti Hamalainen <ccr@tnsp.org>
parents: 291
diff changeset
84
5482736f3913 ChangeLog generation target added.
Matti Hamalainen <ccr@tnsp.org>
parents: 291
diff changeset
85 .changelog: update
5482736f3913 ChangeLog generation target added.
Matti Hamalainen <ccr@tnsp.org>
parents: 291
diff changeset
86 @echo "* Making ChangeLog ..."
1069
25cf3cf2acc8 Change to use Mercurial instead of Subversion.
Matti Hamalainen <ccr@tnsp.org>
parents: 950
diff changeset
87 @hg2cl --strip-prefix "maputils/trunk/maps/"
297
5482736f3913 ChangeLog generation target added.
Matti Hamalainen <ccr@tnsp.org>
parents: 291
diff changeset
88 @touch $@
5482736f3913 ChangeLog generation target added.
Matti Hamalainen <ccr@tnsp.org>
parents: 291
diff changeset
89
5482736f3913 ChangeLog generation target added.
Matti Hamalainen <ccr@tnsp.org>
parents: 291
diff changeset
90 ChangeLog: .changelog
5482736f3913 ChangeLog generation target added.
Matti Hamalainen <ccr@tnsp.org>
parents: 291
diff changeset
91