Codechange: Pass nml/newgrf versions from makefile

Passes automatically determined baseset version as newgrf version to the nml preprocessing Python script

Author: zephyris

baseset/nml/extra/extra-header.pnml

@@ -4,7 +4,7 @@ grf {
 	name: string(STR_GRF_NAME);
 	desc: string(STR_GRF_DESCRIPTION);
 	url: string(STR_GRF_URL);
-	version: 8;
+	#version
 	min_compatible_version: version_openttd(1, 3, 0);
 	param 1 {
 		param_cursors_ {

makefile

@@ -93,15 +93,15 @@ baseset/%_8.grf: graphics_1 baseset/lang/*.lng FORCE
 	$(eval PREF=$(word 1, $(subst _, ,$(basename $(notdir $@)))))
 	$(eval NAME=$(word 2, $(subst _, ,$(basename $(notdir $@)))))
 	$(eval ZOOM=$(word 3, $(subst _, ,$(basename $(notdir $@)))))
-	python3 templates/nml_preprocessor.py baseset/$(PREF)_$(NAME).pnml $(ZOOM)
+	python3 templates/nml_preprocessor.py baseset/$(PREF)_$(NAME).pnml $(BASESET_VERSION) $(ZOOM)
 	cd baseset && nmlc -p DOS --quiet -c $(PREF)_$(NAME)_$(ZOOM).nml --md5 $(PREF)_$(NAME)_$(ZOOM).md5
 
 baseset/%_32ez.grf: graphics_4 baseset/lang/*.lng FORCE
 	$(eval PREF=$(word 1, $(subst _, ,$(basename $(notdir $@)))))
 	$(eval NAME=$(word 2, $(subst _, ,$(basename $(notdir $@)))))
 	$(eval ZOOM=$(word 3, $(subst _, ,$(basename $(notdir $@)))))
 	echo $(PREF) $(NAME) $(ZOOM)
-	python3 templates/nml_preprocessor.py baseset/$(PREF)_$(NAME).pnml $(ZOOM)
+	python3 templates/nml_preprocessor.py baseset/$(PREF)_$(NAME).pnml $(BASESET_VERSION) $(ZOOM)
 	cd baseset && nmlc -p DOS --quiet -c $(PREF)_$(NAME)_$(ZOOM).nml --md5 $(PREF)_$(NAME)_$(ZOOM).md5
 
 # NewGRFs
@@ -117,7 +117,7 @@ newgrf/%.grf: graphics_4 FORCE
 	$(eval PREF=$(word 1, $(subst _, ,$(basename $(notdir $@)))))
 	$(eval NAME=$(word 2, $(subst _, ,$(basename $(notdir $@)))))
 	echo $(PREF) $(NAME)
-	python3 templates/nml_preprocessor.py newgrf/$(PREF)_$(NAME).pnml 32ez
+	python3 templates/nml_preprocessor.py newgrf/$(PREF)_$(NAME).pnml $(BASESET_VERSION) 32ez
 	mv newgrf/$(PREF)_$(NAME)_32ez.nml newgrf/$(PREF)_$(NAME).nml
 	cd newgrf && nmlc -p DOS --quiet -c -l ../baseset/lang $(PREF)_$(NAME).nml
 

newgrf/nml/landscape/landscape-header.pnml

@@ -3,7 +3,7 @@ grf {
 	name: string(STR_GRF_LANDSCAPE_NAME);
 	desc: string(STR_GRF_LANDSCAPE_DESCRIPTION);
 	url:  string(STR_GRF_URL);
-	version: 8;
+	#version
 	min_compatible_version: version_openttd(1, 3, 0);
 	param 2 {
 		param_gridlines {

newgrf/nml/objects/objects-header.pnml

@@ -3,7 +3,7 @@ grf {
 	name: string(STR_GRF_OBJECTS_NAME);
 	desc: string(STR_GRF_OBJECTS_DESCRIPTION);
 	url:  string(STR_GRF_URL);
-	version: 8;
+	#version
 	min_compatible_version: version_openttd(1, 3, 0);
 }
 

newgrf/nml/settings/settings-header.pnml

@@ -3,7 +3,7 @@ grf {
 	name: string(STR_GRF_SETTINGS_NAME);
 	desc: string(STR_GRF_SETTINGS_DESCRIPTION);
 	url:  string(STR_GRF_URL);
-	version: 8;
+	#version
 	min_compatible_version: version_openttd(1, 3, 0);
 	param 1 {
 		param_cursors_ {

newgrf/nml/stations/stations-header.pnml

@@ -3,7 +3,7 @@ grf {
 	name: string(STR_GRF_STATIONS_NAME);
 	desc: string(STR_GRF_STATIONS_DESCRIPTION);
 	url:  string(STR_GRF_URL);
-	version: 8;
+	#version
 	min_compatible_version: version_openttd(1, 3, 0);
 }
 

newgrf/nml/trams/trams-header.pnml

@@ -3,7 +3,7 @@ grf {
 	name: string(STR_GRF_TRAMS_NAME);
 	desc: string(STR_GRF_TRAMS_DESCRIPTION);
 	url:  string(STR_GRF_URL);
-	version: 8;
+	#version
 	min_compatible_version: version_openttd(1, 3, 0);
 }
 

newgrf/nml/trees/trees-header.pnml

@@ -3,7 +3,7 @@ grf {
 	name: string(STR_GRF_TREES_NAME);
 	desc: string(STR_GRF_TREES_DESCRIPTION);
 	url:  string(STR_GRF_URL);
-	version: 8;
+	#version
 	min_compatible_version: version_openttd(1, 3, 0);
 	param 12 {
 		param_trees_temperate {

templates/nml_preprocessor.py

@@ -27,7 +27,7 @@
 
 import sys, os
 
-def preprocess_pnml(pnml_path, high_bitdepth = False, extra_zoom = False, exclude_name_suffix = False):  
+def preprocess_pnml(pnml_path, newgrf_version, high_bitdepth = False, extra_zoom = False, exclude_name_suffix = False):
   def get_name():
     """
     Set the name of the nml variant based on the options.
@@ -67,6 +67,18 @@ def check_imports_change():
         return True
     return False
 
+  def check_version_line(line):
+    """
+    Check if the line is a version line, and return the version if it is.
+    """
+    # comment defining version
+    comment_version = "#version"
+
+    if line.strip() == comment_version:
+      prefix = line.split(comment_version)[0]
+      return prefix + "version: " + newgrf_version + ";"
+    return line
+
   def check_import_line(line):
     """
     Check if the line is an import line, and return the path if it is.
@@ -135,27 +147,33 @@ def handle_alternates(line):
               with open(os.path.join(base_path, import_path), "r") as include:
                 include_lines = include.read().splitlines()
                 for include_line in include_lines:
+                  include_line = check_version_line(include_line)
                   include_line = handle_alternates(include_line)
                   nml.write(include_line + "\n")
             except FileNotFoundError:
               print("File not found:", os.path(base_path, import_path))
           else:
-            include_line = handle_alternates(line)
+            include_line = check_version_line(line)
+            include_line = handle_alternates(include_line)
             nml.write(include_line + "\n")
     except FileNotFoundError:
       print("File not found:", sys.argv[1] + ".pnml")
 
 if __name__ == "__main__":
+  if len(sys.argv) < 3:
+    print("Usage: baseset_generate_obg.py <pnml_path> <newgrf_version> [type_string] [exclude_name_suffix]")
+    sys.exit(1)
   pnml_path = sys.argv[1]
+  newgrf_version = sys.argv[2]
   high_bitdepth = False
   extra_zoom = False
-  if len(sys.argv) > 2:
-    if "32" in sys.argv[2]:
+  if len(sys.argv) > 3:
+    if "32" in sys.argv[3]:
       high_bitdepth = True
-    if "ez" in sys.argv[2]:
+    if "ez" in sys.argv[3]:
       extra_zoom = True
   exclude_name_suffix = False
-  if len(sys.argv) > 3:
-    if sys.argv[3] == "exclude_name_suffix":
+  if len(sys.argv) > 4:
+    if sys.argv[4] == "exclude_name_suffix":
       exclude_name_suffix = True
-  preprocess_pnml(pnml_path, high_bitdepth, extra_zoom, exclude_name_suffix)
+  preprocess_pnml(pnml_path, newgrf_version, high_bitdepth, extra_zoom, exclude_name_suffix)