CMakeLists.txt: Fixed missing versioning when built from tarball outside Git...

debian/rules: get-orig-source target would bail if build directory already exists...
debian/source/lintian-overrides: Added overrides for two false positives arising from Javascript related code...
version.txt: Added central location for versioning...
parent 081b6d85
...@@ -82,18 +82,26 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include) ...@@ -82,18 +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...
# Get last commit date from Git... # Major...
execute_process( string(REGEX MATCH "VERSION_MAJOR *([0-9]*)" _ ${VERSION_FILE})
COMMAND git log -1 --format=%cd --date=format:%Y%m%d set(VERSION_MAJOR ${CMAKE_MATCH_1})
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE VERSION_GIT_DATE # Minor...
OUTPUT_STRIP_TRAILING_WHITESPACE 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 (
......
...@@ -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
*/ */
......
VERSION_MAJOR 0
VERSION_MINOR 0
VERSION_PATCH 001
VERSION_GIT_DATE 20190525
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