Need to process a few more directories

starseeker · starseeker · commit b36b78ffce62 · 2022-10-02T17:57:57.000-04:00
diff --git a/include/core/create_Aggr.h b/include/core/create_Aggr.h
@@ -3,7 +3,7 @@
 
 //typedef's for aggregate creators
 
-#include "sdai.h"
+#include "core/sdai.h"
 #include "sc_export.h"
 
 
diff --git a/include/core/interfacedItem.h b/include/core/interfacedItem.h
@@ -3,7 +3,7 @@
 
 #include "core/dictionaryInstance.h"
 
-#include "sdai.h"
+#include "core/sdai.h"
 
 #include "sc_export.h"
 
diff --git a/include/core/uniquenessRule.h b/include/core/uniquenessRule.h
@@ -3,7 +3,7 @@
 
 #include "core/dictionaryInstance.h"
 
-#include "sdai.h"
+#include "core/sdai.h"
 
 #include "sc_export.h"
 
diff --git a/include/core/whereRule.h b/include/core/whereRule.h
@@ -2,7 +2,7 @@
 #define WHERERULE_H
 
 #include <string>
-#include "sdai.h"
+#include "core/sdai.h"
 #include "core/dictionaryInstance.h"
 #include "typeOrRuleVar.h"
 
diff --git a/misc/header_mv.sh b/misc/header_mv.sh
@@ -2,3 +2,9 @@
 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" {} \;
 
+find . -type f -path "*/include*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"core\/$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 \"core\/$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 \"core\/$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 \"core\/$1\"/g" {} \;
+
diff --git a/src/test/p21read/p21read.cc b/src/test/p21read/p21read.cc
@@ -14,7 +14,7 @@
 
 extern void SchemaInit( class Registry & );
 #include <STEPfile.h>
-#include <sdai.h>
+#include "core/sdai.h"
 #include <STEPattribute.h>
 #include "core/ExpDict.h"
 #include "core/Registry.h"
diff --git a/src/test/tests.h b/src/test/tests.h
@@ -19,7 +19,7 @@
 #include "core/ExpDict.h"
 #include <STEPfile.h>
 #include <STEPattribute.h>
-#include <sdai.h>
+#include "core/sdai.h"
 
 /* Stuff more or less specifically for the Example schema */
 /* The only program that needs this is tstatic.  Since the other programs */
diff --git a/test/cpp/schema_specific/aggregate_bound_runtime.cc b/test/cpp/schema_specific/aggregate_bound_runtime.cc
@@ -1,9 +1,9 @@
 
 #include <STEPfile.h>
-#include <sdai.h>
+#include "core/sdai.h"
 #include <STEPattribute.h>
-#include <ExpDict.h>
-#include <Registry.h>
+#include "core/ExpDict.h"
+#include "core/Registry.h"
 #include <errordesc.h>
 #include <algorithm>
 #include <string>
diff --git a/test/cpp/schema_specific/attribute.cc b/test/cpp/schema_specific/attribute.cc
@@ -4,10 +4,10 @@
  */
 #include "config.h"
 #include <STEPfile.h>
-#include <sdai.h>
+#include "core/sdai.h"
 #include <STEPattribute.h>
-#include <ExpDict.h>
-#include <Registry.h>
+#include "core/ExpDict.h"
+#include "core/Registry.h"
 #include <errordesc.h>
 #include <algorithm>
 #include <string>
diff --git a/test/cpp/schema_specific/inverse_attr1.cc b/test/cpp/schema_specific/inverse_attr1.cc
@@ -6,10 +6,10 @@
 #include "config.h"
 #include "SubSuperIterators.h"
 #include <STEPfile.h>
-#include <sdai.h>
+#include "core/sdai.h"
 #include <STEPattribute.h>
-#include <ExpDict.h>
-#include <Registry.h>
+#include "core/ExpDict.h"
+#include "core/Registry.h"
 #include <errordesc.h>
 #include <algorithm>
 #include <string>
diff --git a/test/cpp/schema_specific/inverse_attr2.cc b/test/cpp/schema_specific/inverse_attr2.cc
@@ -5,10 +5,10 @@
 */
 #include "config.h"
 #include <STEPfile.h>
-#include <sdai.h>
+#include "core/sdai.h"
 #include <STEPattribute.h>
-#include <ExpDict.h>
-#include <Registry.h>
+#include "core/ExpDict.h"
+#include "core/Registry.h"
 #include <errordesc.h>
 #include <algorithm>
 #include <string>
diff --git a/test/cpp/schema_specific/inverse_attr3.cc b/test/cpp/schema_specific/inverse_attr3.cc
@@ -7,10 +7,10 @@
 #include "config.h"
 #include <lazyInstMgr.h>
 #include <lazyRefs.h>
-#include <sdai.h>
+#include "core/sdai.h"
 #include <STEPattribute.h>
-#include <ExpDict.h>
-#include <Registry.h>
+#include "core/ExpDict.h"
+#include "core/Registry.h"
 #include <errordesc.h>
 #include <algorithm>
 #include <string>
diff --git a/test/cpp/schema_specific/stepfile_rw_progress.cc b/test/cpp/schema_specific/stepfile_rw_progress.cc
@@ -1,9 +1,9 @@
 
 #include <STEPfile.h>
-#include <sdai.h>
+#include "core/sdai.h"
 #include <STEPattribute.h>
-#include <ExpDict.h>
-#include <Registry.h>
+#include "core/ExpDict.h"
+#include "core/Registry.h"
 #include <errordesc.h>
 #include <algorithm>
 #include <string>
