debian/control: Build-Depends was missing cppcheck...

CMakeLists.txt: Better support for generating daily unstable builds by giving tarball git commit date...
debian/changelog: Disco build for 25 May, 2019...
include/pistache/version.h.in: Add Git commit date in case anyone needs it...
parent d55d41bf
......@@ -87,6 +87,14 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include)
set(VERSION_MINOR 0)
set(VERSION_PATCH 001)
# Get last commit date from Git...
execute_process(
COMMAND git log -1 --format=%cd --date=format:%Y%m%d
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE VERSION_GIT_DATE
OUTPUT_STRIP_TRAILING_WHITESPACE
)
# Make available in a header file...
configure_file (
"include/pistache/version.h.in"
......@@ -122,7 +130,7 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include)
set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}/)
set(libs ${LIBS})
set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}/)
set(version ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
set(version ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-git${VERSION_GIT_DATE})
# Perform substitutions...
configure_file (
......@@ -190,16 +198,16 @@ endif()
# Generate source tarball...
# Define version of source archive...
set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})
set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})
# Generate a .tar.bz2
set(CPACK_SOURCE_GENERATOR "TBZ2")
# Set filename...
set(CPACK_SOURCE_PACKAGE_FILE_NAME
"${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
"${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}-git${VERSION_GIT_DATE}")
# Don't include these files in the archive...
set(CPACK_SOURCE_IGNORE_FILES
......
pistache (0.0.001-git20190525-kip1~disco) disco; urgency=medium
* Built from latest git head.
-- Kip Warner <kip@thevertigo.com> Sat, 25 May 2019 18:00:20 -0700
pistache (0.0.001-kip1~cosmic) cosmic; urgency=medium
* Build with PISTACHE_ENABLE_NETWORK_TESTS=false to appease sbuild
......
......@@ -5,6 +5,7 @@ Maintainer: Kip Warner <kip@thevertigo.com>
Standards-Version: 4.2.1
Build-Depends:
cmake (>= 3.8.0),
cppcheck,
debhelper-compat (= 11),
dh-exec,
libc6-dev (>= 2.26),
......
......@@ -12,6 +12,7 @@ namespace Version {
static constexpr int Major = @VERSION_MAJOR@;
static constexpr int Minor = @VERSION_MINOR@;
static constexpr int Patch = @VERSION_PATCH@;
static constexpr int Git = @VERSION_GIT_DATE@;
} // namespace Version
} // namespace Pistache
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment