Check for dsf. Single file.

kubilus1 · Feb 3, 2023 · 9011d40 · 9011d40
1 parent 57eb79a
commit 9011d40
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/push-main.yml b/.github/workflows/push-main.yml
@@ -73,7 +73,7 @@ jobs:
       - name: Build
         run: |
           TILENAME=${{ inputs.tileset }} make -f Makefile.tiles ${{ inputs.tileset }}_tile_list_chunks
-          TILENAME=${{ inputs.tileset }} make -f Makefile.tiles -j 2 ${{ matrix.chunk }}
+          TILENAME=${{ inputs.tileset }} make -f Makefile.tiles ${{ matrix.chunk }}
         if: startsWith(github.ref, 'refs/tags/')
 
       - name: Release

diff --git a/Makefile.tiles b/Makefile.tiles
@@ -10,7 +10,7 @@ ZIPS=$(TILE_ZIPS)
 
 # Get the tiles listed in each list file
 .SECONDEXPANSION:
-TILE_FILES = $(addsuffix /.done, $(addprefix Ortho4XP/Tiles/zOrtho4XP_, $(basename $(shell cat $(TILENAME)_tile_list.$* ) ) ) )
+TILE_FILES = $(addsuffix .dsf, $(addprefix Ortho4XP/Tiles/*/*/*/, $(basename $(shell cat $(TILENAME)_tile_list.$* ) ) ) )
 #TILE_FILES = $(basename $(shell cat $(TILENAME)_tile_list.$* ) )
 
 
@@ -61,15 +61,18 @@ $(TILENAME)_tile_list_chunks: $(TILENAME)_tile_list
 #.PHONY: %.dsf
 #%.dsf: Ortho4XP/Tiles/zOrtho4XP_%/.done
 #	echo $<
-Ortho4XP/Tiles/zOrtho4XP_%/.done: Ortho4XP 
+#Ortho4XP/Tiles/zOrtho4XP_%/.done: Ortho4XP 
+Ortho4XP/Tiles/*/*/*/%.dsf: Ortho4XP
+	@echo "Make tile $*"	
 	@echo "Setup per tile config, if possible"
-	mkdir -p $(@D)
-	-cp Ortho4XP_$*.cfg $(@D)/.
-	@echo "Make tile $(@D)" 
+	mkdir -p Ortho4XP/Tiles/zOrtho4XP_$*
+	-cp Ortho4XP_$*.cfg Ortho4XP/Tiles/zOrtho4XP_$*/.
+	@echo "Make tile $(@)" 
 	set -e;\
-	export COORDS=$$(echo $(@D) | sed -e 's/.*_\([-+][0-9]\+\)\([-+][0-9]\+\)/\1 \2/g');\
- 	cd $< && python3 Ortho4XP_v130.py $$COORDS BI 16 || ( cp $(CURDIR)/Ortho4XP_noroads.cfg $(CURDIR)/$(@D)/Ortho4XP_$*.cfg && python3 Ortho4XP_v130.py $$COORDS BI 16 )
-	touch $@
+	export COORDS=$$(echo $(@) | sed -e 's/.*\/\([-+][0-9]\+\)\([-+][0-9]\+\).dsf/\1 \2/g');\
+	echo $$COORDS; \
+ 	cd $< && python3 Ortho4XP_v130.py $$COORDS BI 16 || ( cp $(CURDIR)/Ortho4XP_noroads.cfg $(CURDIR)/Ortho4XP/Tiles/zOrtho4XP_$*/Ortho4XP_$*.cfg && python3 Ortho4XP_v130.py $$COORDS BI 16 )
+	#touch $@
 
 .SECONDARY: $(TILE_FILES)