Skip to content

Commit 483d4a3

Browse files
jahnfjahnf
committed
Merge branch 'hotfix/0.9.1'
2 parents d04b1eb + 539e5d4 commit 483d4a3

5 files changed

+41
-19
lines changed

‎CMakeLists.txt

+8-8
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ target_compile_definitions(projecteur PRIVATE
107107
set_target_properties(projecteur PROPERTIES
108108
VERSION_MAJOR 0
109109
VERSION_MINOR 9
110-
VERSION_PATCH 0
110+
VERSION_PATCH 1
111111
VERSION_TYPE release
112112
)
113113
add_version_info(projecteur "${CMAKE_CURRENT_SOURCE_DIR}")
@@ -140,13 +140,6 @@ set(CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS
140140
WORLD_READ WORLD_EXECUTE
141141
)
142142

143-
## -- prevent additional lintian warnings 'non-standard-dir-perm' for the cmake install prefix
144-
set(DIR_TO_INSTALL "${CMAKE_INSTALL_PREFIX}")
145-
while(NOT "${DIR_TO_INSTALL}" STREQUAL "/" AND NOT "${DIR_TO_INSTALL}" STREQUAL "")
146-
install(DIRECTORY DESTINATION "${DIR_TO_INSTALL}")
147-
get_filename_component(DIR_TO_INSTALL "${DIR_TO_INSTALL}" PATH)
148-
endwhile()
149-
150143
install(TARGETS projecteur DESTINATION bin)
151144
set(PROJECTEUR_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/bin/projecteur") #used in desktop file template
152145

@@ -287,6 +280,13 @@ if(PACKAGE_TARGETS)
287280
# Need to check if this would clash with packages from the debian/ubuntu repos.
288281
#configure_file("${TMPLDIR}/copyright.in" "pkg/copyright" @ONLY)
289282
#install(FILES "${OUTDIR}/pkg/copyright" DESTINATION /usr/share/doc/projecteur/)
283+
284+
## -- prevent additional lintian warnings 'non-standard-dir-perm' for the cmake install prefix
285+
set(DIR_TO_INSTALL "${CMAKE_INSTALL_PREFIX}")
286+
while(NOT "${DIR_TO_INSTALL}" STREQUAL "/" AND NOT "${DIR_TO_INSTALL}" STREQUAL "")
287+
install(DIRECTORY DESTINATION "${DIR_TO_INSTALL}")
288+
get_filename_component(DIR_TO_INSTALL "${DIR_TO_INSTALL}" PATH)
289+
endwhile()
290290
endif()
291291
endif()
292292

‎cmake/modules/GitVersion.cmake

+20-4
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ set(VERSION_RC_START_TAG_PREFIX "rc-") # If available tags with the given prefix
2828
set(RC_BRANCH_PREFIX release) # e.g. release/0.2
2929
set(HOTFIX_BRANCH_PREFIX hotfix) # e.g. hotfix/2.0.3
3030

31+
set(MAIN_BRANCH master)
32+
3133
set(_GitVersion_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}")
3234

3335
# Get the version information for a directory, sets the following variables
@@ -60,6 +62,7 @@ function(get_version_info prefix directory)
6062
set(${prefix}_VERSION_DISTANCE 0)
6163
set(${prefix}_VERSION_DISTANCE 0 PARENT_SCOPE)
6264
set(${prefix}_VERSION_STRING 0.0.0-unknown)
65+
set(${prefix}_VERSION_STRING_FULL 0.0.0-unknown)
6366
set(${prefix}_VERSION_ISDIRTY 0 PARENT_SCOPE)
6467
set(${prefix}_VERSION_DATE_MONTH_YEAR "" PARENT_SCOPE)
6568

@@ -163,7 +166,7 @@ function(get_version_info prefix directory)
163166
string(SUBSTRING ${GIT_BRANCH} 0 ${PREFIX_LEN} COMPARE_PREFIX)
164167
string(COMPARE EQUAL ${HOTFIX_BRANCH_PREFIX} ${COMPARE_PREFIX} ON_HOTFIX_BRANCH)
165168
# Check for master branch
166-
string(COMPARE EQUAL "master" ${GIT_BRANCH} ON_MASTER)
169+
string(COMPARE EQUAL "${MAIN_BRANCH}" "${GIT_BRANCH}" ON_MASTER)
167170

168171
if(ON_RELEASE_BRANCH)
169172
set(${prefix}_VERSION_FLAG ${VERSION_RC_FLAG})
@@ -305,19 +308,24 @@ function(get_version_info prefix directory)
305308

306309
# Build version string...
307310
set(VERSION_STRING "${${prefix}_VERSION_MAJOR}.${${prefix}_VERSION_MINOR}")
311+
set(VERSION_STRING_FULL "${VERSION_STRING}.${${prefix}_VERSION_PATCH}")
308312
if(NOT ${${prefix}_VERSION_PATCH} EQUAL 0)
309313
set(VERSION_STRING "${VERSION_STRING}.${${prefix}_VERSION_PATCH}")
310314
endif()
311315
if(NOT ON_MASTER OR NOT ${${prefix}_VERSION_DISTANCE} EQUAL 0)
312316
set(VERSION_STRING "${VERSION_STRING}-${${prefix}_VERSION_FLAG}")
313-
endif()
317+
set(VERSION_STRING_FULL "${VERSION_STRING_FULL}-${${prefix}_VERSION_FLAG}")
318+
endif()
314319
if(NOT ${${prefix}_VERSION_FLAG} STREQUAL "")
315320
set(VERSION_STRING "${VERSION_STRING}.")
321+
set(VERSION_STRING_FULL "${VERSION_STRING_FULL}.")
316322
endif()
317323
if(NOT ON_MASTER OR (NOT ON_MASTER AND NOT ${${prefix}_VERSION_DISTANCE} EQUAL 0))
318324
set(VERSION_STRING "${VERSION_STRING}${${prefix}_VERSION_DISTANCE}")
325+
set(VERSION_STRING_FULL "${VERSION_STRING_FULL}${${prefix}_VERSION_DISTANCE}")
319326
endif()
320327
set(${prefix}_VERSION_STRING "${VERSION_STRING}" PARENT_SCOPE)
328+
set(${prefix}_VERSION_STRING_FULL "${VERSION_STRING_FULL}" PARENT_SCOPE)
321329
endfunction()
322330

323331
# Add version information to a target, header and source file are configured from templates.
@@ -344,6 +352,7 @@ function(add_version_info_custom_prefix target prefix directory)
344352
set(VERSION_SHORTHASH unknown)
345353
set(VERSION_FULLHASH unknown)
346354
set(VERSION_STRING "0.0-unknown.0")
355+
set(VERSION_STRING_FULL "0.0.0-unknown.0")
347356
set(VERSION_ISDIRTY 0)
348357
set(VERSION_BRANCH unknown)
349358
set(output_dir "${CMAKE_CURRENT_BINARY_DIR}/version/${targetid}")
@@ -388,7 +397,7 @@ function(add_version_info_custom_prefix target prefix directory)
388397
if("${${prefix}_VERSION_BRANCH}" MATCHES ".*[ \t]+[->]+[\t ]+(.*)([,]?.*)")
389398
set(${prefix}_VERSION_BRANCH "${CMAKE_MATCH_1}")
390399
elseif("${${prefix}_VERSION_BRANCH}" MATCHES ".*,[ \t](.*)")
391-
if("${CMAKE_MATCH_1}" STREQUAL "master")
400+
if("${CMAKE_MATCH_1}" STREQUAL "${MAIN_BRANCH}")
392401
set(ON_MASTER ON)
393402
endif()
394403
endif()
@@ -402,7 +411,7 @@ function(add_version_info_custom_prefix target prefix directory)
402411
string(COMPARE EQUAL ${HOTFIX_BRANCH_PREFIX} ${COMPARE_PREFIX} ON_HOTFIX_BRANCH)
403412
# Check for master branch
404413
if(NOT ON_MASTER)
405-
string(COMPARE EQUAL "master" ${${prefix}_VERSION_BRANCH} ON_MASTER)
414+
string(COMPARE EQUAL "${MAIN_BRANCH}" "${${prefix}_VERSION_BRANCH}" ON_MASTER)
406415
endif()
407416
if(ON_MASTER)
408417
set(${prefix}_VERSION_FLAG "")
@@ -415,19 +424,24 @@ function(add_version_info_custom_prefix target prefix directory)
415424
endif()
416425
# Build version string...
417426
set(VERSION_STRING "${${prefix}_VERSION_MAJOR}.${${prefix}_VERSION_MINOR}")
427+
set(VERSION_STRING_FULL "${VERSION_STRING}.${${prefix}_VERSION_PATCH}")
418428
if(NOT ${${prefix}_VERSION_PATCH} EQUAL 0)
419429
set(VERSION_STRING "${VERSION_STRING}.${${prefix}_VERSION_PATCH}")
420430
endif()
421431
if(NOT ON_MASTER OR NOT ${${prefix}_VERSION_DISTANCE} EQUAL 0)
422432
set(VERSION_STRING "${VERSION_STRING}-${${prefix}_VERSION_FLAG}")
433+
set(VERSION_STRING_FULL "${VERSION_STRING_FULL}-${${prefix}_VERSION_FLAG}")
423434
endif()
424435
if(NOT ${${prefix}_VERSION_FLAG} STREQUAL "")
425436
set(VERSION_STRING "${VERSION_STRING}.")
437+
set(VERSION_STRING_FULL "${VERSION_STRING_FULL}.")
426438
endif()
427439
if(NOT ON_MASTER OR (NOT ON_MASTER AND NOT ${${prefix}_VERSION_DISTANCE} EQUAL 0))
428440
set(VERSION_STRING "${VERSION_STRING}${${prefix}_VERSION_DISTANCE}")
441+
set(VERSION_STRING_FULL "${VERSION_STRING_FULL}${${prefix}_VERSION_DISTANCE}")
429442
endif()
430443
set(${prefix}_VERSION_STRING "${VERSION_STRING}")
444+
set(${prefix}_VERSION_STRING_FULL "${VERSION_STRING_FULL}")
431445
endif()
432446
endif()
433447
endif()
@@ -446,6 +460,7 @@ function(add_version_info_custom_prefix target prefix directory)
446460
set(VERSION_SHORTHASH ${${prefix}_VERSION_SHORTHASH})
447461
set(VERSION_FULLHASH ${${prefix}_VERSION_FULLHASH})
448462
set(VERSION_STRING ${${prefix}_VERSION_STRING})
463+
set(VERSION_STRING_FULL ${${prefix}_VERSION_STRING_FULL})
449464
set(VERSION_ISDIRTY ${${prefix}_VERSION_ISDIRTY})
450465
set(VERSION_BRANCH ${${prefix}_VERSION_BRANCH})
451466
set(VERSION_DATE_MONTH_YEAR ${${prefix}_VERSION_DATE_MONTH_YEAR})
@@ -464,6 +479,7 @@ function(add_version_info_custom_prefix target prefix directory)
464479
VERSION_SHORTHASH "${VERSION_SHORTHASH}"
465480
VERSION_FULLHASH "${VERSION_FULLHASH}"
466481
VERSION_STRING "${VERSION_STRING}"
482+
VERSION_STRING_FULL "${VERSION_STRING_FULL}"
467483
VERSION_ISDIRTY "${VERSION_ISDIRTY}"
468484
VERSION_BRANCH "${VERSION_BRANCH}"
469485
VERSION_DATE_MONTH_YEAR "${VERSION_DATE_MONTH_YEAR}"

‎cmake/modules/LinuxPackaging.cmake

+9-5
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ function(add_dist_package_target)
5454
message(FATAL_ERROR "Argument 'TARGET' needs to be a valid target.")
5555
endif()
5656

57-
get_target_property(PKG_VERSION_STRING_FULL ${PKG_TARGET} VERSION_STRING)
57+
get_target_property(PKG_VERSION_STRING_FULL ${PKG_TARGET} VERSION_STRING_FULL)
58+
get_target_property(PKG_VERSION_STRING ${PKG_TARGET} VERSION_STRING)
5859
get_target_property(PKG_VERSION_MAJOR ${PKG_TARGET} VERSION_MAJOR)
5960
get_target_property(PKG_VERSION_MINOR ${PKG_TARGET} VERSION_MINOR)
6061
get_target_property(PKG_VERSION_PATCH ${PKG_TARGET} VERSION_PATCH)
@@ -70,9 +71,12 @@ function(add_dist_package_target)
7071
if("${PKG_VERSION_PATCH}" STREQUAL "")
7172
set(PKG_VERSION_PATCH 0)
7273
endif()
73-
set(PKG_VERSION_STRING "${PKG_VERSION_MAJOR}.${PKG_VERSION_MINOR}.${PKG_VERSION_PATCH}")
74-
set(PKG_VERSION_IDENTIFIERS "${PKG_VERSION_FLAG}.${PKG_VERSION_DISTANCE}")
75-
74+
set(PKG_VERSION_STRING_BASE "${PKG_VERSION_MAJOR}.${PKG_VERSION_MINOR}.${PKG_VERSION_PATCH}")
75+
if("${PKG_VERSION_FLAG}" STREQUAL "")
76+
set(PKG_VERSION_IDENTIFIERS "1")
77+
else()
78+
set(PKG_VERSION_IDENTIFIERS "0${PKG_VERSION_FLAG}.${PKG_VERSION_DISTANCE}")
79+
endif()
7680
# Set defaults if not set
7781
if("${PKG_CONTACT}" STREQUAL "")
7882
set(PKG_CONTACT "Generic Maintainer <[email protected]>")
@@ -272,7 +276,7 @@ endfunction()
272276

273277
# Default cpack packaging (DEB, RPM, TGZ)
274278
function(_cpack_default_packaging)
275-
set(PKG_CPACK_PKG_FILENAME "${PKG_NAME}-${PKG_VERSION_STRING_FULL}_${PKG_DIST}-${CMAKE_SYSTEM_PROCESSOR}")
279+
set(PKG_CPACK_PKG_FILENAME "${PKG_NAME}-${PKG_VERSION_STRING}_${PKG_DIST}-${CMAKE_SYSTEM_PROCESSOR}")
276280
set(PKG_CPACK_PKG_FILE_PREFIX "dist-pkg")
277281
set(PKG_CONFIG_TEMPLATE "${_LinuxPackaging_DIRECTORY}/LinuxPkgCPackConfig.cmake.in")
278282
set(PKG_CONFIG_FILE "${CMAKE_CURRENT_BINARY_DIR}/CPackConfig-${PKG_TYPE}.cmake")

‎cmake/modules/LinuxPkgCPackConfig.cmake.in

+3-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ set(CPACK_OUTPUT_FILE_PREFIX "@PKG_CPACK_PKG_FILE_PREFIX@")
2121
set(CPACK_DEBIAN_PACKAGE_NAME "${CPACK_PACKAGE_NAME}")
2222
set(CPACK_RPM_PACKAGE_NAME "${CPACK_PACKAGE_NAME}")
2323
set(CPACK_RPM_COMPRESSION_TYPE gzip)
24-
set(CPACK_RPM_PACKAGE_VERSION "@PKG_VERSION_STRING@")
24+
set(CPACK_DEBIAN_PACKAGE_VERSION "@PKG_VERSION_STRING_BASE@")
25+
set(CPACK_DEBIAN_PACKAGE_RELEASE "@PKG_VERSION_IDENTIFIERS@")
26+
set(CPACK_RPM_PACKAGE_VERSION "@PKG_VERSION_STRING_BASE@")
2527
set(CPACK_RPM_PACKAGE_RELEASE "@PKG_VERSION_IDENTIFIERS@")
2628
set(CPACK_RPM_PACKAGE_LICENSE "@PKG_LICENSE@")
2729
set(CPACK_RPM_PACKAGE_DESCRIPTION "@PKG_DESCRIPTION_FULL@")

‎cmake/modules/PKGBUILD.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ build() {
1616
cd $srcdir
1717
mkdir -p builddir
1818
cd builddir
19-
cmake $srcdir/@PKG_NAME@-@PKG_VERSION_STRING_FULL@
19+
cmake $srcdir/@PKG_NAME@-@PKG_VERSION_STRING@
2020
make -j2
2121
}
2222

0 commit comments

Comments
 (0)