reduce to two building systems

simutrans · Jan 13, 2022 · a492845 · a492845
1 parent 1e062a4
commit a492845
Show file tree

Hide file tree

Showing 73 changed files with 28 additions and 647 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 simutrans/pak128
 makefile.exe
-makefilesimupak128.zip
+makefile
+simupak128.zip
diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@ ADDONDIR ?= $(DESTDIR)/addons/pak128
 DESTFILE ?= simupak128
 
 OUTSIDE :=
-OUTSIDE += base
+OUTSIDE += base/special
 
 DIRS64 :=
 DIRS64 += base/misc_GUI_64
@@ -87,7 +87,6 @@ ADDON_DIRS64 :=
 
 
 DIRS := $(DIRS64) $(DIRS128) $(DIRS176) $(DIRS250)
-ADDON_DIRS := $(ADDON_DIRS64)
 
 
 .PHONY: $(DIRS) $(OUTSIDE) $(ADDON_DIRS64) copy tar zip
@@ -113,6 +112,8 @@ copy:
 	@rm -rf $(PAKDIR)
 	@mkdir -p $(PAKDIR)
 	@cp -rp pak128.prototype/*  $(PAKDIR)
+	@cp -p history-pak128-svn.txt $(PAKDIR)/doc
+	@cp -p LICENSE.txt $(PAKDIR)/doc
 
 $(DIRS64):
 	@echo "===> PAK64 $@"
@@ -122,31 +123,40 @@ $(DIRS64):
 $(DIRS128):
 	@echo "===> PAK128 $@"
 	@mkdir -p $(PAKDIR)
-	@$(MAKEOBJ) quiet PAK128 $(PAKDIR)/ $@/ > /dev/null
+	@rm -f $@/*.pak
+	@$(MAKEOBJ) quiet PAK128 $@/ $@/ > /dev/null
+	@$(MAKEOBJ) quiet merge $(PAKDIR)/`echo $@ | sed s_/_._g`.all.pak $@/*.pak > /dev/null
+	@rm -f $@/*.pak
 
 $(DIRS176):
 	@echo "===> PAK176 $@"
 	@mkdir -p $(PAKDIR)
-	@$(MAKEOBJ) quiet PAK176 $(PAKDIR)/ $@/ > /dev/null
+	@rm -f $@/*.pak
+	@$(MAKEOBJ) quiet PAK176 $@/ $@/ > /dev/null
+	@$(MAKEOBJ) quiet merge $(PAKDIR)/`echo $@ | sed s_/_._g`.all.pak $@/*.pak > /dev/null
+	@rm -f $@/*.pak
 
 $(DIRS250):
 	@echo "===> PAK250 $@"
 	@mkdir -p $(PAKDIR)
-	@$(MAKEOBJ) quiet PAK250 $(PAKDIR)/ $@/ > /dev/null
+	@rm -f $@/*.pak
+	@$(MAKEOBJ) quiet PAK250 $@/ $@/ > /dev/null
+	@$(MAKEOBJ) quiet merge $(PAKDIR)/`echo $@ | sed s_/_._g`.all.pak $@/*.pak > /dev/null
+	@rm -f $@/*.pak
 
 $(OUTSIDE):
 	@echo "===> Grounds calculations"
 	@echo "===> OUTSIDE with REVISION and grounds"
 	@mkdir -p $(PAKDIR)
-	printf "Obj=ground\nName=Outside\ncopyright=$(PAKID) git r%s\nImage[0][0]=tile.1.1\n-" `git rev-list --count --first-parent HEAD`>$@/outside.dat
-	$(MAKEOBJ) PAK128 $(PAKDIR)/ $@/ > /dev/null
+	@printf "Obj=ground\nName=Outside\ncopyright=$(PAKID) git r%s\nImage[0][0]=tile.1.1\n-" `git rev-list --count --first-parent HEAD`>$@/outside.dat
+	$(MAKEOBJ) quiet PAK128 $(PAKDIR)/ $@/ > /dev/null
 	@rm $@/outside.dat
 
 calclight:
-	@echo "===> MAKE lightmaps and borders"
-	@$(LIGHTMAP) -pak64 -marker16 -c#0xFF8000 ground/marker.png
-	@$(LIGHTMAP) -pak64 -marker16 -c#0x800000 ground/borders.png
-	@$(LIGHTMAP) -pak64 -slope16 -bright128 ground/texture-lightmap.png
+	@echo "===> MAKE lightmaps and borders (not recommended)"
+	@$(LIGHTMAP) -pak128 -marker16 -c#0xFF8000 landscape/grounds/marker.png
+	@$(LIGHTMAP) -pak128 -marker16 -c#0x202020 landscape/grounds/borders.png
+	@$(LIGHTMAP) -pak128 -slope16 -bright128 landscape/grounds/texture-lightmap.png
 
 merge:
 

diff --git a/README.txt b/README.txt
@@ -6,9 +6,8 @@ Compilation
 -----------
 
 Currently these build systems are available:
-* pakmak.py
-* makefile            (presently outdated)
-* Windows batch file
+* makefile
+* Windows batch file (not tested)
 
 The first wants makeobj on path, the other two next to script file. Other requirements are, obviously, the backends: Python for pakmak, GNU make for makefile, and Windows for the batch file.
 

diff --git a/_pakmak.tab b/_pakmak.tab
diff --git a/base/_pakmak.tab b/base/_pakmak.tab
diff --git a/base/misc_GUI/_pakmak.tab b/base/misc_GUI/_pakmak.tab
diff --git a/base/misc_GUI_64/_pakmak.tab b/base/misc_GUI_64/_pakmak.tab
diff --git a/base/pedestrians/_pakmak.tab b/base/pedestrians/_pakmak.tab
diff --git a/base/smokes/_pakmak.tab b/base/smokes/_pakmak.tab
diff --git a/base/misc_GUI/BigLogo.dat → base/special/BigLogo.dat b/base/misc_GUI/BigLogo.dat → base/special/BigLogo.dat
diff --git a/base/misc_GUI/biglogo.png → base/special/biglogo.png b/base/misc_GUI/biglogo.png → base/special/biglogo.png
diff --git a/base/tile.png → base/special/tile.png b/base/tile.png → base/special/tile.png
diff --git a/citycars/_pakmak.tab b/citycars/_pakmak.tab
diff --git a/cityhouses/_pakmak.tab b/cityhouses/_pakmak.tab
diff --git a/cityhouses/com/_pakmak.tab b/cityhouses/com/_pakmak.tab
diff --git a/cityhouses/ind/_pakmak.tab b/cityhouses/ind/_pakmak.tab
diff --git a/cityhouses/res/_pakmak.tab b/cityhouses/res/_pakmak.tab
diff --git a/cityhouses/res/blocks/_pakmak.tab b/cityhouses/res/blocks/_pakmak.tab
diff --git a/devdocs/pakmak-desc.txt b/devdocs/pakmak-desc.txt
diff --git a/devdocs/svn-rules.txt b/devdocs/svn-rules.txt
@@ -32,8 +32,8 @@ Rationale: less annoyance, more productivity - find files by typing names & easy
 
 
 
-Working with svn:
------------------
+Working with svn/git:
+---------------------
 
 Summary: know what you are doing, keep up to date when working, don't make life hard for others
 
@@ -63,5 +63,5 @@ Summary: repair what is broken, increase information value
 Testing the pak:
 ----------------
 
-Whatever you do, remember that ultimately the nightly server is our most important all-time "user". If something works for you, good, but if Werner says it is broken, it IS broken.
+Whatever you do, remember that ultimately the nightly server is our most important all-time "user".
 
diff --git a/factories/_pakmak.tab b/factories/_pakmak.tab
diff --git a/factories/powerplants/_pakmak.tab b/factories/powerplants/_pakmak.tab
diff --git a/infrastructure/_pakmak.tab b/infrastructure/_pakmak.tab
diff --git a/infrastructure/airport_buildings_towers/_pakmak.tab b/infrastructure/airport_buildings_towers/_pakmak.tab
diff --git a/infrastructure/airport_depots/_pakmak.tab b/infrastructure/airport_depots/_pakmak.tab
diff --git a/infrastructure/airport_ways_items/_pakmak.tab b/infrastructure/airport_ways_items/_pakmak.tab
diff --git a/infrastructure/catenary_all/_pakmak.tab b/infrastructure/catenary_all/_pakmak.tab
diff --git a/infrastructure/depots_rail_road_tram/_pakmak.tab b/infrastructure/depots_rail_road_tram/_pakmak.tab
diff --git a/infrastructure/headquarters/_pakmak.tab b/infrastructure/headquarters/_pakmak.tab
diff --git a/infrastructure/powerlines/_pakmak.tab b/infrastructure/powerlines/_pakmak.tab
diff --git a/infrastructure/rail_bridges/_pakmak.tab b/infrastructure/rail_bridges/_pakmak.tab
diff --git a/infrastructure/rail_elevated/_pakmak.tab b/infrastructure/rail_elevated/_pakmak.tab
diff --git a/infrastructure/rail_signals/_pakmak.tab b/infrastructure/rail_signals/_pakmak.tab
diff --git a/infrastructure/rail_stations/_pakmak.tab b/infrastructure/rail_stations/_pakmak.tab
diff --git a/infrastructure/rail_tracks/_pakmak.tab b/infrastructure/rail_tracks/_pakmak.tab
diff --git a/infrastructure/rail_tunnels/_pakmak.tab b/infrastructure/rail_tunnels/_pakmak.tab
diff --git a/infrastructure/rail_water_crossings/_pakmak.tab b/infrastructure/rail_water_crossings/_pakmak.tab
diff --git a/infrastructure/road_bridges/_pakmak.tab b/infrastructure/road_bridges/_pakmak.tab
diff --git a/infrastructure/road_elevated/_pakmak.tab b/infrastructure/road_elevated/_pakmak.tab
diff --git a/infrastructure/road_rail_crossings/_pakmak.tab b/infrastructure/road_rail_crossings/_pakmak.tab
diff --git a/infrastructure/road_signs/_pakmak.tab b/infrastructure/road_signs/_pakmak.tab
diff --git a/infrastructure/road_stops/_pakmak.tab b/infrastructure/road_stops/_pakmak.tab
diff --git a/infrastructure/road_tunnels/_pakmak.tab b/infrastructure/road_tunnels/_pakmak.tab
diff --git a/infrastructure/road_water_crossings/_pakmak.tab b/infrastructure/road_water_crossings/_pakmak.tab
diff --git a/infrastructure/roads/_pakmak.tab b/infrastructure/roads/_pakmak.tab
diff --git a/infrastructure/schwebebahn_all/_pakmak.tab b/infrastructure/schwebebahn_all/_pakmak.tab
diff --git a/infrastructure/station_buildings/_pakmak.tab b/infrastructure/station_buildings/_pakmak.tab
diff --git a/infrastructure/tram_tracks/_pakmak.tab b/infrastructure/tram_tracks/_pakmak.tab
diff --git a/infrastructure/water_all/_pakmak.tab b/infrastructure/water_all/_pakmak.tab
diff --git a/landscape/_pakmak.tab b/landscape/_pakmak.tab
diff --git a/landscape/groundobj_static/_pakmak.tab b/landscape/groundobj_static/_pakmak.tab
diff --git a/landscape/grounds/_pakmak.tab b/landscape/grounds/_pakmak.tab