From c5634d51609ad8c1f313abda18e0a0d3dcfa394c Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Tue, 14 Jul 2026 18:24:22 +0500 Subject: [PATCH] downstream: express: fix use of non-existent ifcexpressparser `express.bnf` arg wasn't handled since d506ad77b `ifcexpressparser` waa moved inside `ifcopenshell-python` awhile ago too --- cmake/CMakeLists.txt | 8 +++++--- src/ifcopenshell-python/ifcopenshell/express/bootstrap.py | 5 ++--- .../ifcopenshell/express/express_parser.py | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 27e0f52cef..af3ee1456f 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -539,8 +539,9 @@ if(COMPILE_SCHEMA) # Bootstrap the parser message(STATUS "Compiling schema, this will take a while...") - execute_process(COMMAND ${PYTHON_EXECUTABLE} bootstrap.py express.bnf - WORKING_DIRECTORY ../src/ifcexpressparser + execute_process( + COMMAND ${PYTHON_EXECUTABLE} bootstrap.py + WORKING_DIRECTORY ../src/ifcopenshell-python/ifcopenshell/express OUTPUT_FILE express_parser.py RESULT_VARIABLE SUCCESS) @@ -549,7 +550,8 @@ if(COMPILE_SCHEMA) endif() # Generate code - execute_process(COMMAND ${PYTHON_EXECUTABLE} ../ifcexpressparser/express_parser.py ../../${COMPILE_SCHEMA} + execute_process( + COMMAND ${PYTHON_EXECUTABLE} ../ifcopenshell-python/ifcopenshell/express/express_parser.py ../../${COMPILE_SCHEMA} WORKING_DIRECTORY ../src/ifcparse OUTPUT_VARIABLE COMPILED_SCHEMA_NAME) diff --git a/src/ifcopenshell-python/ifcopenshell/express/bootstrap.py b/src/ifcopenshell-python/ifcopenshell/express/bootstrap.py index b63f90424e..8533f59ee5 100644 --- a/src/ifcopenshell-python/ifcopenshell/express/bootstrap.py +++ b/src/ifcopenshell-python/ifcopenshell/express/bootstrap.py @@ -210,9 +210,8 @@ for id in sorted(to_emit): statements.append("%s << %s" % (id, stmt)) if __name__ == "__main__": - print( - r""" -# This file is generated by IfcOpenShell ifcexpressparser bootstrap.py + print(r""" +# This file is generated by ifcopenshell.express.bootstrap from __future__ import annotations import os diff --git a/src/ifcopenshell-python/ifcopenshell/express/express_parser.py b/src/ifcopenshell-python/ifcopenshell/express/express_parser.py index 3548d3e136..34bb69585c 100644 --- a/src/ifcopenshell-python/ifcopenshell/express/express_parser.py +++ b/src/ifcopenshell-python/ifcopenshell/express/express_parser.py @@ -1,5 +1,5 @@ -# This file is generated by IfcOpenShell ifcexpressparser bootstrap.py +# This file is generated by ifcopenshell.express.bootstrap from __future__ import annotations import os