simplify SC_VERSION and library versioning

cshorler · cshorler · commit e617808be185 · 2021-08-14T10:24:35.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -42,13 +42,10 @@ project(SC)
 
 # SC version
 set(SC_VERSION_MAJOR 0)
-set(SC_VERSION_MINOR 8-dev)
-set(SC_VERSION ${SC_VERSION_MAJOR}.${SC_VERSION_MINOR})
+set(SC_VERSION_MINOR 9)
+set(SC_VERSION_PATCH 1)
+set(SC_VERSION ${SC_VERSION_MAJOR}.${SC_VERSION_MINOR}.${SC_VERSION_PATCH})
 
-# SC ABI version. SC_ABI_SOVERSION should be incremented
-# for each release introducing API incompatibilities
-set(SC_ABI_SOVERSION 2)
-set(SC_ABI_VERSION ${SC_ABI_SOVERSION}.0.0)
 
 # Minimum required version of CMake
 cmake_minimum_required(VERSION 3.6.3)
@@ -99,8 +96,8 @@ 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 and sc_version_string.h
 include(${SC_CMAKE_DIR}/SC_Config_Headers.cmake)
+# create config headers sc_cf.h
 
 
 ################
@@ -144,6 +141,19 @@ if($CACHE{SC_BUILD_SHARED_LIBS})
 else()
   add_dependencies(core stepdai-static stepeditor-static exp2cxx check-express)
 endif()
+if(NOT SC_IS_SUBBUILD)
+    #-----------------------------------------------------------------------------
+  # SC Packaging
+  # $make package
+  set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "STEPcode")
+  set(CPACK_SET_DESTDIR "ON")
+  set(CPACK_PACKAGE_VERSION_MAJOR ${SC_VERSION_MAJOR})
+  set(CPACK_PACKAGE_VERSION_MINOR ${SC_VERSION_MINOR})
+  set(CPACK_PACKAGE_NAME SC)
+  set(CPACK_PACKAGE_CONTACT "SC Developers <scl-dev@googlegroups.com>")
+  include(CPack)
+endif(NOT SC_IS_SUBBUILD)
+
 
 # CONFIG_END_MESSAGES - list of messages to be printed after everything else is done.
 # THIS MUST BE LAST to ensure that they are visible to the user without scrolling.
diff --git a/cmake/SC_Build_opts.cmake b/cmake/SC_Build_opts.cmake
@@ -144,17 +144,6 @@ if(NOT SC_IS_SUBBUILD)
     PATH "Install prefix prepended to target to create install location")
   set(CMAKE_INSTALL_PREFIX ${SC_INSTALL_PREFIX} CACHE INTERNAL "Prefix prepended to install directories if target destination is not absolute, immutable" FORCE)
 
-  #-----------------------------------------------------------------------------
-  # SC Packaging
-  # $make package
-  set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "STEPcode")
-  set(CPACK_SET_DESTDIR "ON")
-  set(CPACK_PACKAGE_VERSION_MAJOR ${SC_VERSION_MAJOR})
-  set(CPACK_PACKAGE_VERSION_MINOR ${SC_VERSION_MINOR})
-  set(CPACK_PACKAGE_NAME SC)
-  set(CPACK_PACKAGE_CONTACT "SC Developers <scl-dev@googlegroups.com>")
-  include(CPack)
-
   #-----------------------------------------------------------------------------
   # Uninstall target
   # From http://www.cmake.org/Wiki/CMake_FAQ#Can_I_do_.22make_uninstall.22_with_CMake.3F
diff --git a/cmake/SC_CXX_schema_macros.cmake b/cmake/SC_CXX_schema_macros.cmake
@@ -28,18 +28,15 @@ endmacro(P21_TESTS sfile)
 macro(SCHEMA_EXES)
   RELATIVE_PATH_TO_TOPLEVEL(${CMAKE_CURRENT_SOURCE_DIR} RELATIVE_PATH_COMPONENT)
   SC_ADDEXEC(p21read_${PROJECT_NAME} SOURCES "${RELATIVE_PATH_COMPONENT}/src/test/p21read/p21read.cc" LINK_LIBRARIES ${PROJECT_NAME} stepdai stepcore stepeditor steputils base TESTABLE)
-  #add_dependencies(p21read_${PROJECT_NAME} version_string)
   if(NOT WIN32)
     SC_ADDEXEC(lazy_${PROJECT_NAME} SOURCES "${RELATIVE_PATH_COMPONENT}/src/cllazyfile/lazy_test.cc" LINK_LIBRARIES ${PROJECT_NAME} steplazyfile stepdai stepcore stepeditor steputils base TESTABLE)
-    #add_dependencies(lazy_${PROJECT_NAME} version_string)
   endif(NOT WIN32)
 
   #add user-defined executables
   foreach(src ${SC_SDAI_ADDITIONAL_EXES_SRCS})
     get_filename_component(name ${src} NAME_WE)
     get_filename_component(path ${src} ABSOLUTE)
     SC_ADDEXEC(${name}_${PROJECT_NAME} SOURCES ${src} LINK_LIBRARIES ${PROJECT_NAME} stepdai stepcore stepeditor steputils base TESTABLE)
-    add_dependencies(${name}_${PROJECT_NAME} version_string)
     #set_target_properties(${name}_${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${${PROJECT_NAME}_COMPILE_FLAGS} -I${path}")
   endforeach(src ${SC_SDAI_ADDITIONAL_EXES_SRCS})
 ENDMACRO(SCHEMA_EXES)
diff --git a/cmake/SC_Config_Headers.cmake b/cmake/SC_Config_Headers.cmake
@@ -1,4 +1,3 @@
-# create sc_cf.h and sc_version_string.h
 
 # Take the sc config file template as the starting point for
 # sc_cf.h.in - scripts may need to append to the template, so
@@ -18,6 +17,7 @@ if(NOT COMMAND CONFIG_H_APPEND)
 endif(NOT COMMAND CONFIG_H_APPEND)
 file(READ ${SC_SOURCE_DIR}/include/sc_cf_cmake.h.in CONFIG_H_FILE_CONTENTS)
 CONFIG_H_APPEND(SC "${CONFIG_H_FILE_CONTENTS}")
+# create sc_cf.h
 
 include(CheckLibraryExists)
 include(CheckIncludeFile)
@@ -101,32 +101,6 @@ get_property(CONFIG_H_FILE_CONTENTS GLOBAL PROPERTY SC_CONFIG_H_CONTENTS)
 file(WRITE ${CONFIG_H_FILE} "${CONFIG_H_FILE_CONTENTS}")
 configure_file(${CONFIG_H_FILE} ${SC_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_cf.h)
 
-# ------------------------
-
-# create sc_version_string.h, http://stackoverflow.com/questions/3780667
-# Using 'ver_string' instead of 'sc_version_string.h' is a trick to force the
-# command to always execute when the custom target is built. It works because
-# a file by that name never exists.
-if(SC_GIT_VERSION)
-  configure_file(${SC_CMAKE_DIR}/sc_version_string.cmake ${SC_BINARY_DIR}/sc_version_string.cmake @ONLY)
-  add_custom_target(version_string ALL DEPENDS ver_string)
-  # creates sc_version_string.h using cmake script
-  add_custom_command(OUTPUT ver_string
-    COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${SC_SOURCE_DIR} -DBINARY_DIR=${SC_BINARY_DIR} -P ${SC_BINARY_DIR}/sc_version_string.cmake
-    )
-  # sc_version_string.h is a generated file
-else(SC_GIT_VERSION)
-  set(VER_HDR "
-  #ifndef SC_VERSION_STRING
-  #define SC_VERSION_STRING
-  static char sc_version[512] = {\"${SC_VERSION}\"};
-  #endif"
-  )
-  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_version_string.h "${VER_HDR}")
-endif(SC_GIT_VERSION)
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_version_string.h
-  PROPERTIES GENERATED TRUE
-  HEADER_FILE_ONLY TRUE )
 
 # Local Variables:
 # tab-width: 8
diff --git a/cmake/SC_Targets.cmake b/cmake/SC_Targets.cmake
@@ -46,7 +46,11 @@ macro(SC_ADDLIB _addlib_target)
 
   if(${_arg_prefix}_SHARED)
     add_library(${_addlib_target} SHARED ${${_arg_prefix}_SOURCES})
-    set_target_properties(${_addlib_target} PROPERTIES VERSION ${SC_ABI_VERSION} SOVERSION ${SC_ABI_SOVERSION})
+    if(OPENBSD)
+      set_target_properties(${_addlib_target} PROPERTIES VERSION ${SC_VERSION_MAJOR}.${SC_VERSION_MINOR})
+    else(OPENBSD)
+      set_target_properties(${_addlib_target} PROPERTIES VERSION ${SC_VERSION} SOVERSION ${SC_VERSION_MAJOR})
+    endif(OPENBSD)
     if(APPLE)
       set_target_properties(${_addlib_target} PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
     endif(APPLE)
diff --git a/cmake/sc_version_string.cmake b/cmake/sc_version_string.cmake
diff --git a/example/ap203min/CMakeLists.txt b/example/ap203min/CMakeLists.txt
@@ -14,14 +14,14 @@ if(NOT DEFINED STEPCODE_ROOT_DIR)
 endif(NOT DEFINED STEPCODE_ROOT_DIR)
 
 # STEPCODE_ROOT_DIR is relative or absolute path?
-if(EXISTS "${CMAKE_BINARY_DIR}/${STEPCODE_ROOT_DIR}/SC_VERSION.txt")
+if(EXISTS "${CMAKE_BINARY_DIR}/${STEPCODE_ROOT_DIR}/src/express/express.c")
   set(STEPCODE_ROOT_DIR "${CMAKE_BINARY_DIR}/${STEPCODE_ROOT_DIR}")
   message("** STEPCODE_ROOT_DIR is a relative path; converted to absolute path: ${STEPCODE_ROOT_DIR}.")
 else()
-  if(NOT EXISTS "${STEPCODE_ROOT_DIR}/SC_VERSION.txt")
+  if(NOT EXISTS "${STEPCODE_ROOT_DIR}/src/express/express.c")
     message(FATAL_ERROR "****  Cannot locate STEPCODE_ROOT_DIR - try an absolute path.")
-  endif(NOT EXISTS "${STEPCODE_ROOT_DIR}/SC_VERSION.txt")
-endif(EXISTS "${CMAKE_BINARY_DIR}/${STEPCODE_ROOT_DIR}/SC_VERSION.txt")
+  endif(NOT EXISTS "${STEPCODE_ROOT_DIR}/src/express/express.c")
+endif(EXISTS "${CMAKE_BINARY_DIR}/${STEPCODE_ROOT_DIR}/src/express/express.c")
 
 
 # Use STEPcode as library, but build from this build process.
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
@@ -35,9 +35,8 @@ install(FILES ordered_attrs.h
   sc_stdbool.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode)
 
-install(FILES ${SC_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_cf.h
-  ${SC_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_version_string.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode)
+install(FILES ${SC_BINARY_DIR}/${INCLUDE_DIR}/sc_cf.h
+  DESTINATION ${INCLUDE_DIR}/stepcode)
 
 # Local Variables:
 # tab-width: 8
diff --git a/src/exp2cxx/CMakeLists.txt b/src/exp2cxx/CMakeLists.txt
@@ -39,10 +39,6 @@ include_directories(
 
 SC_ADDEXEC(exp2cxx SOURCES ${exp2cxx_SOURCES} LINK_LIBRARIES libexppp express base)
 
-if(NOT SC_IS_SUBBUILD AND SC_GIT_VERSION)
-  add_dependencies(exp2cxx version_string)
-endif(NOT SC_IS_SUBBUILD AND SC_GIT_VERSION)
-
 if(SC_ENABLE_TESTING)
   add_subdirectory(test)
 endif(SC_ENABLE_TESTING)
diff --git a/src/exp2cxx/classes_misc.c b/src/exp2cxx/classes_misc.c
@@ -4,7 +4,6 @@
 #include "classes.h"
 
 #include <sc_trace_fprintf.h>
-#include "sc_version_string.h"
 #include "class_strings.h"
 
 /** \file classes_misc.c
@@ -44,7 +43,7 @@ FILE * FILEcreate( const char * filename ) {
     fprintf( file, "#ifndef  %s\n", fn );
     fprintf( file, "#define  %s\n\n", fn );
 
-    fprintf( file, "// This file was generated by exp2cxx,\n// %s.\n", sc_version );
+    fprintf( file, "// This file was generated by exp2cxx,\n// %s.\n", SC_VERSION );
     fprintf( file, "// You probably don't want to edit it since your modifications\n" );
     fprintf( file, "// will be lost if exp2cxx is used to regenerate it.\n\n" );
     return ( file );
diff --git a/src/exp2python/CMakeLists.txt b/src/exp2python/CMakeLists.txt
@@ -31,9 +31,6 @@ if(SC_PYTHON_GENERATOR)
    )
  SC_ADDEXEC(exp2python SOURCES ${exp2python_SOURCES} LINK_LIBRARIES express base)
 
-  if(NOT SC_IS_SUBBUILD AND SC_GIT_VERSION)
-    add_dependencies(exp2python version_string)
-  endif(NOT SC_IS_SUBBUILD AND SC_GIT_VERSION)
 endif(SC_PYTHON_GENERATOR)
 
 # Local Variables:
diff --git a/src/exppp/pretty_schema.c b/src/exppp/pretty_schema.c
@@ -5,7 +5,6 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include <sc_version_string.h>
 #include <express/express.h>
 
 #include <exppp/exppp.h>
@@ -108,7 +107,7 @@ char * SCHEMAout( Schema s ) {
     for( hp = expheader; *hp; hp++ ) {
         if( ( **hp == '\0' ) && ( **( hp + 1 ) == '\0' ) ) {
             /* if this and the next lines are blank, put version string on this line */
-            raw( "%s\n", sc_version );
+            raw( "%s\n", SC_VERSION );
         } else {
             raw( "%s\n", *hp );
         }
diff --git a/src/express/CMakeLists.txt b/src/express/CMakeLists.txt
@@ -141,9 +141,6 @@ if($CACHE{SC_BUILD_SHARED_LIBS})
     add_dependencies(express express_verify)
   endif()
 
-  if(NOT SC_IS_SUBBUILD AND SC_GIT_VERSION)
-    add_dependencies(express version_string)
-  endif()
 endif()
 
 if($CACHE{SC_BUILD_STATIC_LIBS})
@@ -157,9 +154,6 @@ if($CACHE{SC_BUILD_STATIC_LIBS})
     add_dependencies(express-static express_verify)
   endif()
  
-  if(NOT SC_IS_SUBBUILD AND SC_GIT_VERSION)
-    add_dependencies(express-static version_string)
-  endif()
 endif()
 
 SC_ADDEXEC(check-express SOURCES ${CHECK_EXPRESS_SOURCES} LINK_LIBRARIES express base ${SC_EXEC_NOINSTALL})
diff --git a/src/express/fedex.c b/src/express/fedex.c
@@ -77,7 +77,6 @@
 #include "sc_cf.h"
 #include "sc_memmgr.h"
 #include "sc_export.h"
-#include "sc_version_string.h"
 #include "sc_getopt.h"
 #include "express/error.h"
 #include "express/express.h"
@@ -92,7 +91,7 @@ char EXPRESSgetopt_options[256] = "Bbd:e:i:w:p:rvz"; /* larger than the string b
 static int no_need_to_work = 0; /* TRUE if we can exit gracefully without doing any work */
 
 void print_fedex_version( void ) {
-    fprintf( stderr, "Build info for %s: %s\nhttp://github.com/stepcode/stepcode and scl-dev on google groups\n", EXPRESSprogram_name, sc_version );
+    fprintf( stderr, "Build info for %s: %s\nhttp://github.com/stepcode/stepcode and scl-dev on google groups\n", EXPRESSprogram_name, SC_VERSION );
     no_need_to_work = 1;
 }
 
diff --git a/src/express/info.c b/src/express/info.c
@@ -4,22 +4,14 @@
 #include "express/info.h"
 #include "express/express.h"
 
-#ifndef SCHEMA_SCANNER
-#  include "sc_version_string.h"
-#else
-  /* dummy string to make the compiler happy when building the schema scanner,
-   * should never be seen by users */
-  const char * sc_version = "ERROR: version unknown / SCHEMA_SCANNER defined in libexpress!";
-#endif
-
 char * EXPRESSversion( void ) {
     return( "Express Language, IS (N65), October 24, 1994" );
 }
 
 void EXPRESSusage( int _exit ) {
     fprintf( stderr, "usage: %s [-v] [-d #] [-p <object_type>] {-w|-i <warning>} express_file\n", EXPRESSprogram_name );
     fprintf( stderr, "where\t-v produces the following version description:\n" );
-    fprintf( stderr, "Build info for %s: %s\nhttp://github.com/stepcode/stepcode\n", EXPRESSprogram_name, sc_version );
+    fprintf( stderr, "Build info for %s: %s\nhttp://github.com/stepcode/stepcode\n", EXPRESSprogram_name, SC_VERSION );
     fprintf( stderr, "\t-d turns on debugging (\"-d 0\" describes this further\n" );
     fprintf( stderr, "\t-p turns on printing when processing certain objects (see below)\n" );
     fprintf( stderr, "\t-w warning enable\n" );
diff --git a/src/test/p21read/p21read.cc b/src/test/p21read/p21read.cc
@@ -13,7 +13,6 @@
 */
 
 extern void SchemaInit( class Registry & );
-#include "sc_version_string.h"
 #include <STEPfile.h>
 #include <sdai.h>
 #include <STEPattribute.h>
@@ -91,7 +90,7 @@ void checkSchemaName( Registry & reg, STEPfile & sf, bool ignoreErr ) {
 }
 
 void printVersion( const char * exe ) {
-    std::cout << exe << " build info: " << sc_version << std::endl;
+    std::cout << exe << " build info: " << SC_VERSION << std::endl;
 }
 
 void printUse( const char * exe ) {
diff --git a/test/cpp/schema_specific/attribute.cc b/test/cpp/schema_specific/attribute.cc
@@ -3,7 +3,6 @@
  * Test attribute access; uses a tiny schema similar to a subset of IFC2x3
  */
 #include <sc_cf.h>
-#include "sc_version_string.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
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/stepfile_rw_progress.cc b/test/cpp/schema_specific/stepfile_rw_progress.cc
