First steps of resituating stepcode headers

starseeker · starseeker · commit 33102ee9e346 · 2022-10-02T17:57:56.000-04:00
Goal is for client codes to be able to simply include the stepcode
direcotry and have everything work, rather than having to worry about
individual step libraries.  Will also make it clear with the dir
prefixes when libraries are using .h files from other libraries, rather
than their own.
diff --git a/include/core/CMakeLists.txt b/include/core/CMakeLists.txt
@@ -0,0 +1,71 @@
+set(CORE_HDRS
+  aggrTypeDescriptor.h
+  attrDescriptor.h
+  attrDescriptorList.h
+# baseType.h
+# complexSupport.h
+# create_Aggr.h
+# derivedAttribute.h
+# dictSchema.h
+# dictdefs.h
+# dictionaryInstance.h
+# dispnode.h
+# dispnodelist.h
+# entityDescriptor.h
+# entityDescriptorList.h
+# enumTypeDescriptor.h
+# ExpDict.h
+# explicitItemId.h
+# globalRule.h
+# implicitItemId.h
+# instmgr.h
+# interfaceSpec.h
+# interfacedItem.h
+# inverseAttribute.h
+# inverseAttributeList.h
+# mgrnode.h
+# mgrnodearray.h
+# mgrnodelist.h
+# needFunc.h
+# read_func.h
+# realTypeDescriptor.h
+# Registry.h
+# schRename.h
+# sdai.h
+# sdaiApplication_instance.h
+# sdaiSelect.h
+# selectTypeDescriptor.h
+# SingleLinkList.h
+# STEPaggregate.h
+# STEPaggrBinary.h
+# STEPaggrEntity.h
+# STEPaggrEnum.h
+# STEPaggrGeneric.h
+# STEPaggrInt.h
+# STEPaggrReal.h
+# STEPaggrSelect.h
+# STEPaggrString.h
+# STEPattribute.h
+# STEPattributeList.h
+# STEPcomplex.h
+# STEPinvAttrList.h
+# STEPundefined.h
+# stringTypeDescriptor.h
+# SubSuperIterators.h
+# typeDescriptor.h
+# typeDescriptorList.h
+# typeOrRuleVar.h
+# uniquenessRule.h
+# whereRule.h
+)
+
+install(FILES ${CORE_HDRS}
+  DESTINATION ${INCLUDE_DIR}/stepcode/core)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
+
diff --git a/include/core/aggrTypeDescriptor.h b/include/core/aggrTypeDescriptor.h
diff --git a/include/core/attrDescriptor.h b/include/core/attrDescriptor.h
diff --git a/include/core/attrDescriptorList.h b/include/core/attrDescriptorList.h
diff --git a/src/cldai/CMakeLists.txt b/src/cldai/CMakeLists.txt
@@ -29,6 +29,7 @@ SET(SC_CLDAI_HDRS
 
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/include/stepcode
   ${SC_SOURCE_DIR}/src/clstepcore
   ${SC_SOURCE_DIR}/src/clutils
   )
diff --git a/src/cleditor/CMakeLists.txt b/src/cleditor/CMakeLists.txt
@@ -21,6 +21,7 @@ SET(SC_CLEDITOR_HDRS
 
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/include/stepcode
   ${SC_SOURCE_DIR}/src/cldai
   ${SC_SOURCE_DIR}/src/clstepcore
   ${SC_SOURCE_DIR}/src/clutils
diff --git a/src/cllazyfile/CMakeLists.txt b/src/cllazyfile/CMakeLists.txt
@@ -29,6 +29,7 @@ set( SC_CLLAZYFILE_HDRS
 
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/include/stepcode
   ${SC_SOURCE_DIR}/src/cleditor
   ${SC_SOURCE_DIR}/src/cldai
   ${SC_SOURCE_DIR}/src/clstepcore
diff --git a/src/clstepcore/CMakeLists.txt b/src/clstepcore/CMakeLists.txt
@@ -63,9 +63,6 @@ set(LIBSTEPCORE_SRCS
 )
 
 set(SC_CLSTEPCORE_HDRS
-  aggrTypeDescriptor.h
-  attrDescriptor.h
-  attrDescriptorList.h
   baseType.h
   complexSupport.h
   create_Aggr.h
@@ -125,6 +122,7 @@ set(SC_CLSTEPCORE_HDRS
 
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/include/stepcode
   ${SC_SOURCE_DIR}/src/cldai
   ${SC_SOURCE_DIR}/src/cleditor
   ${SC_SOURCE_DIR}/src/clutils
diff --git a/src/clstepcore/ExpDict.h b/src/clstepcore/ExpDict.h
@@ -28,7 +28,7 @@
 #include <Str.h>
 
 // each of these contains linked list, list node, iterator
-#include "attrDescriptorList.h"
+#include "core/attrDescriptorList.h"
 #include "inverseAttributeList.h"
 #include "typeDescriptorList.h"
 #include "entityDescriptorList.h"
@@ -37,7 +37,7 @@
 #include "typeDescriptor.h"
 #include "entityDescriptor.h"
 #include "enumTypeDescriptor.h"
-#include "attrDescriptor.h"
+#include "core/attrDescriptor.h"
 #include "derivedAttribute.h"
 #include "inverseAttribute.h"
 
@@ -56,7 +56,7 @@
 #include "dictSchema.h"
 #include "schRename.h"
 
-#include "aggrTypeDescriptor.h"
+#include "core/aggrTypeDescriptor.h"
 #include "selectTypeDescriptor.h"
 #include "stringTypeDescriptor.h"
 #include "realTypeDescriptor.h"
diff --git a/src/clstepcore/aggrTypeDescriptor.cc b/src/clstepcore/aggrTypeDescriptor.cc
@@ -1,4 +1,4 @@
-#include "aggrTypeDescriptor.h"
+#include "core/aggrTypeDescriptor.h"
 
 STEPaggregate * AggrTypeDescriptor::CreateAggregate() {
     if( CreateNewAggr ) {
diff --git a/src/clstepcore/attrDescriptor.cc b/src/clstepcore/attrDescriptor.cc
@@ -1,4 +1,4 @@
-#include "attrDescriptor.h"
+#include "core/attrDescriptor.h"
 
 AttrDescriptor::AttrDescriptor( const char * name, const TypeDescriptor * domainType,
                                 Logical optional, Logical unique, AttrType_Enum at,
diff --git a/src/clstepcore/attrDescriptorList.cc b/src/clstepcore/attrDescriptorList.cc
@@ -1,6 +1,6 @@
-#include "attrDescriptorList.h"
+#include "core/attrDescriptorList.h"
 
-#include "attrDescriptor.h"
+#include "core/attrDescriptor.h"
 
 AttrDescriptorList::AttrDescriptorList() {
 }
diff --git a/src/clstepcore/derivedAttribute.h b/src/clstepcore/derivedAttribute.h
@@ -1,7 +1,7 @@
 #ifndef DERIVEDATTRIBUTE_H
 #define DERIVEDATTRIBUTE_H
 
-#include "attrDescriptor.h"
+#include "core/attrDescriptor.h"
 
 #include "sc_export.h"
 
diff --git a/src/clstepcore/entityDescriptor.cc b/src/clstepcore/entityDescriptor.cc
@@ -2,7 +2,7 @@
 
 #include "entityDescriptor.h"
 #include "Registry.h"
-#include "attrDescriptor.h"
+#include "core/attrDescriptor.h"
 #include "inverseAttribute.h"
 #include "SubSuperIterators.h"
 
diff --git a/src/clstepcore/entityDescriptor.h b/src/clstepcore/entityDescriptor.h
@@ -2,9 +2,9 @@
 #define ENTITYDESCRIPTOR_H
 
 #include "typeDescriptor.h"
-#include "attrDescriptor.h"
+#include "core/attrDescriptor.h"
 #include "uniquenessRule.h"
-#include "attrDescriptorList.h"
+#include "core/attrDescriptorList.h"
 #include "inverseAttributeList.h"
 
 #include "sc_export.h"
diff --git a/src/clstepcore/inverseAttribute.h b/src/clstepcore/inverseAttribute.h
@@ -1,7 +1,7 @@
 #ifndef INVERSEATTRIBUTE_H
 #define INVERSEATTRIBUTE_H
 
-#include "attrDescriptor.h"
+#include "core/attrDescriptor.h"
 
 class SC_CORE_EXPORT Inverse_attribute  :    public AttrDescriptor  {
 
diff --git a/src/clutils/CMakeLists.txt b/src/clutils/CMakeLists.txt
@@ -22,6 +22,7 @@ set(SC_CLUTILS_HDRS
 include_directories(
   ${SC_BINARY_DIR}/include
   ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/include/stepcode
   )
 
 if(BUILD_SHARED_LIBS)

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ SET(SC_CLDAI_HDRS`
`29`	`29`
`30`	`30`	`include_directories(`
`31`	`31`	`${CMAKE_CURRENT_SOURCE_DIR}`
	`32`	`+ ${CMAKE_SOURCE_DIR}/include/stepcode`
`32`	`33`	`${SC_SOURCE_DIR}/src/clstepcore`
`33`	`34`	`${SC_SOURCE_DIR}/src/clutils`
`34`	`35`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "aggrTypeDescriptor.h"`
	`1`	`+#include "core/aggrTypeDescriptor.h"`
`2`	`2`
`3`	`3`	`STEPaggregate * AggrTypeDescriptor::CreateAggregate() {`
`4`	`4`	`if( CreateNewAggr ) {`