Move the e* clstepcore headers

starseeker · starseeker · commit 9d1583be6306 · 2022-10-02T17:57:56.000-04:00
diff --git a/include/core/CMakeLists.txt b/include/core/CMakeLists.txt
@@ -11,12 +11,12 @@ set(CORE_HDRS
   dictionaryInstance.h
   dispnode.h
   dispnodelist.h
-# entityDescriptor.h
-# entityDescriptorList.h
-# enumTypeDescriptor.h
-# ExpDict.h
-# explicitItemId.h
-# globalRule.h
+  entityDescriptor.h
+  entityDescriptorList.h
+  enumTypeDescriptor.h
+  ExpDict.h
+  explicitItemId.h
+  globalRule.h
 # implicitItemId.h
 # instmgr.h
 # interfaceSpec.h
diff --git a/include/core/ExpDict.h b/include/core/ExpDict.h
diff --git a/include/core/entityDescriptor.h b/include/core/entityDescriptor.h
diff --git a/include/core/entityDescriptorList.h b/include/core/entityDescriptorList.h
diff --git a/include/core/enumTypeDescriptor.h b/include/core/enumTypeDescriptor.h
diff --git a/include/core/explicitItemId.h b/include/core/explicitItemId.h
diff --git a/include/core/globalRule.h b/include/core/globalRule.h
diff --git a/misc/header_mv.sh b/misc/header_mv.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
-find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"core\/$1\"/g" {} \;
-find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"core\/$1\"/g" {} \;
+find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"core\/$1\"/g" {} \;
+find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"core\/$1\"/g" {} \;
 
diff --git a/src/cleditor/SdaiHeaderSchema.cc b/src/cleditor/SdaiHeaderSchema.cc
@@ -10,7 +10,7 @@ extern ofstream * logStream;
 #define SCLLOGFILE "scl.log"
 #endif
 
-#include <ExpDict.h>
+#include "core/ExpDict.h"
 #include <STEPattribute.h>
 #include <SdaiHeaderSchema.h>
 
diff --git a/src/cleditor/SdaiHeaderSchemaInit.cc b/src/cleditor/SdaiHeaderSchemaInit.cc
@@ -5,7 +5,7 @@
 // regenerate it.
 
 #include <Registry.h>
-#include <ExpDict.h>
+#include "core/ExpDict.h"
 #include <STEPattribute.h>
 #include <SdaiHeaderSchema.h>
 
diff --git a/src/cleditor/SdaiSchemaInit.h b/src/cleditor/SdaiSchemaInit.h
@@ -13,7 +13,7 @@
 #include <Registry.h>
 #include <STEPaggregate.h>
 #include <STEPundefined.h>
-#include <ExpDict.h>
+#include "core/ExpDict.h"
 #include <STEPattribute.h>
 #include "core/complexSupport.h"
 
diff --git a/src/cllazyfile/lazyRefs.h b/src/cllazyfile/lazyRefs.h
@@ -9,7 +9,7 @@
 #include "sc_export.h"
 #include "lazyTypes.h"
 #include "lazyInstMgr.h"
-#include "ExpDict.h"
+#include "core/ExpDict.h"
 #include "SubSuperIterators.h"
 #include <STEPattribute.h>
 #include <STEPaggregate.h>
diff --git a/src/clstepcore/CMakeLists.txt b/src/clstepcore/CMakeLists.txt
@@ -63,12 +63,6 @@ set(LIBSTEPCORE_SRCS
 )
 
 set(SC_CLSTEPCORE_HDRS
-  entityDescriptor.h
-  entityDescriptorList.h
-  enumTypeDescriptor.h
-  ExpDict.h
-  explicitItemId.h
-  globalRule.h
   implicitItemId.h
   instmgr.h
   interfaceSpec.h
diff --git a/src/clstepcore/Registry.cc b/src/clstepcore/Registry.cc
@@ -9,7 +9,7 @@
 * and is not subject to copyright.
 */
 
-#include <ExpDict.h>
+#include "core/ExpDict.h"
 #include <Registry.h>
 
 /* these may be shared between multiple Registry instances, so don't create/destroy in Registry ctor/dtor
diff --git a/src/clstepcore/STEPaggregate.cc b/src/clstepcore/STEPaggregate.cc
@@ -16,7 +16,7 @@
 #include <STEPaggregate.h>
 #include <STEPattribute.h>
 #include <instmgr.h>
-#include <ExpDict.h>
+#include "core/ExpDict.h"
 
 
 /**
diff --git a/src/clstepcore/STEPattribute.cc b/src/clstepcore/STEPattribute.cc
@@ -17,7 +17,7 @@
 #include <instmgr.h>
 #include <STEPundefined.h>
 #include <STEPaggregate.h>
-#include <ExpDict.h>
+#include "core/ExpDict.h"
 #include <sdai.h>
 
 // REAL_NUM_PRECISION is defined in STEPattribute.h, and is also used
diff --git a/src/clstepcore/STEPcomplex.h b/src/clstepcore/STEPcomplex.h
@@ -5,7 +5,7 @@
 #include <errordesc.h>
 #include <sdai.h>
 #include "core/baseType.h"
-#include <ExpDict.h>
+#include "core/ExpDict.h"
 #include <Registry.h>
 
 #include <list>
diff --git a/src/clstepcore/STEPinvAttrList.cc b/src/clstepcore/STEPinvAttrList.cc
@@ -4,7 +4,7 @@
  */
 
 #include <STEPinvAttrList.h>
-#include <ExpDict.h>
+#include "core/ExpDict.h"
 
 invAttrListNodeI::invAttrListNodeI(Inverse_attribute* a, setterI_t s, getterI_t g): invAttrListNode(a), set( s ), get( g ) {}
 invAttrListNodeA::invAttrListNodeA(Inverse_attribute* a, setterA_t s, getterA_t g): invAttrListNode(a), set( s ), get( g ) {}
diff --git a/src/clstepcore/SubSuperIterators.h b/src/clstepcore/SubSuperIterators.h
@@ -1,8 +1,8 @@
 #ifndef SUB_SUPER_ITERATORS
 #define SUB_SUPER_ITERATORS
 
-#include "ExpDict.h"
-#include "ExpDict.h"
+#include "core/ExpDict.h"
+#include "core/ExpDict.h"
 #include <queue>
 #include <assert.h>
 
diff --git a/src/clstepcore/dictSchema.cc b/src/clstepcore/dictSchema.cc
@@ -1,7 +1,7 @@
 #include "core/dictSchema.h"
 
 #include "typeDescriptor.h"
-#include "entityDescriptor.h"
+#include "core/entityDescriptor.h"
 
 Schema::Schema( const char * schemaName )
 : _use_interface_list( new Interface_spec__set ),
diff --git a/src/clstepcore/entityDescriptor.cc b/src/clstepcore/entityDescriptor.cc
@@ -1,6 +1,6 @@
 #include <string>
 
-#include "entityDescriptor.h"
+#include "core/entityDescriptor.h"
 #include "Registry.h"
 #include "core/attrDescriptor.h"
 #include "inverseAttribute.h"
diff --git a/src/clstepcore/entityDescriptorList.cc b/src/clstepcore/entityDescriptorList.cc
@@ -1,4 +1,4 @@
-#include "entityDescriptorList.h"
+#include "core/entityDescriptorList.h"
 
 EntityDescLinkNode::EntityDescLinkNode() {
     _entityDesc = 0;
diff --git a/src/clstepcore/enumTypeDescriptor.cc b/src/clstepcore/enumTypeDescriptor.cc
@@ -1,4 +1,4 @@
-#include "enumTypeDescriptor.h"
+#include "core/enumTypeDescriptor.h"
 
 /*
  * why have EnumTypeDescriptor + EnumerationTypeDescriptor ???
diff --git a/src/clstepcore/explicitItemId.cc b/src/clstepcore/explicitItemId.cc
@@ -1,4 +1,4 @@
-#include "explicitItemId.h"
+#include "core/explicitItemId.h"
 
 Explicit_item_id::Explicit_item_id() {
     _local_definition = 0;
diff --git a/src/clstepcore/globalRule.cc b/src/clstepcore/globalRule.cc
@@ -1,4 +1,4 @@
-#include "globalRule.h"
+#include "core/globalRule.h"
 
 Global_rule::Global_rule()
 : _entities( 0 ), _where_rules( 0 ), _parent_schema( 0 ) {
diff --git a/src/clstepcore/interfaceSpec.h b/src/clstepcore/interfaceSpec.h
@@ -2,7 +2,7 @@
 #define INTERFACESPEC_H
 
 #include "core/dictionaryInstance.h"
-#include "explicitItemId.h"
+#include "core/explicitItemId.h"
 #include "implicitItemId.h"
 
 #include "sc_export.h"
diff --git a/src/clstepcore/sdaiSelect.cc b/src/clstepcore/sdaiSelect.cc
@@ -11,7 +11,7 @@
 */
 
 #include <stdio.h> // to get the BUFSIZ #define
-#include <ExpDict.h>
+#include "core/ExpDict.h"
 #include <sstream>
 #include <string>
 #include <sdai.h>
diff --git a/src/clstepcore/superInvAttrIter.h b/src/clstepcore/superInvAttrIter.h
@@ -2,7 +2,7 @@
 #define SUPERINVATTRITER_H
 
 #include "SubSuperIterators.h"
-#include "ExpDict.h"
+#include "core/ExpDict.h"
 
 /**
  * this class implements an iterator for inverse attributes in an EntityDescriptor's supertypes
diff --git a/src/clstepcore/test/test_SupertypesIterator.cc b/src/clstepcore/test/test_SupertypesIterator.cc
@@ -5,7 +5,7 @@
 //subtypesiterator shouldn't need tested separately from supertypesiterator since there is very little difference
 
 #include "SubSuperIterators.h"
-#include "ExpDict.h"
+#include "core/ExpDict.h"
 #include <iomanip>
 
 int main( int /*argc*/, char ** /*argv*/ ) {
diff --git a/src/clstepcore/test/test_null_attr.cc b/src/clstepcore/test/test_null_attr.cc
@@ -1,4 +1,4 @@
-#include <ExpDict.h>
+#include "core/ExpDict.h"
 #include <STEPattribute.h>
 #include <sdaiString.h>
 
diff --git a/src/clstepcore/test/test_operators_SDAI_Select.cc b/src/clstepcore/test/test_operators_SDAI_Select.cc
@@ -6,7 +6,7 @@
 
 #include <iostream>
 
-#include "ExpDict.h"
+#include "core/ExpDict.h"
 #include "core/baseType.h"
 #include "sdaiSelect.h"
 
diff --git a/src/clstepcore/test/test_operators_STEPattribute.cc b/src/clstepcore/test/test_operators_STEPattribute.cc
@@ -1,7 +1,7 @@
 ///test constructors, destructor, shallow copy, assignment operators for STEPattribute
 
 #include <STEPattribute.h>
-#include <ExpDict.h>
+#include "core/ExpDict.h"
 #include <stdint.h>
 
 
diff --git a/src/exp2cxx/classes_wrapper.cc b/src/exp2cxx/classes_wrapper.cc
@@ -79,7 +79,7 @@ void print_file_header( FILES * files ) {
     fprintf( files->incall, "\n#include <Registry.h>\n" );
     fprintf( files->incall, "\n#include <STEPaggregate.h>\n" );
     fprintf( files->incall, "\n#include <STEPundefined.h>\n" );
-    fprintf( files->incall, "\n#include <ExpDict.h>\n" );
+    fprintf( files->incall, "\n#include \"core/ExpDict.h\"\n" );
     fprintf( files->incall, "\n#include <STEPattribute.h>\n" );
 
     fprintf( files->incall, "\n#include <Sdaiclasses.h>\n" );
diff --git a/src/test/p21read/p21read.cc b/src/test/p21read/p21read.cc
@@ -16,7 +16,7 @@ extern void SchemaInit( class Registry & );
 #include <STEPfile.h>
 #include <sdai.h>
 #include <STEPattribute.h>
-#include <ExpDict.h>
+#include "core/ExpDict.h"
 #include <Registry.h>
 #include <errordesc.h>
 #include <algorithm>
diff --git a/src/test/tests.h b/src/test/tests.h
@@ -16,7 +16,7 @@
 #include <iostream>
 
 /* General SCL stuff */
-#include <ExpDict.h>
+#include "core/ExpDict.h"
 #include <STEPfile.h>
 #include <STEPattribute.h>
 #include <sdai.h>
