Move editor headers

starseeker · starseeker · commit f9f5c7120472 · 2022-10-02T17:57:57.000-04:00
diff --git a/include/core/dispnode.h b/include/core/dispnode.h
@@ -24,7 +24,7 @@
 #include <gennode.h>
 #include <gennodelist.h>
 //#include <gennode.inline.h>
-#include <editordefines.h>
+#include "editor/editordefines.h"
 //#include <mgrnode.h>
 class MgrNode;
 
diff --git a/include/core/dispnodelist.h b/include/core/dispnodelist.h
@@ -19,7 +19,7 @@
 
 #include <gennode.h>
 //#include <gennode.inline.h>
-#include <editordefines.h>
+#include "editor/editordefines.h"
 #include "core/mgrnode.h"
 #include "core/dispnode.h"
 #include <gennodelist.h>
diff --git a/include/core/mgrnode.h b/include/core/mgrnode.h
@@ -23,7 +23,7 @@ class DisplayNode;
 #include <gennode.h>
 #include <gennodelist.h>
 
-#include <editordefines.h>
+#include "editor/editordefines.h"
 
 class InstMgr;
 
diff --git a/include/core/mgrnodelist.h b/include/core/mgrnodelist.h
@@ -20,7 +20,7 @@
 #include <gennode.h>
 //#include <gennode.inline.h>
 #include <gennodelist.h>
-#include <editordefines.h>
+#include "editor/editordefines.h"
 
 //////////////////////////////////////////////////////////////////////////////
 // class MgrNodeList
diff --git a/include/editor/CMakeLists.txt b/include/editor/CMakeLists.txt
@@ -1,5 +1,11 @@
 set(EDITOR_HDRS
-
+  STEPfile.h
+  cmdmgr.h
+  editordefines.h
+  SdaiHeaderSchema.h
+  SdaiHeaderSchemaClasses.h
+  SdaiSchemaInit.h
+  seeinfodefault.h
   )
 
 install(FILES ${EDITOR_HDRS}
diff --git a/include/editor/STEPfile.h b/include/editor/STEPfile.h
diff --git a/include/editor/SdaiHeaderSchema.h b/include/editor/SdaiHeaderSchema.h
@@ -8,8 +8,8 @@
 #include "core/sdai.h"
 #include "core/Registry.h"
 #include "core/STEPaggregate.h"
-#include <SdaiHeaderSchemaClasses.h>
-#include <SdaiSchemaInit.h>
+#include "editor/SdaiHeaderSchemaClasses.h"
+#include "editor/SdaiSchemaInit.h"
 
 /////////         ENTITY section_language
 
diff --git a/include/editor/SdaiHeaderSchemaClasses.h b/include/editor/SdaiHeaderSchemaClasses.h
diff --git a/include/editor/SdaiSchemaInit.h b/include/editor/SdaiSchemaInit.h
@@ -17,8 +17,8 @@
 #include "core/STEPattribute.h"
 #include "core/complexSupport.h"
 
-#include <SdaiHeaderSchemaClasses.h>
-#include <SdaiHeaderSchema.h>
+#include "editor/SdaiHeaderSchemaClasses.h"
+#include "editor/SdaiHeaderSchema.h"
 
 SC_EDITOR_EXPORT void HeaderSchemaInit( Registry & );
 SC_EDITOR_EXPORT void HeaderInitSchemasAndEnts( Registry & );
diff --git a/include/editor/cmdmgr.h b/include/editor/cmdmgr.h
@@ -17,7 +17,7 @@
 #include <gennodelist.h>
 #include <gennodearray.h>
 
-#include <editordefines.h>
+#include "editor/editordefines.h"
 #include "core/mgrnode.h"
 #include "core/mgrnodelist.h"
 #include "core/dispnode.h"
diff --git a/include/editor/editordefines.h b/include/editor/editordefines.h
diff --git a/include/editor/seeinfodefault.h b/include/editor/seeinfodefault.h
@@ -23,7 +23,7 @@ class DisplayNodelist;
 #include "core/sdai.h"
 //class SDAI_Application_instance;
 
-#include <editordefines.h>
+#include "editor/editordefines.h"
 
 class SC_EDITOR_EXPORT seeInfo : public DisplayNode {
     public:
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 \"dai\/$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 \"dai\/$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 \"editor\/$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 \"editor\/$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 \"dai\/$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 \"dai\/$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 \"editor\/$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 \"editor\/$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 \"dai\/$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 \"dai\/$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 \"editor\/$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 \"editor\/$1\"/g" {} \;
 
diff --git a/src/cleditor/CMakeLists.txt b/src/cleditor/CMakeLists.txt
@@ -9,16 +9,6 @@ set(LIBSTEPEDITOR_SRCS
   SdaiSchemaInit.cc
   )
 
-SET(SC_CLEDITOR_HDRS
-  STEPfile.h
-  cmdmgr.h
-  editordefines.h
-  SdaiHeaderSchema.h
-  SdaiHeaderSchemaClasses.h
-  SdaiSchemaInit.h
-  seeinfodefault.h
-  )
-
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/include/stepcode
@@ -38,9 +28,6 @@ if(BUILD_STATIC_LIBS)
   SC_ADDLIB(stepeditor-static STATIC SOURCES ${LIBSTEPEDITOR_SRCS} LINK_LIBRARIES stepcore-static stepdai-static steputils-static)
 endif()
 
-install(FILES ${SC_CLEDITOR_HDRS}
-  DESTINATION ${INCLUDE_DIR}/stepcode/cleditor)
-
 # Local Variables:
 # tab-width: 8
 # mode: cmake
diff --git a/src/cleditor/STEPfile.cc b/src/cleditor/STEPfile.cc
@@ -24,11 +24,11 @@
 #include <algorithm>
 #include <vector>
 
-#include <STEPfile.h>
+#include "editor/STEPfile.h"
 #include "core/sdai.h"
 #include "core/STEPcomplex.h"
 #include "core/STEPattribute.h"
-#include <SdaiHeaderSchema.h>
+#include "editor/SdaiHeaderSchema.h"
 
 // STEPundefined contains
 // void PushPastString (istream& in, std::string &s, ErrorDescriptor *err)
diff --git a/src/cleditor/STEPfile.inline.cc b/src/cleditor/STEPfile.inline.cc
@@ -11,8 +11,8 @@
 * and is not subject to copyright.
 */
 
-#include <STEPfile.h>
-#include <SdaiHeaderSchema.h>
+#include "editor/STEPfile.h"
+#include "editor/SdaiHeaderSchema.h"
 #include "core/STEPaggregate.h"
 #include <cmath>
 
diff --git a/src/cleditor/SdaiHeaderSchema.cc b/src/cleditor/SdaiHeaderSchema.cc
@@ -12,7 +12,7 @@ extern ofstream * logStream;
 
 #include "core/ExpDict.h"
 #include "core/STEPattribute.h"
-#include <SdaiHeaderSchema.h>
+#include "editor/SdaiHeaderSchema.h"
 
 Schema * s_header_section_schema = 0;
 
diff --git a/src/cleditor/SdaiHeaderSchemaAll.cc b/src/cleditor/SdaiHeaderSchemaAll.cc
@@ -4,7 +4,7 @@
 // it since your modifications will be lost if exp2cxx is used to
 // regenerate it.
 
-#include <SdaiHeaderSchema.h>
+#include "editor/SdaiHeaderSchema.h"
 
 void HeaderInitSchemasAndEnts( Registry & reg ) {
     Uniqueness_rule_ptr ur;
diff --git a/src/cleditor/SdaiHeaderSchemaInit.cc b/src/cleditor/SdaiHeaderSchemaInit.cc
@@ -7,7 +7,7 @@
 #include "core/Registry.h"
 #include "core/ExpDict.h"
 #include "core/STEPattribute.h"
-#include <SdaiHeaderSchema.h>
+#include "editor/SdaiHeaderSchema.h"
 
 void SdaiHEADER_SECTION_SCHEMAInit( Registry & reg ) {
     header_section_schemat_time_stamp_text->ReferentType( t_sdaiSTRING );
diff --git a/src/cleditor/SdaiSchemaInit.cc b/src/cleditor/SdaiSchemaInit.cc
@@ -4,7 +4,7 @@
 // it since your modifications will be lost if exp2cxx is used to
 // regenerate it.
 
-#include <SdaiSchemaInit.h>
+#include "editor/SdaiSchemaInit.h"
 
 void HeaderSchemaInit( Registry & reg ) {
     HeaderInitSchemasAndEnts( reg );
diff --git a/src/cleditor/cmdmgr.cc b/src/cleditor/cmdmgr.cc
@@ -10,7 +10,7 @@
 * and is not subject to copyright.
 */
 
-#include <cmdmgr.h>
+#include "editor/cmdmgr.h"
 
 ReplicateLinkNode * ReplicateList::FindNode( MgrNode * mn ) {
     ReplicateLinkNode * rln = ( ReplicateLinkNode * )GetHead();
diff --git a/src/cllazyfile/lazyInstMgr.cc b/src/cllazyfile/lazyInstMgr.cc
@@ -2,7 +2,7 @@
 #include "lazyInstMgr.h"
 #include "core/Registry.h"
 #include "core/SubSuperIterators.h"
-#include "SdaiSchemaInit.h"
+#include "editor/SdaiSchemaInit.h"
 #include "instMgrHelper.h"
 #include "lazyRefs.h"
 
diff --git a/src/cllazyfile/lazy_test.cc b/src/cllazyfile/lazy_test.cc
@@ -1,6 +1,6 @@
 #include "lazyInstMgr.h"
 #include "./sc_benchmark.h"
-#include "SdaiSchemaInit.h"
+#include "editor/SdaiSchemaInit.h"
 #include "config.h"
 
 #ifndef NO_REGISTRY
diff --git a/src/cllazyfile/sectionReader.cc b/src/cllazyfile/sectionReader.cc
@@ -15,7 +15,7 @@
 #include "core/Registry.h"
 #include "core/sdaiApplication_instance.h"
 #include "core/read_func.h"
-#include "SdaiSchemaInit.h"
+#include "editor/SdaiSchemaInit.h"
 #include "core/STEPcomplex.h"
 
 #include "sectionReader.h"
diff --git a/src/test/p21read/p21read.cc b/src/test/p21read/p21read.cc
@@ -13,7 +13,7 @@
 */
 
 extern void SchemaInit( class Registry & );
-#include <STEPfile.h>
+#include "editor/STEPfile.h"
 #include "core/sdai.h"
 #include "core/STEPattribute.h"
 #include "core/ExpDict.h"
diff --git a/src/test/tests.h b/src/test/tests.h
@@ -17,7 +17,7 @@
 
 /* General SCL stuff */
 #include "core/ExpDict.h"
-#include <STEPfile.h>
+#include "editor/STEPfile.h"
 #include "core/STEPattribute.h"
 #include "core/sdai.h"
 
diff --git a/test/cpp/schema_specific/aggregate_bound_runtime.cc b/test/cpp/schema_specific/aggregate_bound_runtime.cc
@@ -1,5 +1,5 @@
 
-#include <STEPfile.h>
+#include "editor/STEPfile.h"
 #include "core/sdai.h"
 #include "core/STEPattribute.h"
 #include "core/ExpDict.h"
diff --git a/test/cpp/schema_specific/attribute.cc b/test/cpp/schema_specific/attribute.cc
@@ -3,7 +3,7 @@
  * Test attribute access; uses a tiny schema similar to a subset of IFC2x3
  */
 #include "config.h"
-#include <STEPfile.h>
+#include "editor/STEPfile.h"
 #include "core/sdai.h"
 #include "core/STEPattribute.h"
 #include "core/ExpDict.h"
diff --git a/test/cpp/schema_specific/inverse_attr1.cc b/test/cpp/schema_specific/inverse_attr1.cc
@@ -5,7 +5,7 @@
 */
 #include "config.h"
 #include "SubSuperIterators.h"
-#include <STEPfile.h>
+#include "editor/STEPfile.h"
 #include "core/sdai.h"
 #include "core/STEPattribute.h"
 #include "core/ExpDict.h"
diff --git a/test/cpp/schema_specific/inverse_attr2.cc b/test/cpp/schema_specific/inverse_attr2.cc
@@ -4,7 +4,7 @@
 **
 */
 #include "config.h"
-#include <STEPfile.h>
+#include "editor/STEPfile.h"
 #include "core/sdai.h"
 #include "core/STEPattribute.h"
 #include "core/ExpDict.h"
diff --git a/test/cpp/schema_specific/stepfile_rw_progress.cc b/test/cpp/schema_specific/stepfile_rw_progress.cc
@@ -1,5 +1,5 @@
 
-#include <STEPfile.h>
+#include "editor/STEPfile.h"
 #include "core/sdai.h"
 #include "core/STEPattribute.h"
 #include "core/ExpDict.h"
