WIP: add input for abi.h.in

Author: Joe-Downs

ompi/mpi/bindings/c_header.py

@@ -17,6 +17,7 @@
 # ============================= Constants / Globals ============================
 DIR = Path(".")
 OUTPUT = DIR / "mpi.h"
+INPUT = DIR / "abi.h.in"
 JSON_PATH = DIR / "abi.json"
 
 ABI_INTERNAL = "_ABI_INTERNAL"
@@ -69,7 +70,8 @@
 # ============================== Argument Parsing ==============================
 parser = argparse.ArgumentParser()
 parser.add_argument("--abi-json", type=str, help=f"path to ABI JSON file [{DIR}/]")
-parser.add_argument("-o", "--output", type=str, help="output directory for the header file")
+parser.add_argument("-i", "--input", type=str, help="input path for the .h.in file")
+parser.add_argument("-o", "--output", type=str, help="output path for the header file")
 parser.add_argument("--mangle-names", help="enable name mangling for constants and datatypes", action="store_true")
 parser.add_argument("--no-mangle", help="disable name mangling (default)", action="store_true")
 
@@ -83,6 +85,8 @@
     MANGLE_NAMES = False
 if args.output:
     OUTPUT = Path(args.output)
+if args.input:
+    INPUT = Path(args.input)
 
 # ================================== Load JSON =================================
 with open(JSON_PATH) as f:
@@ -132,7 +136,7 @@ def output_constant(const, use_enum: bool, mangle_name: bool):
 
 # ========================= Manipulate Template Header =========================
 lines = []
-with open(DIR / "abi.h.in", 'r') as header_in:
+with open(INPUT, 'r') as header_in:
     lines = header_in.readlines()
 
 # Match lines that start with `$CATEGORY:`. Any amount of whitespace is allowed

ompi/mpi/c/Makefile.am

@@ -558,27 +558,21 @@ if OMPI_GENERATE_BINDINGS
 	    source \
 	    ompi \
 	    $<
-abi.h: $(prototype_sources)
-	$(OMPI_V_GEN) $(PYTHON) $(top_srcdir)/ompi/mpi/bindings/bindings.py \
-	    --builddir $(abs_top_builddir) \
-	    --srcdir $(abs_top_srcdir) \
-	    --output $@ \
-	    c \
-	    header \
-	    --srcdir $(srcdir) \
-	    $(prototype_sources)
+
 # Non-mangled version
-standard_abi/mpi.h: $(top_srcdir)/docs/mpi-standard-apis.json c_header.py
+standard_abi/mpi.h: $(top_srcdir)/docs/mpi-standard-apis.json $(top_srcdir)/ompi/mpi/bindings/c_header.py
 	mkdir -p standard_abi
-	$(OMPI_V_GEN) $(PYTHON) c_header.py \
-	--abi-json $(top_srcdir)/docs/mpi-standard-apis.json \
+	$(OMPI_V_GEN) $(PYTHON) $(top_srcdir)/ompi/mpi/bindings/c_header.py \
+	--input $(top_srcdir)/ompi/mpi/c/abi.h.in \
+	--abi-json $(top_srcdir)/docs/mpi-standard-abi.json \
 	--output $(top_srcdir)/ompi/mpi/c/standard_abi/mpi.h
 
 # Mangled version
-abi.h: $(top_srcdir)/docs/mpi-standard-apis.json c_header.py
-	$(OMPI_V_GEN) $(PYTHON) c_header.py \
+abi.h: $(top_srcdir)/docs/mpi-standard-apis.json $(top_srcdir)/ompi/mpi/bindings/c_header.py
+	$(OMPI_V_GEN) $(PYTHON) $(top_srcdir)/ompi/mpi/bindings/c_header.py \
+	--input $(top_srcdir)/ompi/mpi/c/abi.h.in \
 	--output $(top_srcdir)/ompi/mpi/c/abi.h \
-	--abi-json $(top_srcdir)/docs/mpi-standard-apis.json \
+	--abi-json $(top_srcdir)/docs/mpi-standard-abi.json \
 	--mangle-names
 
 %_abi_generated.c: %.c.in