annotate world/Makefile @ 2509:6878dbdbc11e

Oops, remove 'gimp' target from help as it has been removed.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 02 Aug 2023 12:54:39 +0300
parents de2e01e4343b
children 83967e0447f7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2506
de2e01e4343b Large refactoring and cleanup of the build system.
Matti Hamalainen <ccr@tnsp.org>
parents: 2505
diff changeset
1 ###
de2e01e4343b Large refactoring and cleanup of the build system.
Matti Hamalainen <ccr@tnsp.org>
parents: 2505
diff changeset
2 ### Includes and settings
1547
2768b2b396a5 Cosmetics and comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 1536
diff changeset
3 ###
2506
de2e01e4343b Large refactoring and cleanup of the build system.
Matti Hamalainen <ccr@tnsp.org>
parents: 2505
diff changeset
4 include ../config.mak
de2e01e4343b Large refactoring and cleanup of the build system.
Matti Hamalainen <ccr@tnsp.org>
parents: 2505
diff changeset
5 include ../Makefile.maps
de2e01e4343b Large refactoring and cleanup of the build system.
Matti Hamalainen <ccr@tnsp.org>
parents: 2505
diff changeset
6 include ../Makefile.paths
de2e01e4343b Large refactoring and cleanup of the build system.
Matti Hamalainen <ccr@tnsp.org>
parents: 2505
diff changeset
7
de2e01e4343b Large refactoring and cleanup of the build system.
Matti Hamalainen <ccr@tnsp.org>
parents: 2505
diff changeset
8 BINPATH=../bin/
de2e01e4343b Large refactoring and cleanup of the build system.
Matti Hamalainen <ccr@tnsp.org>
parents: 2505
diff changeset
9 EXEEXT=
de2e01e4343b Large refactoring and cleanup of the build system.
Matti Hamalainen <ccr@tnsp.org>
parents: 2505
diff changeset
10
2388
e845f54be995 Autodetect curl or wget.
Matti Hamalainen <ccr@tnsp.org>
parents: 2387
diff changeset
11
e845f54be995 Autodetect curl or wget.
Matti Hamalainen <ccr@tnsp.org>
parents: 2387
diff changeset
12 ifeq ($(HAVE_CURL),yes)
e845f54be995 Autodetect curl or wget.
Matti Hamalainen <ccr@tnsp.org>
parents: 2387
diff changeset
13 HTTPGET ?= curl -o
e845f54be995 Autodetect curl or wget.
Matti Hamalainen <ccr@tnsp.org>
parents: 2387
diff changeset
14 else
e845f54be995 Autodetect curl or wget.
Matti Hamalainen <ccr@tnsp.org>
parents: 2387
diff changeset
15 ifeq ($(HAVE_WGET),yes)
e845f54be995 Autodetect curl or wget.
Matti Hamalainen <ccr@tnsp.org>
parents: 2387
diff changeset
16 HTTPGET ?= wget -O
e845f54be995 Autodetect curl or wget.
Matti Hamalainen <ccr@tnsp.org>
parents: 2387
diff changeset
17 else
e845f54be995 Autodetect curl or wget.
Matti Hamalainen <ccr@tnsp.org>
parents: 2387
diff changeset
18 ifeq ($(HTTPGET),)
e845f54be995 Autodetect curl or wget.
Matti Hamalainen <ccr@tnsp.org>
parents: 2387
diff changeset
19 $(error Required utility 'curl' or 'wget' not found in PATH. You can configure HTTPGET variable in config.mak.)
e845f54be995 Autodetect curl or wget.
Matti Hamalainen <ccr@tnsp.org>
parents: 2387
diff changeset
20 endif
e845f54be995 Autodetect curl or wget.
Matti Hamalainen <ccr@tnsp.org>
parents: 2387
diff changeset
21 endif
e845f54be995 Autodetect curl or wget.
Matti Hamalainen <ccr@tnsp.org>
parents: 2387
diff changeset
22 endif
e845f54be995 Autodetect curl or wget.
Matti Hamalainen <ccr@tnsp.org>
parents: 2387
diff changeset
23
e845f54be995 Autodetect curl or wget.
Matti Hamalainen <ccr@tnsp.org>
parents: 2387
diff changeset
24
e845f54be995 Autodetect curl or wget.
Matti Hamalainen <ccr@tnsp.org>
parents: 2387
diff changeset
25 ###
1547
2768b2b396a5 Cosmetics and comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 1536
diff changeset
26 ### Main targets
2768b2b396a5 Cosmetics and comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 1536
diff changeset
27 ###
2397
b76c25ad1b99 Change how batclient.xml is uploaded. Some improvements to the build rules.
Matti Hamalainen <ccr@tnsp.org>
parents: 2395
diff changeset
28 TARGETS = \
b76c25ad1b99 Change how batclient.xml is uploaded. Some improvements to the build rules.
Matti Hamalainen <ccr@tnsp.org>
parents: 2395
diff changeset
29 $(addsuffix .html,$(WORLD_MAPS)) \
1708
9a124fdb6dab Rename various Makefile variables and improve + modularize hcbat-related things better.
Matti Hamalainen <ccr@tnsp.org>
parents: 1707
diff changeset
30 $(addsuffix .ansi,$(WORLD_MAPS)) \
9a124fdb6dab Rename various Makefile variables and improve + modularize hcbat-related things better.
Matti Hamalainen <ccr@tnsp.org>
parents: 1707
diff changeset
31 $(addsuffix .png,$(WORLD_MAPS)) \
9a124fdb6dab Rename various Makefile variables and improve + modularize hcbat-related things better.
Matti Hamalainen <ccr@tnsp.org>
parents: 1707
diff changeset
32 $(addsuffix .htm,$(WORLD_MAPS)) \
2397
b76c25ad1b99 Change how batclient.xml is uploaded. Some improvements to the build rules.
Matti Hamalainen <ccr@tnsp.org>
parents: 2395
diff changeset
33 util.js changelog.txt
b76c25ad1b99 Change how batclient.xml is uploaded. Some improvements to the build rules.
Matti Hamalainen <ccr@tnsp.org>
parents: 2395
diff changeset
34
b76c25ad1b99 Change how batclient.xml is uploaded. Some improvements to the build rules.
Matti Hamalainen <ccr@tnsp.org>
parents: 2395
diff changeset
35 LOCFILES = $(addsuffix .loc,$(WORLD_MAPS)) special.loc limbo.loc
b76c25ad1b99 Change how batclient.xml is uploaded. Some improvements to the build rules.
Matti Hamalainen <ccr@tnsp.org>
parents: 2395
diff changeset
36
b76c25ad1b99 Change how batclient.xml is uploaded. Some improvements to the build rules.
Matti Hamalainen <ccr@tnsp.org>
parents: 2395
diff changeset
37 ifeq ($(HAVE_PHP),yes)
2408
f2e639d72f6f Rename batclient.xml to markers.xml
Matti Hamalainen <ccr@tnsp.org>
parents: 2397
diff changeset
38 TARGETS += markers.xml
f2e639d72f6f Rename batclient.xml to markers.xml
Matti Hamalainen <ccr@tnsp.org>
parents: 2397
diff changeset
39 EXTRA_UPLOAD += markers.xml
2397
b76c25ad1b99 Change how batclient.xml is uploaded. Some improvements to the build rules.
Matti Hamalainen <ccr@tnsp.org>
parents: 2395
diff changeset
40 endif
1536
796cf56a9b0a Disable plain HTML (non-javascript enhanced) versions.
Matti Hamalainen <ccr@tnsp.org>
parents: 1515
diff changeset
41
796cf56a9b0a Disable plain HTML (non-javascript enhanced) versions.
Matti Hamalainen <ccr@tnsp.org>
parents: 1515
diff changeset
42
1547
2768b2b396a5 Cosmetics and comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 1536
diff changeset
43 ###
2768b2b396a5 Cosmetics and comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 1536
diff changeset
44 ### If no target specified, show some help
2768b2b396a5 Cosmetics and comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 1536
diff changeset
45 ###
842
f5dda74e6e07 Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents: 807
diff changeset
46 all:
2067
97e4361d9ac9 Clean up 'make help'.
Matti Hamalainen <ccr@tnsp.org>
parents: 2047
diff changeset
47 @echo "Usage: make <target>"
97e4361d9ac9 Clean up 'make help'.
Matti Hamalainen <ccr@tnsp.org>
parents: 2047
diff changeset
48 @echo "Available targets are as follows:"
97e4361d9ac9 Clean up 'make help'.
Matti Hamalainen <ccr@tnsp.org>
parents: 2047
diff changeset
49 @echo
97e4361d9ac9 Clean up 'make help'.
Matti Hamalainen <ccr@tnsp.org>
parents: 2047
diff changeset
50 @echo "maps : Build HTML, HTML+JS, PNG image and ANSI format maps."
97e4361d9ac9 Clean up 'make help'.
Matti Hamalainen <ccr@tnsp.org>
parents: 2047
diff changeset
51 @echo "fetch : Fetch latest raw ASCII map data from bat.org."
842
f5dda74e6e07 Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents: 807
diff changeset
52 @echo
2067
97e4361d9ac9 Clean up 'make help'.
Matti Hamalainen <ccr@tnsp.org>
parents: 2047
diff changeset
53 @echo "diff : Do special diff operation between new data (gotten via 'fetch')"
97e4361d9ac9 Clean up 'make help'.
Matti Hamalainen <ccr@tnsp.org>
parents: 2047
diff changeset
54 @echo " and update .loc files for each continent with new locations."
97e4361d9ac9 Clean up 'make help'.
Matti Hamalainen <ccr@tnsp.org>
parents: 2047
diff changeset
55 @echo " A diff -u of new and old location files is outputted."
97e4361d9ac9 Clean up 'make help'.
Matti Hamalainen <ccr@tnsp.org>
parents: 2047
diff changeset
56 @echo
97e4361d9ac9 Clean up 'make help'.
Matti Hamalainen <ccr@tnsp.org>
parents: 2047
diff changeset
57 @echo "upload : Uploads map and loc-files via SCP to server specified in"
97e4361d9ac9 Clean up 'make help'.
Matti Hamalainen <ccr@tnsp.org>
parents: 2047
diff changeset
58 @echo " ../config.mak"
97e4361d9ac9 Clean up 'make help'.
Matti Hamalainen <ccr@tnsp.org>
parents: 2047
diff changeset
59 @echo
97e4361d9ac9 Clean up 'make help'.
Matti Hamalainen <ccr@tnsp.org>
parents: 2047
diff changeset
60 @echo "clean : Delete all the generated files."
1512
031708e1dcb9 Update help.
Matti Hamalainen <ccr@tnsp.org>
parents: 1237
diff changeset
61 @echo
842
f5dda74e6e07 Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents: 807
diff changeset
62
f5dda74e6e07 Print help if no target is given. Remove generation of worldmap.
Matti Hamalainen <ccr@tnsp.org>
parents: 807
diff changeset
63
1547
2768b2b396a5 Cosmetics and comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 1536
diff changeset
64 ###
2506
de2e01e4343b Large refactoring and cleanup of the build system.
Matti Hamalainen <ccr@tnsp.org>
parents: 2505
diff changeset
65 ### Targets
1547
2768b2b396a5 Cosmetics and comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 1536
diff changeset
66 ###
1708
9a124fdb6dab Rename various Makefile variables and improve + modularize hcbat-related things better.
Matti Hamalainen <ccr@tnsp.org>
parents: 1707
diff changeset
67 maps: $(addsuffix .ppm,$(WORLD_MAPS)) $(TARGETS)
39
fa68caaf3c94 New maps
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
68
346
721bfe123726 Minor refactoring of the build files.
Matti Hamalainen <ccr@tnsp.org>
parents: 338
diff changeset
69
2317
f90303eec665 Include misc maps in generated changelog as well.
Matti Hamalainen <ccr@tnsp.org>
parents: 2315
diff changeset
70 changelog.txt: $(addsuffix .map,$(WORLD_MAPS)) \
2438
f90494b8efa7 Possibly fix the changelog.txt not updating properly -issue.
Matti Hamalainen <ccr@tnsp.org>
parents: 2421
diff changeset
71 $(addsuffix .loc,$(WORLD_MAPS)) \
2317
f90303eec665 Include misc maps in generated changelog as well.
Matti Hamalainen <ccr@tnsp.org>
parents: 2315
diff changeset
72 $(addprefix ../$(MISC_MAPS_PATH),$(addsuffix .map,$(MISC_MAPS))) \
f90303eec665 Include misc maps in generated changelog as well.
Matti Hamalainen <ccr@tnsp.org>
parents: 2315
diff changeset
73 $(addprefix ../$(MISC_MAPS_PATH),$(addsuffix .loc,$(MISC_MAPS)))
2463
7a33f1beaf71 Adjust changelog generation rule: hg up && ... instead of hg up ; ...
Matti Hamalainen <ccr@tnsp.org>
parents: 2438
diff changeset
74 @hg up && ( echo '<?xml version="1.0"?>' && echo '<log>' && \
2069
d0e00cd7b2a5 Add make target for building changelog.txt, that contains cleaned up
Matti Hamalainen <ccr@tnsp.org>
parents: 2067
diff changeset
75 hg log $+ -M -v -f --template \
d0e00cd7b2a5 Add make target for building changelog.txt, that contains cleaned up
Matti Hamalainen <ccr@tnsp.org>
parents: 2067
diff changeset
76 '<logentry revision="{rev}"><author>{author|escape}</author><date>{date|isodate}</date><paths><path>{files}</path></paths><msg>{desc|escape}</msg></logentry>\n' && \
d0e00cd7b2a5 Add make target for building changelog.txt, that contains cleaned up
Matti Hamalainen <ccr@tnsp.org>
parents: 2067
diff changeset
77 echo '</log>' ) | \
d0e00cd7b2a5 Add make target for building changelog.txt, that contains cleaned up
Matti Hamalainen <ccr@tnsp.org>
parents: 2067
diff changeset
78 iconv -f "iso-8859-1" -t "utf-8" | \
d0e00cd7b2a5 Add make target for building changelog.txt, that contains cleaned up
Matti Hamalainen <ccr@tnsp.org>
parents: 2067
diff changeset
79 xsltproc --stringparam strip-prefix "" \
d0e00cd7b2a5 Add make target for building changelog.txt, that contains cleaned up
Matti Hamalainen <ccr@tnsp.org>
parents: 2067
diff changeset
80 --stringparam linelen 80 \
d0e00cd7b2a5 Add make target for building changelog.txt, that contains cleaned up
Matti Hamalainen <ccr@tnsp.org>
parents: 2067
diff changeset
81 --stringparam groupbyday yes \
d0e00cd7b2a5 Add make target for building changelog.txt, that contains cleaned up
Matti Hamalainen <ccr@tnsp.org>
parents: 2067
diff changeset
82 --stringparam include-rev no \
d0e00cd7b2a5 Add make target for building changelog.txt, that contains cleaned up
Matti Hamalainen <ccr@tnsp.org>
parents: 2067
diff changeset
83 "svn2cl.xsl" - | \
d0e00cd7b2a5 Add make target for building changelog.txt, that contains cleaned up
Matti Hamalainen <ccr@tnsp.org>
parents: 2067
diff changeset
84 sed 's/world\///g;s/maps\///g;s/Matti .*/Ggr/g;s/Jarkko .*/Jeskko/g' \
d0e00cd7b2a5 Add make target for building changelog.txt, that contains cleaned up
Matti Hamalainen <ccr@tnsp.org>
parents: 2067
diff changeset
85 > $@
d0e00cd7b2a5 Add make target for building changelog.txt, that contains cleaned up
Matti Hamalainen <ccr@tnsp.org>
parents: 2067
diff changeset
86
d0e00cd7b2a5 Add make target for building changelog.txt, that contains cleaned up
Matti Hamalainen <ccr@tnsp.org>
parents: 2067
diff changeset
87
2408
f2e639d72f6f Rename batclient.xml to markers.xml
Matti Hamalainen <ccr@tnsp.org>
parents: 2397
diff changeset
88 # Build Batclient markers.xml
f2e639d72f6f Rename batclient.xml to markers.xml
Matti Hamalainen <ccr@tnsp.org>
parents: 2397
diff changeset
89 markers.xml: $(addsuffix .loc,$(WORLD_MAPS)) $(MKLOC_BIN) ../www/world.inc.php
2395
42ee2079a69d Rename generate_batclient_xml.php to genbcxml.php
Matti Hamalainen <ccr@tnsp.org>
parents: 2388
diff changeset
90 php ../src/genbcxml.php $(MKLOC_BIN) ./ ../www/world.inc.php $@
2387
53c34aaf4515 Add PHP kludge for generating batclient.xml and necessary Makefile rules for
Matti Hamalainen <ccr@tnsp.org>
parents: 2369
diff changeset
91
2069
d0e00cd7b2a5 Add make target for building changelog.txt, that contains cleaned up
Matti Hamalainen <ccr@tnsp.org>
parents: 2067
diff changeset
92
950
72e53a705775 Add comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 937
diff changeset
93 # Upload changed files to site
2397
b76c25ad1b99 Change how batclient.xml is uploaded. Some improvements to the build rules.
Matti Hamalainen <ccr@tnsp.org>
parents: 2395
diff changeset
94 upload: $(TARGETS) $(LOCFILES) $(EXTRA_UPLOAD)
2047
7b18fb64dff1 Use rsync + ssh instead of scp for uploads.
Matti Hamalainen <ccr@tnsp.org>
parents: 1858
diff changeset
95 $(RSCP) $? $(UPLOAD_URL)
1623
032cdfc4f017 Various build fixes.
Matti Hamalainen <ccr@tnsp.org>
parents: 1622
diff changeset
96 @touch $@
95
0d2b25e342df Also make PNG images from maps
Matti Hamalainen <ccr@tnsp.org>
parents: 90
diff changeset
97
950
72e53a705775 Add comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 937
diff changeset
98 # Upload only *.loc files
2397
b76c25ad1b99 Change how batclient.xml is uploaded. Some improvements to the build rules.
Matti Hamalainen <ccr@tnsp.org>
parents: 2395
diff changeset
99 uploc: $(LOCFILES) $(EXTRA_UPLOAD)
2047
7b18fb64dff1 Use rsync + ssh instead of scp for uploads.
Matti Hamalainen <ccr@tnsp.org>
parents: 1858
diff changeset
100 $(RSCP) $+ $(UPLOAD_URL)
291
b78d089a0cf4 Upload target for location files only.
Matti Hamalainen <ccr@tnsp.org>
parents: 255
diff changeset
101
950
72e53a705775 Add comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 937
diff changeset
102 # Fetch raw ASCII maps from bat.org to *.new
459
30c9f70a554e Foo-bar.
Matti Hamalainen <ccr@tnsp.org>
parents: 436
diff changeset
103 fetch:
2369
3e8d01bdc195 Cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 2367
diff changeset
104 @for AMAP in $(CONT_MAPS); do echo "Fetching $${AMAP}.new"; $(HTTPGET) "$${AMAP}.new" "$(BATMAPURL)$${AMAP}.txt"; done
459
30c9f70a554e Foo-bar.
Matti Hamalainen <ccr@tnsp.org>
parents: 436
diff changeset
105
30c9f70a554e Foo-bar.
Matti Hamalainen <ccr@tnsp.org>
parents: 436
diff changeset
106
950
72e53a705775 Add comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 937
diff changeset
107 # Remove all temporary .diff files
653
b5bd0d457481 Improved 'make diff' target.
Matti Hamalainen <ccr@tnsp.org>
parents: 605
diff changeset
108 cleardiff:
b5bd0d457481 Improved 'make diff' target.
Matti Hamalainen <ccr@tnsp.org>
parents: 605
diff changeset
109 $(RM) *.diff
b5bd0d457481 Improved 'make diff' target.
Matti Hamalainen <ccr@tnsp.org>
parents: 605
diff changeset
110
950
72e53a705775 Add comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 937
diff changeset
111 # 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
112 # Finally do 'hg diff' to show changes.
1708
9a124fdb6dab Rename various Makefile variables and improve + modularize hcbat-related things better.
Matti Hamalainen <ccr@tnsp.org>
parents: 1707
diff changeset
113 diff: cleardiff $(addsuffix .diff,$(CONT_MAPS))
1155
2f7ca3ec98e8 Only 'hg diff' current directory with 'make diff'.
Matti Hamalainen <ccr@tnsp.org>
parents: 1069
diff changeset
114 @hg diff .
459
30c9f70a554e Foo-bar.
Matti Hamalainen <ccr@tnsp.org>
parents: 436
diff changeset
115
2348
6ef9445390d2 Move Javascript files under src/ too.
Matti Hamalainen <ccr@tnsp.org>
parents: 2318
diff changeset
116 %.js:: ../src/%.js
1623
032cdfc4f017 Various build fixes.
Matti Hamalainen <ccr@tnsp.org>
parents: 1622
diff changeset
117 @ln -s $< $@
032cdfc4f017 Various build fixes.
Matti Hamalainen <ccr@tnsp.org>
parents: 1622
diff changeset
118
950
72e53a705775 Add comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 937
diff changeset
119 # Clean temporary and generated targets
39
fa68caaf3c94 New maps
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
120 clean:
937
9342d636bc21 Remove *.script files on clean target.
Matti Hamalainen <ccr@tnsp.org>
parents: 911
diff changeset
121 $(RM) $(TARGETS) *.diff *.ppm *.o *.script
39
fa68caaf3c94 New maps
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
122
fa68caaf3c94 New maps
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
123 srcclean: clean
299
ed5dfa77511f Removed '-f' option.
Matti Hamalainen <ccr@tnsp.org>
parents: 297
diff changeset
124 $(RM) *~