See if we can script some of the move process

starseeker · starseeker · commit 8a7e0af3b5a0 · 2022-10-02T17:57:56.000-04:00
diff --git a/include/core/CMakeLists.txt b/include/core/CMakeLists.txt
@@ -5,7 +5,7 @@ set(CORE_HDRS
   baseType.h
   complexSupport.h
   create_Aggr.h
-# derivedAttribute.h
+  derivedAttribute.h
 # dictSchema.h
 # dictdefs.h
 # dictionaryInstance.h
diff --git a/include/core/derivedAttribute.h b/include/core/derivedAttribute.h
diff --git a/misc/header_mv.sh b/misc/header_mv.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|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\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"core\/$1\"/g" {} \;
+
diff --git a/src/clstepcore/ExpDict.h b/src/clstepcore/ExpDict.h
@@ -38,7 +38,7 @@
 #include "entityDescriptor.h"
 #include "enumTypeDescriptor.h"
 #include "core/attrDescriptor.h"
-#include "derivedAttribute.h"
+#include "core/derivedAttribute.h"
 #include "inverseAttribute.h"
 
 #include "core/create_Aggr.h"
diff --git a/src/clstepcore/derivedAttribute.cc b/src/clstepcore/derivedAttribute.cc
@@ -1,4 +1,4 @@
-#include "derivedAttribute.h"
+#include "core/derivedAttribute.h"
 
 Derived_attribute::Derived_attribute( const char * name, const TypeDescriptor * domainType,
                                       Logical optional, Logical unique, AttrType_Enum at, const EntityDescriptor & owner )

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "derivedAttribute.h"`
	`1`	`+#include "core/derivedAttribute.h"`
`2`	`2`
`3`	`3`	`Derived_attribute::Derived_attribute( const char * name, const TypeDescriptor * domainType,`
`4`	`4`	`Logical optional, Logical unique, AttrType_Enum at, const EntityDescriptor & owner )`