Unverified Commit 117db02e authored by Dennis Jenkins's avatar Dennis Jenkins Committed by GitHub

Merge pull request #543 from kiplingw/kip-debianization

debian/control: Build-Depends was missing cppcheck...
parents d55d41bf e3fe5928
...@@ -82,10 +82,26 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include) ...@@ -82,10 +82,26 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include)
# Set version... # Set version...
# Major and minor version... # Retrieve from external file...
set(VERSION_MAJOR 0) file(READ "version.txt" VERSION_FILE)
set(VERSION_MINOR 0)
set(VERSION_PATCH 001) # Extract version...
# Major...
string(REGEX MATCH "VERSION_MAJOR *([0-9]*)" _ ${VERSION_FILE})
set(VERSION_MAJOR ${CMAKE_MATCH_1})
# Minor...
string(REGEX MATCH "VERSION_MINOR *([0-9]+)" _ ${VERSION_FILE})
set(VERSION_MINOR ${CMAKE_MATCH_1})
# Patch...
string(REGEX MATCH "VERSION_PATCH *([0-9]+)" _ ${VERSION_FILE})
set(VERSION_PATCH ${CMAKE_MATCH_1})
# Git date...
string(REGEX MATCH "VERSION_GIT_DATE *([0-9]+)" _ ${VERSION_FILE})
set(VERSION_GIT_DATE ${CMAKE_MATCH_1})
# Make available in a header file... # Make available in a header file...
configure_file ( configure_file (
...@@ -122,7 +138,7 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include) ...@@ -122,7 +138,7 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include)
set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}/) set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}/)
set(libs ${LIBS}) set(libs ${LIBS})
set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}/) 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... # Perform substitutions...
configure_file ( configure_file (
...@@ -190,16 +206,16 @@ endif() ...@@ -190,16 +206,16 @@ endif()
# Generate source tarball... # Generate source tarball...
# Define version of source archive... # Define version of source archive...
set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR}) set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH}) set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})
# Generate a .tar.bz2 # Generate a .tar.bz2
set(CPACK_SOURCE_GENERATOR "TBZ2") set(CPACK_SOURCE_GENERATOR "TBZ2")
# Set filename... # Set filename...
set(CPACK_SOURCE_PACKAGE_FILE_NAME 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... # Don't include these files in the archive...
set(CPACK_SOURCE_IGNORE_FILES set(CPACK_SOURCE_IGNORE_FILES
......
pistache (0.0.001-git20190526-kip1~disco) disco; urgency=medium
* Built from latest git head.
-- Kip Warner <kip@thevertigo.com> Sun, 26 May 2019 09:25:37 -0700
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 pistache (0.0.001-kip1~cosmic) cosmic; urgency=medium
* Build with PISTACHE_ENABLE_NETWORK_TESTS=false to appease sbuild * Build with PISTACHE_ENABLE_NETWORK_TESTS=false to appease sbuild
......
...@@ -5,6 +5,7 @@ Maintainer: Kip Warner <kip@thevertigo.com> ...@@ -5,6 +5,7 @@ Maintainer: Kip Warner <kip@thevertigo.com>
Standards-Version: 4.2.1 Standards-Version: 4.2.1
Build-Depends: Build-Depends:
cmake (>= 3.8.0), cmake (>= 3.8.0),
cppcheck,
debhelper-compat (= 11), debhelper-compat (= 11),
dh-exec, dh-exec,
libc6-dev (>= 2.26), libc6-dev (>= 2.26),
......
...@@ -70,7 +70,7 @@ $(DEB_SOURCE)_$(DEB_VERSION_UPSTREAM).orig.tar.bz2: ...@@ -70,7 +70,7 @@ $(DEB_SOURCE)_$(DEB_VERSION_UPSTREAM).orig.tar.bz2:
@echo "# Preparing source for $(DEB_SOURCE) v$(DEB_VERSION_UPSTREAM)..." @echo "# Preparing source for $(DEB_SOURCE) v$(DEB_VERSION_UPSTREAM)..."
cd $(SOURCE_DIR) \ cd $(SOURCE_DIR) \
&& cd $(PACKAGE_DIR) \ && cd $(PACKAGE_DIR) \
&& mkdir $(DEB_SOURCE)_$(DEB_VERSION_UPSTREAM) \ && mkdir -p $(DEB_SOURCE)_$(DEB_VERSION_UPSTREAM) \
&& cd $(DEB_SOURCE)_$(DEB_VERSION_UPSTREAM) \ && cd $(DEB_SOURCE)_$(DEB_VERSION_UPSTREAM) \
&& cmake \ && cmake \
-G "Unix Makefiles" \ -G "Unix Makefiles" \
......
pistache source: source-is-missing assets/js/jquery.min.js
pistache source: source-is-missing assets/js/modernizr.js line length is 8708 characters (>512)
/* version.h /* version.h
Kip Warner, 29 May 2018 Kip Warner, 25 May 2019
Version constants Version constants
*/ */
...@@ -12,6 +12,7 @@ namespace Version { ...@@ -12,6 +12,7 @@ namespace Version {
static constexpr int Major = @VERSION_MAJOR@; static constexpr int Major = @VERSION_MAJOR@;
static constexpr int Minor = @VERSION_MINOR@; static constexpr int Minor = @VERSION_MINOR@;
static constexpr int Patch = @VERSION_PATCH@; static constexpr int Patch = @VERSION_PATCH@;
static constexpr int Git = @VERSION_GIT_DATE@;
} // namespace Version } // namespace Version
} // namespace Pistache } // namespace Pistache
VERSION_MAJOR 0
VERSION_MINOR 0
VERSION_PATCH 001
VERSION_GIT_DATE 20190526
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