From aca369a78ea9a5ea49d3da551bd5dd4507a69be9 Mon Sep 17 00:00:00 2001 From: "Maxim [maxirmx] Samsonov" Date: Sat, 24 Jun 2023 15:04:00 +0300 Subject: [PATCH] Renamed the project and project artifacts to sexpp --- CMakeLists.txt | 85 +++++++++++------------- README.adoc | 16 ++--- cmake/{sexp.pc.in => sexpp.pc.in} | 4 +- cmake/version.cmake | 23 ++++--- include/{sexp => sexpp}/ext-key-format.h | 7 +- include/{sexp => sexpp}/sexp-error.h | 4 +- include/{sexp => sexpp}/sexp.h | 16 ++--- man/{sexp.1 => sexpp.1} | 10 +-- src/ext-key-format.cpp | 2 +- src/sexp-char-defs.cpp | 2 +- src/sexp-depth-manager.cpp | 3 +- src/sexp-error.cpp | 2 +- src/sexp-input.cpp | 2 +- src/sexp-main.cpp | 2 +- src/sexp-object.cpp | 2 +- src/sexp-output.cpp | 2 +- src/sexp-simple-string.cpp | 2 +- tests/include/sexp-tests.h | 5 +- tests/scripts/tests.sh | 46 ++++++------- tests/src/baseline-tests.cpp | 2 +- tests/src/compare-files.cpp | 2 +- tests/src/exception-tests.cpp | 2 +- tests/src/g10-compat-tests.cpp | 2 +- tests/src/g23-compat-tests.cpp | 4 +- tests/src/g23-exception-tests.cpp | 4 +- tests/src/primitives-tests.cpp | 2 +- version.txt | 2 +- 27 files changed, 126 insertions(+), 129 deletions(-) rename cmake/{sexp.pc.in => sexpp.pc.in} (68%) rename include/{sexp => sexpp}/ext-key-format.h (96%) rename include/{sexp => sexpp}/sexp-error.h (97%) rename include/{sexp => sexpp}/sexp.h (94%) rename man/{sexp.1 => sexpp.1} (78%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0910cc0..d88547e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,11 +23,10 @@ cmake_minimum_required(VERSION 3.14) include(cmake/version.cmake) -determine_version("${CMAKE_CURRENT_SOURCE_DIR}" SEXP) - +determine_version("${CMAKE_CURRENT_SOURCE_DIR}" SEXPP) # project name, etc -project(sexp - VERSION "${SEXP_VERSION}" +project(sexpp + VERSION "${SEXPP_VERSION}" LANGUAGES C CXX DESCRIPTION "S-expressions parser and generator C++ library, fully compliant to [https://people.csail.mit.edu/rivest/Sexp.txt]" ) @@ -111,7 +110,7 @@ if(NOT MSVC) endif(NOT MSVC) -add_library(sexp ${TYPE} +add_library(sexpp ${TYPE} "src/sexp-input.cpp" "src/sexp-output.cpp" "src/sexp-object.cpp" @@ -120,43 +119,39 @@ add_library(sexp ${TYPE} "src/sexp-error.cpp" "src/sexp-depth-manager.cpp" "src/ext-key-format.cpp" - "include/sexp/sexp.h" - "include/sexp/sexp-error.h" - "include/sexp/ext-key-format.h" + "include/sexpp/sexp.h" + "include/sexpp/sexp-error.h" + "include/sexpp/ext-key-format.h" ) -target_compile_features(sexp PUBLIC cxx_std_11) -target_include_directories(sexp PUBLIC +target_compile_features(sexpp PUBLIC cxx_std_11) +target_include_directories(sexpp PUBLIC $ $ ) -string(REGEX MATCH "^([0-9]+)\\.[0-9]+\\.[0-9]+$" vmatches "${SEXP_VERSION}") -if (NOT vmatches) - message(FATAL_ERROR "Failed to extract major version from SEXP_VERSION (${SEXP_VERSION}).") -endif() -set(SEXP_MAJOR_VERSION "${CMAKE_MATCH_1}") - -set_target_properties(sexp PROPERTIES +set_target_properties(sexpp PROPERTIES POSITION_INDEPENDENT_CODE ON RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" - VERSION "${SEXP_VERSION}" - SOVERSION "${SEXP_MAJOR_VERSION}" - OUTPUT_NAME "sexp" + VERSION "${SEXPP_VERSION}" + SOVERSION "${SEXPP_MAJOR_VERSION}" + OUTPUT_NAME "sexpp" ) -if(WITH_SEXP_CLI) - add_executable (sexp-cli +if (WITH_SEXP_CLI) + add_executable (sexpp-cli src/sexp-main.cpp - include/sexp/sexp.h - include/sexp/sexp-error.h + include/sexpp/sexp.h + include/sexpp/sexp-error.h ) - target_include_directories (sexp-cli PUBLIC include) - target_link_libraries(sexp-cli PRIVATE sexp) - target_compile_features(sexp-cli PUBLIC cxx_std_11) - set_target_properties(sexp-cli PROPERTIES RUNTIME_OUTPUT_NAME sexp) - set_target_properties(sexp-cli PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) -endif(WITH_SEXP_CLI) + target_include_directories (sexpp-cli PUBLIC include) + target_link_libraries(sexpp-cli PRIVATE sexpp) + target_compile_features(sexpp-cli PUBLIC cxx_std_11) + set_target_properties(sexpp-cli PROPERTIES + RUNTIME_OUTPUT_NAME sexpp + RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin + ) +endif (WITH_SEXP_CLI) if(WITH_SEXP_TESTS) @@ -194,7 +189,7 @@ if(WITH_SEXP_TESTS) @ONLY ) - add_executable(sexp-tests + add_executable(sexpp-tests "tests/src/baseline-tests.cpp" "tests/src/exception-tests.cpp" "tests/src/primitives-tests.cpp" @@ -229,45 +224,45 @@ if(WITH_SEXP_TESTS) set(GTest GTest::GTest) if(NOT MSVC) - target_link_libraries(sexp-tests PRIVATE pthread) + target_link_libraries(sexpp-tests PRIVATE pthread) endif(NOT MSVC) endif(DOWNLOAD_GTEST) - target_link_libraries(sexp-tests PRIVATE - sexp + target_link_libraries(sexpp-tests PRIVATE + sexpp ${GTestMain} ${GTest} ) - target_include_directories(sexp-tests PRIVATE + target_include_directories(sexpp-tests PRIVATE tests/include include "${GTEST_INCLUDE_DIRS}" ) - target_compile_features(sexp-tests PUBLIC cxx_std_11) - set_target_properties(sexp-tests PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + target_compile_features(sexpp-tests PUBLIC cxx_std_11) + set_target_properties(sexpp-tests PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) - gtest_discover_tests(sexp-tests) + gtest_discover_tests(sexpp-tests) endif(WITH_SEXP_TESTS) -set(CONFIGURED_PC "${CMAKE_CURRENT_BINARY_DIR}/sexp.pc") +set(CONFIGURED_PC "${CMAKE_CURRENT_BINARY_DIR}/sexpp.pc") configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/cmake/sexp.pc.in" + "${CMAKE_CURRENT_SOURCE_DIR}/cmake/sexpp.pc.in" "${CONFIGURED_PC}" @ONLY ) if (WIN32 AND BUILD_SHARED_LIBS) - install(TARGETS sexp RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") - install(TARGETS sexp ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") + install(TARGETS sexpp RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + install(TARGETS sexpp ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") else(WIN32 AND BUILD_SHARED_LIBS) - install(TARGETS sexp DESTINATION "${CMAKE_INSTALL_LIBDIR}") + install(TARGETS sexpp DESTINATION "${CMAKE_INSTALL_LIBDIR}") endif(WIN32 AND BUILD_SHARED_LIBS) install(DIRECTORY include/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") install(FILES "${CONFIGURED_PC}" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") if(WITH_SEXP_CLI) - install(TARGETS sexp-cli DESTINATION "${CMAKE_INSTALL_BINDIR}") - install(FILES man/sexp.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1") + install(TARGETS sexpp-cli DESTINATION "${CMAKE_INSTALL_BINDIR}") + install(FILES man/sexpp.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1") endif(WITH_SEXP_CLI) diff --git a/README.adoc b/README.adoc index 80b9253..92ce1e7 100644 --- a/README.adoc +++ b/README.adoc @@ -120,14 +120,14 @@ build with address and other sanitizers (requires clang compiler) -== SEXP command-line utility +== SEXPP command-line utility -The `sexp` command-line utility is reference parser and generator of +The `sexpp` command-line utility is reference parser and generator of S-Expressions. It can read, parse and print out SEXP in all defined formats. === Switches -.`sexp` switches +.`sexpp` switches [options="header"] |=== | Switch | Description | Default @@ -160,7 +160,7 @@ Prompt for S-Expressions input from console, parse and output it to [source] ---- -$ sexp -o certificate.dat -p -b +$ sexpp -o certificate.dat -p -b > Input: > (aa bb (cc dd)) @@ -173,7 +173,7 @@ advanced transport format with no prompts: [source,sh] ---- -$ sexp -i certificate.dat -x +$ sexpp -i certificate.dat -x > (2:aa2:bb(2:cc2:dd)) ---- @@ -183,7 +183,7 @@ base64 and advanced format with prompts and no width limitation: [source,sh] ---- -$ sexp -i certificate.dat -a -b -c -p -w 0 +$ sexpp -i certificate.dat -a -b -c -p -w 0 > Reading input from certificate.dat > @@ -200,14 +200,14 @@ console in advanced, base64 and canonical formats: [source,sh] ---- -$ sexp -p -a -b -c -x +$ sexpp -p -a -b -c -x ---- or just [source,sh] ---- -$ sexp +$ sexpp > Input: > (abc def (ghi jkl)) diff --git a/cmake/sexp.pc.in b/cmake/sexpp.pc.in similarity index 68% rename from cmake/sexp.pc.in rename to cmake/sexpp.pc.in index df9531f..1ab63e1 100644 --- a/cmake/sexp.pc.in +++ b/cmake/sexpp.pc.in @@ -2,8 +2,8 @@ libdir=@CMAKE_INSTALL_FULL_LIBDIR@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ Name: sexp -Description: S-expressions library +Description: C++ library for working with S-Expressions Version: @PROJECT_VERSION@ URL: https://github.com/rnpgp/sexp -Libs: -L${libdir} -lsexp +Libs: -L${libdir} -lsexpp Cflags: -I${includedir} diff --git a/cmake/version.cmake b/cmake/version.cmake index 5f029a3..41287e4 100644 --- a/cmake/version.cmake +++ b/cmake/version.cmake @@ -38,29 +38,30 @@ function(extract_version_info version var_prefix) # extract the main components # v1.9.0-3-g5b92266+1546836556 # v1.9.0-3-g5b92266-dirty+1546836556 - string(REGEX MATCH "^v?([0-9]+\\.[0-9]+\\.[0-9]+)(-([0-9]+)-g([0-9a-f]+)(-dirty)?)?(\\+([0-9]+))?$" matches "${version}") + string(REGEX MATCH "^v?(([0-9]+)\\.[0-9]+\\.[0-9]+)(-([0-9]+)-g([0-9a-f]+)(-dirty)?)?(\\+([0-9]+))?$" matches "${version}") if (NOT matches) message(FATAL_ERROR "Failed to extract version components from ${version}.") endif() set(${var_prefix}_VERSION "${CMAKE_MATCH_1}" PARENT_SCOPE) # 1.9.0 - if (NOT CMAKE_MATCH_3) - set(CMAKE_MATCH_3 "0") - endif() - set(${var_prefix}_VERSION_NCOMMITS "${CMAKE_MATCH_3}" PARENT_SCOPE) # 3 + set(${var_prefix}_MAJOR_VERSION "${CMAKE_MATCH_2}" PARENT_SCOPE) # 1 if (NOT CMAKE_MATCH_4) set(CMAKE_MATCH_4 "0") endif() - set(${var_prefix}_VERSION_GIT_REV "${CMAKE_MATCH_4}" PARENT_SCOPE) # 5b92266 - if (CMAKE_MATCH_5 STREQUAL "-dirty") + set(${var_prefix}_VERSION_NCOMMITS "${CMAKE_MATCH_4}" PARENT_SCOPE) # 3 + if (NOT CMAKE_MATCH_5) + set(CMAKE_MATCH_5 "0") + endif() + set(${var_prefix}_VERSION_GIT_REV "${CMAKE_MATCH_5}" PARENT_SCOPE) # 5b92266 + if (CMAKE_MATCH_6 STREQUAL "-dirty") set(${var_prefix}_VERSION_IS_DIRTY TRUE PARENT_SCOPE) else() set(${var_prefix}_VERSION_IS_DIRTY FALSE PARENT_SCOPE) endif() # timestamp is optional, default to 0 - if (NOT CMAKE_MATCH_7) - set(CMAKE_MATCH_7 "0") + if (NOT CMAKE_MATCH_8) + set(CMAKE_MATCH_8 "0") endif() - set(${var_prefix}_VERSION_COMMIT_TIMESTAMP "${CMAKE_MATCH_7}" PARENT_SCOPE) # 1546836556 + set(${var_prefix}_VERSION_COMMIT_TIMESTAMP "${CMAKE_MATCH_8}" PARENT_SCOPE) # 1546836556 endfunction() function(determine_version source_dir var_prefix) @@ -153,7 +154,9 @@ function(determine_version source_dir var_prefix) # set the results set(${var_prefix}_VERSION_SUFFIX "${version_suffix}" PARENT_SCOPE) set(${var_prefix}_VERSION_FULL "${version_full}" PARENT_SCOPE) + set(${var_prefix}_MAJOR_VERSION "${${local_prefix}_MAJOR_VERSION}" PARENT_SCOPE) # 1 # for informational purposes + message(STATUS "${var_prefix}_MAJOR_VERSION: ${${local_prefix}_MAJOR_VERSION}") message(STATUS "${var_prefix}_VERSION_SUFFIX: ${version_suffix}") message(STATUS "${var_prefix}_VERSION_FULL: ${version_full}") endfunction() diff --git a/include/sexp/ext-key-format.h b/include/sexpp/ext-key-format.h similarity index 96% rename from include/sexp/ext-key-format.h rename to include/sexpp/ext-key-format.h index f9e8a30..b28102d 100644 --- a/include/sexp/ext-key-format.h +++ b/include/sexpp/ext-key-format.h @@ -24,16 +24,17 @@ #pragma once #include + #include "sexp.h" namespace ext_key_format { -void ext_key_error( +void ext_key_error( sexp::sexp_exception_t::severity level, const char *msg, size_t c1, size_t c2, int pos); class ext_key_input_stream_t; -class extended_private_key_t { +class extended_private_key_t { public: // Comparison of names is done case insensitively !!! struct ci_less { @@ -67,7 +68,7 @@ class extended_private_key_t { void parse(ext_key_input_stream_t &is); }; -class ext_key_input_stream_t : public sexp::sexp_input_stream_t { +class ext_key_input_stream_t : public sexp::sexp_input_stream_t { private: static const bool namechar[256]; /* true if allowed in the name field */ diff --git a/include/sexp/sexp-error.h b/include/sexpp/sexp-error.h similarity index 97% rename from include/sexp/sexp-error.h rename to include/sexpp/sexp-error.h index 7364a42..158748e 100644 --- a/include/sexp/sexp-error.h +++ b/include/sexpp/sexp-error.h @@ -30,7 +30,7 @@ namespace sexp { -class sexp_exception_t : public std::exception { +class sexp_exception_t : public std::exception { public: enum severity { error = 0, warning = 1 }; @@ -65,7 +65,7 @@ class sexp_exception_t : public std::exception { static void set_interactive(bool new_interactive) { interactive = new_interactive; }; }; -void sexp_error( +void sexp_error( sexp_exception_t::severity level, const char *msg, size_t c1, size_t c2, int pos); } // namespace sexp diff --git a/include/sexp/sexp.h b/include/sexpp/sexp.h similarity index 94% rename from include/sexp/sexp.h rename to include/sexpp/sexp.h index d97a45e..789bf72 100644 --- a/include/sexp/sexp.h +++ b/include/sexpp/sexp.h @@ -51,7 +51,7 @@ namespace sexp { * However, we do enforce 'C' locale this way */ -class sexp_char_defs_t { +class sexp_char_defs_t { protected: static const bool base64digit[256]; /* true if c is base64 digit */ static const bool tokenchar[256]; /* true if c can be in a token */ @@ -100,7 +100,7 @@ class sexp_input_stream_t; typedef uint8_t octet_t; -class sexp_simple_string_t : public std::basic_string, private sexp_char_defs_t { +class sexp_simple_string_t : public std::basic_string, private sexp_char_defs_t { public: sexp_simple_string_t(void) = default; sexp_simple_string_t(const octet_t *dt) : std::basic_string{dt} {} @@ -161,7 +161,7 @@ inline bool operator!=(const sexp_simple_string_t *left, const std::string &righ * SEXP object */ -class sexp_object_t { +class sexp_object_t { public: virtual ~sexp_object_t(){}; @@ -201,7 +201,7 @@ class sexp_object_t { * SEXP string */ -class sexp_string_t : public sexp_object_t { +class sexp_string_t : public sexp_object_t { protected: bool with_presentation_hint; sexp_simple_string_t presentation_hint; @@ -265,7 +265,7 @@ inline bool operator!=(const sexp_string_t *left, const std::string &right) noex * SEXP list */ -class sexp_list_t : public sexp_object_t, public std::vector> { +class sexp_list_t : public sexp_object_t, public std::vector> { public: virtual ~sexp_list_t() {} @@ -299,7 +299,7 @@ class sexp_list_t : public sexp_object_t, public std::vector +#include using namespace sexp; diff --git a/src/sexp-char-defs.cpp b/src/sexp-char-defs.cpp index d2712a1..0dd7011 100644 --- a/src/sexp-char-defs.cpp +++ b/src/sexp-char-defs.cpp @@ -26,7 +26,7 @@ * 7/21/1997 */ -#include +#include namespace sexp { diff --git a/src/sexp-depth-manager.cpp b/src/sexp-depth-manager.cpp index 9192de4..6694cb6 100644 --- a/src/sexp-depth-manager.cpp +++ b/src/sexp-depth-manager.cpp @@ -21,8 +21,7 @@ * **/ -#include -#include +#include namespace sexp { diff --git a/src/sexp-error.cpp b/src/sexp-error.cpp index 40fa1aa..ad1458d 100644 --- a/src/sexp-error.cpp +++ b/src/sexp-error.cpp @@ -21,7 +21,7 @@ * */ -#include +#include namespace sexp { diff --git a/src/sexp-input.cpp b/src/sexp-input.cpp index 625a42a..2508331 100644 --- a/src/sexp-input.cpp +++ b/src/sexp-input.cpp @@ -26,7 +26,7 @@ * 7/21/1997 */ -#include +#include namespace sexp { diff --git a/src/sexp-main.cpp b/src/sexp-main.cpp index c10db6e..937fa4c 100644 --- a/src/sexp-main.cpp +++ b/src/sexp-main.cpp @@ -28,7 +28,7 @@ #include -#include +#include using namespace sexp; diff --git a/src/sexp-object.cpp b/src/sexp-object.cpp index d18a387..0099d19 100644 --- a/src/sexp-object.cpp +++ b/src/sexp-object.cpp @@ -26,7 +26,7 @@ * 5/5/1997 */ -#include +#include namespace sexp { diff --git a/src/sexp-output.cpp b/src/sexp-output.cpp index e3a0502..f1acd13 100644 --- a/src/sexp-output.cpp +++ b/src/sexp-output.cpp @@ -26,7 +26,7 @@ * 5/5/1997 */ -#include +#include namespace sexp { diff --git a/src/sexp-simple-string.cpp b/src/sexp-simple-string.cpp index f2854e1..ad585f0 100644 --- a/src/sexp-simple-string.cpp +++ b/src/sexp-simple-string.cpp @@ -26,7 +26,7 @@ * 5/5/1997 */ -#include +#include namespace sexp { /* diff --git a/tests/include/sexp-tests.h b/tests/include/sexp-tests.h index 9a78086..497fc91 100644 --- a/tests/include/sexp-tests.h +++ b/tests/include/sexp-tests.h @@ -30,9 +30,8 @@ #include -#include - -#include +#include "sexpp/sexp.h" +#include "sexp-samples-folder.h" bool compare_binary_files(const std::string &filename1, const std::string &filename2); bool compare_text_files(const std::string &filename1, const std::string &filename2); diff --git a/tests/scripts/tests.sh b/tests/scripts/tests.sh index 376d5ec..9344e17 100755 --- a/tests/scripts/tests.sh +++ b/tests/scripts/tests.sh @@ -47,48 +47,48 @@ test_install_script() { version_major="${version:0:1}" case "$OSTYPE" in darwin*) - assert_installed "$DIR_INS_B/sexp" - assert_installed "$DIR_INS_L/libsexp.dylib" - assert_installed "$DIR_INS_L/libsexp.$version_major.dylib" - assert_installed "$DIR_INS_L/libsexp.$version.dylib" + assert_installed "$DIR_INS_B/sexpp" + assert_installed "$DIR_INS_L/libsexpp.dylib" + assert_installed "$DIR_INS_L/libsexpp.$version_major.dylib" + assert_installed "$DIR_INS_L/libsexpp.$version.dylib" ;; windows ) - assert_installed "$DIR_INS_B/sexp.exe" - assert_installed "$DIR_INS_B/sexp.dll" - assert_installed "$DIR_INS_L/sexp.lib" + assert_installed "$DIR_INS_B/sexpp.exe" + assert_installed "$DIR_INS_B/sexpp.dll" + assert_installed "$DIR_INS_L/sexpp.lib" ;; msys) - assert_installed "$DIR_INS_B/sexp.exe" - assert_installed "$DIR_INS_B/libsexp.dll" - assert_installed "$DIR_INS_L/libsexp.dll.a" + assert_installed "$DIR_INS_B/sexpp.exe" + assert_installed "$DIR_INS_B/libsexpp.dll" + assert_installed "$DIR_INS_L/libsexpp.dll.a" ;; *) - assert_installed "$DIR_INS_B/sexp" - assert_installed_var "$DIR_INS_L" "$DIR_INS_L64" "libsexp.so" - assert_installed_var "$DIR_INS_L" "$DIR_INS_L64" "libsexp.so.$version_major" - assert_installed_var "$DIR_INS_L" "$DIR_INS_L64" "libsexp.so.$version" + assert_installed "$DIR_INS_B/sexpp" + assert_installed_var "$DIR_INS_L" "$DIR_INS_L64" "libsexpp.so" + assert_installed_var "$DIR_INS_L" "$DIR_INS_L64" "libsexpp.so.$version_major" + assert_installed_var "$DIR_INS_L" "$DIR_INS_L64" "libsexpp.so.$version" ;; esac else case "$OSTYPE" in windows) - assert_installed "$DIR_INS_B/sexp.exe" - assert_installed "$DIR_INS_L/sexp.lib" + assert_installed "$DIR_INS_B/sexpp.exe" + assert_installed "$DIR_INS_L/sexpp.lib" ;; msys) - assert_installed "$DIR_INS_B/sexp.exe" - assert_installed "$DIR_INS_L/libsexp.a" + assert_installed "$DIR_INS_B/sexpp.exe" + assert_installed "$DIR_INS_L/libsexpp.a" ;; *) - assert_installed "$DIR_INS_B/sexp" - assert_installed_var "$DIR_INS_L" "$DIR_INS_L64" "libsexp.a" + assert_installed "$DIR_INS_B/sexpp" + assert_installed_var "$DIR_INS_L" "$DIR_INS_L64" "libsexpp.a" ;; esac fi - assert_installed_var "$DIR_INS_P" "$DIR_INS_P64" "sexp.pc" - assert_installed_var_2 "$DIR_INS_M/man1" "sexp.1" "sexp.1.gz" + assert_installed_var "$DIR_INS_P" "$DIR_INS_P64" "sexpp.pc" + assert_installed_var_2 "$DIR_INS_M/man1" "sexpp.1" "sexpp.1.gz" assert_installed "$DIR_INS_I/sexp.h" assert_installed "$DIR_INS_I/sexp-error.h" @@ -182,7 +182,7 @@ DIR_INS_L64="$DIR_INSTALL/lib64" DIR_INS_M="$DIR_INSTALL/share/man" DIR_INS_P="$DIR_INS_L/pkgconfig" DIR_INS_P64="$DIR_INS_L64/pkgconfig" -DIR_INS_I="$DIR_INSTALL/include/sexp" +DIR_INS_I="$DIR_INSTALL/include/sexpp" DIR_TESTS=$( cd "$DIR0/.." && pwd) diff --git a/tests/src/baseline-tests.cpp b/tests/src/baseline-tests.cpp index 8a1b0c8..bbd59a4 100644 --- a/tests/src/baseline-tests.cpp +++ b/tests/src/baseline-tests.cpp @@ -21,7 +21,7 @@ * */ -#include +#include "sexp-tests.h" using namespace sexp; using ::testing::UnitTest; diff --git a/tests/src/compare-files.cpp b/tests/src/compare-files.cpp index 1db7f6f..49caec5 100644 --- a/tests/src/compare-files.cpp +++ b/tests/src/compare-files.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include "sexp-tests.h" bool compare_binary_files(const std::string &filename1, const std::string &filename2) { diff --git a/tests/src/exception-tests.cpp b/tests/src/exception-tests.cpp index e3e4d82..318b2b8 100644 --- a/tests/src/exception-tests.cpp +++ b/tests/src/exception-tests.cpp @@ -21,7 +21,7 @@ * */ -#include +#include "sexp-tests.h" using namespace sexp; diff --git a/tests/src/g10-compat-tests.cpp b/tests/src/g10-compat-tests.cpp index fcbbe83..62f1180 100644 --- a/tests/src/g10-compat-tests.cpp +++ b/tests/src/g10-compat-tests.cpp @@ -21,7 +21,7 @@ * */ -#include +#include "sexp-tests.h" using namespace sexp; diff --git a/tests/src/g23-compat-tests.cpp b/tests/src/g23-compat-tests.cpp index 63a5a2f..3a2e756 100644 --- a/tests/src/g23-compat-tests.cpp +++ b/tests/src/g23-compat-tests.cpp @@ -21,8 +21,8 @@ * */ -#include -#include +#include "sexp-tests.h" +#include "sexpp/ext-key-format.h" using namespace sexp; using namespace ext_key_format; diff --git a/tests/src/g23-exception-tests.cpp b/tests/src/g23-exception-tests.cpp index d83ea7e..4f4413d 100644 --- a/tests/src/g23-exception-tests.cpp +++ b/tests/src/g23-exception-tests.cpp @@ -21,8 +21,8 @@ * */ -#include -#include +#include "sexp-tests.h" +#include "sexpp/ext-key-format.h" using namespace sexp; using namespace ext_key_format; diff --git a/tests/src/primitives-tests.cpp b/tests/src/primitives-tests.cpp index d4a3474..0689d27 100644 --- a/tests/src/primitives-tests.cpp +++ b/tests/src/primitives-tests.cpp @@ -21,7 +21,7 @@ * */ -#include +#include "sexp-tests.h" using namespace sexp; diff --git a/version.txt b/version.txt index 7ada0d3..1e9b46b 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.8.5 +0.8.7