Update github workflow

Author: GoGoOtaku

.github/workflows/multi-os-build.yml

@@ -9,62 +9,71 @@ on:
 
 jobs:
   build-linux:
-
     runs-on: ubuntu-latest
-
+    strategy:
+      matrix:
+        shared: [true, false]
     steps:
-
     - name: Install packages
       uses: delgurth/get-package@v6
       with:
         # Space-separated list of packages to install using apt-get.  Will only run if on ubuntu.
-        apt-get: libssl-dev
-    
+        apt-get: libssl-dev cmake binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686
     - name: Checkout with submodules
-      uses: actions/checkout@v3
-      with:
-        submodules: 'true'
-
+      uses: actions/checkout@v4
+    - name: config shared=${{ matrix.shared }}
+      run: >-
+        cmake
+        -Bbuild
+        -DBUILD_SHARED_LIBS=${{ matrix.shared }}
     - name: Compile
-      run: make
-      
-      
-  build-osx:
+      run: cmake --build build
+    - name: test
+      run: ctest --test-dir build -V
 
+  build-osx:
     runs-on: macos-latest
-
     steps:
-
     - name: Checkout with submodules
-      uses: actions/checkout@v3
-      with:
-        submodules: 'true'
-
+      uses: actions/checkout@v4
+    - name: config
+      run: >-
+        cmake
+        -Bbuild
+        -DENABLE_TESTS=Off
     - name: Compile
-      run: CFLAGS="-I$(brew --prefix openssl@1.1)/include/" LDFLAGS="-L$(brew --prefix openssl@1.1)/lib/" make
+      run: cmake --build build
+#    - name: Compile
+#      run: CFLAGS="-I$(brew --prefix openssl@1.1)/include/" LDFLAGS="-L$(brew --prefix openssl@1.1)/lib/" make
 
   build-win64:
-
     runs-on: windows-latest
-
     steps:
-
     - name: Install Cygwin
       # You may pin to the exact commit or the version.
       # uses: egor-tensin/setup-cygwin@4f96f9fecb8c952fa32ff791b0a77d93d5191bb4
-      uses: egor-tensin/setup-cygwin@v3
+      uses: egor-tensin/setup-cygwin@v4
       with:
         platform: x64 # optional, default is x64
         install-dir: c:\tools\cygwin # optional, default is C:\tools\cygwin
-        packages: gcc-core binutils make zip libssl-devel # optional
-    
+        packages: gcc-core gcc-g++ binutils make zip libssl-devel cmake  # optional
     - name: Checkout with submodules
-      uses: actions/checkout@v3
-      with:
-        submodules: 'true'
-
+      uses: actions/checkout@v4
+      shell: C:\tools\cygwin\bin\bash.exe --login '{0}'
+    - name: config
+      run: >-
+        cmake
+        -Bbuild
+        -DENABLE_TESTS=Off
+      shell: C:\tools\cygwin\bin\bash.exe --login '{0}'
     - name: Compile
-      run: make
-      
-    - name: Compile Windows-only tools and create a ZIP package
-      run: make zip
+      run: cmake --build build
+      shell: C:\tools\cygwin\bin\bash.exe --login '{0}'
+    - name: pack
+      run:  cd build cpack -G CYGWIN_BINARY
+      shell: C:\tools\cygwin\bin\bash.exe --login '{0}'
+#    - name: Compile
+#      run: make
+#    - name: Compile Windows-only tools and create a ZIP package
+#      run: make zip
+

CMakeLists.txt

@@ -1,11 +1,12 @@
-cmake_minimum_required(VERSION 3.30)
+cmake_minimum_required(VERSION 3.20.0)
 project(readpe)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 option(BUILD_DISASSEMBLER "Build with basic disassembler support (deprecated)" OFF)
-option(BUILD_STATIC "Build static executable" Off)
+option(BUILD_LEGACY "Build support for legacy executables by link name" ON)
 option(BUILD_STANDALONE "Build separate executables" OFF)
+option(BUILD_STATIC "Build static executable" Off)
 option(ENABLE_TESTS "Enable testing" On)
 
 if(BUILD_DISASSEMBLER)
@@ -20,3 +21,28 @@ if(ENABLE_TESTS)
     include("${CMAKE_SOURCE_DIR}/cmake/tests.cmake")
 endif()
 
+set(
+    CPACK_PACKAGE_NAME ${PROJECT_NAME}
+    CACHE STRING "The resulting package name"
+)
+
+
+set(CPACK_STRIP_FILES YES)
+
+
+set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
+
+
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
+
+
+include(CPack)
+configure_file ("${PROJECT_SOURCE_DIR}/cmake/cpackopt.cmake.in"
+                "${PROJECT_BINARY_DIR}/cpackopt.cmake"
+                @ONLY)
+set (CPACK_PROJECT_CONFIG_FILE
+     "${PROJECT_BINARY_DIR}/cpackopt.cmake")
+

cmake/TC-mingw64.cmake

@@ -5,8 +5,20 @@ set(CMAKE_SYSTEM_NAME Windows)
 # enable_language(C,CXX)
 
 # which compilers to use for C and C++
-set(CMAKE_C_COMPILER   i686-w64-mingw32-gcc)
-set(CMAKE_CXX_COMPILER i686-w64-mingw32-g++)
+find_program(GNUCCi686W86Mingw32 NAMES
+    i686-w64-mingw32-gcc
+    i686-w64-mingw32-gcc-win32
+    i686-w64-mingw32-gcc-posix
+    REQUIRED
+)
+find_program(GNUPlusPlusi686W86Mingw32 NAMES
+    i686-w64-mingw32-g++
+    i686-w64-mingw32-g++-win32
+    i686-w64-mingw32-g++-posix
+    REQUIRED
+)
+set(CMAKE_C_COMPILER ${GNUCCi686W86Mingw32})
+set(CMAKE_CXX_COMPILER ${GNUPlusPlusi686W86Mingw32})
 
 # where is the target environment located
 set(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32)

cmake/cpackopt.cmake.in

@@ -0,0 +1,2 @@
+@_CPACK_OTHER_VARIABLES_@
+

lib/libpe/CMakeLists.txt

@@ -40,8 +40,17 @@ set(SOURCES
 	utils.c
 )
 
-add_library(pe STATIC ${HEADERS} ${SOURCES})
-target_include_directories(pe PRIVATE "include")
+find_package(OpenSSL REQUIRED)
+
+if(BUILD_STATIC)
+    add_library(pe STATIC ${HEADERS} ${SOURCES})
+else()
+    add_library(pe SHARED ${HEADERS} ${SOURCES})
+endif()
+
+target_link_libraries(pe PRIVATE OpenSSL::Crypto OpenSSL::SSL )
+
+target_include_directories(pe PRIVATE "include" ${OPENSSL_INCLUDE_DIR} )
 if(MSVC)
 	target_compile_options(pe PRIVATE /W4 /WX)
 else()
@@ -58,3 +67,11 @@ else()
 	)
 endif()
 
+install(TARGETS pe
+    EXPORT peTargets
+    LIBRARY DESTINATION lib
+    ARCHIVE DESTINATION lib
+    RUNTIME DESTINATION bin
+    INCLUDES DESTINATION include/libpe
+)
+

src/CMakeLists.txt

@@ -14,7 +14,6 @@ set(HEADERS
     ../include/stack.h
 
     dylib.h
-    legacy.h
 )
 
 set(SOURCES
@@ -41,20 +40,28 @@ set(SOURCES
     certificates.c
     scan.c
 
-    legacy/pehash.c
-    legacy/peldd.c
-    legacy/pepack.c
-    legacy/peres.c
-    legacy/pescan.c
-    legacy/pesec.c
-    legacy/pestr.c
-    legacy/readpe.c
-    legacy/ofs2rva.c
-    legacy/rva2ofs.c
 )
 
-if(BUILD_DISASSEMBLER)
-    list(APPEND SOURCES legacy/pedis.c )
+if(BUILD_LEGACY)
+    if(BUILD_DISASSEMBLER)
+        list(APPEND SOURCES legacy/pedis.c )
+    endif()
+
+    list(APPEND HEADERS
+        legacy.h
+    )
+    list(APPEND SOURCES
+        legacy/pehash.c
+        legacy/peldd.c
+        legacy/pepack.c
+        legacy/peres.c
+        legacy/pescan.c
+        legacy/pesec.c
+        legacy/pestr.c
+        legacy/readpe.c
+        legacy/ofs2rva.c
+        legacy/rva2ofs.c
+    )
 endif()
 
 if(BUILD_STATIC)
@@ -82,8 +89,6 @@ add_compile_definitions(
     PLUGINSDIR="src/plugins"
 )
 
-
-
 find_package(OpenSSL)
 
 add_executable(readpe ${HEADERS} ${SOURCES})
@@ -95,10 +100,17 @@ target_include_directories(readpe PRIVATE
 
 target_link_libraries(readpe PRIVATE pe OpenSSL::Crypto m)
 
-if(BUILD_DISASSEMBLER)
-    target_link_libraries(readpe PRIVATE udis86)
-    target_compile_definitions(readpe
-        READPE_DISASSEMBLER=1
+
+if(BUILD_LEGACY)
+    if(BUILD_DISASSEMBLER)
+        target_link_libraries(readpe PRIVATE udis86)
+        target_compile_definitions(readpe PRIVATE
+            READPE_DISASSEMBLER=1
+        )
+    endif()
+
+    target_compile_definitions(readpe PRIVATE
+        READPE_LEGACY=1
     )
 endif()
 
@@ -119,3 +131,10 @@ else()
     )
 endif()
 
+install(TARGETS readpe
+    LIBRARY DESTINATION lib
+    ARCHIVE DESTINATION lib
+    RUNTIME DESTINATION bin
+    INCLUDES DESTINATION include
+)
+

src/main.c

@@ -36,11 +36,14 @@
 
 #include "common.h"
 #include "config.h"
-#include "legacy.h"
 #include "modes.h"
 #include "output.h"
 #include "readpe.h"
 
+#ifdef READPE_LEGACY
+#include "legacy.h"
+#endif
+
 #include <getopt.h>
 #include <libpe/context.h>
 #include <libpe/error.h>
@@ -302,6 +305,7 @@ static const struct mode_option base_mode[] = {
 
 // ------------------------------------------------------------------------- //
 
+#ifdef READPE_LEGACY
 static void legacy(int argc, char *argv[])
 {
     const char *bin_name = strrchr(argv[0], '/');
@@ -332,7 +336,7 @@ static void legacy(int argc, char *argv[])
             else if (bin_name[2] == 'd' && bin_name[3] == 'i') {
                 exit(pedis(argc, argv));
             }
-#endif
+#endif // READPE_DISASSEMBLER
         } else if (bin_name[2] == 'l' && bin_name[3] == 'd'
                    && bin_name[4] == 'd') {
             exit(peldd(argc, argv));
@@ -350,6 +354,7 @@ static void legacy(int argc, char *argv[])
     //     }
     // }
 }
+#endif // READPE_LEGACY
 
 // -------------------------------------------------------------------------
 
@@ -723,7 +728,9 @@ static const char *parse_options(int argc, char *argv[])
 
 int main(int argc, char *argv[])
 {
+#ifdef READPE_LEGACY
     legacy(argc, argv);
+#endif // READPE_LEGACY
 
     // Print help when no arguments are given
     if (argc < 2) {

src/plugins/CMakeLists.txt

@@ -5,3 +5,10 @@ add_library(html SHARED  output/html.c)
 add_library(json SHARED output/json.c)
 add_library(xml SHARED output/xml.c)
 
+install(TARGETS csv html json xml
+    LIBRARY DESTINATION share/readpe/plugins
+    ARCHIVE DESTINATION share/readpe/plugins
+    RUNTIME DESTINATION bin
+    INCLUDES DESTINATION include/readpe
+)
+

t/texe/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.30)
+cmake_minimum_required(VERSION 3.20)
 project(texe)
 
 # Test EXEcutable