Fix PKGBUILD

AUR/PKGBUILD

@@ -16,7 +16,7 @@ sha1sums=('SKIP' 'SKIP' 'SKIP')
 pkgver () {
 	_date=`date +"%Y%m%d"`
 	cd "${srcdir}/${pkgname}-git"
-	echo "$(echo "$(sh ./gen-version-string.sh)" | sed 's/-/_/g')"
+	echo "$(echo "$(git describe --always --dirty)" | sed 's/-/_/g')"
 }
 
 build () {
@@ -24,6 +24,7 @@ build () {
 	cd "$srcdir/$pkgname-git/build"
 	cmake -DCMAKE_BUILD_TYPE=Release ..
 	make -j12
+	make man-page
 }
 
 prepare () {

CMakeLists.txt

@@ -28,8 +28,6 @@ pkg_check_modules(ELF REQUIRED libelf)
 find_package(Doxygen)
 find_package(LibXml2 REQUIRED)
 
-add_subdirectory(man)
-
 aux_source_directory("src" CFILES)
 
 set(GEN_HEADER_PATH "${CMAKE_CURRENT_BINARY_DIR}/include/generated")
@@ -37,12 +35,17 @@ set(GEN_HEADER_PATH "${CMAKE_CURRENT_BINARY_DIR}/include/generated")
 add_custom_target(
 		version-header
 	COMMAND
-		mkdir -p ${GEN_HEADER_PATH} && bash "${CMAKE_CURRENT_SOURCE_DIR}/gen_version_header.sh" "${GEN_HEADER_PATH}/version.h"
+		${CMAKE_COMMAND} -D SRC=${CMAKE_SOURCE_DIR}/version.h.template
+					 -D DST=${GEN_HEADER_PATH}/version.h
+					 -P ${CMAKE_SOURCE_DIR}/GenerateVersion.cmake
 	WORKING_DIRECTORY
 		${CMAKE_CURRENT_SOURCE_DIR}
 	COMMENT "Generating version header"
 	)
 
+
+add_subdirectory(man)
+
 add_custom_target(schema-header DEPENDS "${GEN_HEADER_PATH}/schema-blob.h")
 add_custom_command(
 	OUTPUT "${GEN_HEADER_PATH}/schema-blob.h"
@@ -66,7 +69,8 @@ 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 "${CMAKE_CURRENT_BINARY_DIR}/include")
 target_include_directories(${PROJECT_NAME} PRIVATE "include")
-add_dependencies(${PROJECT_NAME} version-header schema-header)
+add_dependencies(${PROJECT_NAME} schema-header)
+add_dependencies(${PROJECT_NAME} version-header)
 
 if (DOXYGEN_FOUND)
 	set(DOXYFILE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/doxygen/Doxyfile.in")
@@ -83,7 +87,9 @@ if (DOXYGEN_FOUND)
 
 	add_custom_target(doxygen-version-header
 		COMMAND
-			bash ${CMAKE_CURRENT_SOURCE_DIR}/doxygen/gen-version-string.sh "${CMAKE_CURRENT_BINARY_DIR}/doxyversion.in"
+			${CMAKE_COMMAND} -D SRC="${CMAKE_SOURCE_DIR}/doxyversion.in.template"
+					 -D DST="${CMAKE_CURRENT_BINARY_DIR}/doxyversion.in"
+					 -P ${CMAKE_SOURCE_DIR}/GenerateVersion.cmake
 		WORKING_DIRECTORY
 			${CMAKE_CURRENT_SOURCE_DIR}
 	)

GenerateVersion.cmake

@@ -0,0 +1,26 @@
+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)

doxyversion.in.template

@@ -0,0 +1 @@
+@PROGRAM_GIT_VERSION@

gen-version-string.sh

@@ -1 +0,0 @@
-echo `git describe --tags --always --dirty`

gen_version_header.sh

@@ -1,11 +0,0 @@
-#!/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

man/CMakeLists.txt

@@ -1,7 +1,6 @@
 set (MAN_PAGE_NAME "patchelfcrc.1.gz")
 
 add_custom_target(man-page
-	ALL
 	DEPENDS
 		${CMAKE_CURRENT_BINARY_DIR}/${MAN_PAGE_NAME}
 )

version.h.template

@@ -0,0 +1,4 @@
+#ifndef _GENRATED_VERSION_H_
+#define _GENRATED_VERSION_H_
+#define GIT_VERSION_STRING "@PROGRAM_GIT_VERSION@"
+#endif /* _GENRATED_VERSION_H_ */