Skip to content

feat: Support VERSION file #474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zccrs merged 1 commit into from
Jun 6, 2025
Merged

feat: Support VERSION file #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .reuse/dep5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Copyright: None
License: CC0-1.0

# cmake
Files: *.cmake *CMakeLists.txt *.pc.in, cmake/*.in misc/*.in
Files: *.cmake *CMakeLists.txt *.pc.in, cmake/*.in misc/*.in VERSION
Copyright: None
License: CC0-1.0

Expand Down
1 change: 1 addition & 0 deletions .syncexclude
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
# are always ignored
linglong.yaml
conanfile.py
VERSION
5 changes: 4 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
cmake_minimum_required (VERSION 3.13)

set (DTK_VERSION "5.6.12" CACHE STRING "define project version")
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" DTK_FILE_VERSION)
string(STRIP "${DTK_FILE_VERSION}" DTK_FILE_VERSION)
set(DTK_VERSION "${DTK_FILE_VERSION}" CACHE STRING "DTK version")

project (DtkCore
VERSION ${DTK_VERSION}
DESCRIPTION "DTK Core module"
Expand Down
1 change: 1 addition & 0 deletions VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5.7.15
6 changes: 2 additions & 4 deletions archlinux/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Maintainer: justforlxz <justforlxz@gmail.com>
pkgname=dtkcore-git
pkgver=5.6.16
pkgver=5.7.15
pkgrel=1
sourcename=dtkcore
sourcetars=("$sourcename"_"$pkgver".tar.xz)
Expand All @@ -19,7 +19,6 @@ sha512sums=('SKIP')

build() {
cd $sourcedir
version=$(echo $pkgver | awk -F'[+_~-]' '{print $1}')
cmake \
-GNinja \
-DMKSPECS_INSTALL_DIR=lib/qt/mkspecs/modules \
Expand All @@ -31,8 +30,7 @@ build() {
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DD_DSG_APP_DATA_FALLBACK=/var/dsg/appdata \
-DBUILD_WITH_SYSTEMD=ON \
-DDTK_VERSION=$version
-DBUILD_WITH_SYSTEMD=ON
ninja
}

Expand Down
3 changes: 1 addition & 2 deletions debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export DEB_CXXFLAGS_MAINT_APPEND = -Ofast
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)

VERSION = $(DEB_VERSION_UPSTREAM)
PACK_VER = $(shell echo $(VERSION) | awk -F'[+_~-]' '{print $$1}')

# Calculate build version:
# 5.6.8 -> 0; 5.6.8.7 -> 7; 5.6.8+u001 -> 1; 5.6.8.7+u001 -> 7; 5.6.8.0+u001 -> 0
Expand All @@ -22,7 +21,7 @@ endif
dh $@

override_dh_auto_configure:
dh_auto_configure -- -DBUILD_WITH_SYSTEMD=ON -DBUILD_EXAMPLES=OFF -DBUILD_DOCS=ON -DBUILD_VERSION=$(BUILD_VER) -DDTK_VERSION=$(PACK_VER) -DD_DSG_APP_DATA_FALLBACK=/var/dsg/appdata
dh_auto_configure -- -DBUILD_WITH_SYSTEMD=ON -DBUILD_EXAMPLES=OFF -DBUILD_DOCS=ON -DBUILD_VERSION=$(BUILD_VER) -DD_DSG_APP_DATA_FALLBACK=/var/dsg/appdata

#override_dh_auto_test:
# echo "skip auto test"
Expand Down