Merge branch 'develop'

v0.8.2
Merge pull request #452 from starseeker/headers
2023-09-17 12:07:49 -04:00 · 2023-09-03 23:32:12 -04:00 · 2023-09-02 20:26:58 -04:00 · 2023-09-02 20:15:42 -04:00 · 2023-08-23 14:57:10 -04:00 · 2023-08-23 14:54:33 -04:00
244 changed files with 681 additions and 3759 deletions
@@ -48,7 +48,7 @@ endif (POLICY CMP0077)

 # SC version
 set(SC_VERSION_MAJOR 0)
-set(SC_VERSION_MINOR 9)
+set(SC_VERSION_MINOR 8)
 set(SC_VERSION_PATCH 1)
 set(SC_VERSION ${SC_VERSION_MAJOR}.${SC_VERSION_MINOR}.${SC_VERSION_PATCH})

@@ -141,7 +141,7 @@ if (LEMON_EXECUTABLE)

      # execute lemon
      add_custom_command(
-	OUTPUT ${_out_src_file}
+	OUTPUT ${_out_src_file} ${_basename}.h
 	COMMAND ${LEMON_EXECUTABLE} -T${LEMON_TEMPLATE} ${LEMON_EXECUTABLE_opts} ${_in_y_file}
 	DEPENDS ${Name}_input_cpy
 	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
@@ -152,7 +152,7 @@ if (LEMON_EXECUTABLE)
      add_custom_command(
 	OUTPUT ${_out_hdr_file}
 	COMMAND ${CMAKE_COMMAND} ARGS -E rename ${_basename}.h ${_out_hdr_file}
-	DEPENDS ${_out_src_file}
+	DEPENDS ${_out_src_file} ${_basename}.h
 	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 	)

@@ -58,10 +58,6 @@ add_subdirectory(${STEPCODE_ROOT_DIR} "${CMAKE_CURRENT_BINARY_DIR}/sc" EXCLUDE_F

 # Set up STEPcode include directories.
 set(STEPCODE_INCLUDE_DIR
-  ${STEPCODE_ROOT_DIR}/src/clstepcore
-  ${STEPCODE_ROOT_DIR}/src/cldai
-  ${STEPCODE_ROOT_DIR}/src/clutils
-  ${STEPCODE_ROOT_DIR}/src/cleditor
  ${STEPCODE_BUILD_DIR}/include
  ${STEPCODE_ROOT_DIR}/include
  ${CMAKE_BINARY_DIR}
@@ -49,15 +49,15 @@
 //  $./AP203Minimum
 //  AP203Minimum    outfile.stp

-#include <STEPfile.h>
-#include <sdai.h>
-#include <STEPattribute.h>
-#include <ExpDict.h>
-#include <Registry.h>
-#include <errordesc.h>
+#include <cleditor/STEPfile.h>
+#include <clstepcore/sdai.h>
+#include <clstepcore/STEPattribute.h>
+#include <clstepcore/ExpDict.h>
+#include <clstepcore/Registry.h>
+#include <clutils/errordesc.h>

-#include <STEPcomplex.h>
-#include <SdaiHeaderSchema.h>
+#include <clstepcore/STEPcomplex.h>
+#include <cleditor/SdaiHeaderSchema.h>

 #include "schema.h"

@@ -37,6 +37,12 @@ install(FILES ordered_attrs.h
 install(FILES ${SC_BINARY_DIR}/${INCLUDE_DIR}/config.h
  DESTINATION ${INCLUDE_DIR}/stepcode)

+add_subdirectory(cldai)
+add_subdirectory(cleditor)
+add_subdirectory(cllazyfile)
+add_subdirectory(clstepcore)
+add_subdirectory(clutils)
+
 # Local Variables:
 # tab-width: 8
 # mode: cmake
@@ -0,0 +1,24 @@
+set(DAI_HDRS
+  sdaiApplication_instance_set.h
+  sdaiBinary.h
+  sdaiDaObject.h
+  sdaiEntity_extent.h
+  sdaiEntity_extent_set.h
+  sdaiEnum.h
+  sdaiModel_contents.h
+  sdaiModel_contents_list.h
+  sdaiObject.h
+  sdaiSession_instance.h
+  sdaiString.h
+  )
+
+install(FILES ${DAI_HDRS}
+  DESTINATION ${INCLUDE_DIR}/stepcode/cldai)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
+
@@ -1,9 +1,9 @@
 #ifndef SDAIDAOBJECT_H
 #define SDAIDAOBJECT_H 1

-#include <sdaiObject.h>
-#include <sdaiString.h>
-#include <sdaiEnum.h>
+#include "cldai/sdaiObject.h"
+#include "cldai/sdaiString.h"
+#include "cldai/sdaiEnum.h"

 #include <sc_export.h>

@@ -3,7 +3,7 @@
 #define SESSION_INSTANCE_H 1

 #include <sc_export.h>
-//#include <sdai.h>
+//#include "clstepcore/sdai.h"

 class SC_DAI_EXPORT SDAI_Session_instance : public SDAI_sdaiObject {

@@ -0,0 +1,20 @@
+set(EDITOR_HDRS
+  STEPfile.h
+  cmdmgr.h
+  editordefines.h
+  SdaiHeaderSchema.h
+  SdaiHeaderSchemaClasses.h
+  SdaiSchemaInit.h
+  seeinfodefault.h
+  )
+
+install(FILES ${EDITOR_HDRS}
+  DESTINATION ${INCLUDE_DIR}/stepcode/cleditor)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
+
@@ -15,14 +15,14 @@

 #include <sc_export.h>
 #include <string>
-#include <instmgr.h>
-#include <Registry.h>
+#include "clstepcore/instmgr.h"
+#include "clstepcore/Registry.h"
 #include <fstream>
-#include <dirobj.h>
-#include <errordesc.h>
+#include "clutils/dirobj.h"
+#include "clutils/errordesc.h"
 #include <time.h>

-#include <read_func.h>
+#include "clstepcore/read_func.h"

 //error reporting level
 #define READ_COMPLETE    10
@@ -5,11 +5,11 @@
 // regenerate it.

 #include <sc_export.h>
-#include <sdai.h>
-#include <Registry.h>
-#include <STEPaggregate.h>
-#include <SdaiHeaderSchemaClasses.h>
-#include <SdaiSchemaInit.h>
+#include "clstepcore/sdai.h"
+#include "clstepcore/Registry.h"
+#include "clstepcore/STEPaggregate.h"
+#include "cleditor/SdaiHeaderSchemaClasses.h"
+#include "cleditor/SdaiSchemaInit.h"

 /////////         ENTITY section_language

@@ -9,16 +9,16 @@
 #endif

 #include <sc_export.h>
-#include <sdai.h>
-#include <Registry.h>
-#include <STEPaggregate.h>
-#include <STEPundefined.h>
-#include <ExpDict.h>
-#include <STEPattribute.h>
-#include <complexSupport.h>
+#include "clstepcore/sdai.h"
+#include "clstepcore/Registry.h"
+#include "clstepcore/STEPaggregate.h"
+#include "clstepcore/STEPundefined.h"
+#include "clstepcore/ExpDict.h"
+#include "clstepcore/STEPattribute.h"
+#include "clstepcore/complexSupport.h"

-#include <SdaiHeaderSchemaClasses.h>
-#include <SdaiHeaderSchema.h>
+#include "cleditor/SdaiHeaderSchemaClasses.h"
+#include "cleditor/SdaiHeaderSchema.h"

 SC_EDITOR_EXPORT void HeaderSchemaInit( Registry & );
 SC_EDITOR_EXPORT void HeaderInitSchemasAndEnts( Registry & );
@@ -13,16 +13,16 @@
 */

 #include <sc_export.h>
-#include <gennode.h>
-#include <gennodelist.h>
-#include <gennodearray.h>
+#include "clutils/gennode.h"
+#include "clutils/gennodelist.h"
+#include "clutils/gennodearray.h"

-#include <editordefines.h>
-#include <mgrnode.h>
-#include <mgrnodelist.h>
-#include <dispnode.h>
-#include <dispnodelist.h>
-#include <SingleLinkList.h>
+#include "cleditor/editordefines.h"
+#include "clstepcore/mgrnode.h"
+#include "clstepcore/mgrnodelist.h"
+#include "clstepcore/dispnode.h"
+#include "clstepcore/dispnodelist.h"
+#include "clstepcore/SingleLinkList.h"

 //#define NUM_CMDMGR_CMDS 9
 // this is the number of columns that contain cmds (as opposed
@@ -20,10 +20,10 @@
 class MgrNode;
 class DisplayNode;
 class DisplayNodelist;
-#include <sdai.h>
+#include "clstepcore/sdai.h"
 //class SDAI_Application_instance;

-#include <editordefines.h>
+#include "cleditor/editordefines.h"

 class SC_EDITOR_EXPORT seeInfo : public DisplayNode {
    public:
@@ -0,0 +1,27 @@
+set(LAZY_HDRS
+  headerSectionReader.h
+  lazyFileReader.h
+  lazyP21DataSectionReader.h
+  p21HeaderSectionReader.h
+  lazyDataSectionReader.h
+  lazyInstMgr.h
+  lazyTypes.h
+  sectionReader.h
+  instMgrHelper.h
+  judy.h
+  judyL2Array.h
+  judyLArray.h
+  judyS2Array.h
+  judySArray.h
+  )
+
+install(FILES ${LAZY_HDRS}
+  DESTINATION ${INCLUDE_DIR}/stepcode/cllazyfile)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
+
@@ -5,9 +5,9 @@
 #include <fstream>

 #include "judyL2Array.h"
-#include "lazyFileReader.h"
-#include "sectionReader.h"
-#include "lazyTypes.h"
+#include "cllazyfile/lazyFileReader.h"
+#include "cllazyfile/sectionReader.h"
+#include "cllazyfile/lazyTypes.h"

 #include "sc_export.h"

@@ -3,9 +3,9 @@

 #include <sc_export.h>

-#include <mgrnode.h>
-#include <lazyInstMgr.h>
-#include <instmgr.h>
+#include "clstepcore/mgrnode.h"
+#include "cllazyfile/lazyInstMgr.h"
+#include "clstepcore/instmgr.h"

 /**
 * \file instMgrHelper.h helper classes for the lazyInstMgr. Allows use of SDAI_Application_instance class
@@ -3,8 +3,8 @@

 #include <map>
 #include <iostream>
-#include "sectionReader.h"
-#include "lazyTypes.h"
+#include "cllazyfile/sectionReader.h"
+#include "cllazyfile/lazyTypes.h"

 #include "sc_export.h"

@@ -8,9 +8,9 @@
 #include "sc_export.h"

 // PART 21
-#include "lazyP21DataSectionReader.h"
-#include "p21HeaderSectionReader.h"
-#include "headerSectionReader.h"
+#include "cllazyfile/lazyP21DataSectionReader.h"
+#include "cllazyfile/p21HeaderSectionReader.h"
+#include "cllazyfile/headerSectionReader.h"

 /* // PART 28
 * #include "lazyP28DataSectionReader.h"
@@ -5,11 +5,11 @@
 #include <string>
 #include <assert.h>

-#include "lazyDataSectionReader.h"
-#include "lazyFileReader.h"
-#include "lazyTypes.h"
+#include "cllazyfile/lazyDataSectionReader.h"
+#include "cllazyfile/lazyFileReader.h"
+#include "cllazyfile/lazyTypes.h"

-#include "Registry.h"
+#include "clstepcore/Registry.h"
 #include "sc_export.h"

 #include "judyLArray.h"
@@ -1,8 +1,8 @@
 #ifndef LAZYP21DATASECTIONREADER_H
 #define LAZYP21DATASECTIONREADER_H

-#include "lazyDataSectionReader.h"
-#include "lazyFileReader.h"
+#include "cllazyfile/lazyDataSectionReader.h"
+#include "cllazyfile/lazyFileReader.h"
 #include "sc_export.h"

 class SC_LAZYFILE_EXPORT lazyP21DataSectionReader: public lazyDataSectionReader {
@@ -1,7 +1,7 @@
 #ifndef P21HEADERSECTIONREADER_H
 #define P21HEADERSECTIONREADER_H

-#include "headerSectionReader.h"
+#include "cllazyfile/headerSectionReader.h"
 #include "sc_export.h"

 class SC_LAZYFILE_EXPORT p21HeaderSectionReader: public headerSectionReader {
@@ -3,10 +3,10 @@

 #include <fstream>
 #include <set>
-#include "lazyTypes.h"
+#include "cllazyfile/lazyTypes.h"
 #include "sc_export.h"
-#include "errordesc.h"
-#include "STEPcomplex.h"
+#include "clutils/errordesc.h"
+#include "clstepcore/STEPcomplex.h"

 class SDAI_Application_instance;
 class lazyFileReader;
@@ -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/clstepcore)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
+
@@ -15,20 +15,20 @@
 */

 #include <sc_export.h>
-#include <sdai.h>
+#include "clstepcore/sdai.h"

 #include <vector>
 #include <string>
 #include <assert.h>

-#include <SingleLinkList.h>
+#include "clstepcore/SingleLinkList.h"

-#include <baseType.h>
-#include <dictdefs.h>
-#include <Str.h>
+#include "clstepcore/baseType.h"
+#include "clstepcore/dictdefs.h"
+#include "clutils/Str.h"

 // each of these contains linked list, list node, iterator
-#include "attrDescriptorList.h"
+#include "clstepcore/attrDescriptorList.h"
 #include "inverseAttributeList.h"
 #include "typeDescriptorList.h"
 #include "entityDescriptorList.h"
@@ -37,12 +37,12 @@
 #include "typeDescriptor.h"
 #include "entityDescriptor.h"
 #include "enumTypeDescriptor.h"
-#include "attrDescriptor.h"
-#include "derivedAttribute.h"
+#include "clstepcore/attrDescriptor.h"
+#include "clstepcore/derivedAttribute.h"
 #include "inverseAttribute.h"

-#include "create_Aggr.h"
-#include "dictionaryInstance.h"
+#include "clstepcore/create_Aggr.h"
+#include "clstepcore/dictionaryInstance.h"

 #include "uniquenessRule.h"
 #include "whereRule.h"
@@ -53,10 +53,10 @@
 #include "interfaceSpec.h"
 #include "typeOrRuleVar.h"
 #include "globalRule.h"
-#include "dictSchema.h"
+#include "clstepcore/dictSchema.h"
 #include "schRename.h"

-#include "aggrTypeDescriptor.h"
+#include "clstepcore/aggrTypeDescriptor.h"
 #include "selectTypeDescriptor.h"
 #include "stringTypeDescriptor.h"
 #include "realTypeDescriptor.h"
@@ -13,11 +13,11 @@
 */

 #include <sc_export.h>
-#include <sdai.h>
-#include <errordesc.h>
-#include <sc_hash.h>
-#include <Str.h>
-#include <complexSupport.h>
+#include "clstepcore/sdai.h"
+#include "clutils/errordesc.h"
+#include "clutils/sc_hash.h"
+#include "clutils/Str.h"
+#include "clstepcore/complexSupport.h"


 // defined and created in Registry.cc
@@ -1,7 +1,7 @@
 #ifndef STEPAGGRBINARY_H
 #define STEPAGGRBINARY_H

-#include "STEPaggregate.h"
+#include "clstepcore/STEPaggregate.h"
 #include <sc_export.h>

 /** \file STEPaggrBinary.h
@@ -5,7 +5,7 @@
 * classes EntityAggregate, EntityNode
 */

-#include "STEPaggregate.h"
+#include "clstepcore/STEPaggregate.h"
 #include <sc_export.h>

 class SC_CORE_EXPORT EntityAggregate  :  public  STEPaggregate {
@@ -1,7 +1,7 @@
 #ifndef STEPAGGRENUM_H
 #define STEPAGGRENUM_H

-#include "STEPaggregate.h"
+#include "clstepcore/STEPaggregate.h"
 #include "sc_export.h"
 /** \file StepaggrEnum.h
 * classes EnumAggregate, LOGICALS, BOOLEANS, EnumNode
@@ -1,7 +1,7 @@
 #ifndef STEPAGGRGENERIC_H
 #define STEPAGGRGENERIC_H

-#include "STEPaggregate.h"
+#include "clstepcore/STEPaggregate.h"
 #include <sc_export.h>

 /** \file STEPaggrGeneric.h
@@ -1,7 +1,7 @@
 #ifndef STEPAGGRINT_H
 #define STEPAGGRINT_H

-#include "STEPaggregate.h"
+#include "clstepcore/STEPaggregate.h"
 #include <sc_export.h>

 class SC_CORE_EXPORT IntAggregate  : public STEPaggregate  {
@@ -1,7 +1,7 @@
 #ifndef STEPAGGRREAL_H
 #define STEPAGGRREAL_H

-#include "STEPaggregate.h"
+#include "clstepcore/STEPaggregate.h"
 #include <sc_export.h>

 class SC_CORE_EXPORT RealAggregate  : public STEPaggregate  {
@@ -1,7 +1,7 @@
 #ifndef STEPAGGRSELECT_H
 #define STEPAGGRSELECT_H

-#include "STEPaggregate.h"
+#include "clstepcore/STEPaggregate.h"
 #include <sc_export.h>

 /** \file STEPaggrSelect.h
@@ -1,7 +1,7 @@
 #ifndef STEPAGGRSTRING_H
 #define STEPAGGRSTRING_H

-#include "STEPaggregate.h"
+#include "clstepcore/STEPaggregate.h"
 #include <sc_export.h>

 /** \file STEPaggrString.h
@@ -17,11 +17,11 @@ class STEPaggregate;
 class TypeDescriptor;

 #include <sc_export.h>
-#include <errordesc.h>
-#include <SingleLinkList.h>
-#include <baseType.h>
-#include <sdai.h>
-#include <STEPundefined.h>
+#include "clutils/errordesc.h"
+#include "clstepcore/SingleLinkList.h"
+#include "clstepcore/baseType.h"
+#include "clstepcore/sdai.h"
+#include "clstepcore/STEPundefined.h"
 #include <string>

 #define     AGGR_NULL   &NilSTEPaggregate
@@ -110,14 +110,14 @@ public:
 };
 typedef  STEPnode  * STEPnodeH;

-#include "STEPaggrGeneric.h"
-#include "STEPaggrEntity.h"
-#include "STEPaggrSelect.h"
-#include "STEPaggrString.h"
-#include "STEPaggrBinary.h"
-#include "STEPaggrEnum.h"
-#include "STEPaggrReal.h"
-#include "STEPaggrInt.h"
+#include "clstepcore/STEPaggrGeneric.h"
+#include "clstepcore/STEPaggrEntity.h"
+#include "clstepcore/STEPaggrSelect.h"
+#include "clstepcore/STEPaggrString.h"
+#include "clstepcore/STEPaggrBinary.h"
+#include "clstepcore/STEPaggrEnum.h"
+#include "clstepcore/STEPaggrReal.h"
+#include "clstepcore/STEPaggrInt.h"

 /******************************************************************
 **   FIXME The following classes are currently stubs
@@ -15,10 +15,10 @@

 #include <sc_export.h>
 #include <stdio.h>
-#include <errordesc.h>
-#include <baseType.h>
+#include "clutils/errordesc.h"
+#include "clstepcore/baseType.h"

-#include <sdai.h>
+#include "clstepcore/sdai.h"

 /** \def REAL_NUM_PRECISION
 * this is used to set a const int Real_Num_Precision
@@ -16,7 +16,7 @@
 class STEPattribute;

 #include <sc_export.h>
-#include <SingleLinkList.h>
+#include "clstepcore/SingleLinkList.h"

 class STEPattributeList;

@@ -2,11 +2,11 @@
 #define STEPCOMPLEX_H

 #include <sc_export.h>
-#include <errordesc.h>
-#include <sdai.h>
-#include <baseType.h>
-#include <ExpDict.h>
-#include <Registry.h>
+#include "clutils/errordesc.h"
+#include "clstepcore/sdai.h"
+#include "clstepcore/baseType.h"
+#include "clstepcore/ExpDict.h"
+#include "clstepcore/Registry.h"

 #include <list>

@@ -15,7 +15,7 @@
 class Inverse_attribute;

 #include <sc_export.h>
-#include <SingleLinkList.h>
+#include "clstepcore/SingleLinkList.h"

 class STEPinvAttrList;
 class EntityAggregate;
@@ -13,9 +13,9 @@
 */

 #include <sc_export.h>
-#include <errordesc.h>
+#include "clutils/errordesc.h"
 #include <string>
-#include <read_func.h>
+#include "clstepcore/read_func.h"

 class SC_CORE_EXPORT SCLundefined  {
    protected:
@@ -1,8 +1,8 @@
 #ifndef SUB_SUPER_ITERATORS
 #define SUB_SUPER_ITERATORS

-#include "ExpDict.h"
-#include "ExpDict.h"
+#include "clstepcore/ExpDict.h"
+#include "clstepcore/ExpDict.h"
 #include <queue>
 #include <assert.h>

@@ -2,7 +2,7 @@
 #define AGGRTYPEDESCRIPTOR_H

 #include "typeDescriptor.h"
-#include "create_Aggr.h"
+#include "clstepcore/create_Aggr.h"

 #include "assert.h"

@@ -3,7 +3,7 @@

 #include "typeDescriptor.h"

-#include "sdaiEnum.h"
+#include "cldai/sdaiEnum.h"

 #include "sc_export.h"

@@ -18,7 +18,7 @@
 #include <iostream>
 #include <fstream>
 using namespace std;
-#include "Str.h"
+#include "clutils/Str.h"

 #define LISTEND 999
 /** \def LISTEND
@@ -3,7 +3,7 @@

 //typedef's for aggregate creators

-#include "sdai.h"
+#include "clstepcore/sdai.h"
 #include "sc_export.h"


@@ -1,7 +1,7 @@
 #ifndef DERIVEDATTRIBUTE_H
 #define DERIVEDATTRIBUTE_H

-#include "attrDescriptor.h"
+#include "clstepcore/attrDescriptor.h"

 #include "sc_export.h"

@@ -17,14 +17,14 @@

 #include <sc_export.h>

-/*#include <STEPattribute.h>*/
+/*#include "clstepcore/STEPattribute.h"*/
 /*#include <STEPentity.h>*/
-#include <sdai.h>
+#include "clstepcore/sdai.h"

-#include <gennode.h>
-#include <gennodelist.h>
+#include "clutils/gennode.h"
+#include "clutils/gennodelist.h"
 //#include <gennode.inline.h>
-#include <editordefines.h>
+#include "cleditor/editordefines.h"
 //#include <mgrnode.h>
 class MgrNode;

@@ -17,12 +17,12 @@

 #include <sc_export.h>

-#include <gennode.h>
+#include "clutils/gennode.h"
 //#include <gennode.inline.h>
-#include <editordefines.h>
-#include <mgrnode.h>
-#include <dispnode.h>
-#include <gennodelist.h>
+#include "cleditor/editordefines.h"
+#include "clstepcore/mgrnode.h"
+#include "clstepcore/dispnode.h"
+#include "clutils/gennodelist.h"

 ///////////////////////////////////////////////////////////////////////////////
 // class DisplayNodeList
@@ -2,9 +2,9 @@
 #define ENTITYDESCRIPTOR_H

 #include "typeDescriptor.h"
-#include "attrDescriptor.h"
+#include "clstepcore/attrDescriptor.h"
 #include "uniquenessRule.h"
-#include "attrDescriptorList.h"
+#include "clstepcore/attrDescriptorList.h"
 #include "inverseAttributeList.h"

 #include "sc_export.h"
@@ -1,7 +1,7 @@
 #ifndef GLOBALRULE_H
 #define GLOBALRULE_H

-#include "dictionaryInstance.h"
+#include "clstepcore/dictionaryInstance.h"
 #include "whereRule.h"
 #include "entityDescriptorList.h"

@@ -27,17 +27,17 @@
 // IT IS VERY IMPORTANT THAT THE ORDER OF THE FOLLOWING INCLUDE FILES
 // BE PRESERVED

-#include <gennode.h>
-#include <gennodelist.h>
-#include <gennodearray.h>
+#include "clutils/gennode.h"
+#include "clutils/gennodelist.h"
+#include "clutils/gennodearray.h"

-#include <mgrnode.h>
-#include <mgrnodelist.h>
+#include "clstepcore/mgrnode.h"
+#include "clstepcore/mgrnodelist.h"

-#include <dispnode.h>
-#include <dispnodelist.h>
+#include "clstepcore/dispnode.h"
+#include "clstepcore/dispnodelist.h"

-#include <mgrnodearray.h>
+#include "clstepcore/mgrnodearray.h"

 class SC_CORE_EXPORT InstMgrBase {
    public:
@@ -1,8 +1,8 @@
 #ifndef INTERFACESPEC_H
 #define INTERFACESPEC_H

-#include "dictionaryInstance.h"
-#include "explicitItemId.h"
+#include "clstepcore/dictionaryInstance.h"
+#include "clstepcore/explicitItemId.h"
 #include "implicitItemId.h"

 #include "sc_export.h"
@@ -1,9 +1,9 @@
 #ifndef INTERFACEDITEM_H
 #define INTERFACEDITEM_H

-#include "dictionaryInstance.h"
+#include "clstepcore/dictionaryInstance.h"

-#include "sdai.h"
+#include "clstepcore/sdai.h"

 #include "sc_export.h"

@@ -1,7 +1,7 @@
 #ifndef INVERSEATTRIBUTE_H
 #define INVERSEATTRIBUTE_H

-#include "attrDescriptor.h"
+#include "clstepcore/attrDescriptor.h"

 class SC_CORE_EXPORT Inverse_attribute  :    public AttrDescriptor  {

@@ -18,12 +18,12 @@

 class GenericNode;
 class DisplayNode;
-#include <sdai.h>
+#include "clstepcore/sdai.h"

-#include <gennode.h>
-#include <gennodelist.h>
+#include "clutils/gennode.h"
+#include "clutils/gennodelist.h"

-#include <editordefines.h>
+#include "cleditor/editordefines.h"

 class InstMgr;

@@ -19,14 +19,14 @@

 #include <string.h>

-#include <gennode.h>
-#include <gennodelist.h>
+#include "clutils/gennode.h"
+#include "clutils/gennodelist.h"
 //#include <gennode.inline.h>

-#include <mgrnode.h>
-#include <mgrnodelist.h>
+#include "clstepcore/mgrnode.h"
+#include "clstepcore/mgrnodelist.h"

-#include <gennodearray.h>
+#include "clutils/gennodearray.h"

 #define ARRAY_DEFAULT_SIZE (1024)

@@ -17,10 +17,10 @@

 #include <sc_export.h>

-#include <gennode.h>
+#include "clutils/gennode.h"
 //#include <gennode.inline.h>
-#include <gennodelist.h>
-#include <editordefines.h>
+#include "clutils/gennodelist.h"
+#include "cleditor/editordefines.h"

 //////////////////////////////////////////////////////////////////////////////
 // class MgrNodeList
@@ -2,7 +2,7 @@
 #define READ_FUNC_H

 #include <sc_export.h>
-#include <sdai.h>
+#include "clstepcore/sdai.h"

 /// This was 512. According to 10303-21:2002 section 5.6: comment length is unlimited. FIXME need to check the code for potential problems before eliminating this limit completely.
 #define MAX_COMMENT_LENGTH 8192
@@ -4,7 +4,7 @@
 #include <cstdio>
 #include <cstring>

-#include "Str.h"
+#include "clutils/Str.h"

 #include "sc_export.h"

@@ -27,11 +27,11 @@ extern const char * SCLversion;
 #include <string>


-#include "dictdefs.h"
+#include "clstepcore/dictdefs.h"

-#include "baseType.h"
-#include "Str.h"
-#include "errordesc.h"
+#include "clstepcore/baseType.h"
+#include "clutils/Str.h"
+#include "clutils/errordesc.h"

 typedef std::string Express_id;

@@ -40,8 +40,8 @@ class EntityDescriptor;
 class SelectTypeDescriptor;
 class InstMgrBase;

-#include "STEPattributeList.h"
-#include "STEPinvAttrList.h"
+#include "clstepcore/STEPattributeList.h"
+#include "clstepcore/STEPinvAttrList.h"

 class STEPattributeList;
 class STEPattribute;
@@ -155,12 +155,12 @@ typedef char * SDAI_Time_stamp;
 typedef char * SDAI_Entity_name;
 typedef char * SDAI_Schema_name;

-#include <sdaiString.h>
+#include "cldai/sdaiString.h"

-#include <sdaiBinary.h>
+#include "cldai/sdaiBinary.h"

 // define Object which I am calling sdaiObject for now - DAS
-#include <sdaiObject.h>
+#include "cldai/sdaiObject.h"

 /******************************************************************************
 ENUMERATION
@@ -172,7 +172,7 @@ ENUMERATION
    *  the value ENUM_NULL is used to represent NULL for all enumerated types
 *****************************************************************************/

-#include <sdaiEnum.h>
+#include "cldai/sdaiEnum.h"

 /******************************************************************************
 BOOLEAN and LOGICAL
@@ -185,11 +185,11 @@ BOOLEAN and LOGICAL

 // ***note*** this file needs classes from sdaiEnum.h
 // define DAObjectID and classes PID, PID_DA, PID_SDAI, DAObject, DAObject_SDAI
-#include <sdaiDaObject.h>
+#include "cldai/sdaiDaObject.h"


-#include <sdaiApplication_instance.h>
-#include <sdaiApplication_instance_set.h>
+#include "clstepcore/sdaiApplication_instance.h"
+#include "cldai/sdaiApplication_instance_set.h"

 /******************************************************************************
 SELECT
@@ -198,18 +198,18 @@ SELECT
    sdaiSelect.h

 ******************************************************************************/
-#include <sdaiSelect.h>
+#include "clstepcore/sdaiSelect.h"

 class SDAI_Model_contents;
 typedef SDAI_Model_contents * SDAI_Model_contents_ptr;
 typedef SDAI_Model_contents_ptr SDAI_Model_contents_var;

-#include <sdaiModel_contents_list.h>
+#include "cldai/sdaiModel_contents_list.h"

-#include <sdaiSession_instance.h>
-#include <sdaiEntity_extent.h>
-#include <sdaiEntity_extent_set.h>
-#include <sdaiModel_contents.h>
+#include "cldai/sdaiSession_instance.h"
+#include "cldai/sdaiEntity_extent.h"
+#include "cldai/sdaiEntity_extent_set.h"
+#include "cldai/sdaiModel_contents.h"

 //  ENTITY
 extern SC_CORE_EXPORT SDAI_Application_instance NilSTEPentity;
@@ -16,7 +16,7 @@
 #include <iostream>

 #include <sc_export.h>
-#include <sdaiDaObject.h>
+#include "cldai/sdaiDaObject.h"

 class EntityAggregate;
 class Inverse_attribute;
@@ -3,7 +3,7 @@

 #include "schRename.h"
 #include "whereRule.h"
-#include "dictSchema.h"
+#include "clstepcore/dictSchema.h"

 #include "sc_export.h"

@@ -1,7 +1,7 @@
 #ifndef TYPEORRULEVAR_H
 #define TYPEORRULEVAR_H

-#include "dictionaryInstance.h"
+#include "clstepcore/dictionaryInstance.h"

 #include "sc_export.h"

@@ -1,9 +1,9 @@
 #ifndef UNIQUENESSRULE_H
 #define UNIQUENESSRULE_H

-#include "dictionaryInstance.h"
+#include "clstepcore/dictionaryInstance.h"

-#include "sdai.h"
+#include "clstepcore/sdai.h"

 #include "sc_export.h"

@@ -2,8 +2,8 @@
 #define WHERERULE_H

 #include <string>
-#include "sdai.h"
-#include "dictionaryInstance.h"
+#include "clstepcore/sdai.h"
+#include "clstepcore/dictionaryInstance.h"
 #include "typeOrRuleVar.h"

 #include "sc_export.h"
@@ -0,0 +1,20 @@
+set(UTILS_HDRS
+  dirobj.h
+  errordesc.h
+  gennodearray.h
+  gennode.h
+  gennodelist.h
+  sc_hash.h
+  Str.h
+  )
+
+install(FILES ${UTILS_HDRS}
+  DESTINATION ${INCLUDE_DIR}/stepcode/clutils)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
+
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Clifford Yapp	5cf8fc1a89	Merge branch 'develop' v0.8.2	2023-09-17 12:07:49 -04:00
Clifford Yapp	c0d3fac5f7	Merge pull request #452 from starseeker/headers Relocate headers to include, add explicit directory prefixes	2023-09-03 23:32:12 -04:00
Clifford Yapp	56da4ab614	Update ap203min example for new header setup.	2023-09-02 20:26:58 -04:00
Clifford Yapp	111d7e94b0	Merge pull request #456 from starseeker/develop Fixes for newer clang compilers and more robust parallel building	2023-09-02 20:15:42 -04:00
Clifford Yapp	db2c3d8e5b	Minor updates for newer compilers The Wstrict-prototypes flag didn't like some of the stepcode function definitions. Also add a couple includes and defines for isascii.	2023-08-23 14:57:10 -04:00
Clifford Yapp	592823b64b	List the generated .h file explicitly as an output Occasional compile problems with libexpress appear to be an attempt to compile with an incompletely generated header. Make the dependency explicit to assist CMake in generating proper build ordering rules.	2023-08-23 14:54:33 -04:00
Clifford Yapp	ed8390a0b4	Merge pull request #453 from starseeker/develop Make expparse explicitly depend on scanner header	2022-10-19 18:13:14 -04:00
Clifford Yapp	6fd22a1e0a	Make expparse explicitly depend on scanner header Without this dependency, we get intermittent failures where parallel builds attempt the expparse.c compile before the necessary header is in place.	2022-10-17 10:02:16 -04:00
Clifford Yapp	f35d25d93d	Missed a header conversion	2022-10-03 21:41:17 -04:00
Clifford Yapp	d824fc0c4e	Keep longer directory names We want to be consistent with the previous layout, to avoid needlessly breaking existing codes. The header update means client codes are not required to include all of the stepcode library includes explicitly - i.e., stepcode itself does not force this requirement with its own internal includes. However, if client codes do not want to add the library prefixes to their own includes as we have for stepcode, they should still be able to add the various includes and work as before. Adjust the include directory names accordingly.	2022-10-02 17:57:57 -04:00
Clifford Yapp	1bd7ad942b	Remove includes of other lib src directories	2022-10-02 17:57:57 -04:00
Clifford Yapp	bc96f29d6b	Move utils headers	2022-10-02 17:57:57 -04:00
Clifford Yapp	820ca86159	Move the cllazyfile headers, trim down judy arrays I'm not sure if this logic was ever brought to a production level - needs investigateion... maybe we should just arcive it if there isn't any active development? Regardless, there appears to be no upstream activity on the judy code, so just make it a part of cllazy directly.	2022-10-02 17:57:57 -04:00
Clifford Yapp	f9f5c71204	Move editor headers	2022-10-02 17:57:57 -04:00
Clifford Yapp	84d939baa7	Missed sdaiString.h	2022-10-02 17:57:57 -04:00
Clifford Yapp	04a5404e60	Move cldai headers	2022-10-02 17:57:57 -04:00
Clifford Yapp	c85720fbb4	Stub in CMake logic for other header dirs	2022-10-02 17:57:57 -04:00
Clifford Yapp	ac19698fde	Move remaining stepcore headers	2022-10-02 17:57:57 -04:00
Clifford Yapp	b36b78ffce	Need to process a few more directories	2022-10-02 17:57:57 -04:00
Clifford Yapp	77a43bc3f2	Move all non STEP* headers in stepcore	2022-10-02 17:57:57 -04:00
Clifford Yapp	fc4edb9b06	Move stepcore headers through r*	2022-10-02 17:57:57 -04:00
Clifford Yapp	6e53c8f833	Relocate i* stepcore headers	2022-10-02 17:57:56 -04:00
Clifford Yapp	9d1583be63	Move the e* clstepcore headers	2022-10-02 17:57:56 -04:00
Clifford Yapp	94c978359d	Move d* headers in clstepcore	2022-10-02 17:57:56 -04:00
Clifford Yapp	8a7e0af3b5	See if we can script some of the move process	2022-10-02 17:57:56 -04:00
Clifford Yapp	840d57c2f1	Move a few more headers	2022-10-02 17:57:56 -04:00
Clifford Yapp	33102ee9e3	First steps of resituating stepcode headers 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.	2022-10-02 17:57:56 -04:00
Chris HORLER	131fe6e7b4	Merge branch 'develop' v0.8.1	2022-10-02 20:54:53 +01:00
Chris HORLER	627c0935a8	Merge branch 'master' into develop v0.8.1 prep	2022-10-02 20:42:36 +01:00