sc_cf.h -> config.h

starseeker · cshorler · commit 97c3d193a142 · 2022-06-11T17:41:58.000+01:00
Remove unused sc_cf_cmake.h.in, rename sc_cf.h to the more standard name
"config.h", don't call the generator twice
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -153,7 +153,7 @@ include(SC_Locale)
 # logic related to regenerating the lexer and parser source code
 include(SC_Regenerate)
 
-# create config header sc_cf.h
+# create config.h header
 include(SC_Config_Headers)
 
 if(NOT DEFINED SC_SDAI_ADDITIONAL_EXES_SRCS)
@@ -174,10 +174,6 @@ if(NOT SC_IS_SUBBUILD)
     ".. Generating step can take a while if you are building several schemas.")
 endif(NOT SC_IS_SUBBUILD)
 
-# create config headers sc_cf.h
-include(SC_Config_Headers)
-
-
 ################
 
 if(MSVC)
diff --git a/cmake/SC_Config_Headers.cmake b/cmake/SC_Config_Headers.cmake
@@ -1,4 +1,4 @@
-# create sc_cf.h
+# create config.h
 
 include(CheckLibraryExists)
 include(CheckIncludeFile)
@@ -77,9 +77,9 @@ int main() {return !(f() == f());}
   cmake_pop_check_state()
 endif(SC_ENABLE_CXX11)
 
-# Now that all the tests are done, configure the sc_cf.h file:
-configure_file(${CMAKE_SOURCE_DIR}/include/sc_cf.h.in ${SC_BINARY_DIR}/${INCLUDE_DIR}/sc_cf.h.gen)
-execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SC_BINARY_DIR}/${INCLUDE_DIR}/sc_cf.h.gen ${SC_BINARY_DIR}/${INCLUDE_DIR}/sc_cf.h)
+# Now that all the tests are done, configure the config.h file:
+configure_file(${CMAKE_SOURCE_DIR}/include/config.h.in ${SC_BINARY_DIR}/${INCLUDE_DIR}/config.h.gen)
+execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SC_BINARY_DIR}/${INCLUDE_DIR}/config.h.gen ${SC_BINARY_DIR}/${INCLUDE_DIR}/config.h)
 
 # Local Variables:
 # tab-width: 8
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
@@ -34,7 +34,7 @@ install(FILES ordered_attrs.h
   sc_export.h
   DESTINATION ${INCLUDE_DIR}/stepcode)
 
-install(FILES ${SC_BINARY_DIR}/${INCLUDE_DIR}/sc_cf.h
+install(FILES ${SC_BINARY_DIR}/${INCLUDE_DIR}/config.h
   DESTINATION ${INCLUDE_DIR}/stepcode)
 
 # Local Variables:
diff --git a/include/config.h.in b/include/config.h.in
diff --git a/include/express/basic.h b/include/express/basic.h
@@ -71,7 +71,7 @@
  *
  */
 
-#include <sc_cf.h>
+#include "config.h"
 #include <sc_export.h>
 #include <stdio.h>
 
diff --git a/include/sc_cf_cmake.h.in b/include/sc_cf_cmake.h.in
diff --git a/src/base/sc_memmgr.cc b/src/base/sc_memmgr.cc
@@ -1,7 +1,7 @@
 
 #define SC_MEMMGR_CC
 
-#include <sc_cf.h>
+#include "config.h"
 #include "sc_memmgr.h"
 
 #include <stdio.h>
diff --git a/src/cllazyfile/lazyTypes.h b/src/cllazyfile/lazyTypes.h
@@ -1,7 +1,7 @@
 #ifndef LAZYTYPES_H
 #define LAZYTYPES_H
 
-#include "sc_cf.h"
+#include "config.h"
 
 #include <iostream>
 #include <vector>
diff --git a/src/cllazyfile/lazy_test.cc b/src/cllazyfile/lazy_test.cc
@@ -2,7 +2,7 @@
 #include <sc_benchmark.h>
 #include "SdaiSchemaInit.h"
 #include "sc_memmgr.h"
-#include <sc_cf.h>
+#include "config.h"
 
 #ifndef NO_REGISTRY
 # include "schema.h"
diff --git a/src/clstepcore/sdai.h b/src/clstepcore/sdai.h
@@ -18,7 +18,7 @@
 * values for the EXPRESS base types.
 */
 
-#include "sc_cf.h"
+#include "config.h"
 #include <sc_export.h>
 
 extern const char * SCLversion;
diff --git a/src/clutils/dirobj.cc b/src/clutils/dirobj.cc
@@ -39,7 +39,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sc_cf.h>
+#include "config.h"
 #include <dirobj.h>
 #ifdef HAVE_DIRENT_H
 # include <dirent.h>
diff --git a/src/clutils/dirobj.h b/src/clutils/dirobj.h
@@ -33,7 +33,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include <sc_cf.h>
+#include "config.h"
 #include <sc_export.h>
 #include <stdlib.h>
 
diff --git a/src/clutils/gennodearray.cc b/src/clutils/gennodearray.cc
@@ -11,7 +11,7 @@
 */
 
 
-#include <sc_cf.h>
+#include "config.h"
 
 #include <gennode.h>
 #include <gennodelist.h>
diff --git a/src/express/error.c b/src/express/error.c
@@ -24,7 +24,7 @@
  * Revision 1.11  1997/10/22 16:10:26  sauderd
  * This would #include stdarg.h if __STDC__ was defined otherwise it would
  * #include vararg.h. I changed it to check the configure generated config file
- * named sc_cf.h (if HAVE_CONFIG_H is defined - it's also defined by
+ * named config.h (if HAVE_CONFIG_H is defined - it's also defined by
  * configure) to see if HAVE_STDARG_H is defined. If it is it #includes stdarg.h
  * otherwise it #includes vararg.h. If HAVE_CONFIG_H isn't defined then it works
  * like it used to.
diff --git a/src/express/fedex.c b/src/express/fedex.c
@@ -74,7 +74,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "sc_cf.h"
+#include "config.h"
 #include "sc_memmgr.h"
 #include "sc_export.h"
 #include "sc_getopt.h"
diff --git a/src/express/test/print_attrs.c b/src/express/test/print_attrs.c
@@ -6,7 +6,7 @@
  * print_attrs -a <entity> <schema>
  */
 
-#include "sc_cf.h"
+#include "config.h"
 #include <stdlib.h>
 #ifdef HAVE_SYS_PARAM_H
 #  include <sys/param.h>
diff --git a/src/express/test/print_schemas.c b/src/express/test/print_schemas.c
@@ -2,7 +2,7 @@
 /* prints names of schemas used in an EXPRESS file */
 /* symlink.c author: Don Libes, NIST, 20-Mar-1993 */
 
-#include "sc_cf.h"
+#include "config.h"
 #include <stdlib.h>
 #ifdef HAVE_SYS_PARAM_H
 #  include <sys/param.h>
diff --git a/test/cpp/schema_specific/attribute.cc b/test/cpp/schema_specific/attribute.cc
@@ -2,7 +2,7 @@
  * 1-Jul-2012
  * Test attribute access; uses a tiny schema similar to a subset of IFC2x3
  */
-#include <sc_cf.h>
+#include "config.h"
 #include <STEPfile.h>
 #include <sdai.h>
 #include <STEPattribute.h>
diff --git a/test/cpp/schema_specific/inverse_attr1.cc b/test/cpp/schema_specific/inverse_attr1.cc
@@ -3,7 +3,7 @@
 ** Test inverse attributes; uses a tiny schema similar to a subset of IFC2x3
 **
 */
-#include <sc_cf.h>
+#include "config.h"
 #include "SubSuperIterators.h"
 #include <STEPfile.h>
 #include <sdai.h>
diff --git a/test/cpp/schema_specific/inverse_attr2.cc b/test/cpp/schema_specific/inverse_attr2.cc
@@ -3,7 +3,7 @@
 ** Test inverse attributes; uses a tiny schema similar to a subset of IFC2x3
 **
 */
-#include <sc_cf.h>
+#include "config.h"
 #include <STEPfile.h>
 #include <sdai.h>
 #include <STEPattribute.h>
diff --git a/test/cpp/schema_specific/inverse_attr3.cc b/test/cpp/schema_specific/inverse_attr3.cc
@@ -4,7 +4,7 @@
  *
  * This test originally used STEPfile, which didn't work. Fixing STEPfile would have been very difficult, it uses lazyInstMgr now.
  */
-#include <sc_cf.h>
+#include "config.h"
 #include <lazyInstMgr.h>
 #include <lazyRefs.h>
 #include <sdai.h>

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@`
`71`	`71`	`*`
`72`	`72`	`*/`
`73`	`73`
`74`		`-#include <sc_cf.h>`
	`74`	`+#include "config.h"`
`75`	`75`	`#include <sc_export.h>`
`76`	`76`	`#include <stdio.h>`
`77`	`77`