Compare commits
1 Commits
v1.0.0-rc7
...
dev
Author | SHA1 | Date | |
---|---|---|---|
b49ae6e46c |
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -4,3 +4,6 @@
|
|||||||
[submodule "linklist-lib"]
|
[submodule "linklist-lib"]
|
||||||
path = linklist-lib
|
path = linklist-lib
|
||||||
url = https://git.shimatta.de/mhu/linklist-lib.git
|
url = https://git.shimatta.de/mhu/linklist-lib.git
|
||||||
|
[submodule "test/catch2"]
|
||||||
|
path = test/catch2
|
||||||
|
url = https://git.shimatta.de/3rd-party/catch2.git
|
||||||
|
@@ -16,7 +16,7 @@ sha1sums=('SKIP' 'SKIP' 'SKIP')
|
|||||||
pkgver () {
|
pkgver () {
|
||||||
_date=`date +"%Y%m%d"`
|
_date=`date +"%Y%m%d"`
|
||||||
cd "${srcdir}/${pkgname}-git"
|
cd "${srcdir}/${pkgname}-git"
|
||||||
echo "$(echo "$(git describe --always --dirty)" | sed 's/-/_/g')"
|
echo "$(echo "$(sh ./gen-version-string.sh)" | sed 's/-/_/g')"
|
||||||
}
|
}
|
||||||
|
|
||||||
build () {
|
build () {
|
||||||
@@ -24,7 +24,6 @@ build () {
|
|||||||
cd "$srcdir/$pkgname-git/build"
|
cd "$srcdir/$pkgname-git/build"
|
||||||
cmake -DCMAKE_BUILD_TYPE=Release ..
|
cmake -DCMAKE_BUILD_TYPE=Release ..
|
||||||
make -j12
|
make -j12
|
||||||
make man-page
|
|
||||||
}
|
}
|
||||||
|
|
||||||
prepare () {
|
prepare () {
|
||||||
|
@@ -28,6 +28,8 @@ pkg_check_modules(ELF REQUIRED libelf)
|
|||||||
find_package(Doxygen)
|
find_package(Doxygen)
|
||||||
find_package(LibXml2 REQUIRED)
|
find_package(LibXml2 REQUIRED)
|
||||||
|
|
||||||
|
add_subdirectory(man)
|
||||||
|
|
||||||
aux_source_directory("src" CFILES)
|
aux_source_directory("src" CFILES)
|
||||||
|
|
||||||
set(GEN_HEADER_PATH "${CMAKE_CURRENT_BINARY_DIR}/include/generated")
|
set(GEN_HEADER_PATH "${CMAKE_CURRENT_BINARY_DIR}/include/generated")
|
||||||
@@ -35,17 +37,12 @@ set(GEN_HEADER_PATH "${CMAKE_CURRENT_BINARY_DIR}/include/generated")
|
|||||||
add_custom_target(
|
add_custom_target(
|
||||||
version-header
|
version-header
|
||||||
COMMAND
|
COMMAND
|
||||||
${CMAKE_COMMAND} -D SRC=${CMAKE_SOURCE_DIR}/version.h.template
|
mkdir -p ${GEN_HEADER_PATH} && bash "${CMAKE_CURRENT_SOURCE_DIR}/gen_version_header.sh" "${GEN_HEADER_PATH}/version.h"
|
||||||
-D DST=${GEN_HEADER_PATH}/version.h
|
|
||||||
-P ${CMAKE_SOURCE_DIR}/GenerateVersion.cmake
|
|
||||||
WORKING_DIRECTORY
|
WORKING_DIRECTORY
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}
|
${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
COMMENT "Generating version header"
|
COMMENT "Generating version header"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
add_subdirectory(man)
|
|
||||||
|
|
||||||
add_custom_target(schema-header DEPENDS "${GEN_HEADER_PATH}/schema-blob.h")
|
add_custom_target(schema-header DEPENDS "${GEN_HEADER_PATH}/schema-blob.h")
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT "${GEN_HEADER_PATH}/schema-blob.h"
|
OUTPUT "${GEN_HEADER_PATH}/schema-blob.h"
|
||||||
@@ -69,8 +66,7 @@ target_link_directories(${PROJECT_NAME} PRIVATE ${ELF_LIBRARY_DIRS} ${LIBXML2_LI
|
|||||||
target_include_directories(${PROJECT_NAME} PRIVATE ${ELF_INCLUDE_DIRS})
|
target_include_directories(${PROJECT_NAME} PRIVATE ${ELF_INCLUDE_DIRS})
|
||||||
target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/include")
|
target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/include")
|
||||||
target_include_directories(${PROJECT_NAME} PRIVATE "include")
|
target_include_directories(${PROJECT_NAME} PRIVATE "include")
|
||||||
add_dependencies(${PROJECT_NAME} schema-header)
|
add_dependencies(${PROJECT_NAME} version-header schema-header)
|
||||||
add_dependencies(${PROJECT_NAME} version-header)
|
|
||||||
|
|
||||||
if (DOXYGEN_FOUND)
|
if (DOXYGEN_FOUND)
|
||||||
set(DOXYFILE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/doxygen/Doxyfile.in")
|
set(DOXYFILE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/doxygen/Doxyfile.in")
|
||||||
@@ -87,13 +83,13 @@ if (DOXYGEN_FOUND)
|
|||||||
|
|
||||||
add_custom_target(doxygen-version-header
|
add_custom_target(doxygen-version-header
|
||||||
COMMAND
|
COMMAND
|
||||||
${CMAKE_COMMAND} -D SRC="${CMAKE_SOURCE_DIR}/doxyversion.in.template"
|
bash ${CMAKE_CURRENT_SOURCE_DIR}/doxygen/gen-version-string.sh "${CMAKE_CURRENT_BINARY_DIR}/doxyversion.in"
|
||||||
-D DST="${CMAKE_CURRENT_BINARY_DIR}/doxyversion.in"
|
|
||||||
-P ${CMAKE_SOURCE_DIR}/GenerateVersion.cmake
|
|
||||||
WORKING_DIRECTORY
|
WORKING_DIRECTORY
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}
|
${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
)
|
)
|
||||||
else (DOXYGEN_FOUND)
|
else (DOXYGEN_FOUND)
|
||||||
message("${BoldMagenta}Doxygen needs to be installed to generate the doxygen documentation${ColorReset}")
|
message("${BoldMagenta}Doxygen needs to be installed to generate the doxygen documentation${ColorReset}")
|
||||||
message("${BoldMagenta}doxygen target will not be available${ColorReset}")
|
message("${BoldMagenta}doxygen target will not be available${ColorReset}")
|
||||||
endif (DOXYGEN_FOUND)
|
endif (DOXYGEN_FOUND)
|
||||||
|
|
||||||
|
add_subdirectory(test)
|
||||||
|
@@ -1,26 +0,0 @@
|
|||||||
find_package(Git)
|
|
||||||
|
|
||||||
if(GIT_EXECUTABLE)
|
|
||||||
get_filename_component(WORKING_DIR ${SRC} DIRECTORY)
|
|
||||||
execute_process(
|
|
||||||
COMMAND ${GIT_EXECUTABLE} describe --always --dirty
|
|
||||||
WORKING_DIRECTORY ${WORKING_DIR}
|
|
||||||
OUTPUT_VARIABLE PROGRAM_GIT_VERSION
|
|
||||||
RESULT_VARIABLE ERROR_CODE
|
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
|
||||||
)
|
|
||||||
|
|
||||||
if(NOT ERROR_CODE EQUAL "0")
|
|
||||||
set(PROGRAM_GIT_VERSION "")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(PROGRAM_GIT_VERSION STREQUAL "")
|
|
||||||
set(PROGRAM_GIT_VERSION 0.0.0-unknown)
|
|
||||||
message(WARNING "Failed to determine version from Git tags. Using default version \"${PROGRAM_GIT_VERSION}\".")
|
|
||||||
else()
|
|
||||||
message("Git Version: \"${PROGRAM_GIT_VERSION}\".")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
configure_file(${SRC} ${DST} @ONLY)
|
|
9
bash-completion/patchelfcrc
Normal file
9
bash-completion/patchelfcrc
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
function _patchelfcrc() {
|
||||||
|
echo "Cursor index: $COMP_CWORD"
|
||||||
|
echo "line as array: $COMP_WORDS"
|
||||||
|
echo "line as string: $COMP_LINE"
|
||||||
|
}
|
||||||
|
|
||||||
|
complete -F _patchelfcrc patchelfcrc
|
@@ -1 +0,0 @@
|
|||||||
@PROGRAM_GIT_VERSION@
|
|
1
gen-version-string.sh
Executable file
1
gen-version-string.sh
Executable file
@@ -0,0 +1 @@
|
|||||||
|
echo `git describe --tags --always --dirty`
|
11
gen_version_header.sh
Executable file
11
gen_version_header.sh
Executable file
@@ -0,0 +1,11 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
if [[ -z $1 ]]; then
|
||||||
|
exit -1;
|
||||||
|
fi
|
||||||
|
|
||||||
|
ver=`git describe --tags --always --dirty`
|
||||||
|
echo "#ifndef _VERSION_GENERATED_H_" > $1
|
||||||
|
echo "#define _VERSION_GENERATED_H_" >> $1
|
||||||
|
echo "#define GIT_VERSION_STRING \"$ver\"" >> $1
|
||||||
|
echo "#endif /* _VERSION_GENERATED_H_ */" >> $1
|
@@ -1,6 +1,7 @@
|
|||||||
set (MAN_PAGE_NAME "patchelfcrc.1.gz")
|
set (MAN_PAGE_NAME "patchelfcrc.1.gz")
|
||||||
|
|
||||||
add_custom_target(man-page
|
add_custom_target(man-page
|
||||||
|
ALL
|
||||||
DEPENDS
|
DEPENDS
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/${MAN_PAGE_NAME}
|
${CMAKE_CURRENT_BINARY_DIR}/${MAN_PAGE_NAME}
|
||||||
)
|
)
|
||||||
|
11
test/CMakeLists.txt
Normal file
11
test/CMakeLists.txt
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
cmake_minimum_required(VERSION 3.5)
|
||||||
|
|
||||||
|
project(patchelfcrc-test LANGUAGES CXX C)
|
||||||
|
add_subdirectory(catch2 EXCLUDE_FROM_ALL)
|
||||||
|
|
||||||
|
add_custom_target(test "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}" "-r compact" "-s" DEPENDS ${PROJECT_NAME})
|
||||||
|
aux_source_directory("src" TEST_SOURCES)
|
||||||
|
set(DUT_SOURCES ${CMAKE_CURRENT_LIST_DIR}/../src/crc.c)
|
||||||
|
|
||||||
|
add_executable(${PROJECT_NAME} EXCLUDE_FROM_ALL ${TEST_SOURCES} ${DUT_SOURCES})
|
||||||
|
target_link_libraries(${PROJECT_NAME} PRIVATE Catch2::Catch2WithMain)
|
1
test/catch2
Submodule
1
test/catch2
Submodule
Submodule test/catch2 added at 0631b607ee
@@ -1,4 +0,0 @@
|
|||||||
#ifndef _GENRATED_VERSION_H_
|
|
||||||
#define _GENRATED_VERSION_H_
|
|
||||||
#define GIT_VERSION_STRING "@PROGRAM_GIT_VERSION@"
|
|
||||||
#endif /* _GENRATED_VERSION_H_ */
|
|
Reference in New Issue
Block a user