Codechange: Pass baseset obg versions from makefile

Passes manually set user-facing version and automatically determined baseset version to the obg-generating Python script (fixes #222)

Author: zephyris

baseset/baseset_generate_obg.py

@@ -2,7 +2,7 @@
 
 import sys, os, glob
 
-def generate_obg(base_path, type_string):
+def generate_obg(base_path, type_string, baseset_version, user_version):
   print("Generating obg file")
   print("Running in " + base_path)
 
@@ -158,7 +158,7 @@ def generate_obg(base_path, type_string):
 
   # general, non-translateable, version string
   # version, never translated
-  descriptionversion = "OpenGFX2 0.8 " + typeshort
+  descriptionversion = "OpenGFX2 " + user_version + " " + typeshort
   # used for the origin string
   descriptionorigin = "Available from the in-game content download system (BaNaNaS) or https://github.com/OpenTTD/OpenGFX2/"
   # fallback description for non-standard zoom and bit depth combinations, should never be in player-facing standard builds
@@ -211,7 +211,7 @@ def pad(string, length, character=" ", pad_left=True):
     pad_length = 18
     obg.write(pad("name", pad_length, pad_left=False) + "= OpenGFX2 " + namesuffix + "\n")
     obg.write(pad("shortname", pad_length, pad_left=False) + "= " + namelookup[typeshort] + "\n")
-    obg.write(pad("version", pad_length, pad_left=False) + "= 7" + "\n")
+    obg.write(pad("version", pad_length, pad_left=False) + "= " + baseset_version + "\n")
     obg.write(pad("palette", pad_length, pad_left=False) + "= DOS" + "\n")
     obg.write(pad("blitter", pad_length, pad_left=False) + "= "+str(blitter)+"bpp" + "\n")
     obg.write(pad("url", pad_length, pad_left=False) + "= https://github.com/OpenTTD/OpenGFX2/" + "\n")
@@ -247,12 +247,17 @@ def pad(string, length, character=" ", pad_left=True):
     obg.write("default = " + descriptionorigin + "\n")
 
 if __name__ == "__main__":
-  if len(sys.argv) > 1:
-    type_string = sys.argv[1]
+  if len(sys.argv) < 3:
+    print("Usage: baseset_generate_obg.py <baseset_version> <user_version> [type_string] [base_path]")
+    sys.exit(1)
+  baseset_version = sys.argv[1]
+  user_version = sys.argv[2]
+  if len(sys.argv) > 3:
+    type_string = sys.argv[3]
   else:
     type_string = "8"
-  if len(sys.argv) > 2:
-    base_path = sys.argv[2]
+  if len(sys.argv) > 4:
+    base_path = sys.argv[4]
   else:
     base_path = "."
-  generate_obg(base_path, type_string)
+  generate_obg(base_path, type_string, baseset_version, user_version)

makefile

@@ -79,11 +79,11 @@ baseset/OpenGFX2_HighDef-$(NAMING_VERSION).tar: baseset/opengfx2_32ez.obg $(BASE
 # FORCE, as baseset_generate_obg checks for necessary updates
 .PRECIOUS: baseset/opengfx2_8.obg baseset/opengfx2_32ez.obg
 
-baseset/opengfx2_8.obg: baseset/baseset_generate_obg.py baseset/lang/*.lng $(foreach grf,$(BASESET_GRFS),baseset/$(grf)_8.grf) $(foreach grf,$(BASESET_GRFS),baseset/$(grf)_8.md5)
-	python3 baseset/baseset_generate_obg.py 8 baseset/
+baseset/opengfx2_8.obg: baseset/baseset_generate_obg.py baseset/lang/*.lng $(foreach grf,$(BASESET_GRFS),baseset/$(grf)_8.grf) $(foreach grf,$(BASESET_GRFS),baseset/$(grf)_8.md5) makefile.vcs
+	python3 baseset/baseset_generate_obg.py $(BASESET_VERSION) $(USER_VERSION) 8 baseset/
 
-baseset/opengfx2_32ez.obg: baseset/baseset_generate_obg.py baseset/lang/*.lng $(foreach grf,$(BASESET_GRFS),baseset/$(grf)_32ez.grf) $(foreach grf,$(BASESET_GRFS),baseset/$(grf)_32ez.md5)
-	python3 baseset/baseset_generate_obg.py 32ez baseset/
+baseset/opengfx2_32ez.obg: baseset/baseset_generate_obg.py baseset/lang/*.lng $(foreach grf,$(BASESET_GRFS),baseset/$(grf)_32ez.grf) $(foreach grf,$(BASESET_GRFS),baseset/$(grf)_32ez.md5) makefile.vcs
+	python3 baseset/baseset_generate_obg.py $(BASESET_VERSION) $(USER_VERSION) 32ez baseset/
 
 # GRF and MD5, via NML intermediate, for baseset
 # FORCE, as nml_preprocessor includes arbitrary pnml files