From f0b15d40ef7ff0de62502ad3bb92722a6b93f35c Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Mon, 30 Mar 2020 15:47:05 +0100 Subject: [PATCH] fix_packaging_0.27 --- cmake/packaging.cmake | 18 ++++++++++++++++-- releasenotes/CYGWIN/ReadMe.txt | 3 +-- releasenotes/Darwin/ReadMe.txt | 3 +-- releasenotes/Linux/ReadMe.txt | 3 +-- releasenotes/MinGW/ReadMe.txt | 3 +-- releasenotes/Unix/ReadMe.txt | 3 +-- releasenotes/msvc/ReadMe.txt | 3 +-- releasenotes/releasenotes.txt | 12 ++++-------- 8 files changed, 26 insertions(+), 22 deletions(-) diff --git a/cmake/packaging.cmake b/cmake/packaging.cmake index a09b3ec7..64511feb 100644 --- a/cmake/packaging.cmake +++ b/cmake/packaging.cmake @@ -89,6 +89,18 @@ if ( MSVC ) endif() endif() +# Set RC = Release Candidate +if ( PROJECT_VERSION_TWEAK STREQUAL "9" ) + set (RC "Not for release") +elseif ( (PROJECT_VERSION_TWEAK STREQUAL "0") OR (PROJECT_VERSION_TWEAK STREQUAL "") ) + set(RC "GM Release") +else() + set ( RC "Release Candidate ${PROJECT_VERSION_TWEAK}" ) +endif() + +# Set RV = Release Version +set(RV "Exiv2 v${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") + set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${VS}${BUNDLE_NAME}${BS}${CC}${LT}${BT}${VI}${WR}) # https://stackoverflow.com/questions/17495906/copying-files-and-including-them-in-a-cpack-archive @@ -117,7 +129,9 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/build/logs/test.txt) endif() # Copy releasenotes.txt and appropriate ReadMe.txt (eg releasenotes/${PACKDIR}/ReadMe.txt) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/releasenotes/${PACKDIR}/ReadMe.txt DESTINATION .) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/releasenotes/releasenotes.txt DESTINATION .) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/releasenotes/${PACKDIR}/ReadMe.txt ReadMe.txt @ONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/releasenotes/releasenotes.txt releasenotes.txt @ONLY) +install (FILES ${CMAKE_CURRENT_BINARY_DIR}/ReadMe.txt ${CMAKE_CURRENT_BINARY_DIR}/releasenotes.txt DESTINATION .) +# file (REMOVE ${CMAKE_CURRENT_BINARY_DIR}/releasenotes.txt ${CMAKE_CURRENT_BINARY_DIR}/ReadMe.txt) include (CPack) diff --git a/releasenotes/CYGWIN/ReadMe.txt b/releasenotes/CYGWIN/ReadMe.txt index 037cbd27..2959e3cd 100644 --- a/releasenotes/CYGWIN/ReadMe.txt +++ b/releasenotes/CYGWIN/ReadMe.txt @@ -1,5 +1,4 @@ -CYGWIN Exiv2 v0.27.2 Bundle -------------------------------- +@RV@ Cygwin/Windows Bundle @RC@ Structure of the bundle: ------------------------ diff --git a/releasenotes/Darwin/ReadMe.txt b/releasenotes/Darwin/ReadMe.txt index 58275cb5..fa91219e 100644 --- a/releasenotes/Darwin/ReadMe.txt +++ b/releasenotes/Darwin/ReadMe.txt @@ -1,5 +1,4 @@ -macOS (Darwin) Exiv2 v0.27.2 Bundle ------------------------------------ +@RV@ macOS (Darwin) Bundle @RC@ Structure of the bundle ----------------------- diff --git a/releasenotes/Linux/ReadMe.txt b/releasenotes/Linux/ReadMe.txt index 3df24fc1..38f1698e 100644 --- a/releasenotes/Linux/ReadMe.txt +++ b/releasenotes/Linux/ReadMe.txt @@ -1,5 +1,4 @@ -Linux Exiv2 v0.27.2-RC3 Bundle ------------------------------- +@RV@ Linux Bundle @RC@ Structure of the bundle: ------------------------ diff --git a/releasenotes/MinGW/ReadMe.txt b/releasenotes/MinGW/ReadMe.txt index ffeee0bd..0860cd33 100644 --- a/releasenotes/MinGW/ReadMe.txt +++ b/releasenotes/MinGW/ReadMe.txt @@ -1,5 +1,4 @@ -MinGW/msys2 Exiv2 v0.27.2 Bundle ------------------------------------- +@RV@ MinGW/Windows Bundle @RC@ Structure of the bundle: ------------------------ diff --git a/releasenotes/Unix/ReadMe.txt b/releasenotes/Unix/ReadMe.txt index f7eee9de..9fe3c9a5 100644 --- a/releasenotes/Unix/ReadMe.txt +++ b/releasenotes/Unix/ReadMe.txt @@ -1,5 +1,4 @@ -Unix Exiv2 v0.27.2 Bundle (FreeBSD and NetBSD) --------------------------------------------------- +@RV@ @CMAKE_SYSTEM_NAME@ Bundle @RC@ Structure of the bundle: ------------------------ diff --git a/releasenotes/msvc/ReadMe.txt b/releasenotes/msvc/ReadMe.txt index 36167d27..17348c74 100644 --- a/releasenotes/msvc/ReadMe.txt +++ b/releasenotes/msvc/ReadMe.txt @@ -1,5 +1,4 @@ -Visual Studio 2017 Release DLL v0.27.2 Bundle -------------------------------------------------- +@RV@ Visual Studio Bundle @RC@ Structure of the bundle: ------------------------ diff --git a/releasenotes/releasenotes.txt b/releasenotes/releasenotes.txt index 610a0bd6..30538985 100644 --- a/releasenotes/releasenotes.txt +++ b/releasenotes/releasenotes.txt @@ -1,13 +1,9 @@ -Exiv2 v0.27.2 -------------- +@RV@ @RC@ -Exiv2 v0.27 Second Dot Release +Headline Features of Exiv2 v0.27.3 +---------------------------------- +To be written -Thank You to Kevin for security contributions to this release. -Thank You to Ting-Wei for Unix contributions to this release. -Thank You to Dan and Luis for their solid efforts on Exiv2. -Thank You to Andreas S for representing Team Exiv2 at LGM 2019. -Contributors: Jens, Nehal, Phil, Toni, Paul Headline Features of Exiv2 v0.27.2 ----------------------------------