Skip to content

Commit e682f96

Browse files
authored
Merge pull request #714 from LocutusOfBorg/fix-version
Fix VERSION when being zero.
2 parents 97f703f + ca41000 commit e682f96

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ cmake_minimum_required (VERSION 3.15)
1919
include(scripts/windows/version.cmake)
2020
include(scripts/linux/version.cmake)
2121

22-
message(STATUS "COVESA DLT Viewer version: ${DLT_PROJECT_VERSION_MAJOR}.${DLT_PROJECT_VERSION_MINOR}.${DLT_PROJECT_VERSION_PATCH}")
23-
if(NOT DLT_PROJECT_VERSION_MAJOR OR NOT DLT_PROJECT_VERSION_MINOR OR NOT DLT_PROJECT_VERSION_PATCH)
22+
if(NOT DEFINED DLT_PROJECT_VERSION_MAJOR OR NOT DEFINED DLT_PROJECT_VERSION_MINOR OR NOT DEFINED DLT_PROJECT_VERSION_PATCH)
2423
set(DLT_PROJECT_VERSION_MAJOR 0)
2524
set(DLT_PROJECT_VERSION_MINOR 0)
2625
set(DLT_PROJECT_VERSION_PATCH 0)

build_viewer_debs_noble.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ echo "DLT_VERSION_STATE: ${DLT_VERSION_STATE}"
2222
echo "PACKAGE_NAME: ${PACKAGE_NAME}"
2323

2424
mkdir -p ./debtmp/${PACKAGE_NAME}-${DLT_VERSION}-${DEBIAN_REVISION}
25-
rsync -a --exclude=debtmp --exclude=*.sh --exclude=*.bat --exclude=cache --exclude=parser --exclude=bionic * debtmp/${PACKAGE_NAME}-${DLT_VERSION}
25+
rsync -a --exclude=debtmp --include=scripts/linux/parse_version.sh --exclude=*.sh --exclude=*.bat --exclude=cache --exclude=parser --exclude=bionic * debtmp/${PACKAGE_NAME}-${DLT_VERSION}
2626

2727
cd debtmp/${PACKAGE_NAME}-${DLT_VERSION}
2828
echo "#############################################"

0 commit comments

Comments
 (0)