Mercurial > hg > batmud > maputils

changeset 2510:83967e0447f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move pieces around in build system for some more clarity.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 02 Aug 2023 12:57:42 +0300
parents 6878dbdbc11e
children 9973f78f8291
files Makefile.maps world/Makefile
diffstat 2 files changed, 63 insertions(+), 67 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.maps	Wed Aug 02 12:54:39 2023 +0300
+++ b/Makefile.maps	Wed Aug 02 12:57:42 2023 +0300
@@ -33,53 +33,3 @@
 %.ansi: %.tmp1 %.desc $(COLORMAP_BIN)
 	@echo "COLORMAP $@"
 	@$(COLORMAP_BIN) $(COLORMAP_OPTS) $(COLORMAP_EXTRA) -f ansi -t "`cat $(patsubst %.tmp1,%.desc,$<)`" -o $@ $<
-
-
-###
-### PNG images
-###
-%.script: %.map %.loc title.png $(WORLDMAP_FONT_FILE) $(MKLOC_BIN)
-	@echo "MKLOC $@"
-	@$(MKLOC_BIN) $(MKLOC_OPTS) -S -m $< -l $(patsubst %.map,%.loc,$<) -f $(WORLDMAP_FONT_SCALE) -u $(WORLDMAP_UNIT_SIZE) -s $(WORLDMAP_SCALE) | \
-	sed -e "s/@OPTS_START@/-font $(WORLDMAP_FONT_FILE) -pointsize 14 -type TruecolorMatte/g" \
-	-e "s/@OPTS_END@/\t-geometry +0+0 title.png -composite -compose screen \\\\\n\t-pointsize 20 -fill white -box none -draw \"text 5,50 \'@PAF@\n\n\n/g" | \
-	sed -e "/@PAF@/r $(patsubst %.map,%.desc,$<)" -e "s/@PAF@//g" > $@
-
-%.ppm: %.map
-	@echo "MAP2PPM $@"
-	@$(MAP2PPM_BIN) $(MAP2PPM_OPTS) -s $(WORLDMAP_SCALE) $(COLORMAP_EXTRA) $< -o $@
-
-ifeq ($(HAVE_GIMP_CONSOLE),yes)
-%_rgb.png: %.ppm %.script %.desc
-	@echo "PNG $@"
-	@/bin/sh $(patsubst %.ppm,%.script,$<) $< $@
-
-%.png: %_rgb.png
-	@echo "GIMP $@"
-	@gimp-console -c -d -i -b \
-	"(let* ( \
-	(img (car (file-png-load RUN-NONINTERACTIVE \"$<\" \"$<\"))) \
-	(drawable (car (gimp-image-active-drawable img)))) \
-	(gimp-convert-indexed img NO-DITHER MAKE-PALETTE 64 FALSE FALSE \"\") \
-	(file-png-save2 RUN-NONINTERACTIVE img drawable \"$@\" \"$@\" 0 9 0 0 0 0 0 0 0))" \
-	-b '(gimp-quit 0)'
-else
-%.png: %.ppm %.script %.desc
-	@echo "PNG $@"
-	@/bin/sh $(patsubst %.ppm,%.script,$<) $< $@
-endif
-
-
-###
-### Diff target between .map file and .new file. Makes necessary changes in .map and .loc
-###
-%.diff: %.map %.new
-	@echo "DIFFING $< ..."
-	@if $(DIFFMAP_BIN) $(DIFFMAP_OPTS) $+ -o $@ -a; then \
-		echo "PATCHING ..."; \
-		$(MAP2PPM_BIN) $@ -o $@.ppm -d; \
-		$(PATCHMAP_BIN) $< $@ -o $<; \
-	fi
-	@echo "UPDATING LOCATIONS ..."
-	@$(MKLOC_BIN) -v -m $(patsubst %.map,%.new,$<) -l $(patsubst %.map,%.loc,$<) -L -g -o $(patsubst %.map,%.nloc,$<)
-	@diff -ubB $(patsubst %.map,%.loc,$<) $(patsubst %.map,%.nloc,$<) | patch
--- a/world/Makefile	Wed Aug 02 12:54:39 2023 +0300
+++ b/world/Makefile	Wed Aug 02 12:57:42 2023 +0300
@@ -67,6 +67,69 @@
 maps: $(addsuffix .ppm,$(WORLD_MAPS)) $(TARGETS)
 
 
+%.script: %.map %.loc title.png $(WORLDMAP_FONT_FILE) $(MKLOC_BIN)
+	@echo "MKLOC $@"
+	@$(MKLOC_BIN) $(MKLOC_OPTS) -S -m $< -l $(patsubst %.map,%.loc,$<) -f $(WORLDMAP_FONT_SCALE) -u $(WORLDMAP_UNIT_SIZE) -s $(WORLDMAP_SCALE) | \
+	sed -e "s/@OPTS_START@/-font $(WORLDMAP_FONT_FILE) -pointsize 14 -type TruecolorMatte/g" \
+	-e "s/@OPTS_END@/\t-geometry +0+0 title.png -composite -compose screen \\\\\n\t-pointsize 20 -fill white -box none -draw \"text 5,50 \'@PAF@\n\n\n/g" | \
+	sed -e "/@PAF@/r $(patsubst %.map,%.desc,$<)" -e "s/@PAF@//g" > $@
+
+%.ppm: %.map
+	@echo "MAP2PPM $@"
+	@$(MAP2PPM_BIN) $(MAP2PPM_OPTS) -s $(WORLDMAP_SCALE) $(COLORMAP_EXTRA) $< -o $@
+
+ifeq ($(HAVE_GIMP_CONSOLE),yes)
+%_rgb.png: %.ppm %.script %.desc
+	@echo "PNG $@"
+	@/bin/sh $(patsubst %.ppm,%.script,$<) $< $@
+
+%.png: %_rgb.png
+	@echo "GIMP $@"
+	@gimp-console -c -d -i -b \
+	"(let* ( \
+	(img (car (file-png-load RUN-NONINTERACTIVE \"$<\" \"$<\"))) \
+	(drawable (car (gimp-image-active-drawable img)))) \
+	(gimp-convert-indexed img NO-DITHER MAKE-PALETTE 64 FALSE FALSE \"\") \
+	(file-png-save2 RUN-NONINTERACTIVE img drawable \"$@\" \"$@\" 0 9 0 0 0 0 0 0 0))" \
+	-b '(gimp-quit 0)'
+else
+%.png: %.ppm %.script %.desc
+	@echo "PNG $@"
+	@/bin/sh $(patsubst %.ppm,%.script,$<) $< $@
+endif
+
+
+###
+### Diff target between .map file and .new file. Makes necessary changes in .map and .loc
+###
+%.diff: %.map %.new
+	@echo "DIFFING $< ..."
+	@if $(DIFFMAP_BIN) $(DIFFMAP_OPTS) $+ -o $@ -a; then \
+		echo "PATCHING ..."; \
+		$(MAP2PPM_BIN) $@ -o $@.ppm -d; \
+		$(PATCHMAP_BIN) $< $@ -o $<; \
+	fi
+	@echo "UPDATING LOCATIONS ..."
+	@$(MKLOC_BIN) -v -m $(patsubst %.map,%.new,$<) -l $(patsubst %.map,%.loc,$<) -L -g -o $(patsubst %.map,%.nloc,$<)
+	@diff -ubB $(patsubst %.map,%.loc,$<) $(patsubst %.map,%.nloc,$<) | patch
+# Fetch raw ASCII maps from bat.org to *.new
+fetch:
+	@for AMAP in $(CONT_MAPS); do echo "Fetching $${AMAP}.new"; $(HTTPGET) "$${AMAP}.new" "$(BATMAPURL)$${AMAP}.txt"; done
+
+
+# Remove all temporary .diff files
+cleardiff:
+	$(RM) *.diff
+
+# Diff target - run diff for each .map and .new (fetched via 'fetch' target).
+# Finally do 'hg diff' to show changes.
+diff: cleardiff $(addsuffix .diff,$(CONT_MAPS))
+	@hg diff .
+
+%.js:: ../src/%.js
+	@ln -s $< $@
+
+
 changelog.txt: $(addsuffix .map,$(WORLD_MAPS)) \
 	$(addsuffix .loc,$(WORLD_MAPS)) \
 	$(addprefix ../$(MISC_MAPS_PATH),$(addsuffix .map,$(MISC_MAPS))) \
@@ -99,23 +162,6 @@
 uploc: $(LOCFILES) $(EXTRA_UPLOAD)
 	$(RSCP) $+ $(UPLOAD_URL)
 
-# Fetch raw ASCII maps from bat.org to *.new
-fetch:
-	@for AMAP in $(CONT_MAPS); do echo "Fetching $${AMAP}.new"; $(HTTPGET) "$${AMAP}.new" "$(BATMAPURL)$${AMAP}.txt"; done
-
-
-# Remove all temporary .diff files
-cleardiff:
-	$(RM) *.diff
-
-# Diff target - run diff for each .map and .new (fetched via 'fetch' target).
-# Finally do 'hg diff' to show changes.
-diff: cleardiff $(addsuffix .diff,$(CONT_MAPS))
-	@hg diff .
-
-%.js:: ../src/%.js
-	@ln -s $< $@
-
 # Clean temporary and generated targets
 clean:
 	$(RM) $(TARGETS) *.diff *.ppm *.o *.script