From 724cdb446eee5d97ba89cf2b3a760de5de2845ae Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Tue, 31 Mar 2026 10:02:00 +0200 Subject: [PATCH] Move schemas into schemas/ subfolder --- src/ifcgeom/mapping/mapping.h | 4 +- .../ifcopenshell/express/run.bat | 124 +++++++++--------- .../ifcopenshell/express/schema_class.py | 4 +- .../ifcopenshell/express/templates.py | 20 +-- src/ifcparse/CMakeLists.txt | 18 +-- src/ifcparse/IfcAlignmentHelper.h | 2 +- src/ifcparse/IfcHierarchyHelper.h | 24 ++-- src/ifcparse/IfcSIPrefix.cpp | 24 ++-- src/ifcparse/IfcSchema.cpp | 24 ++-- .../{ => schemas}/Ifc2x3-definitions.h | 0 src/ifcparse/{ => schemas}/Ifc2x3-schema.cpp | 4 +- src/ifcparse/{ => schemas}/Ifc2x3.cpp | 8 +- src/ifcparse/{ => schemas}/Ifc2x3.h | 10 +- src/ifcparse/{ => schemas}/Ifc4-definitions.h | 0 src/ifcparse/{ => schemas}/Ifc4-schema.cpp | 4 +- src/ifcparse/{ => schemas}/Ifc4.cpp | 8 +- src/ifcparse/{ => schemas}/Ifc4.h | 10 +- .../{ => schemas}/Ifc4x1-definitions.h | 0 src/ifcparse/{ => schemas}/Ifc4x1-schema.cpp | 4 +- src/ifcparse/{ => schemas}/Ifc4x1.cpp | 8 +- src/ifcparse/{ => schemas}/Ifc4x1.h | 10 +- .../{ => schemas}/Ifc4x2-definitions.h | 0 src/ifcparse/{ => schemas}/Ifc4x2-schema.cpp | 4 +- src/ifcparse/{ => schemas}/Ifc4x2.cpp | 8 +- src/ifcparse/{ => schemas}/Ifc4x2.h | 10 +- .../{ => schemas}/Ifc4x3-definitions.h | 0 src/ifcparse/{ => schemas}/Ifc4x3-schema.cpp | 4 +- src/ifcparse/{ => schemas}/Ifc4x3.cpp | 8 +- src/ifcparse/{ => schemas}/Ifc4x3.h | 10 +- .../{ => schemas}/Ifc4x3_add1-definitions.h | 0 .../{ => schemas}/Ifc4x3_add1-schema.cpp | 4 +- src/ifcparse/{ => schemas}/Ifc4x3_add1.cpp | 8 +- src/ifcparse/{ => schemas}/Ifc4x3_add1.h | 10 +- .../{ => schemas}/Ifc4x3_add2-definitions.h | 0 .../{ => schemas}/Ifc4x3_add2-schema.cpp | 4 +- src/ifcparse/{ => schemas}/Ifc4x3_add2.cpp | 8 +- src/ifcparse/{ => schemas}/Ifc4x3_add2.h | 10 +- .../{ => schemas}/Ifc4x3_rc1-definitions.h | 0 .../{ => schemas}/Ifc4x3_rc1-schema.cpp | 4 +- src/ifcparse/{ => schemas}/Ifc4x3_rc1.cpp | 8 +- src/ifcparse/{ => schemas}/Ifc4x3_rc1.h | 10 +- .../{ => schemas}/Ifc4x3_rc2-definitions.h | 0 .../{ => schemas}/Ifc4x3_rc2-schema.cpp | 4 +- src/ifcparse/{ => schemas}/Ifc4x3_rc2.cpp | 8 +- src/ifcparse/{ => schemas}/Ifc4x3_rc2.h | 10 +- .../{ => schemas}/Ifc4x3_rc3-definitions.h | 0 .../{ => schemas}/Ifc4x3_rc3-schema.cpp | 4 +- src/ifcparse/{ => schemas}/Ifc4x3_rc3.cpp | 8 +- src/ifcparse/{ => schemas}/Ifc4x3_rc3.h | 10 +- .../{ => schemas}/Ifc4x3_rc4-definitions.h | 0 .../{ => schemas}/Ifc4x3_rc4-schema.cpp | 4 +- src/ifcparse/{ => schemas}/Ifc4x3_rc4.cpp | 8 +- src/ifcparse/{ => schemas}/Ifc4x3_rc4.h | 10 +- .../{ => schemas}/Ifc4x3_tc1-definitions.h | 0 .../{ => schemas}/Ifc4x3_tc1-schema.cpp | 4 +- src/ifcparse/{ => schemas}/Ifc4x3_tc1.cpp | 8 +- src/ifcparse/{ => schemas}/Ifc4x3_tc1.h | 10 +- src/ifcwrap/IfcPython.i | 48 +++---- .../schema_dependent/JsonSerializer.h | 4 +- .../schema_dependent/XmlSerializer.h | 4 +- 60 files changed, 279 insertions(+), 285 deletions(-) rename src/ifcparse/{ => schemas}/Ifc2x3-definitions.h (100%) rename src/ifcparse/{ => schemas}/Ifc2x3-schema.cpp (99%) rename src/ifcparse/{ => schemas}/Ifc2x3.cpp (99%) rename src/ifcparse/{ => schemas}/Ifc2x3.h (99%) rename src/ifcparse/{ => schemas}/Ifc4-definitions.h (100%) rename src/ifcparse/{ => schemas}/Ifc4-schema.cpp (99%) rename src/ifcparse/{ => schemas}/Ifc4.cpp (99%) rename src/ifcparse/{ => schemas}/Ifc4.h (99%) rename src/ifcparse/{ => schemas}/Ifc4x1-definitions.h (100%) rename src/ifcparse/{ => schemas}/Ifc4x1-schema.cpp (99%) rename src/ifcparse/{ => schemas}/Ifc4x1.cpp (99%) rename src/ifcparse/{ => schemas}/Ifc4x1.h (99%) rename src/ifcparse/{ => schemas}/Ifc4x2-definitions.h (100%) rename src/ifcparse/{ => schemas}/Ifc4x2-schema.cpp (99%) rename src/ifcparse/{ => schemas}/Ifc4x2.cpp (99%) rename src/ifcparse/{ => schemas}/Ifc4x2.h (99%) rename src/ifcparse/{ => schemas}/Ifc4x3-definitions.h (100%) rename src/ifcparse/{ => schemas}/Ifc4x3-schema.cpp (99%) rename src/ifcparse/{ => schemas}/Ifc4x3.cpp (99%) rename src/ifcparse/{ => schemas}/Ifc4x3.h (99%) rename src/ifcparse/{ => schemas}/Ifc4x3_add1-definitions.h (100%) rename src/ifcparse/{ => schemas}/Ifc4x3_add1-schema.cpp (99%) rename src/ifcparse/{ => schemas}/Ifc4x3_add1.cpp (99%) rename src/ifcparse/{ => schemas}/Ifc4x3_add1.h (99%) rename src/ifcparse/{ => schemas}/Ifc4x3_add2-definitions.h (100%) rename src/ifcparse/{ => schemas}/Ifc4x3_add2-schema.cpp (99%) rename src/ifcparse/{ => schemas}/Ifc4x3_add2.cpp (99%) rename src/ifcparse/{ => schemas}/Ifc4x3_add2.h (99%) rename src/ifcparse/{ => schemas}/Ifc4x3_rc1-definitions.h (100%) rename src/ifcparse/{ => schemas}/Ifc4x3_rc1-schema.cpp (99%) rename src/ifcparse/{ => schemas}/Ifc4x3_rc1.cpp (99%) rename src/ifcparse/{ => schemas}/Ifc4x3_rc1.h (99%) rename src/ifcparse/{ => schemas}/Ifc4x3_rc2-definitions.h (100%) rename src/ifcparse/{ => schemas}/Ifc4x3_rc2-schema.cpp (99%) rename src/ifcparse/{ => schemas}/Ifc4x3_rc2.cpp (99%) rename src/ifcparse/{ => schemas}/Ifc4x3_rc2.h (99%) rename src/ifcparse/{ => schemas}/Ifc4x3_rc3-definitions.h (100%) rename src/ifcparse/{ => schemas}/Ifc4x3_rc3-schema.cpp (99%) rename src/ifcparse/{ => schemas}/Ifc4x3_rc3.cpp (99%) rename src/ifcparse/{ => schemas}/Ifc4x3_rc3.h (99%) rename src/ifcparse/{ => schemas}/Ifc4x3_rc4-definitions.h (100%) rename src/ifcparse/{ => schemas}/Ifc4x3_rc4-schema.cpp (99%) rename src/ifcparse/{ => schemas}/Ifc4x3_rc4.cpp (99%) rename src/ifcparse/{ => schemas}/Ifc4x3_rc4.h (99%) rename src/ifcparse/{ => schemas}/Ifc4x3_tc1-definitions.h (100%) rename src/ifcparse/{ => schemas}/Ifc4x3_tc1-schema.cpp (99%) rename src/ifcparse/{ => schemas}/Ifc4x3_tc1.cpp (99%) rename src/ifcparse/{ => schemas}/Ifc4x3_tc1.h (99%) diff --git a/src/ifcgeom/mapping/mapping.h b/src/ifcgeom/mapping/mapping.h index 63df82e422..6c30debb7a 100644 --- a/src/ifcgeom/mapping/mapping.h +++ b/src/ifcgeom/mapping/mapping.h @@ -8,10 +8,10 @@ #include -#define INCLUDE_SCHEMA(x) STRINGIFY(../../ifcparse/x.h) +#define INCLUDE_SCHEMA(x) STRINGIFY(../../ifcparse/schemas/x.h) #include INCLUDE_SCHEMA(IfcSchema) #undef INCLUDE_SCHEMA -#define INCLUDE_SCHEMA(x) STRINGIFY(../../ifcparse/x-definitions.h) +#define INCLUDE_SCHEMA(x) STRINGIFY(../../ifcparse/schemas/x-definitions.h) #include INCLUDE_SCHEMA(IfcSchema) #undef INCLUDE_SCHEMA diff --git a/src/ifcopenshell-python/ifcopenshell/express/run.bat b/src/ifcopenshell-python/ifcopenshell/express/run.bat index 1e8be4bfd2..fc8072c1c0 100644 --- a/src/ifcopenshell-python/ifcopenshell/express/run.bat +++ b/src/ifcopenshell-python/ifcopenshell/express/run.bat @@ -7,17 +7,17 @@ IF EXIST IFC2X3_TC1.exp ( IF EXIST Ifc2x3-schema.cpp ( :: v0.6.0 - python cat.py -o ..\..\..\ifcparse\Ifc2x3.cpp txt/header_ifc2x3.txt Ifc2x3.cpp - python cat.py -o ..\..\..\ifcparse\Ifc2x3.h txt/header_ifc2x3.txt Ifc2x3.h - python cat.py -o ..\..\..\ifcparse\Ifc2x3-schema.cpp txt/header_ifc2x3.txt Ifc2x3-schema.cpp - python cat.py -o ..\..\..\ifcparse\Ifc2x3-definitions.h txt/header_ifc2x3.txt Ifc2x3-definitions.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc2x3.cpp txt/header_ifc2x3.txt Ifc2x3.cpp + python cat.py -o ..\..\..\ifcparse\schemas\Ifc2x3.h txt/header_ifc2x3.txt Ifc2x3.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc2x3-schema.cpp txt/header_ifc2x3.txt Ifc2x3-schema.cpp + python cat.py -o ..\..\..\ifcparse\schemas\Ifc2x3-definitions.h txt/header_ifc2x3.txt Ifc2x3-definitions.h ) ELSE ( :: v0.5.0 - python cat.py -o ..\..\..\ifcparse\Ifc2x3.cpp txt/header_ifc2x3.txt txt/ifndef_ifc4.txt Ifc2x3.cpp txt/endif.txt - python cat.py -o ..\..\..\ifcparse\Ifc2x3.h txt/header_ifc2x3.txt Ifc2x3.h - python cat.py -o ..\..\..\ifcparse\Ifc2x3enum.h txt/header_ifc2x3.txt Ifc2x3enum.h - python cat.py -o ..\..\..\ifcparse\Ifc2x3-latebound.cpp txt/header_ifc2x3.txt txt/ifndef_ifc4.txt Ifc2x3-latebound.cpp txt/endif.txt - python cat.py -o ..\..\..\ifcparse\Ifc2x3-latebound.h txt/header_ifc2x3.txt Ifc2x3-latebound.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc2x3.cpp txt/header_ifc2x3.txt txt/ifndef_ifc4.txt Ifc2x3.cpp txt/endif.txt + python cat.py -o ..\..\..\ifcparse\schemas\Ifc2x3.h txt/header_ifc2x3.txt Ifc2x3.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc2x3enum.h txt/header_ifc2x3.txt Ifc2x3enum.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc2x3-latebound.cpp txt/header_ifc2x3.txt txt/ifndef_ifc4.txt Ifc2x3-latebound.cpp txt/endif.txt + python cat.py -o ..\..\..\ifcparse\schemas\Ifc2x3-latebound.h txt/header_ifc2x3.txt Ifc2x3-latebound.h ) del *.cpp *.h @@ -28,17 +28,17 @@ IF EXIST IFC4_ADD2TC1.exp ( IF EXIST Ifc4-schema.cpp ( :: v0.6.0 - python cat.py -o ..\..\..\ifcparse\Ifc4.cpp txt/header_ifc4.txt Ifc4.cpp - python cat.py -o ..\..\..\ifcparse\Ifc4.h txt/header_ifc4.txt Ifc4.h - python cat.py -o ..\..\..\ifcparse\Ifc4-schema.cpp txt/header_ifc4.txt Ifc4-schema.cpp - python cat.py -o ..\..\..\ifcparse\Ifc4-definitions.h txt/header_ifc4.txt Ifc4-definitions.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4.cpp txt/header_ifc4.txt Ifc4.cpp + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4.h txt/header_ifc4.txt Ifc4.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4-schema.cpp txt/header_ifc4.txt Ifc4-schema.cpp + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4-definitions.h txt/header_ifc4.txt Ifc4-definitions.h ) ELSE ( :: v0.5.0 - python cat.py -o ..\..\..\ifcparse\Ifc4.cpp txt/header_ifc4.txt txt/ifdef_ifc4.txt Ifc4.cpp txt/endif.txt - python cat.py -o ..\..\..\ifcparse\Ifc4.h txt/header_ifc4.txt Ifc4.h - python cat.py -o ..\..\..\ifcparse\Ifc4enum.h txt/header_ifc4.txt Ifc4enum.h - python cat.py -o ..\..\..\ifcparse\Ifc4-latebound.cpp txt/header_ifc4.txt txt/ifdef_ifc4.txt Ifc4-latebound.cpp txt/endif.txt - python cat.py -o ..\..\..\ifcparse\Ifc4-latebound.h txt/header_ifc4.txt Ifc4-latebound.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4.cpp txt/header_ifc4.txt txt/ifdef_ifc4.txt Ifc4.cpp txt/endif.txt + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4.h txt/header_ifc4.txt Ifc4.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4enum.h txt/header_ifc4.txt Ifc4enum.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4-latebound.cpp txt/header_ifc4.txt txt/ifdef_ifc4.txt Ifc4-latebound.cpp txt/endif.txt + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4-latebound.h txt/header_ifc4.txt Ifc4-latebound.h ) del *.cpp *.h @@ -49,10 +49,10 @@ IF EXIST IFC4x1.exp ( IF EXIST Ifc4x1-schema.cpp ( :: v0.6.0 - python cat.py -o ..\..\..\ifcparse\Ifc4x1.cpp txt/header_ifc4x1.txt Ifc4x1.cpp - python cat.py -o ..\..\..\ifcparse\Ifc4x1.h txt/header_ifc4x1.txt Ifc4x1.h - python cat.py -o ..\..\..\ifcparse\Ifc4x1-schema.cpp txt/header_ifc4x1.txt Ifc4x1-schema.cpp - python cat.py -o ..\..\..\ifcparse\Ifc4x1-definitions.h txt/header_ifc4x1.txt Ifc4x1-definitions.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x1.cpp txt/header_ifc4x1.txt Ifc4x1.cpp + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x1.h txt/header_ifc4x1.txt Ifc4x1.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x1-schema.cpp txt/header_ifc4x1.txt Ifc4x1-schema.cpp + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x1-definitions.h txt/header_ifc4x1.txt Ifc4x1-definitions.h ) del *.cpp *.h @@ -63,10 +63,10 @@ IF EXIST IFC4x2.exp ( IF EXIST Ifc4x2-schema.cpp ( :: v0.6.0 - python cat.py -o ..\..\..\ifcparse\Ifc4x2.cpp txt/header_ifc4x2.txt Ifc4x2.cpp - python cat.py -o ..\..\..\ifcparse\Ifc4x2.h txt/header_ifc4x2.txt Ifc4x2.h - python cat.py -o ..\..\..\ifcparse\Ifc4x2-schema.cpp txt/header_ifc4x2.txt Ifc4x2-schema.cpp - python cat.py -o ..\..\..\ifcparse\Ifc4x2-definitions.h txt/header_ifc4x2.txt Ifc4x2-definitions.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x2.cpp txt/header_ifc4x2.txt Ifc4x2.cpp + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x2.h txt/header_ifc4x2.txt Ifc4x2.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x2-schema.cpp txt/header_ifc4x2.txt Ifc4x2-schema.cpp + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x2-definitions.h txt/header_ifc4x2.txt Ifc4x2-definitions.h ) del *.cpp *.h @@ -77,10 +77,10 @@ IF EXIST IFC4x3_RC1.exp ( IF EXIST Ifc4x3_rc1-schema.cpp ( :: v0.6.0 - python cat.py -o ..\..\..\ifcparse\Ifc4x3_rc1.cpp txt/header_ifc4x3_rc1.txt Ifc4x3_rc1.cpp - python cat.py -o ..\..\..\ifcparse\Ifc4x3_rc1.h txt/header_ifc4x3_rc1.txt Ifc4x3_rc1.h - python cat.py -o ..\..\..\ifcparse\Ifc4x3_rc1-schema.cpp txt/header_ifc4x3_rc1.txt Ifc4x3_rc1-schema.cpp - python cat.py -o ..\..\..\ifcparse\Ifc4x3_rc1-definitions.h txt/header_ifc4x3_rc1.txt Ifc4x3_rc1-definitions.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_rc1.cpp txt/header_ifc4x3_rc1.txt Ifc4x3_rc1.cpp + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_rc1.h txt/header_ifc4x3_rc1.txt Ifc4x3_rc1.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_rc1-schema.cpp txt/header_ifc4x3_rc1.txt Ifc4x3_rc1-schema.cpp + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_rc1-definitions.h txt/header_ifc4x3_rc1.txt Ifc4x3_rc1-definitions.h ) del *.cpp *.h @@ -91,10 +91,10 @@ IF EXIST IFC4x3_RC2.exp ( IF EXIST Ifc4x3_rc2-schema.cpp ( :: v0.6.0 - python cat.py -o ..\..\..\ifcparse\Ifc4x3_rc2.cpp txt/header_ifc4x3_rc2.txt Ifc4x3_rc2.cpp - python cat.py -o ..\..\..\ifcparse\Ifc4x3_rc2.h txt/header_ifc4x3_rc2.txt Ifc4x3_rc2.h - python cat.py -o ..\..\..\ifcparse\Ifc4x3_rc2-schema.cpp txt/header_ifc4x3_rc2.txt Ifc4x3_rc2-schema.cpp - python cat.py -o ..\..\..\ifcparse\Ifc4x3_rc2-definitions.h txt/header_ifc4x3_rc2.txt Ifc4x3_rc2-definitions.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_rc2.cpp txt/header_ifc4x3_rc2.txt Ifc4x3_rc2.cpp + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_rc2.h txt/header_ifc4x3_rc2.txt Ifc4x3_rc2.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_rc2-schema.cpp txt/header_ifc4x3_rc2.txt Ifc4x3_rc2-schema.cpp + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_rc2-definitions.h txt/header_ifc4x3_rc2.txt Ifc4x3_rc2-definitions.h ) del *.cpp *.h @@ -105,10 +105,10 @@ IF EXIST IFC4x3_RC3.exp ( IF EXIST Ifc4x3_rc3-schema.cpp ( :: v0.6.0 - python cat.py -o ..\..\..\ifcparse\Ifc4x3_rc3.cpp txt/header_ifc4x3_rc2.txt Ifc4x3_rc3.cpp - python cat.py -o ..\..\..\ifcparse\Ifc4x3_rc3.h txt/header_ifc4x3_rc2.txt Ifc4x3_rc3.h - python cat.py -o ..\..\..\ifcparse\Ifc4x3_rc3-schema.cpp txt/header_ifc4x3_rc2.txt Ifc4x3_rc3-schema.cpp - python cat.py -o ..\..\..\ifcparse\Ifc4x3_rc3-definitions.h txt/header_ifc4x3_rc2.txt Ifc4x3_rc3-definitions.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_rc3.cpp txt/header_ifc4x3_rc2.txt Ifc4x3_rc3.cpp + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_rc3.h txt/header_ifc4x3_rc2.txt Ifc4x3_rc3.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_rc3-schema.cpp txt/header_ifc4x3_rc2.txt Ifc4x3_rc3-schema.cpp + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_rc3-definitions.h txt/header_ifc4x3_rc2.txt Ifc4x3_rc3-definitions.h ) del *.cpp *.h @@ -119,10 +119,10 @@ IF EXIST IFC4x3_RC4.exp ( IF EXIST Ifc4x3_rc4-schema.cpp ( :: v0.6.0 - python cat.py -o ..\..\..\ifcparse\Ifc4x3_rc4.cpp txt/header_ifc4x3_rc2.txt Ifc4x3_rc4.cpp - python cat.py -o ..\..\..\ifcparse\Ifc4x3_rc4.h txt/header_ifc4x3_rc2.txt Ifc4x3_rc4.h - python cat.py -o ..\..\..\ifcparse\Ifc4x3_rc4-schema.cpp txt/header_ifc4x3_rc2.txt Ifc4x3_rc4-schema.cpp - python cat.py -o ..\..\..\ifcparse\Ifc4x3_rc4-definitions.h txt/header_ifc4x3_rc2.txt Ifc4x3_rc4-definitions.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_rc4.cpp txt/header_ifc4x3_rc2.txt Ifc4x3_rc4.cpp + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_rc4.h txt/header_ifc4x3_rc2.txt Ifc4x3_rc4.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_rc4-schema.cpp txt/header_ifc4x3_rc2.txt Ifc4x3_rc4-schema.cpp + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_rc4-definitions.h txt/header_ifc4x3_rc2.txt Ifc4x3_rc4-definitions.h ) del *.cpp *.h @@ -133,10 +133,10 @@ IF EXIST IFC4X3.exp ( IF EXIST Ifc4x3-schema.cpp ( :: v0.6.0 - python cat.py -o ..\..\..\ifcparse\Ifc4x3.cpp txt/header_ifc4x3_rc2.txt Ifc4x3.cpp - python cat.py -o ..\..\..\ifcparse\Ifc4x3.h txt/header_ifc4x3_rc2.txt Ifc4x3.h - python cat.py -o ..\..\..\ifcparse\Ifc4x3-schema.cpp txt/header_ifc4x3_rc2.txt Ifc4x3-schema.cpp - python cat.py -o ..\..\..\ifcparse\Ifc4x3-definitions.h txt/header_ifc4x3_rc2.txt Ifc4x3-definitions.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3.cpp txt/header_ifc4x3_rc2.txt Ifc4x3.cpp + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3.h txt/header_ifc4x3_rc2.txt Ifc4x3.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3-schema.cpp txt/header_ifc4x3_rc2.txt Ifc4x3-schema.cpp + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3-definitions.h txt/header_ifc4x3_rc2.txt Ifc4x3-definitions.h ) del *.cpp *.h @@ -147,10 +147,10 @@ IF EXIST IFC4X3_TC1.exp ( IF EXIST Ifc4x3_tc1-schema.cpp ( :: v0.6.0 - python cat.py -o ..\..\..\ifcparse\Ifc4x3_tc1.cpp txt/header_ifc4x3_tc1.txt Ifc4x3_tc1.cpp - python cat.py -o ..\..\..\ifcparse\Ifc4x3_tc1.h txt/header_ifc4x3_tc1.txt Ifc4x3_tc1.h - python cat.py -o ..\..\..\ifcparse\Ifc4x3_tc1-schema.cpp txt/header_ifc4x3_tc1.txt Ifc4x3_tc1-schema.cpp - python cat.py -o ..\..\..\ifcparse\Ifc4x3_tc1-definitions.h txt/header_ifc4x3_tc1.txt Ifc4x3_tc1-definitions.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_tc1.cpp txt/header_ifc4x3_tc1.txt Ifc4x3_tc1.cpp + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_tc1.h txt/header_ifc4x3_tc1.txt Ifc4x3_tc1.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_tc1-schema.cpp txt/header_ifc4x3_tc1.txt Ifc4x3_tc1-schema.cpp + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_tc1-definitions.h txt/header_ifc4x3_tc1.txt Ifc4x3_tc1-definitions.h ) del *.cpp *.h @@ -161,10 +161,10 @@ IF EXIST IFC4X3_ADD1.exp ( IF EXIST Ifc4x3_add1-schema.cpp ( :: v0.6.0 - python cat.py -o ..\..\..\ifcparse\Ifc4x3_add1.cpp txt/header_ifc4x3_add1.txt Ifc4x3_add1.cpp - python cat.py -o ..\..\..\ifcparse\Ifc4x3_add1.h txt/header_ifc4x3_add1.txt Ifc4x3_add1.h - python cat.py -o ..\..\..\ifcparse\Ifc4x3_add1-schema.cpp txt/header_ifc4x3_add1.txt Ifc4x3_add1-schema.cpp - python cat.py -o ..\..\..\ifcparse\Ifc4x3_add1-definitions.h txt/header_ifc4x3_add1.txt Ifc4x3_add1-definitions.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_add1.cpp txt/header_ifc4x3_add1.txt Ifc4x3_add1.cpp + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_add1.h txt/header_ifc4x3_add1.txt Ifc4x3_add1.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_add1-schema.cpp txt/header_ifc4x3_add1.txt Ifc4x3_add1-schema.cpp + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_add1-definitions.h txt/header_ifc4x3_add1.txt Ifc4x3_add1-definitions.h ) del *.cpp *.h @@ -175,10 +175,10 @@ IF EXIST IFC4X3_ADD2.exp ( IF EXIST Ifc4x3_add2-schema.cpp ( :: v0.6.0 - python cat.py -o ..\..\..\ifcparse\Ifc4x3_add2.cpp txt/header_ifc4x3_add2.txt Ifc4x3_add2.cpp - python cat.py -o ..\..\..\ifcparse\Ifc4x3_add2.h txt/header_ifc4x3_add2.txt Ifc4x3_add2.h - python cat.py -o ..\..\..\ifcparse\Ifc4x3_add2-schema.cpp txt/header_ifc4x3_add2.txt Ifc4x3_add2-schema.cpp - python cat.py -o ..\..\..\ifcparse\Ifc4x3_add2-definitions.h txt/header_ifc4x3_add2.txt Ifc4x3_add2-definitions.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_add2.cpp txt/header_ifc4x3_add2.txt Ifc4x3_add2.cpp + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_add2.h txt/header_ifc4x3_add2.txt Ifc4x3_add2.h + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_add2-schema.cpp txt/header_ifc4x3_add2.txt Ifc4x3_add2-schema.cpp + python cat.py -o ..\..\..\ifcparse\schemas\Ifc4x3_add2-definitions.h txt/header_ifc4x3_add2.txt Ifc4x3_add2-definitions.h ) del *.cpp *.h @@ -189,10 +189,10 @@ IF EXIST header_schema.exp ( IF EXIST Header_section_schema-schema.cpp ( :: v0.6.0 - python cat.py -o ..\..\..\ifcparse\Header_section_schema.cpp Header_section_schema.cpp - python cat.py -o ..\..\..\ifcparse\Header_section_schema.h Header_section_schema.h - python cat.py -o ..\..\..\ifcparse\Header_section_schema-schema.cpp Header_section_schema-schema.cpp - python cat.py -o ..\..\..\ifcparse\Header_section_schema-definitions.h Header_section_schema-definitions.h + python cat.py -o ..\..\..\ifcparse\schemas\Header_section_schema.cpp Header_section_schema.cpp + python cat.py -o ..\..\..\ifcparse\schemas\Header_section_schema.h Header_section_schema.h + python cat.py -o ..\..\..\ifcparse\schemas\Header_section_schema-schema.cpp Header_section_schema-schema.cpp + python cat.py -o ..\..\..\ifcparse\schemas\Header_section_schema-definitions.h Header_section_schema-definitions.h ) del *.cpp *.h diff --git a/src/ifcopenshell-python/ifcopenshell/express/schema_class.py b/src/ifcopenshell-python/ifcopenshell/express/schema_class.py index 2fd20c7861..a8a5c70ddf 100644 --- a/src/ifcopenshell-python/ifcopenshell/express/schema_class.py +++ b/src/ifcopenshell-python/ifcopenshell/express/schema_class.py @@ -144,8 +144,8 @@ class EarlyBoundCodeWriter: self.statements = [ "", - '#include "../ifcparse/IfcSchema.h"', - '#include "../ifcparse/%(schema_name_title)s.h"' % self.__dict__, + '#include "../../ifcparse/IfcSchema.h"', + '#include "../../ifcparse/schemas/%(schema_name_title)s.h"' % self.__dict__, '#include ', "", 'using namespace std::string_literals;', diff --git a/src/ifcopenshell-python/ifcopenshell/express/templates.py b/src/ifcopenshell-python/ifcopenshell/express/templates.py index 05aa541e5f..e678a92fef 100644 --- a/src/ifcopenshell-python/ifcopenshell/express/templates.py +++ b/src/ifcopenshell-python/ifcopenshell/express/templates.py @@ -25,12 +25,12 @@ header = """ #include #include -#include "../ifcparse/ifc_parse_api.h" +#include "../../ifcparse/ifc_parse_api.h" -#include "../ifcparse/express.h" -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/IfcException.h" -#include "../ifcparse/Argument.h" +#include "../../ifcparse/express.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/IfcException.h" +#include "../../ifcparse/Argument.h" namespace IfcParse { class IfcFile; @@ -60,7 +60,7 @@ enum_header = """ #ifndef %(schema_name_upper)sENUM_H #define %(schema_name_upper)sENUM_H -#include "../ifcparse/ifc_parse_api.h" +#include "../../ifcparse/ifc_parse_api.h" #include #include @@ -71,10 +71,10 @@ enum_header = """ lb_header = """""" implementation = """ -#include "../ifcparse/%(schema_name)s.h" -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/IfcException.h" -#include "../ifcparse/IfcFile.h" +#include "../../ifcparse/schemas/%(schema_name)s.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/IfcException.h" +#include "../../ifcparse/IfcFile.h" #include diff --git a/src/ifcparse/CMakeLists.txt b/src/ifcparse/CMakeLists.txt index e6b9a15346..f9c9e33972 100644 --- a/src/ifcparse/CMakeLists.txt +++ b/src/ifcparse/CMakeLists.txt @@ -3,29 +3,23 @@ file(GLOB IFCPARSE_CPP_FILES_ALL *.cpp) foreach(file ${IFCPARSE_H_FILES_ALL}) get_filename_component(filename "${file}" NAME) - - if(NOT "${filename}" MATCHES "[0-9]") - list(APPEND IFCPARSE_H_FILES "${file}") - endif() + list(APPEND IFCPARSE_H_FILES "${file}") endforeach() foreach(file ${IFCPARSE_CPP_FILES_ALL}) get_filename_component(filename "${file}" NAME) - - if(NOT "${filename}" MATCHES "[0-9]") - list(APPEND IFCPARSE_CPP_FILES "${file}") - endif() + list(APPEND IFCPARSE_CPP_FILES "${file}") endforeach() message(STATUS "SCHEMA_VERSIONS from ifcparse: ${SCHEMA_VERSIONS}") foreach(schema ${SCHEMA_VERSIONS}) list(APPEND IFCPARSE_H_FILES - Ifc${schema}.h - Ifc${schema}-definitions.h + schemas/Ifc${schema}.h + schemas/Ifc${schema}-definitions.h ) list(APPEND IFCPARSE_CPP_FILES - Ifc${schema}.cpp - Ifc${schema}-schema.cpp + schemas/Ifc${schema}.cpp + schemas/Ifc${schema}-schema.cpp ) endforeach() diff --git a/src/ifcparse/IfcAlignmentHelper.h b/src/ifcparse/IfcAlignmentHelper.h index ceb7b2fa1f..f993fd9500 100644 --- a/src/ifcparse/IfcAlignmentHelper.h +++ b/src/ifcparse/IfcAlignmentHelper.h @@ -30,7 +30,7 @@ #include "IfcLogger.h" #ifdef HAS_SCHEMA_4x3_add2 -#include "Ifc4x3_add2.h" +#include "schemas/Ifc4x3_add2.h" #endif #include "IfcHierarchyHelper.h" diff --git a/src/ifcparse/IfcHierarchyHelper.h b/src/ifcparse/IfcHierarchyHelper.h index e0ef5b1c95..862732e4f7 100644 --- a/src/ifcparse/IfcHierarchyHelper.h +++ b/src/ifcparse/IfcHierarchyHelper.h @@ -34,40 +34,40 @@ #include #ifdef HAS_SCHEMA_2x3 -#include "Ifc2x3.h" +#include "schemas/Ifc2x3.h" #endif #ifdef HAS_SCHEMA_4 -#include "Ifc4.h" +#include "schemas/Ifc4.h" #endif #ifdef HAS_SCHEMA_4x1 -#include "Ifc4x1.h" +#include "schemas/Ifc4x1.h" #endif #ifdef HAS_SCHEMA_4x2 -#include "Ifc4x2.h" +#include "schemas/Ifc4x2.h" #endif #ifdef HAS_SCHEMA_4x3_rc1 -#include "Ifc4x3_rc1.h" +#include "schemas/Ifc4x3_rc1.h" #endif #ifdef HAS_SCHEMA_4x3_rc2 -#include "Ifc4x3_rc2.h" +#include "schemas/Ifc4x3_rc2.h" #endif #ifdef HAS_SCHEMA_4x3_rc3 -#include "Ifc4x3_rc3.h" +#include "schemas/Ifc4x3_rc3.h" #endif #ifdef HAS_SCHEMA_4x3_rc4 -#include "Ifc4x3_rc4.h" +#include "schemas/Ifc4x3_rc4.h" #endif #ifdef HAS_SCHEMA_4x3 -#include "Ifc4x3.h" +#include "schemas/Ifc4x3.h" #endif #ifdef HAS_SCHEMA_4x3_tc1 -#include "Ifc4x3_tc1.h" +#include "schemas/Ifc4x3_tc1.h" #endif #ifdef HAS_SCHEMA_4x3_add1 -#include "Ifc4x3_add1.h" +#include "schemas/Ifc4x3_add1.h" #endif #ifdef HAS_SCHEMA_4x3_add2 -#include "Ifc4x3_add2.h" +#include "schemas/Ifc4x3_add2.h" #endif #include "IfcFile.h" diff --git a/src/ifcparse/IfcSIPrefix.cpp b/src/ifcparse/IfcSIPrefix.cpp index 1c9bcd485d..b0725445b0 100644 --- a/src/ifcparse/IfcSIPrefix.cpp +++ b/src/ifcparse/IfcSIPrefix.cpp @@ -21,40 +21,40 @@ #include "InstanceData.h" #ifdef HAS_SCHEMA_2x3 -#include "Ifc2x3.h" +#include "schemas/Ifc2x3.h" #endif #ifdef HAS_SCHEMA_4 -#include "Ifc4.h" +#include "schemas/Ifc4.h" #endif #ifdef HAS_SCHEMA_4x1 -#include "Ifc4x1.h" +#include "schemas/Ifc4x1.h" #endif #ifdef HAS_SCHEMA_4x2 -#include "Ifc4x2.h" +#include "schemas/Ifc4x2.h" #endif #ifdef HAS_SCHEMA_4x3_rc1 -#include "Ifc4x3_rc1.h" +#include "schemas/Ifc4x3_rc1.h" #endif #ifdef HAS_SCHEMA_4x3_rc2 -#include "Ifc4x3_rc2.h" +#include "schemas/Ifc4x3_rc2.h" #endif #ifdef HAS_SCHEMA_4x3_rc3 -#include "Ifc4x3_rc3.h" +#include "schemas/Ifc4x3_rc3.h" #endif #ifdef HAS_SCHEMA_4x3_rc4 -#include "Ifc4x3_rc4.h" +#include "schemas/Ifc4x3_rc4.h" #endif #ifdef HAS_SCHEMA_4x3 -#include "Ifc4x3.h" +#include "schemas/Ifc4x3.h" #endif #ifdef HAS_SCHEMA_4x3_tc1 -#include "Ifc4x3_tc1.h" +#include "schemas/Ifc4x3_tc1.h" #endif #ifdef HAS_SCHEMA_4x3_add1 -#include "Ifc4x3_add1.h" +#include "schemas/Ifc4x3_add1.h" #endif #ifdef HAS_SCHEMA_4x3_add2 -#include "Ifc4x3_add2.h" +#include "schemas/Ifc4x3_add2.h" #endif double IfcParse::IfcSIPrefixToValue(const std::string& prefix) { diff --git a/src/ifcparse/IfcSchema.cpp b/src/ifcparse/IfcSchema.cpp index 61581ca3bd..331ed7daf0 100644 --- a/src/ifcparse/IfcSchema.cpp +++ b/src/ifcparse/IfcSchema.cpp @@ -24,40 +24,40 @@ #include #ifdef HAS_SCHEMA_2x3 -#include "Ifc2x3.h" +#include "schemas/Ifc2x3.h" #endif #ifdef HAS_SCHEMA_4 -#include "Ifc4.h" +#include "schemas/Ifc4.h" #endif #ifdef HAS_SCHEMA_4x1 -#include "Ifc4x1.h" +#include "schemas/Ifc4x1.h" #endif #ifdef HAS_SCHEMA_4x2 -#include "Ifc4x2.h" +#include "schemas/Ifc4x2.h" #endif #ifdef HAS_SCHEMA_4x3_rc1 -#include "Ifc4x3_rc1.h" +#include "schemas/Ifc4x3_rc1.h" #endif #ifdef HAS_SCHEMA_4x3_rc2 -#include "Ifc4x3_rc2.h" +#include "schemas/Ifc4x3_rc2.h" #endif #ifdef HAS_SCHEMA_4x3_rc3 -#include "Ifc4x3_rc3.h" +#include "schemas/Ifc4x3_rc3.h" #endif #ifdef HAS_SCHEMA_4x3_rc4 -#include "Ifc4x3_rc4.h" +#include "schemas/Ifc4x3_rc4.h" #endif #ifdef HAS_SCHEMA_4x3 -#include "Ifc4x3.h" +#include "schemas/Ifc4x3.h" #endif #ifdef HAS_SCHEMA_4x3_tc1 -#include "Ifc4x3_tc1.h" +#include "schemas/Ifc4x3_tc1.h" #endif #ifdef HAS_SCHEMA_4x3_add1 -#include "Ifc4x3_add1.h" +#include "schemas/Ifc4x3_add1.h" #endif #ifdef HAS_SCHEMA_4x3_add2 -#include "Ifc4x3_add2.h" +#include "schemas/Ifc4x3_add2.h" #endif #include "Header_section_schema.h" diff --git a/src/ifcparse/Ifc2x3-definitions.h b/src/ifcparse/schemas/Ifc2x3-definitions.h similarity index 100% rename from src/ifcparse/Ifc2x3-definitions.h rename to src/ifcparse/schemas/Ifc2x3-definitions.h diff --git a/src/ifcparse/Ifc2x3-schema.cpp b/src/ifcparse/schemas/Ifc2x3-schema.cpp similarity index 99% rename from src/ifcparse/Ifc2x3-schema.cpp rename to src/ifcparse/schemas/Ifc2x3-schema.cpp index 600d055305..10166c3ba5 100644 --- a/src/ifcparse/Ifc2x3-schema.cpp +++ b/src/ifcparse/schemas/Ifc2x3-schema.cpp @@ -24,8 +24,8 @@ * * ********************************************************************************/ -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/Ifc2x3.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/schemas/Ifc2x3.h" #include using namespace std::string_literals; diff --git a/src/ifcparse/Ifc2x3.cpp b/src/ifcparse/schemas/Ifc2x3.cpp similarity index 99% rename from src/ifcparse/Ifc2x3.cpp rename to src/ifcparse/schemas/Ifc2x3.cpp index b978114735..85baf9944d 100644 --- a/src/ifcparse/Ifc2x3.cpp +++ b/src/ifcparse/schemas/Ifc2x3.cpp @@ -24,10 +24,10 @@ * * ********************************************************************************/ -#include "../ifcparse/Ifc2x3.h" -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/IfcException.h" -#include "../ifcparse/IfcFile.h" +#include "../../ifcparse/schemas/Ifc2x3.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/IfcException.h" +#include "../../ifcparse/IfcFile.h" #include diff --git a/src/ifcparse/Ifc2x3.h b/src/ifcparse/schemas/Ifc2x3.h similarity index 99% rename from src/ifcparse/Ifc2x3.h rename to src/ifcparse/schemas/Ifc2x3.h index d0f5b7c525..93529d27cc 100644 --- a/src/ifcparse/Ifc2x3.h +++ b/src/ifcparse/schemas/Ifc2x3.h @@ -31,12 +31,12 @@ #include #include -#include "../ifcparse/ifc_parse_api.h" +#include "../../ifcparse/ifc_parse_api.h" -#include "../ifcparse/express.h" -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/IfcException.h" -#include "../ifcparse/Argument.h" +#include "../../ifcparse/express.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/IfcException.h" +#include "../../ifcparse/Argument.h" namespace IfcParse { class IfcFile; diff --git a/src/ifcparse/Ifc4-definitions.h b/src/ifcparse/schemas/Ifc4-definitions.h similarity index 100% rename from src/ifcparse/Ifc4-definitions.h rename to src/ifcparse/schemas/Ifc4-definitions.h diff --git a/src/ifcparse/Ifc4-schema.cpp b/src/ifcparse/schemas/Ifc4-schema.cpp similarity index 99% rename from src/ifcparse/Ifc4-schema.cpp rename to src/ifcparse/schemas/Ifc4-schema.cpp index 57aea07f7a..c8131da39b 100644 --- a/src/ifcparse/Ifc4-schema.cpp +++ b/src/ifcparse/schemas/Ifc4-schema.cpp @@ -24,8 +24,8 @@ * * ********************************************************************************/ -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/Ifc4.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/schemas/Ifc4.h" #include using namespace std::string_literals; diff --git a/src/ifcparse/Ifc4.cpp b/src/ifcparse/schemas/Ifc4.cpp similarity index 99% rename from src/ifcparse/Ifc4.cpp rename to src/ifcparse/schemas/Ifc4.cpp index 4c7218cfa9..039ef7fa06 100644 --- a/src/ifcparse/Ifc4.cpp +++ b/src/ifcparse/schemas/Ifc4.cpp @@ -24,10 +24,10 @@ * * ********************************************************************************/ -#include "../ifcparse/Ifc4.h" -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/IfcException.h" -#include "../ifcparse/IfcFile.h" +#include "../../ifcparse/schemas/Ifc4.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/IfcException.h" +#include "../../ifcparse/IfcFile.h" #include diff --git a/src/ifcparse/Ifc4.h b/src/ifcparse/schemas/Ifc4.h similarity index 99% rename from src/ifcparse/Ifc4.h rename to src/ifcparse/schemas/Ifc4.h index 32f630f3d7..3838fdcdfb 100644 --- a/src/ifcparse/Ifc4.h +++ b/src/ifcparse/schemas/Ifc4.h @@ -31,12 +31,12 @@ #include #include -#include "../ifcparse/ifc_parse_api.h" +#include "../../ifcparse/ifc_parse_api.h" -#include "../ifcparse/express.h" -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/IfcException.h" -#include "../ifcparse/Argument.h" +#include "../../ifcparse/express.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/IfcException.h" +#include "../../ifcparse/Argument.h" namespace IfcParse { class IfcFile; diff --git a/src/ifcparse/Ifc4x1-definitions.h b/src/ifcparse/schemas/Ifc4x1-definitions.h similarity index 100% rename from src/ifcparse/Ifc4x1-definitions.h rename to src/ifcparse/schemas/Ifc4x1-definitions.h diff --git a/src/ifcparse/Ifc4x1-schema.cpp b/src/ifcparse/schemas/Ifc4x1-schema.cpp similarity index 99% rename from src/ifcparse/Ifc4x1-schema.cpp rename to src/ifcparse/schemas/Ifc4x1-schema.cpp index cc769abd44..868d2f87ef 100644 --- a/src/ifcparse/Ifc4x1-schema.cpp +++ b/src/ifcparse/schemas/Ifc4x1-schema.cpp @@ -24,8 +24,8 @@ * * ********************************************************************************/ -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/Ifc4x1.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/schemas/Ifc4x1.h" #include using namespace std::string_literals; diff --git a/src/ifcparse/Ifc4x1.cpp b/src/ifcparse/schemas/Ifc4x1.cpp similarity index 99% rename from src/ifcparse/Ifc4x1.cpp rename to src/ifcparse/schemas/Ifc4x1.cpp index 7e8a702346..74aef07e6e 100644 --- a/src/ifcparse/Ifc4x1.cpp +++ b/src/ifcparse/schemas/Ifc4x1.cpp @@ -24,10 +24,10 @@ * * ********************************************************************************/ -#include "../ifcparse/Ifc4x1.h" -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/IfcException.h" -#include "../ifcparse/IfcFile.h" +#include "../../ifcparse/schemas/Ifc4x1.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/IfcException.h" +#include "../../ifcparse/IfcFile.h" #include diff --git a/src/ifcparse/Ifc4x1.h b/src/ifcparse/schemas/Ifc4x1.h similarity index 99% rename from src/ifcparse/Ifc4x1.h rename to src/ifcparse/schemas/Ifc4x1.h index f7fa6370e1..29b52fcb1c 100644 --- a/src/ifcparse/Ifc4x1.h +++ b/src/ifcparse/schemas/Ifc4x1.h @@ -31,12 +31,12 @@ #include #include -#include "../ifcparse/ifc_parse_api.h" +#include "../../ifcparse/ifc_parse_api.h" -#include "../ifcparse/express.h" -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/IfcException.h" -#include "../ifcparse/Argument.h" +#include "../../ifcparse/express.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/IfcException.h" +#include "../../ifcparse/Argument.h" namespace IfcParse { class IfcFile; diff --git a/src/ifcparse/Ifc4x2-definitions.h b/src/ifcparse/schemas/Ifc4x2-definitions.h similarity index 100% rename from src/ifcparse/Ifc4x2-definitions.h rename to src/ifcparse/schemas/Ifc4x2-definitions.h diff --git a/src/ifcparse/Ifc4x2-schema.cpp b/src/ifcparse/schemas/Ifc4x2-schema.cpp similarity index 99% rename from src/ifcparse/Ifc4x2-schema.cpp rename to src/ifcparse/schemas/Ifc4x2-schema.cpp index 2f1fc2daf5..289b72ae3f 100644 --- a/src/ifcparse/Ifc4x2-schema.cpp +++ b/src/ifcparse/schemas/Ifc4x2-schema.cpp @@ -24,8 +24,8 @@ * * ********************************************************************************/ -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/Ifc4x2.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/schemas/Ifc4x2.h" #include using namespace std::string_literals; diff --git a/src/ifcparse/Ifc4x2.cpp b/src/ifcparse/schemas/Ifc4x2.cpp similarity index 99% rename from src/ifcparse/Ifc4x2.cpp rename to src/ifcparse/schemas/Ifc4x2.cpp index f67b9887f0..2da53b7364 100644 --- a/src/ifcparse/Ifc4x2.cpp +++ b/src/ifcparse/schemas/Ifc4x2.cpp @@ -24,10 +24,10 @@ * * ********************************************************************************/ -#include "../ifcparse/Ifc4x2.h" -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/IfcException.h" -#include "../ifcparse/IfcFile.h" +#include "../../ifcparse/schemas/Ifc4x2.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/IfcException.h" +#include "../../ifcparse/IfcFile.h" #include diff --git a/src/ifcparse/Ifc4x2.h b/src/ifcparse/schemas/Ifc4x2.h similarity index 99% rename from src/ifcparse/Ifc4x2.h rename to src/ifcparse/schemas/Ifc4x2.h index 4c2f5aa920..b91f1fa996 100644 --- a/src/ifcparse/Ifc4x2.h +++ b/src/ifcparse/schemas/Ifc4x2.h @@ -31,12 +31,12 @@ #include #include -#include "../ifcparse/ifc_parse_api.h" +#include "../../ifcparse/ifc_parse_api.h" -#include "../ifcparse/express.h" -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/IfcException.h" -#include "../ifcparse/Argument.h" +#include "../../ifcparse/express.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/IfcException.h" +#include "../../ifcparse/Argument.h" namespace IfcParse { class IfcFile; diff --git a/src/ifcparse/Ifc4x3-definitions.h b/src/ifcparse/schemas/Ifc4x3-definitions.h similarity index 100% rename from src/ifcparse/Ifc4x3-definitions.h rename to src/ifcparse/schemas/Ifc4x3-definitions.h diff --git a/src/ifcparse/Ifc4x3-schema.cpp b/src/ifcparse/schemas/Ifc4x3-schema.cpp similarity index 99% rename from src/ifcparse/Ifc4x3-schema.cpp rename to src/ifcparse/schemas/Ifc4x3-schema.cpp index 0c9c85fa02..ef570812df 100644 --- a/src/ifcparse/Ifc4x3-schema.cpp +++ b/src/ifcparse/schemas/Ifc4x3-schema.cpp @@ -24,8 +24,8 @@ * * ********************************************************************************/ -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/Ifc4x3.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/schemas/Ifc4x3.h" #include using namespace std::string_literals; diff --git a/src/ifcparse/Ifc4x3.cpp b/src/ifcparse/schemas/Ifc4x3.cpp similarity index 99% rename from src/ifcparse/Ifc4x3.cpp rename to src/ifcparse/schemas/Ifc4x3.cpp index 470eec5549..52fac7e977 100644 --- a/src/ifcparse/Ifc4x3.cpp +++ b/src/ifcparse/schemas/Ifc4x3.cpp @@ -24,10 +24,10 @@ * * ********************************************************************************/ -#include "../ifcparse/Ifc4x3.h" -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/IfcException.h" -#include "../ifcparse/IfcFile.h" +#include "../../ifcparse/schemas/Ifc4x3.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/IfcException.h" +#include "../../ifcparse/IfcFile.h" #include diff --git a/src/ifcparse/Ifc4x3.h b/src/ifcparse/schemas/Ifc4x3.h similarity index 99% rename from src/ifcparse/Ifc4x3.h rename to src/ifcparse/schemas/Ifc4x3.h index 785e0ccf34..f13ad57684 100644 --- a/src/ifcparse/Ifc4x3.h +++ b/src/ifcparse/schemas/Ifc4x3.h @@ -31,12 +31,12 @@ #include #include -#include "../ifcparse/ifc_parse_api.h" +#include "../../ifcparse/ifc_parse_api.h" -#include "../ifcparse/express.h" -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/IfcException.h" -#include "../ifcparse/Argument.h" +#include "../../ifcparse/express.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/IfcException.h" +#include "../../ifcparse/Argument.h" namespace IfcParse { class IfcFile; diff --git a/src/ifcparse/Ifc4x3_add1-definitions.h b/src/ifcparse/schemas/Ifc4x3_add1-definitions.h similarity index 100% rename from src/ifcparse/Ifc4x3_add1-definitions.h rename to src/ifcparse/schemas/Ifc4x3_add1-definitions.h diff --git a/src/ifcparse/Ifc4x3_add1-schema.cpp b/src/ifcparse/schemas/Ifc4x3_add1-schema.cpp similarity index 99% rename from src/ifcparse/Ifc4x3_add1-schema.cpp rename to src/ifcparse/schemas/Ifc4x3_add1-schema.cpp index 4ab20e0fd5..3d09719461 100644 --- a/src/ifcparse/Ifc4x3_add1-schema.cpp +++ b/src/ifcparse/schemas/Ifc4x3_add1-schema.cpp @@ -24,8 +24,8 @@ * * ********************************************************************************/ -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/Ifc4x3_add1.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/schemas/Ifc4x3_add1.h" #include using namespace std::string_literals; diff --git a/src/ifcparse/Ifc4x3_add1.cpp b/src/ifcparse/schemas/Ifc4x3_add1.cpp similarity index 99% rename from src/ifcparse/Ifc4x3_add1.cpp rename to src/ifcparse/schemas/Ifc4x3_add1.cpp index 0647941123..28becb3425 100644 --- a/src/ifcparse/Ifc4x3_add1.cpp +++ b/src/ifcparse/schemas/Ifc4x3_add1.cpp @@ -24,10 +24,10 @@ * * ********************************************************************************/ -#include "../ifcparse/Ifc4x3_add1.h" -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/IfcException.h" -#include "../ifcparse/IfcFile.h" +#include "../../ifcparse/schemas/Ifc4x3_add1.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/IfcException.h" +#include "../../ifcparse/IfcFile.h" #include diff --git a/src/ifcparse/Ifc4x3_add1.h b/src/ifcparse/schemas/Ifc4x3_add1.h similarity index 99% rename from src/ifcparse/Ifc4x3_add1.h rename to src/ifcparse/schemas/Ifc4x3_add1.h index 19e6060011..660a07a0ae 100644 --- a/src/ifcparse/Ifc4x3_add1.h +++ b/src/ifcparse/schemas/Ifc4x3_add1.h @@ -31,12 +31,12 @@ #include #include -#include "../ifcparse/ifc_parse_api.h" +#include "../../ifcparse/ifc_parse_api.h" -#include "../ifcparse/express.h" -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/IfcException.h" -#include "../ifcparse/Argument.h" +#include "../../ifcparse/express.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/IfcException.h" +#include "../../ifcparse/Argument.h" namespace IfcParse { class IfcFile; diff --git a/src/ifcparse/Ifc4x3_add2-definitions.h b/src/ifcparse/schemas/Ifc4x3_add2-definitions.h similarity index 100% rename from src/ifcparse/Ifc4x3_add2-definitions.h rename to src/ifcparse/schemas/Ifc4x3_add2-definitions.h diff --git a/src/ifcparse/Ifc4x3_add2-schema.cpp b/src/ifcparse/schemas/Ifc4x3_add2-schema.cpp similarity index 99% rename from src/ifcparse/Ifc4x3_add2-schema.cpp rename to src/ifcparse/schemas/Ifc4x3_add2-schema.cpp index 3c848294bb..91da50e48d 100644 --- a/src/ifcparse/Ifc4x3_add2-schema.cpp +++ b/src/ifcparse/schemas/Ifc4x3_add2-schema.cpp @@ -24,8 +24,8 @@ * * ********************************************************************************/ -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/Ifc4x3_add2.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/schemas/Ifc4x3_add2.h" #include using namespace std::string_literals; diff --git a/src/ifcparse/Ifc4x3_add2.cpp b/src/ifcparse/schemas/Ifc4x3_add2.cpp similarity index 99% rename from src/ifcparse/Ifc4x3_add2.cpp rename to src/ifcparse/schemas/Ifc4x3_add2.cpp index 6832392825..5406ee01f5 100644 --- a/src/ifcparse/Ifc4x3_add2.cpp +++ b/src/ifcparse/schemas/Ifc4x3_add2.cpp @@ -24,10 +24,10 @@ * * ********************************************************************************/ -#include "../ifcparse/Ifc4x3_add2.h" -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/IfcException.h" -#include "../ifcparse/IfcFile.h" +#include "../../ifcparse/schemas/Ifc4x3_add2.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/IfcException.h" +#include "../../ifcparse/IfcFile.h" #include diff --git a/src/ifcparse/Ifc4x3_add2.h b/src/ifcparse/schemas/Ifc4x3_add2.h similarity index 99% rename from src/ifcparse/Ifc4x3_add2.h rename to src/ifcparse/schemas/Ifc4x3_add2.h index aa09ca0165..58074bbde7 100644 --- a/src/ifcparse/Ifc4x3_add2.h +++ b/src/ifcparse/schemas/Ifc4x3_add2.h @@ -31,12 +31,12 @@ #include #include -#include "../ifcparse/ifc_parse_api.h" +#include "../../ifcparse/ifc_parse_api.h" -#include "../ifcparse/express.h" -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/IfcException.h" -#include "../ifcparse/Argument.h" +#include "../../ifcparse/express.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/IfcException.h" +#include "../../ifcparse/Argument.h" namespace IfcParse { class IfcFile; diff --git a/src/ifcparse/Ifc4x3_rc1-definitions.h b/src/ifcparse/schemas/Ifc4x3_rc1-definitions.h similarity index 100% rename from src/ifcparse/Ifc4x3_rc1-definitions.h rename to src/ifcparse/schemas/Ifc4x3_rc1-definitions.h diff --git a/src/ifcparse/Ifc4x3_rc1-schema.cpp b/src/ifcparse/schemas/Ifc4x3_rc1-schema.cpp similarity index 99% rename from src/ifcparse/Ifc4x3_rc1-schema.cpp rename to src/ifcparse/schemas/Ifc4x3_rc1-schema.cpp index 0c789dcca1..8c190e7830 100644 --- a/src/ifcparse/Ifc4x3_rc1-schema.cpp +++ b/src/ifcparse/schemas/Ifc4x3_rc1-schema.cpp @@ -24,8 +24,8 @@ * * ********************************************************************************/ -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/Ifc4x3_rc1.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/schemas/Ifc4x3_rc1.h" #include using namespace std::string_literals; diff --git a/src/ifcparse/Ifc4x3_rc1.cpp b/src/ifcparse/schemas/Ifc4x3_rc1.cpp similarity index 99% rename from src/ifcparse/Ifc4x3_rc1.cpp rename to src/ifcparse/schemas/Ifc4x3_rc1.cpp index 320a624916..e21a74dfaa 100644 --- a/src/ifcparse/Ifc4x3_rc1.cpp +++ b/src/ifcparse/schemas/Ifc4x3_rc1.cpp @@ -24,10 +24,10 @@ * * ********************************************************************************/ -#include "../ifcparse/Ifc4x3_rc1.h" -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/IfcException.h" -#include "../ifcparse/IfcFile.h" +#include "../../ifcparse/schemas/Ifc4x3_rc1.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/IfcException.h" +#include "../../ifcparse/IfcFile.h" #include diff --git a/src/ifcparse/Ifc4x3_rc1.h b/src/ifcparse/schemas/Ifc4x3_rc1.h similarity index 99% rename from src/ifcparse/Ifc4x3_rc1.h rename to src/ifcparse/schemas/Ifc4x3_rc1.h index 2242e3b96c..f346ea3be0 100644 --- a/src/ifcparse/Ifc4x3_rc1.h +++ b/src/ifcparse/schemas/Ifc4x3_rc1.h @@ -31,12 +31,12 @@ #include #include -#include "../ifcparse/ifc_parse_api.h" +#include "../../ifcparse/ifc_parse_api.h" -#include "../ifcparse/express.h" -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/IfcException.h" -#include "../ifcparse/Argument.h" +#include "../../ifcparse/express.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/IfcException.h" +#include "../../ifcparse/Argument.h" namespace IfcParse { class IfcFile; diff --git a/src/ifcparse/Ifc4x3_rc2-definitions.h b/src/ifcparse/schemas/Ifc4x3_rc2-definitions.h similarity index 100% rename from src/ifcparse/Ifc4x3_rc2-definitions.h rename to src/ifcparse/schemas/Ifc4x3_rc2-definitions.h diff --git a/src/ifcparse/Ifc4x3_rc2-schema.cpp b/src/ifcparse/schemas/Ifc4x3_rc2-schema.cpp similarity index 99% rename from src/ifcparse/Ifc4x3_rc2-schema.cpp rename to src/ifcparse/schemas/Ifc4x3_rc2-schema.cpp index fb58b5e98e..e7ae6cc6fa 100644 --- a/src/ifcparse/Ifc4x3_rc2-schema.cpp +++ b/src/ifcparse/schemas/Ifc4x3_rc2-schema.cpp @@ -24,8 +24,8 @@ * * ********************************************************************************/ -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/Ifc4x3_rc2.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/schemas/Ifc4x3_rc2.h" #include using namespace std::string_literals; diff --git a/src/ifcparse/Ifc4x3_rc2.cpp b/src/ifcparse/schemas/Ifc4x3_rc2.cpp similarity index 99% rename from src/ifcparse/Ifc4x3_rc2.cpp rename to src/ifcparse/schemas/Ifc4x3_rc2.cpp index e1d3b43de6..0583c3f231 100644 --- a/src/ifcparse/Ifc4x3_rc2.cpp +++ b/src/ifcparse/schemas/Ifc4x3_rc2.cpp @@ -24,10 +24,10 @@ * * ********************************************************************************/ -#include "../ifcparse/Ifc4x3_rc2.h" -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/IfcException.h" -#include "../ifcparse/IfcFile.h" +#include "../../ifcparse/schemas/Ifc4x3_rc2.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/IfcException.h" +#include "../../ifcparse/IfcFile.h" #include diff --git a/src/ifcparse/Ifc4x3_rc2.h b/src/ifcparse/schemas/Ifc4x3_rc2.h similarity index 99% rename from src/ifcparse/Ifc4x3_rc2.h rename to src/ifcparse/schemas/Ifc4x3_rc2.h index 09ba53f42e..c6202f40e1 100644 --- a/src/ifcparse/Ifc4x3_rc2.h +++ b/src/ifcparse/schemas/Ifc4x3_rc2.h @@ -31,12 +31,12 @@ #include #include -#include "../ifcparse/ifc_parse_api.h" +#include "../../ifcparse/ifc_parse_api.h" -#include "../ifcparse/express.h" -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/IfcException.h" -#include "../ifcparse/Argument.h" +#include "../../ifcparse/express.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/IfcException.h" +#include "../../ifcparse/Argument.h" namespace IfcParse { class IfcFile; diff --git a/src/ifcparse/Ifc4x3_rc3-definitions.h b/src/ifcparse/schemas/Ifc4x3_rc3-definitions.h similarity index 100% rename from src/ifcparse/Ifc4x3_rc3-definitions.h rename to src/ifcparse/schemas/Ifc4x3_rc3-definitions.h diff --git a/src/ifcparse/Ifc4x3_rc3-schema.cpp b/src/ifcparse/schemas/Ifc4x3_rc3-schema.cpp similarity index 99% rename from src/ifcparse/Ifc4x3_rc3-schema.cpp rename to src/ifcparse/schemas/Ifc4x3_rc3-schema.cpp index abeeeabb6e..c1640a452d 100644 --- a/src/ifcparse/Ifc4x3_rc3-schema.cpp +++ b/src/ifcparse/schemas/Ifc4x3_rc3-schema.cpp @@ -24,8 +24,8 @@ * * ********************************************************************************/ -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/Ifc4x3_rc3.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/schemas/Ifc4x3_rc3.h" #include using namespace std::string_literals; diff --git a/src/ifcparse/Ifc4x3_rc3.cpp b/src/ifcparse/schemas/Ifc4x3_rc3.cpp similarity index 99% rename from src/ifcparse/Ifc4x3_rc3.cpp rename to src/ifcparse/schemas/Ifc4x3_rc3.cpp index 734c8f4800..3ecc7fdbdb 100644 --- a/src/ifcparse/Ifc4x3_rc3.cpp +++ b/src/ifcparse/schemas/Ifc4x3_rc3.cpp @@ -24,10 +24,10 @@ * * ********************************************************************************/ -#include "../ifcparse/Ifc4x3_rc3.h" -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/IfcException.h" -#include "../ifcparse/IfcFile.h" +#include "../../ifcparse/schemas/Ifc4x3_rc3.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/IfcException.h" +#include "../../ifcparse/IfcFile.h" #include diff --git a/src/ifcparse/Ifc4x3_rc3.h b/src/ifcparse/schemas/Ifc4x3_rc3.h similarity index 99% rename from src/ifcparse/Ifc4x3_rc3.h rename to src/ifcparse/schemas/Ifc4x3_rc3.h index cf90230ada..0cea01ccda 100644 --- a/src/ifcparse/Ifc4x3_rc3.h +++ b/src/ifcparse/schemas/Ifc4x3_rc3.h @@ -31,12 +31,12 @@ #include #include -#include "../ifcparse/ifc_parse_api.h" +#include "../../ifcparse/ifc_parse_api.h" -#include "../ifcparse/express.h" -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/IfcException.h" -#include "../ifcparse/Argument.h" +#include "../../ifcparse/express.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/IfcException.h" +#include "../../ifcparse/Argument.h" namespace IfcParse { class IfcFile; diff --git a/src/ifcparse/Ifc4x3_rc4-definitions.h b/src/ifcparse/schemas/Ifc4x3_rc4-definitions.h similarity index 100% rename from src/ifcparse/Ifc4x3_rc4-definitions.h rename to src/ifcparse/schemas/Ifc4x3_rc4-definitions.h diff --git a/src/ifcparse/Ifc4x3_rc4-schema.cpp b/src/ifcparse/schemas/Ifc4x3_rc4-schema.cpp similarity index 99% rename from src/ifcparse/Ifc4x3_rc4-schema.cpp rename to src/ifcparse/schemas/Ifc4x3_rc4-schema.cpp index bbe44420b0..e78dd7ae2b 100644 --- a/src/ifcparse/Ifc4x3_rc4-schema.cpp +++ b/src/ifcparse/schemas/Ifc4x3_rc4-schema.cpp @@ -24,8 +24,8 @@ * * ********************************************************************************/ -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/Ifc4x3_rc4.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/schemas/Ifc4x3_rc4.h" #include using namespace std::string_literals; diff --git a/src/ifcparse/Ifc4x3_rc4.cpp b/src/ifcparse/schemas/Ifc4x3_rc4.cpp similarity index 99% rename from src/ifcparse/Ifc4x3_rc4.cpp rename to src/ifcparse/schemas/Ifc4x3_rc4.cpp index b63dfa838d..85a85511aa 100644 --- a/src/ifcparse/Ifc4x3_rc4.cpp +++ b/src/ifcparse/schemas/Ifc4x3_rc4.cpp @@ -24,10 +24,10 @@ * * ********************************************************************************/ -#include "../ifcparse/Ifc4x3_rc4.h" -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/IfcException.h" -#include "../ifcparse/IfcFile.h" +#include "../../ifcparse/schemas/Ifc4x3_rc4.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/IfcException.h" +#include "../../ifcparse/IfcFile.h" #include diff --git a/src/ifcparse/Ifc4x3_rc4.h b/src/ifcparse/schemas/Ifc4x3_rc4.h similarity index 99% rename from src/ifcparse/Ifc4x3_rc4.h rename to src/ifcparse/schemas/Ifc4x3_rc4.h index efcdafe17e..de833231eb 100644 --- a/src/ifcparse/Ifc4x3_rc4.h +++ b/src/ifcparse/schemas/Ifc4x3_rc4.h @@ -31,12 +31,12 @@ #include #include -#include "../ifcparse/ifc_parse_api.h" +#include "../../ifcparse/ifc_parse_api.h" -#include "../ifcparse/express.h" -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/IfcException.h" -#include "../ifcparse/Argument.h" +#include "../../ifcparse/express.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/IfcException.h" +#include "../../ifcparse/Argument.h" namespace IfcParse { class IfcFile; diff --git a/src/ifcparse/Ifc4x3_tc1-definitions.h b/src/ifcparse/schemas/Ifc4x3_tc1-definitions.h similarity index 100% rename from src/ifcparse/Ifc4x3_tc1-definitions.h rename to src/ifcparse/schemas/Ifc4x3_tc1-definitions.h diff --git a/src/ifcparse/Ifc4x3_tc1-schema.cpp b/src/ifcparse/schemas/Ifc4x3_tc1-schema.cpp similarity index 99% rename from src/ifcparse/Ifc4x3_tc1-schema.cpp rename to src/ifcparse/schemas/Ifc4x3_tc1-schema.cpp index 03387a6cf0..0bf53cb251 100644 --- a/src/ifcparse/Ifc4x3_tc1-schema.cpp +++ b/src/ifcparse/schemas/Ifc4x3_tc1-schema.cpp @@ -24,8 +24,8 @@ * * ********************************************************************************/ -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/Ifc4x3_tc1.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/schemas/Ifc4x3_tc1.h" #include using namespace std::string_literals; diff --git a/src/ifcparse/Ifc4x3_tc1.cpp b/src/ifcparse/schemas/Ifc4x3_tc1.cpp similarity index 99% rename from src/ifcparse/Ifc4x3_tc1.cpp rename to src/ifcparse/schemas/Ifc4x3_tc1.cpp index d4fe126099..33f38f3afa 100644 --- a/src/ifcparse/Ifc4x3_tc1.cpp +++ b/src/ifcparse/schemas/Ifc4x3_tc1.cpp @@ -24,10 +24,10 @@ * * ********************************************************************************/ -#include "../ifcparse/Ifc4x3_tc1.h" -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/IfcException.h" -#include "../ifcparse/IfcFile.h" +#include "../../ifcparse/schemas/Ifc4x3_tc1.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/IfcException.h" +#include "../../ifcparse/IfcFile.h" #include diff --git a/src/ifcparse/Ifc4x3_tc1.h b/src/ifcparse/schemas/Ifc4x3_tc1.h similarity index 99% rename from src/ifcparse/Ifc4x3_tc1.h rename to src/ifcparse/schemas/Ifc4x3_tc1.h index 6b66fd8696..a971785523 100644 --- a/src/ifcparse/Ifc4x3_tc1.h +++ b/src/ifcparse/schemas/Ifc4x3_tc1.h @@ -31,12 +31,12 @@ #include #include -#include "../ifcparse/ifc_parse_api.h" +#include "../../ifcparse/ifc_parse_api.h" -#include "../ifcparse/express.h" -#include "../ifcparse/IfcSchema.h" -#include "../ifcparse/IfcException.h" -#include "../ifcparse/Argument.h" +#include "../../ifcparse/express.h" +#include "../../ifcparse/IfcSchema.h" +#include "../../ifcparse/IfcException.h" +#include "../../ifcparse/Argument.h" namespace IfcParse { class IfcFile; diff --git a/src/ifcwrap/IfcPython.i b/src/ifcwrap/IfcPython.i index 4e9cacf75d..4de1dffa6e 100644 --- a/src/ifcwrap/IfcPython.i +++ b/src/ifcwrap/IfcPython.i @@ -211,40 +211,40 @@ #include "../serializers/RocksDbSerializer.h" #ifdef HAS_SCHEMA_2x3 - #include "../ifcparse/Ifc2x3.h" + #include "../ifcparse/schemas/Ifc2x3.h" #endif #ifdef HAS_SCHEMA_4 - #include "../ifcparse/Ifc4.h" + #include "../ifcparse/schemas/Ifc4.h" #endif #ifdef HAS_SCHEMA_4x1 - #include "../ifcparse/Ifc4x1.h" + #include "../ifcparse/schemas/Ifc4x1.h" #endif #ifdef HAS_SCHEMA_4x2 - #include "../ifcparse/Ifc4x2.h" + #include "../ifcparse/schemas/Ifc4x2.h" #endif #ifdef HAS_SCHEMA_4x3_rc1 - #include "../ifcparse/Ifc4x3_rc1.h" + #include "../ifcparse/schemas/Ifc4x3_rc1.h" #endif #ifdef HAS_SCHEMA_4x3_rc2 - #include "../ifcparse/Ifc4x3_rc2.h" + #include "../ifcparse/schemas/Ifc4x3_rc2.h" #endif #ifdef HAS_SCHEMA_4x3_rc3 -#include "../ifcparse/Ifc4x3_rc3.h" +#include "../ifcparse/schemas/Ifc4x3_rc3.h" #endif #ifdef HAS_SCHEMA_4x3_rc4 -#include "../ifcparse/Ifc4x3_rc4.h" +#include "../ifcparse/schemas/Ifc4x3_rc4.h" #endif #ifdef HAS_SCHEMA_4x3 -#include "../ifcparse/Ifc4x3.h" +#include "../ifcparse/schemas/Ifc4x3.h" #endif #ifdef HAS_SCHEMA_4x3_tc1 -#include "../ifcparse/Ifc4x3_tc1.h" +#include "../ifcparse/schemas/Ifc4x3_tc1.h" #endif #ifdef HAS_SCHEMA_4x3_add1 -#include "../ifcparse/Ifc4x3_add1.h" +#include "../ifcparse/schemas/Ifc4x3_add1.h" #endif #ifdef HAS_SCHEMA_4x3_add2 -#include "../ifcparse/Ifc4x3_add2.h" +#include "../ifcparse/schemas/Ifc4x3_add2.h" #endif #include "../ifcparse/express.h" @@ -296,40 +296,40 @@ #include "../serializers/JsonSerializer.h" #ifdef HAS_SCHEMA_2x3 - #include "../ifcparse/Ifc2x3.h" + #include "../ifcparse/schemas/Ifc2x3.h" #endif #ifdef HAS_SCHEMA_4 - #include "../ifcparse/Ifc4.h" + #include "../ifcparse/schemas/Ifc4.h" #endif #ifdef HAS_SCHEMA_4x1 - #include "../ifcparse/Ifc4x1.h" + #include "../ifcparse/schemas/Ifc4x1.h" #endif #ifdef HAS_SCHEMA_4x2 - #include "../ifcparse/Ifc4x2.h" + #include "../ifcparse/schemas/Ifc4x2.h" #endif #ifdef HAS_SCHEMA_4x3_rc1 - #include "../ifcparse/Ifc4x3_rc1.h" + #include "../ifcparse/schemas/Ifc4x3_rc1.h" #endif #ifdef HAS_SCHEMA_4x3_rc2 - #include "../ifcparse/Ifc4x3_rc2.h" + #include "../ifcparse/schemas/Ifc4x3_rc2.h" #endif #ifdef HAS_SCHEMA_4x3_rc3 - #include "../ifcparse/Ifc4x3_rc3.h" + #include "../ifcparse/schemas/Ifc4x3_rc3.h" #endif #ifdef HAS_SCHEMA_4x3_rc4 - #include "../ifcparse/Ifc4x3_rc4.h" + #include "../ifcparse/schemas/Ifc4x3_rc4.h" #endif #ifdef HAS_SCHEMA_4x3 - #include "../ifcparse/Ifc4x3.h" + #include "../ifcparse/schemas/Ifc4x3.h" #endif #ifdef HAS_SCHEMA_4x3_tc1 - #include "../ifcparse/Ifc4x3_tc1.h" + #include "../ifcparse/schemas/Ifc4x3_tc1.h" #endif #ifdef HAS_SCHEMA_4x3_add1 - #include "../ifcparse/Ifc4x3_add1.h" + #include "../ifcparse/schemas/Ifc4x3_add1.h" #endif #ifdef HAS_SCHEMA_4x3_add2 - #include "../ifcparse/Ifc4x3_add2.h" + #include "../ifcparse/schemas/Ifc4x3_add2.h" #endif #include "../ifcparse/express.h" diff --git a/src/serializers/schema_dependent/JsonSerializer.h b/src/serializers/schema_dependent/JsonSerializer.h index 0fd7c57040..abd81bead1 100644 --- a/src/serializers/schema_dependent/JsonSerializer.h +++ b/src/serializers/schema_dependent/JsonSerializer.h @@ -26,10 +26,10 @@ #include "../../ifcparse/macros.h" #include "../../serializers/JsonSerializer.h" -#define INCLUDE_PARENT_PARENT_DIR(x) STRINGIFY(../../ifcparse/x.h) +#define INCLUDE_PARENT_PARENT_DIR(x) STRINGIFY(../../ifcparse/schemas/x.h) #include INCLUDE_PARENT_PARENT_DIR(IfcSchema) #undef INCLUDE_PARENT_PARENT_DIR -#define INCLUDE_PARENT_PARENT_DIR(x) STRINGIFY(../../ifcparse/x-definitions.h) +#define INCLUDE_PARENT_PARENT_DIR(x) STRINGIFY(../../ifcparse/schemas/x-definitions.h) #include INCLUDE_PARENT_PARENT_DIR(IfcSchema) class POSTFIX_SCHEMA(JsonSerializer) : public JsonSerializer { diff --git a/src/serializers/schema_dependent/XmlSerializer.h b/src/serializers/schema_dependent/XmlSerializer.h index a404c45cb7..de2cf77dd7 100644 --- a/src/serializers/schema_dependent/XmlSerializer.h +++ b/src/serializers/schema_dependent/XmlSerializer.h @@ -24,10 +24,10 @@ #include "../../ifcparse/macros.h" #include "../../serializers/XmlSerializer.h" -#define INCLUDE_PARENT_PARENT_DIR(x) STRINGIFY(../../ifcparse/x.h) +#define INCLUDE_PARENT_PARENT_DIR(x) STRINGIFY(../../ifcparse/schemas/x.h) #include INCLUDE_PARENT_PARENT_DIR(IfcSchema) #undef INCLUDE_PARENT_PARENT_DIR -#define INCLUDE_PARENT_PARENT_DIR(x) STRINGIFY(../../ifcparse/x-definitions.h) +#define INCLUDE_PARENT_PARENT_DIR(x) STRINGIFY(../../ifcparse/schemas/x-definitions.h) #include INCLUDE_PARENT_PARENT_DIR(IfcSchema) class POSTFIX_SCHEMA(XmlSerializer) : public XmlSerializer {