Move utils headers

starseeker · starseeker · commit bc96f29d6bc8 · 2022-10-02T17:57:57.000-04:00
diff --git a/include/core/ExpDict.h b/include/core/ExpDict.h
@@ -25,7 +25,7 @@
 
 #include "core/baseType.h"
 #include "core/dictdefs.h"
-#include <Str.h>
+#include "utils/Str.h"
 
 // each of these contains linked list, list node, iterator
 #include "core/attrDescriptorList.h"
diff --git a/include/core/Registry.h b/include/core/Registry.h
@@ -14,9 +14,9 @@
 
 #include <sc_export.h>
 #include "core/sdai.h"
-#include <errordesc.h>
-#include <sc_hash.h>
-#include <Str.h>
+#include "utils/errordesc.h"
+#include "utils/sc_hash.h"
+#include "utils/Str.h"
 #include "core/complexSupport.h"
 
 
diff --git a/include/core/STEPaggregate.h b/include/core/STEPaggregate.h
@@ -17,7 +17,7 @@ class STEPaggregate;
 class TypeDescriptor;
 
 #include <sc_export.h>
-#include <errordesc.h>
+#include "utils/errordesc.h"
 #include "core/SingleLinkList.h"
 #include "core/baseType.h"
 #include "core/sdai.h"
diff --git a/include/core/STEPattribute.h b/include/core/STEPattribute.h
@@ -15,7 +15,7 @@
 
 #include <sc_export.h>
 #include <stdio.h>
-#include <errordesc.h>
+#include "utils/errordesc.h"
 #include "core/baseType.h"
 
 #include "core/sdai.h"
diff --git a/include/core/STEPcomplex.h b/include/core/STEPcomplex.h
@@ -2,7 +2,7 @@
 #define STEPCOMPLEX_H
 
 #include <sc_export.h>
-#include <errordesc.h>
+#include "utils/errordesc.h"
 #include "core/sdai.h"
 #include "core/baseType.h"
 #include "core/ExpDict.h"
diff --git a/include/core/STEPundefined.h b/include/core/STEPundefined.h
@@ -13,7 +13,7 @@
 */
 
 #include <sc_export.h>
-#include <errordesc.h>
+#include "utils/errordesc.h"
 #include <string>
 #include "core/read_func.h"
 
diff --git a/include/core/complexSupport.h b/include/core/complexSupport.h
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <fstream>
 using namespace std;
-#include "Str.h"
+#include "utils/Str.h"
 
 #define LISTEND 999
 /** \def LISTEND
diff --git a/include/core/dispnode.h b/include/core/dispnode.h
@@ -21,8 +21,8 @@
 /*#include <STEPentity.h>*/
 #include "core/sdai.h"
 
-#include <gennode.h>
-#include <gennodelist.h>
+#include "utils/gennode.h"
+#include "utils/gennodelist.h"
 //#include <gennode.inline.h>
 #include "editor/editordefines.h"
 //#include <mgrnode.h>
diff --git a/include/core/dispnodelist.h b/include/core/dispnodelist.h
@@ -17,12 +17,12 @@
 
 #include <sc_export.h>
 
-#include <gennode.h>
+#include "utils/gennode.h"
 //#include <gennode.inline.h>
 #include "editor/editordefines.h"
 #include "core/mgrnode.h"
 #include "core/dispnode.h"
-#include <gennodelist.h>
+#include "utils/gennodelist.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // class DisplayNodeList
diff --git a/include/core/instmgr.h b/include/core/instmgr.h
@@ -27,9 +27,9 @@
 // IT IS VERY IMPORTANT THAT THE ORDER OF THE FOLLOWING INCLUDE FILES
 // BE PRESERVED
 
-#include <gennode.h>
-#include <gennodelist.h>
-#include <gennodearray.h>
+#include "utils/gennode.h"
+#include "utils/gennodelist.h"
+#include "utils/gennodearray.h"
 
 #include "core/mgrnode.h"
 #include "core/mgrnodelist.h"
diff --git a/include/core/mgrnode.h b/include/core/mgrnode.h
@@ -20,8 +20,8 @@ class GenericNode;
 class DisplayNode;
 #include "core/sdai.h"
 
-#include <gennode.h>
-#include <gennodelist.h>
+#include "utils/gennode.h"
+#include "utils/gennodelist.h"
 
 #include "editor/editordefines.h"
 
diff --git a/include/core/mgrnodearray.h b/include/core/mgrnodearray.h
@@ -19,14 +19,14 @@
 
 #include <string.h>
 
-#include <gennode.h>
-#include <gennodelist.h>
+#include "utils/gennode.h"
+#include "utils/gennodelist.h"
 //#include <gennode.inline.h>
 
 #include "core/mgrnode.h"
 #include "core/mgrnodelist.h"
 
-#include <gennodearray.h>
+#include "utils/gennodearray.h"
 
 #define ARRAY_DEFAULT_SIZE (1024)
 
diff --git a/include/core/mgrnodelist.h b/include/core/mgrnodelist.h
@@ -17,9 +17,9 @@
 
 #include <sc_export.h>
 
-#include <gennode.h>
+#include "utils/gennode.h"
 //#include <gennode.inline.h>
-#include <gennodelist.h>
+#include "utils/gennodelist.h"
 #include "editor/editordefines.h"
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/include/core/schRename.h b/include/core/schRename.h
@@ -4,7 +4,7 @@
 #include <cstdio>
 #include <cstring>
 
-#include "Str.h"
+#include "utils/Str.h"
 
 #include "sc_export.h"
 
diff --git a/include/core/sdai.h b/include/core/sdai.h
@@ -30,8 +30,8 @@ extern const char * SCLversion;
 #include "core/dictdefs.h"
 
 #include "core/baseType.h"
-#include "Str.h"
-#include "errordesc.h"
+#include "utils/Str.h"
+#include "utils/errordesc.h"
 
 typedef std::string Express_id;
 
diff --git a/include/editor/STEPfile.h b/include/editor/STEPfile.h
@@ -18,8 +18,8 @@
 #include "core/instmgr.h"
 #include "core/Registry.h"
 #include <fstream>
-#include <dirobj.h>
-#include <errordesc.h>
+#include "utils/dirobj.h"
+#include "utils/errordesc.h"
 #include <time.h>
 
 #include "core/read_func.h"
diff --git a/include/editor/cmdmgr.h b/include/editor/cmdmgr.h
@@ -13,9 +13,9 @@
 */
 
 #include <sc_export.h>
-#include <gennode.h>
-#include <gennodelist.h>
-#include <gennodearray.h>
+#include "utils/gennode.h"
+#include "utils/gennodelist.h"
+#include "utils/gennodearray.h"
 
 #include "editor/editordefines.h"
 #include "core/mgrnode.h"
diff --git a/include/lazy/sectionReader.h b/include/lazy/sectionReader.h
@@ -5,7 +5,7 @@
 #include <set>
 #include "lazy/lazyTypes.h"
 #include "sc_export.h"
-#include "errordesc.h"
+#include "utils/errordesc.h"
 #include "core/STEPcomplex.h"
 
 class SDAI_Application_instance;
diff --git a/include/utils/CMakeLists.txt b/include/utils/CMakeLists.txt
@@ -1,5 +1,11 @@
 set(UTILS_HDRS
-
+  dirobj.h
+  errordesc.h
+  gennodearray.h
+  gennode.h
+  gennodelist.h
+  sc_hash.h
+  Str.h
   )
 
 install(FILES ${UTILS_HDRS}
diff --git a/include/utils/Str.h b/include/utils/Str.h
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errordesc.h>
+#include "utils/errordesc.h"
 
 #ifndef STRING_DELIM
 #define STRING_DELIM '\''
diff --git a/include/utils/dirobj.h b/include/utils/dirobj.h
diff --git a/include/utils/errordesc.h b/include/utils/errordesc.h
diff --git a/include/utils/gennode.h b/include/utils/gennode.h
diff --git a/include/utils/gennodearray.h b/include/utils/gennodearray.h
@@ -26,7 +26,7 @@
 #include <memory.h>
 #include <stdlib.h> // to get bcopy for CenterLine
 
-#include <gennode.h>
+#include "utils/gennode.h"
 
 // the initial size of the array
 #define ARRAY_DEFAULT_SIZE (1024)
diff --git a/include/utils/gennodelist.h b/include/utils/gennodelist.h
diff --git a/include/utils/sc_hash.h b/include/utils/sc_hash.h
diff --git a/misc/header_mv.sh b/misc/header_mv.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
-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 \"lazy\/$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 \"lazy\/$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 \"utils\/$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 \"utils\/$1\"/g" {} \;
 
-find . -type f -path "*/include*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"lazy\/$1\"/g" {} \;
-find . -type f -path "*/include*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"lazy\/$1\"/g" {} \;
+find . -type f -path "*/include*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"utils\/$1\"/g" {} \;
+find . -type f -path "*/include*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"utils\/$1\"/g" {} \;
 
-find . -type f -path "*/test*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"lazy\/$1\"/g" {} \;
-find . -type f -path "*/test*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"lazy\/$1\"/g" {} \;
+find . -type f -path "*/test*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"utils\/$1\"/g" {} \;
+find . -type f -path "*/test*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"utils\/$1\"/g" {} \;
 
diff --git a/src/clstepcore/dispnode.cc b/src/clstepcore/dispnode.cc
@@ -12,8 +12,8 @@
 
 /* $Id: dispnode.cc,v 3.0.1.2 1997/11/05 22:11:39 sauderd DP3.1 $ */
 
-#include <gennode.h>
-#include <gennodelist.h>
+#include "utils/gennode.h"
+#include "utils/gennodelist.h"
 //#include <gennode.inline.h>
 
 #include "core/dispnode.h"
diff --git a/src/clstepcore/dispnodelist.cc b/src/clstepcore/dispnodelist.cc
@@ -12,8 +12,8 @@
 
 /* $Id: dispnodelist.cc,v 3.0.1.2 1997/11/05 22:11:40 sauderd DP3.1 $ */
 
-#include <gennode.h>
-#include <gennodelist.h>
+#include "utils/gennode.h"
+#include "utils/gennodelist.h"
 
 #include "core/mgrnode.h"
 #include "core/mgrnodelist.h"
diff --git a/src/clstepcore/read_func.cc b/src/clstepcore/read_func.cc
@@ -1,10 +1,10 @@
 
-#include <errordesc.h>
+#include "utils/errordesc.h"
 #include <stdio.h>
 #include "core/sdai.h"
 #include "core/read_func.h"
 #include "core/STEPattribute.h"
-#include "Str.h"
+#include "utils/Str.h"
 
 const int RealNumPrecision = REAL_NUM_PRECISION;
 
diff --git a/src/clutils/CMakeLists.txt b/src/clutils/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 set(LIBSTEPUTILS_SRCS
   Str.cc
   dirobj.cc
@@ -9,16 +8,6 @@ set(LIBSTEPUTILS_SRCS
   errordesc.cc
   )
 
-set(SC_CLUTILS_HDRS
-  dirobj.h
-  errordesc.h
-  gennodearray.h
-  gennode.h
-  gennodelist.h
-  sc_hash.h
-  Str.h
-  )
-
 include_directories(
   ${SC_BINARY_DIR}/include
   ${CMAKE_CURRENT_SOURCE_DIR}
@@ -40,9 +29,6 @@ if(BUILD_STATIC_LIBS)
   endif()
 endif()
 
-install(FILES ${SC_CLUTILS_HDRS}
-  DESTINATION ${INCLUDE_DIR}/stepcode/clutils)
-
 # Local Variables:
 # tab-width: 8
 # mode: cmake
diff --git a/src/clutils/Str.cc b/src/clutils/Str.cc
@@ -9,7 +9,7 @@
 * and is not subject to copyright.
 */
 
-#include "Str.h"
+#include "utils/Str.h"
 #include <sstream>
 #include <string>
 
diff --git a/src/clutils/dirobj.cc b/src/clutils/dirobj.cc
@@ -40,7 +40,7 @@
  */
 
 #include "config.h"
-#include <dirobj.h>
+#include "utils/dirobj.h"
 #ifdef HAVE_DIRENT_H
 # include <dirent.h>
 #endif
diff --git a/src/clutils/errordesc.cc b/src/clutils/errordesc.cc
@@ -10,8 +10,8 @@
 * and is not subject to copyright.
 */
 
-#include <errordesc.h>
-#include <Str.h>
+#include "utils/errordesc.h"
+#include "utils/Str.h"
 
 DebugLevel ErrorDescriptor::_debug_level = DEBUG_OFF;
 ostream  * ErrorDescriptor::_out = 0;
diff --git a/src/clutils/gennode.cc b/src/clutils/gennode.cc
@@ -12,8 +12,8 @@
 
 /* $Id: gennode.cc,v 3.0.1.4 1997/11/05 22:33:47 sauderd DP3.1 $  */
 
-#include <gennode.h>
-#include <gennodelist.h>
+#include "utils/gennode.h"
+#include "utils/gennodelist.h"
 
 //////////////////////////////////////////////////////////////////////////////
 // class GenericNode inline functions that depend on other classes
diff --git a/src/clutils/gennodearray.cc b/src/clutils/gennodearray.cc
@@ -13,9 +13,9 @@
 
 #include "config.h"
 
-#include <gennode.h>
-#include <gennodelist.h>
-#include <gennodearray.h>
+#include "utils/gennode.h"
+#include "utils/gennodelist.h"
+#include "utils/gennodearray.h"
 
 #ifndef HAVE_MEMMOVE
 extern "C" {
diff --git a/src/clutils/gennodelist.cc b/src/clutils/gennodelist.cc
@@ -12,10 +12,10 @@
 
 /* $Id: gennodelist.cc,v 3.0.1.2 1997/11/05 22:33:49 sauderd DP3.1 $  */
 
-#include <gennode.h>
-#include <gennodelist.h>
+#include "utils/gennode.h"
+#include "utils/gennodelist.h"
 //#include <gennode.inline.h>
-#include <gennodearray.h>
+#include "utils/gennodearray.h"
 
 // inserts after existNode
 void GenNodeList::InsertAfter( GenericNode * newNode,
diff --git a/src/clutils/sc_hash.cc b/src/clutils/sc_hash.cc
@@ -5,7 +5,7 @@
  * also, hcreate/hdestroy routines added to simulate hsearch(3).
  */
 
-#include <sc_hash.h>
+#include "utils/sc_hash.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/test/p21read/p21read.cc b/src/test/p21read/p21read.cc
@@ -18,7 +18,7 @@ extern void SchemaInit( class Registry & );
 #include "core/STEPattribute.h"
 #include "core/ExpDict.h"
 #include "core/Registry.h"
-#include <errordesc.h>
+#include "utils/errordesc.h"
 #include <algorithm>
 #include <string>
 #include "sc_benchmark.h"
diff --git a/test/cpp/schema_specific/aggregate_bound_runtime.cc b/test/cpp/schema_specific/aggregate_bound_runtime.cc
diff --git a/test/cpp/schema_specific/attribute.cc b/test/cpp/schema_specific/attribute.cc
diff --git a/test/cpp/schema_specific/inverse_attr1.cc b/test/cpp/schema_specific/inverse_attr1.cc
diff --git a/test/cpp/schema_specific/inverse_attr2.cc b/test/cpp/schema_specific/inverse_attr2.cc
diff --git a/test/cpp/schema_specific/inverse_attr3.cc b/test/cpp/schema_specific/inverse_attr3.cc
diff --git a/test/cpp/schema_specific/stepfile_rw_progress.cc b/test/cpp/schema_specific/stepfile_rw_progress.cc
