Remove MD5 verification logic.

starseeker · cshorler · commit 736d637d6399 · 2021-08-15T09:22:59.000+01:00
diff --git a/src/express/CMakeLists.txt b/src/express/CMakeLists.txt
@@ -4,39 +4,6 @@ include_directories(
   ${SC_SOURCE_DIR}/src/base
   )
 
-# Set up the information we need to feed the generated source management
-# scripts
-set(BASELINE_INFORMATION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/generated/verification_info.cmake")
-set(PROJECT_CMAKE_DIR "${SC_SOURCE_DIR}/cmake")
-set(MD5_FILELIST
-  "${CMAKE_CURRENT_SOURCE_DIR}/expscan.l"
-  "${CMAKE_CURRENT_SOURCE_DIR}/expparse.y"
-  "${CMAKE_CURRENT_SOURCE_DIR}/generated/expscan.c"
-  "${CMAKE_CURRENT_SOURCE_DIR}/generated/expscan.h"
-  "${CMAKE_CURRENT_SOURCE_DIR}/generated/expparse.c"
-  "${CMAKE_CURRENT_SOURCE_DIR}/generated/expparse.h"
-  )
-configure_file(${SC_SOURCE_DIR}/cmake/md5_gen.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/express_md5gen.cmake @ONLY)
-configure_file(${SC_SOURCE_DIR}/cmake/md5_verify.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/express_verify.cmake @ONLY)
-
-# Convenience target to generate an updated verification_info.cmake file
-add_custom_command(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/express_md5gen.sentinel
-  COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/express_md5gen.cmake
-  COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/express_md5gen.sentinel
-  )
-add_custom_target(express_md5gen DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/express_md5gen.sentinel)
-
-# Target for actually checking cached MD5 sums against files
-add_custom_command(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/express_verify.sentinel
-  COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/express_verify.cmake
-  COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/express_verify.sentinel
-  DEPENDS ${MD5_FILELIST}
-  )
-add_custom_target(express_verify DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/express_verify.sentinel)
-
-
 # Depending on whether we're using pre-generated sources or building them on
 # the fly, set up targets and source lists.
 if(SC_GENERATE_LP_SOURCES)
@@ -87,6 +54,8 @@ foreach(_src ${EXPRESS_SOURCES})
     string(REPLACE "." "_" _suffix ${_src})
     set(_objlib "objlib_${_suffix}")
     add_library(${_objlib} OBJECT ${_src})
+    add_dependencies(${_objlib} objlib_expscan_c)
+    add_dependencies(${_objlib} objlib_expparse_c)
     # TODO: probably PIC should be used everywhere...
     set_property(TARGET ${_objlib} PROPERTY POSITION_INDEPENDENT_CODE ON)
     list(APPEND EXPRESS_OBJS $<TARGET_OBJECTS:${_objlib}>)
@@ -132,28 +101,10 @@ if("$CACHE{SC_BUILD_SHARED_LIBS}" OR NOT "$CACHE{SC_BUILD_STATIC_LIBS}")
   if(WIN32)
     target_compile_definitions(express PRIVATE SC_EXPRESS_DLL_EXPORTS)
   endif()
-
-  if(SC_GENERATE_LP_SOURCES)
-    add_custom_command(TARGET express POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/express_verify.cmake
-    )
-  else()
-    add_dependencies(express express_verify)
-  endif()
-
 endif()
 
 if($CACHE{SC_BUILD_STATIC_LIBS})
   SC_ADDLIB(express-static STATIC SOURCES "dummy.c" ${EXPRESS_OBJS} LINK_LIBRARIES base-static)
-
-  if(SC_GENERATE_LP_SOURCES)
-    add_custom_command(TARGET express-static POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/express_verify.cmake
-    )
-  else()
-    add_dependencies(express-static express_verify)
-  endif()
-
 endif()
 
 SC_ADDEXEC(check-express SOURCES ${CHECK_EXPRESS_SOURCES} LINK_LIBRARIES express base ${SC_EXEC_NOINSTALL})
diff --git a/src/express/generated/README b/src/express/generated/README
@@ -5,21 +5,4 @@ lexing and parsing logic.
 
 DO NOT EDIT THESE FILES.  They are machine generated and should not be modified
 directly - bugs in these files need to be fixed in either the
-Perplex/RE2C/Lemon input files or the tools themselves.  Directly changing
-these files will result in a build failure.
-
-If changes need to be made, the correct approach is:
-
-1.  install Perplex, RE2C, and Lemon
-2.  make any necessary fixes to the input files and/or the generator tools.
-3.  run the build, and copy the new generated expscan and expparse c and h
-    files to this directory.
-4.  run the build target "express_md5gen" to generate a new verification_info.cmake
-    file, and copy that file into this directory as well.
-
-The verification_info.cmake file in this directory is used by CMake to protect
-the integrity of the generated files.
-
-If iterative debugging is necessary, set the cmake configure variable
-DEBUGGING_GENERATED_SOURCES to avoid having to update generated sources and md5
-sums each time an input file is changed.
+Perplex/RE2C/Lemon input files or the tools themselves.
diff --git a/src/express/generated/verification_info.cmake b/src/express/generated/verification_info.cmake
