Updates to support new stepcode converter

Extensive reworking of step conversion requires stepcode changes -
update upstream

Author: starseeker

stepcode/CMakeLists.txt

@@ -17,7 +17,7 @@ if (ENABLE_STEPCODE)
   ExternalProject_Add(STEPCODE_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/stepcode"
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
-    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/expparse.patch
+    PATCH_COMMAND ${CMAKE_COMMAND};-DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/stepcode;-DDEST_DIR=<SOURCE_DIR>;-P;${CMAKE_CURRENT_SOURCE_DIR}/RefreshSource.cmake
     CMAKE_ARGS
     ${BUILD_TYPE_SPECIFIER}
     -DBIN_DIR=${BIN_DIR}
@@ -34,7 +34,7 @@ if (ENABLE_STEPCODE)
     $<$<BOOL:${PERPLEX_TARGET}>:-DPERPLEX_TEMPLATE=${CMAKE_NOBUNDLE_INSTALL_PREFIX}/${DATA_DIR}/perplex/perplex_template.c>
     $<$<BOOL:${PERPLEX_TARGET}>:-DRE2C_ROOT=${CMAKE_NOBUNDLE_INSTALL_PREFIX}>
     -DSC_BUILD_SCHEMAS=
-    -DSC_EXP2CXX_CHUNK_SIZE=256
+    -DSC_EXP2CXX_CHUNK_SIZE=64:8
     -DSC_ENABLE_COVERAGE=OFF
     -DSC_ENABLE_TESTING=OFF
     -DSC_IS_SUBBUILD=ON

stepcode/RefreshSource.cmake

@@ -0,0 +1,36 @@
+if (NOT DEFINED SOURCE_DIR OR NOT IS_DIRECTORY "${SOURCE_DIR}")
+  message(FATAL_ERROR "SOURCE_DIR is not a directory: ${SOURCE_DIR}")
+endif ()
+
+if (NOT DEFINED DEST_DIR OR DEST_DIR STREQUAL "")
+  message(FATAL_ERROR "DEST_DIR is not defined")
+endif ()
+
+cmake_path(ABSOLUTE_PATH SOURCE_DIR NORMALIZE OUTPUT_VARIABLE source_abs)
+cmake_path(ABSOLUTE_PATH DEST_DIR NORMALIZE OUTPUT_VARIABLE dest_abs)
+if (source_abs STREQUAL dest_abs)
+  message(FATAL_ERROR "Refusing to refresh a source directory from itself")
+endif ()
+
+cmake_path(GET dest_abs FILENAME dest_name)
+if (NOT dest_name STREQUAL "STEPCODE_BLD")
+  message(FATAL_ERROR "Refusing to remove unexpected destination: ${dest_abs}")
+endif ()
+
+# ExternalProject runs PATCH_COMMAND with DEST_DIR as its current working
+# directory.  Removing DEST_DIR itself invalidates that working directory and
+# causes the next patch command to fail.  Keep the directory inode, but remove
+# all of its contents so overlapping patches and patches which add files are
+# always applied to pristine input when PATCH_COMMAND is rerun without the
+# local-directory download step.
+file(GLOB dest_entries LIST_DIRECTORIES TRUE
+  "${dest_abs}/*"
+  "${dest_abs}/.[!.]*"
+  "${dest_abs}/..?*"
+)
+if (dest_entries)
+  file(REMOVE_RECURSE ${dest_entries})
+endif ()
+file(COPY "${source_abs}/" DESTINATION "${dest_abs}"
+  PATTERN ".git" EXCLUDE
+)