Skip to content

Commit

Permalink
fix fallback logic
Browse files Browse the repository at this point in the history
  • Loading branch information
jonaseberle committed Dec 24, 2024
1 parent e441e87 commit 7d29a04
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -262,21 +262,23 @@ build/Tiles/zOrtho4XP_%/Earth\ nav\ data/*/*.dsf: Ortho4XP Ortho4XP-shred86 Orth
@mkdir -p build/Tiles/zOrtho4XP_$*
@# this silences deprecation warnings in Ortho4XP for more concise output
@set -e; \
export COORDS=$$(echo $(@) | sed -e 's/.*\/\([-+][0-9]\+\)\([-+][0-9]\+\).dsf/\1 \2/g'); \
set -x; \
echo $(@); \
export COORDS=$$(echo $(@) | sed -e 's/.*\([-+][0-9]\+\)\([-+][0-9]\+\).*/\1 \2/g'); \
cd $(CURDIR)/Ortho4XP \
&& cp Ortho4XP.cfg $(CURDIR)/build/Tiles/zOrtho4XP_$*/Ortho4XP_$*.cfg \
&& . .venv/bin/activate \
&& python3 Ortho4XP.py $$COORDS 2>&1 \
&& cp generated_by.template $(CURDIR)/build/Tiles/zOrtho4XP_$*/generated_by_$*.txt ;\
[ -e Tiles/*/*/*/$*.dsf ] || ( \
[ -e "$(CURDIR)/build/Tiles/zOrtho4XP_$*/Earth nav data/"*/$*.dsf ] || ( \
echo "ERROR DETECTED! Retry tile $@ with noroads config."; \
cd $(CURDIR)/Ortho4XP \
&& cp Ortho4XP.cfg $(CURDIR)/build/Tiles/zOrtho4XP_$*/Ortho4XP_$*.cfg \
&& . .venv/bin/activate \
&& python3 Ortho4XP.py $$COORDS 2>&1 \
&& cp generated_by.template $(CURDIR)/build/Tiles/zOrtho4XP_$*/generated_by_$*.txt ;\
); \
[ -e Tiles/*/*/*/$*.dsf ] || ( \
[ -e "$(CURDIR)/build/Tiles/zOrtho4XP_$*/Earth nav data/"*/$*.dsf ] || ( \
echo "ERROR DETECTED! Retry tile $@ with Ortho4XP 1.3"; \
cd $(CURDIR)/Ortho4XP-v1.3 \
&& cp Ortho4XP.cfg $(CURDIR)/build/Tiles/zOrtho4XP_$*/Ortho4XP_$*.cfg \
Expand Down

0 comments on commit 7d29a04

Please sign in to comment.