Use reccmp as a python requirement

.github/workflows/analyze.yml

@@ -17,10 +17,14 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
+    - uses: actions/setup-python@v5
+      with:
+        python-version: '3.12'
+
     - name: Install python libraries
       run: |
-        python -m pip install -r tools/requirements.txt
+        pip install -r tools/requirements.txt
 
     - name: Run decomplint.py
       run: |
-        tools/decomplint/decomplint.py ${{ matrix.who }} --module ${{ matrix.who }} --warnfail
+        reccmp-decomplint ${{ matrix.who }} --module ${{ matrix.who }} --warnfail

.github/workflows/build.yml

@@ -107,6 +107,10 @@ jobs:
     steps:
     - uses: actions/checkout@master
 
+    - uses: actions/setup-python@v5
+      with:
+        python-version: '3.12'
+
     - uses: actions/download-artifact@master
       with:
        name: Win32
@@ -125,12 +129,17 @@ jobs:
       run: |
         pip install -r tools/requirements.txt
 
+    - name: Detect binaries
+      run: |
+        reccmp-project detect --what original   --search-path legobin
+        reccmp-project detect --what recompiled --search-path build
+
     - name: Summarize Accuracy
       shell: bash
       run: |
-        python3 tools/reccmp/reccmp.py -S CONFIGPROGRESS.SVG --svg-icon tools/reccmp/config.png -H CONFIGPROGRESS.HTML legobin/CONFIG.EXE build/CONFIG.EXE build/CONFIG.PDB . | tee CONFIGPROGRESS.TXT
-        python3 tools/reccmp/reccmp.py -S ISLEPROGRESS.SVG --svg-icon tools/reccmp/isle.png -H ISLEPROGRESS.HTML legobin/ISLE.EXE build/ISLE.EXE build/ISLE.PDB . | tee ISLEPROGRESS.TXT
-        python3 tools/reccmp/reccmp.py -S LEGO1PROGRESS.SVG -T 4252 --svg-icon tools/reccmp/lego1.png -H LEGO1PROGRESS.HTML legobin/LEGO1.DLL build/LEGO1.DLL build/LEGO1.PDB . | tee LEGO1PROGRESS.TXT
+        reccmp-reccmp -S CONFIGPROGRESS.SVG --svg-icon assets/config.png --target CONFIG | tee CONFIGPROGRESS.TXT
+        reccmp-reccmp -S ISLEPROGRESS.SVG --svg-icon assets/isle.png --target ISLE | tee ISLEPROGRESS.TXT
+        reccmp-reccmp -S LEGO1PROGRESS.SVG -T 4252 --svg-icon assets/lego1.png --target LEGO1 | tee LEGO1PROGRESS.TXT
 
     - name: Compare Accuracy With Current Master
       shell: bash
@@ -147,21 +156,21 @@ jobs:
     - name: Test Exports
       shell: bash
       run: |
-        tools/verexp/verexp.py legobin/LEGO1.DLL build/LEGO1.DLL
+        reccmp-verexp --target LEGO1
 
     - name: Check Vtables
       shell: bash
       run: |
-        python3 tools/vtable/vtable.py legobin/CONFIG.EXE build/CONFIG.EXE build/CONFIG.PDB .
-        python3 tools/vtable/vtable.py legobin/ISLE.EXE build/ISLE.EXE build/ISLE.PDB .
-        python3 tools/vtable/vtable.py legobin/LEGO1.DLL build/LEGO1.DLL build/LEGO1.PDB .
+        reccmp-vtable --target CONFIG
+        reccmp-vtable --target ISLE
+        reccmp-vtable --target LEGO1
 
     - name: Check Variables
       shell: bash
       run: |
-        python3 tools/datacmp.py legobin/CONFIG.EXE build/CONFIG.EXE build/CONFIG.PDB .
-        python3 tools/datacmp.py legobin/ISLE.EXE build/ISLE.EXE build/ISLE.PDB .
-        python3 tools/datacmp.py legobin/LEGO1.DLL build/LEGO1.DLL build/LEGO1.PDB .
+       reccmp-datacmp --target CONFIG
+       reccmp-datacmp --target ISLE
+       reccmp-datacmp --target LEGO1
 
     - name: Upload Artifact
       uses: actions/upload-artifact@master

.github/workflows/naming.yml

@@ -15,6 +15,10 @@ jobs:
       with:
         version: "16"
 
+    - uses: actions/setup-python@v5
+      with:
+        python-version: '3.12'
+
     - name: Install python libraries
       run: |
         pip install -r tools/requirements.txt

.gitignore

@@ -1,3 +1,5 @@
+reccmp-user.yml
+reccmp-build.yml
 Debug/
 Release/
 *.ncb

CMakeLists.txt

@@ -8,6 +8,7 @@ project(isle CXX)
 include(CheckCXXSourceCompiles)
 include(CMakeDependentOption)
 include(CMakePushCheckState)
+include("${CMAKE_CURRENT_LIST_DIR}/cmake/reccmp.cmake")
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
 option(ENABLE_CLANG_TIDY "Enable clang-tidy")
@@ -405,6 +406,7 @@ add_library(lego1 SHARED
   LEGO1/main.cpp
   LEGO1/modeldb/modeldb.cpp
 )
+reccmp_add_target(lego1 ID LEGO1)
 register_lego1_target(lego1)
 
 if (MINGW)
@@ -447,6 +449,7 @@ if (ISLE_BUILD_APP)
     ISLE/res/isle.rc
     ISLE/isleapp.cpp
   )
+  reccmp_add_target(isle ID ISLE)
 
   target_compile_definitions(isle PRIVATE ISLE_APP)
 
@@ -477,6 +480,7 @@ if (ISLE_BUILD_CONFIG)
     CONFIG/StdAfx.cpp
     CONFIG/res/config.rc
   )
+  reccmp_add_target(config ID CONFIG)
   target_compile_definitions(config PRIVATE _AFXDLL MXDIRECTX_FOR_CONFIG)
   target_include_directories(config PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/util" "${CMAKE_CURRENT_SOURCE_DIR}/LEGO1")
   if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14)
@@ -603,3 +607,5 @@ if(EXISTS "${CLANGFORMAT_BIN}")
     endif()
   endif()
 endif()
+
+reccmp_configure()

README.md

@@ -62,3 +62,4 @@ Right click on `LEGO1.DLL`, select `Properties`, and switch to the `Details` tab
 
 * ISLE.EXE `md5: f6da12249e03eed1c74810cd23beb9f5`
 * LEGO1.DLL `md5: 4e2f6d969ea2ef8655ba3fc221a0c8fe`
+* CONFIG.DLL `md5: 92d958a64a273662c591c88b09100f4a`

cmake/reccmp.cmake

@@ -0,0 +1,58 @@
+function(reccmp_find_project RESULT)
+    set(curdir "${CMAKE_CURRENT_SOURCE_DIR}")
+    while(1)
+        if(EXISTS "${curdir}/reccmp-project.yml")
+            break()
+        endif()
+        get_filename_component(nextdir "${curdir}" DIRECTORY)
+        if(nextdir STREQUAL curdir)
+            set(curdir "${RESULT}-NOTFOUND")
+            break()
+        endif()
+        set(curdir "${nextdir}")
+    endwhile()
+    set("${RESULT}" "${curdir}" PARENT_SCOPE)
+endfunction()
+
+function(reccmp_add_target TARGET)
+    cmake_parse_arguments(ARGS "" "ID" "" ${ARGN})
+    if(NOT ARGS_ID)
+        message(FATAL_ERROR "Missing ID argument")
+    endif()
+    set_property(TARGET ${TARGET} PROPERTY INTERFACE_RECCMP_ID "${ARGS_ID}")
+    set_property(GLOBAL APPEND PROPERTY RECCMP_TARGETS ${TARGET})
+endfunction()
+
+function(reccmp_configure)
+    cmake_parse_arguments(ARGS "COPY_TO_SOURCE_FOLDER" "DIR" "" ${ARGN})
+    set(binary_dir "${CMAKE_BINARY_DIR}")
+    if(ARGS_DIR)
+        set(binary_dir "${ARGS_DIR}")
+    endif()
+
+    reccmp_find_project(reccmp_project_dir)
+    if(NOT reccmp_project_dir)
+        message(FATAL_ERROR "Cannot find reccmp-project.yml")
+    endif()
+
+    if(CMAKE_CONFIGURATION_TYPES)
+        set(outputdir "${binary_dir}/$<CONFIG>")
+    else()
+        set(outputdir "${binary_dir}")
+    endif()
+    set(build_yml_txt "project: '${reccmp_project_dir}'\ntargets:\n")
+    get_property(RECCMP_TARGETS GLOBAL PROPERTY RECCMP_TARGETS)
+    foreach(target ${RECCMP_TARGETS})
+        get_property(id TARGET "${target}" PROPERTY INTERFACE_RECCMP_ID)
+        string(APPEND build_yml_txt "  ${id}:\n")
+        string(APPEND build_yml_txt "    path: '$<TARGET_FILE:${target}>'\n")
+        if(WIN32 AND MSVC)
+            string(APPEND build_yml_txt "    pdb: '$<TARGET_PDB_FILE:${target}>'\n")
+        endif()
+    endforeach()
+    file(GENERATE OUTPUT "${outputdir}/reccmp-build.yml" CONTENT "${build_yml_txt}")
+
+    if(ARGS_COPY_TO_SOURCE_FOLDER)
+        file(GENERATE OUTPUT "${CMAKE_SOURCE_DIR}/reccmp-build.yml" CONTENT "${build_yml_txt}" CONDITION $<CONFIG:Release>)
+    endif()
+endfunction()

reccmp-project.yml

@@ -0,0 +1,21 @@
+targets:
+  ISLE:
+    filename: ISLE.EXE
+    source-root: ISLE
+    hash:
+      sha256: 5cf57c284973fce9d14f5677a2e4435fd989c5e938970764d00c8932ed5128ca
+  LEGO1:
+    filename: LEGO1.DLL
+    source-root: LEGO1
+    hash:
+      sha256: 14645225bbe81212e9bc1919cd8a692b81b8622abb6561280d99b0fc4151ce17
+  CONFIG:
+    filename: CONFIG.EXE
+    source-root: CONFIG
+    hash:
+      sha256: 864766d024d78330fed5e1f6efb2faf815f1b1c3405713a9718059dc9a54e52c
+  BETA10:
+    filename: BETA10.DLL
+    source-root: LEGO1
+    hash:
+      sha256: d91435a40fa31f405fba33b03bd3bd40dcd4ca36ccf8ef6162c6c5ca0d7190e7