From a54ea6228674c1dc16c032e1a5fec96625ab5b0b Mon Sep 17 00:00:00 2001 From: passthecilantro <65034117+passthecilantro@users.noreply.github.com> Date: Wed, 23 Sep 2020 23:20:49 -0400 Subject: [PATCH] Rename libpe-parser-library -> libpe-parse (#138) Co-authored-by: William Woodruff --- MANIFEST.in | 2 +- dump-pe/CMakeLists.txt | 2 +- dump-pe/main.cpp | 2 +- examples/peaddrconv/CMakeLists.txt | 2 +- pe-parser-library/CMakeLists.txt | 10 +++++----- pe-parser-library/cmake/pe-parse-config.cmake | 4 ++-- .../include/{parser-library => pe-parse}/nt-headers.h | 0 .../include/{parser-library => pe-parse}/parse.h | 0 .../include/{parser-library => pe-parse}/to_string.h | 0 pe-parser-library/src/buffer.cpp | 2 +- pe-parser-library/src/parse.cpp | 6 +++--- pe-parser-library/src/unicode_codecvt.cpp | 2 +- pe-parser-library/src/unicode_winapi.cpp | 2 +- pepy/pepy.cpp | 2 +- 14 files changed, 18 insertions(+), 18 deletions(-) rename pe-parser-library/include/{parser-library => pe-parse}/nt-headers.h (100%) rename pe-parser-library/include/{parser-library => pe-parse}/parse.h (100%) rename pe-parser-library/include/{parser-library => pe-parse}/to_string.h (100%) diff --git a/MANIFEST.in b/MANIFEST.in index b430c9d..4edcb82 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,3 @@ include VERSION include pepy/README.md -include pe-parser-library/include/parser-library/*.h +include pe-parser-library/include/pe-parse/*.h diff --git a/dump-pe/CMakeLists.txt b/dump-pe/CMakeLists.txt index 22e413c..bd40723 100644 --- a/dump-pe/CMakeLists.txt +++ b/dump-pe/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.12 FATAL_ERROR) project(dump-pe) add_executable(${PROJECT_NAME} main.cpp) -target_link_libraries(${PROJECT_NAME} PRIVATE pe-parser-library) +target_link_libraries(${PROJECT_NAME} PRIVATE pe-parse) target_compile_options(${PROJECT_NAME} PRIVATE ${GLOBAL_CXXFLAGS}) install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION "bin") diff --git a/dump-pe/main.cpp b/dump-pe/main.cpp index 48dbc54..eb24200 100644 --- a/dump-pe/main.cpp +++ b/dump-pe/main.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. #include #include -#include +#include using namespace peparse; diff --git a/examples/peaddrconv/CMakeLists.txt b/examples/peaddrconv/CMakeLists.txt index d8e6b64..fce13e1 100644 --- a/examples/peaddrconv/CMakeLists.txt +++ b/examples/peaddrconv/CMakeLists.txt @@ -38,7 +38,7 @@ endif () find_package(pe-parse REQUIRED) add_executable(${PROJECT_NAME} main.cpp) -target_link_libraries(${PROJECT_NAME} pe-parse::pe-parser-library) +target_link_libraries(${PROJECT_NAME} pe-parse::pe-parse) target_compile_options(${PROJECT_NAME} PRIVATE ${PEADDRCONV_CXXFLAGS}) install(TARGETS ${PROJECT_NAME} DESTINATION "bin") diff --git a/pe-parser-library/CMakeLists.txt b/pe-parser-library/CMakeLists.txt index 763b8a4..468891b 100644 --- a/pe-parser-library/CMakeLists.txt +++ b/pe-parser-library/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.12 FATAL_ERROR) -project(pe-parser-library) +project(pe-parse) message(STATUS "VERSION file: ${PROJECT_SOURCE_DIR}/../VERSION") @@ -9,9 +9,9 @@ add_compile_definitions(PEPARSE_VERSION="${PEPARSE_VERSION}") # List all files explicitly; this will make IDEs happy (i.e. QtCreator, CLion, ...) list(APPEND PEPARSERLIB_SOURCEFILES - include/parser-library/parse.h - include/parser-library/nt-headers.h - include/parser-library/to_string.h + include/pe-parse/parse.h + include/pe-parse/nt-headers.h + include/pe-parse/to_string.h src/buffer.cpp src/parse.cpp @@ -64,4 +64,4 @@ install( NAMESPACE pe-parse:: EXPORT_LINK_INTERFACE_LIBRARIES ) -install(DIRECTORY "include/parser-library" DESTINATION "include") +install(DIRECTORY "include/pe-parse" DESTINATION "include") diff --git a/pe-parser-library/cmake/pe-parse-config.cmake b/pe-parser-library/cmake/pe-parse-config.cmake index 242d6c8..a3c8b42 100644 --- a/pe-parser-library/cmake/pe-parse-config.cmake +++ b/pe-parser-library/cmake/pe-parse-config.cmake @@ -1,5 +1,5 @@ -find_path(PEPARSE_INCLUDE_DIR "parser-library/parse.h") -find_library(PEPARSE_LIBRARIES NAMES "libpe-parser-library" "pe-parser-library") +find_path(PEPARSE_INCLUDE_DIR "pe-parse/parse.h") +find_library(PEPARSE_LIBRARIES NAMES "libpe-parse" "pe-parse") include(FindPackageHandleStandardArgs) find_package_handle_standard_args(pe-parse DEFAULT_MSG PEPARSE_INCLUDE_DIR PEPARSE_LIBRARIES) diff --git a/pe-parser-library/include/parser-library/nt-headers.h b/pe-parser-library/include/pe-parse/nt-headers.h similarity index 100% rename from pe-parser-library/include/parser-library/nt-headers.h rename to pe-parser-library/include/pe-parse/nt-headers.h diff --git a/pe-parser-library/include/parser-library/parse.h b/pe-parser-library/include/pe-parse/parse.h similarity index 100% rename from pe-parser-library/include/parser-library/parse.h rename to pe-parser-library/include/pe-parse/parse.h diff --git a/pe-parser-library/include/parser-library/to_string.h b/pe-parser-library/include/pe-parse/to_string.h similarity index 100% rename from pe-parser-library/include/parser-library/to_string.h rename to pe-parser-library/include/pe-parse/to_string.h diff --git a/pe-parser-library/src/buffer.cpp b/pe-parser-library/src/buffer.cpp index c56864d..5b27ebf 100644 --- a/pe-parser-library/src/buffer.cpp +++ b/pe-parser-library/src/buffer.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include // keep this header above "windows.h" because it contains many types -#include +#include #ifdef _WIN32 diff --git a/pe-parser-library/src/parse.cpp b/pe-parser-library/src/parse.cpp index 92502dd..ae91c15 100644 --- a/pe-parser-library/src/parse.cpp +++ b/pe-parser-library/src/parse.cpp @@ -29,9 +29,9 @@ THE SOFTWARE. #include #include -#include -#include -#include +#include +#include +#include namespace peparse { diff --git a/pe-parser-library/src/unicode_codecvt.cpp b/pe-parser-library/src/unicode_codecvt.cpp index b702ddd..22ea1d4 100644 --- a/pe-parser-library/src/unicode_codecvt.cpp +++ b/pe-parser-library/src/unicode_codecvt.cpp @@ -24,7 +24,7 @@ THE SOFTWARE. #include #include -#include +#include namespace peparse { // See diff --git a/pe-parser-library/src/unicode_winapi.cpp b/pe-parser-library/src/unicode_winapi.cpp index 6160f2a..7518a1d 100644 --- a/pe-parser-library/src/unicode_winapi.cpp +++ b/pe-parser-library/src/unicode_winapi.cpp @@ -23,7 +23,7 @@ THE SOFTWARE. */ #include -#include +#include namespace peparse { std::string from_utf16(const UCharString &u) { diff --git a/pepy/pepy.cpp b/pepy/pepy.cpp index c895ac5..4f42a25 100644 --- a/pepy/pepy.cpp +++ b/pepy/pepy.cpp @@ -26,7 +26,7 @@ */ #include -#include +#include #include using namespace peparse;