[office/ghostwriter] /: Use only single application version

Megan Conkle null at kde.org
Sat Dec 31 21:13:52 GMT 2022


Git commit 122d64d76497f878acada26b05614df34bcb98ae by Megan Conkle.
Committed on 31/12/2022 at 21:13.
Pushed by wereturtle into branch 'master'.

Use only single application version

Instead of maintaining a private and public version of the
application, use only the KDE Gears release version.

M  +7    -11   CMakeLists.txt
M  +4    -3    doc/man-ghostwriter.1.docbook
M  +1    -1    src/CMakeLists.txt

https://invent.kde.org/office/ghostwriter/commit/122d64d76497f878acada26b05614df34bcb98ae

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6759d00..dda75ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,17 +8,11 @@ if (POLICY CMP0063)
 endif()
 
 # KDE Application Version, managed by release script
-set(RELEASE_SERVICE_VERSION_MAJOR "22")
-set(RELEASE_SERVICE_VERSION_MINOR "11")
+set(RELEASE_SERVICE_VERSION_MAJOR "23")
+set(RELEASE_SERVICE_VERSION_MINOR "03")
 set(RELEASE_SERVICE_VERSION_MICRO "70")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
-# Internal project release version
-set(INTERNAL_RELEASE_VERSION_MAJOR "2")
-set(INTERNAL_RELEASE_VERSION_MINOR "2")
-set(INTERNAL_RELEASE_VERSION_MICRO "70")
-set(INTERNAL_RELEASE_VERSION "${INTERNAL_RELEASE_VERSION_MAJOR}.${INTERNAL_RELEASE_VERSION_MINOR}.${INTERNAL_RELEASE_VERSION_MICRO}")
-
 project(ghostwriter VERSION ${RELEASE_SERVICE_VERSION} LANGUAGES CXX)
 
 set(QT_MIN_VERSION "5.15.2")
@@ -87,6 +81,8 @@ target_sources(ghostwriter PRIVATE ${ICONS_SOURCES})
 
 # See https://cmake.org/cmake/help/v3.15/prop_tgt/MACOSX_BUNDLE_INFO_PLIST.html
 if(APPLE)
+    string(TIMESTAMP CURRENT_YEAR "%Y")
+
     set_property(
         TARGET ghostwriter
         PROPERTY MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/resources/mac/MacOSBundleInfo.plist.in
@@ -98,10 +94,10 @@ if(APPLE)
     set(MACOSX_BUNDLE_BUNDLE_NAME "ghostwriter")
     set(MACOSX_BUNDLE_DISPLAY_NAME "ghostwriter")
     set(MACOSX_BUNDLE_INFO_STRING "ghostwriter - A Markdown Editor")
-    set(MACOSX_BUNDLE_LONG_VERSION_STRING "ghostwriter ${INTERNAL_RELEASE_VERSION} ${RELEASE_SERVICE_VERSION}")
-    set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${INTERNAL_RELEASE_VERSION_MAJOR}.${INTERNAL_RELEASE_VERSION_MINOR}")
+    set(MACOSX_BUNDLE_LONG_VERSION_STRING "ghostwriter ${RELEASE_SERVICE_VERSION}")
+    set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}")
     set(MACOSX_BUNDLE_BUNDLE_VERSION "${RELEASE_SERVICE_VERSION}")
-    set(MACOSX_BUNDLE_COPYRIGHT "2014-2022 the ghostwriter authors")
+    set(MACOSX_BUNDLE_COPYRIGHT "2014-${CURRENT_YEAR} the ghostwriter authors")
 endif()
 
 install(TARGETS ghostwriter ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/doc/man-ghostwriter.1.docbook b/doc/man-ghostwriter.1.docbook
index 392cbdc..d5f84fc 100644
--- a/doc/man-ghostwriter.1.docbook
+++ b/doc/man-ghostwriter.1.docbook
@@ -4,18 +4,19 @@
 ]>
 <!--
 SPDX-FileCopyrightText: 2022 Carl Schwan <carl at carlschwan.eu>
+SPDX-FileCopyrightText: 2022 Megan Conkle <megan.conkle at kdemail.net>
 SPDX-License-Identifier: CC-BY-SA-4.0
 -->
 
 <refentry lang="&language;">
 <refentryinfo>
-<title>Ghostwriter User's Manual</title>
+<title>ghostwriter User's Manual</title>
 <author><firstname>Megan</firstname><surname>Conkle</surname>
-<contrib>Ghostwriter man page.</contrib>
+<contrib>ghostwriter man page.</contrib>
 <email>megan.conkle at kdemail.net</email></author>
 <date>2022-09-17</date>
 <releaseinfo>2.2.0</releaseinfo>
-<productname>Ghostwriter</productname>
+<productname>ghostwriter</productname>
 </refentryinfo>
 
 <refmeta>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5ee5a29..80ae163 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,7 @@
 
 add_executable(ghostwriter ../resources.qrc)
 
-target_compile_definitions(ghostwriter PRIVATE APPVERSION="${INTERNAL_RELEASE_VERSION}")
+target_compile_definitions(ghostwriter PRIVATE APPVERSION="${RELEASE_SERVICE_VERSION}")
 
 target_include_directories(ghostwriter PUBLIC
     "${PROJECT_BINARY_DIR}"


More information about the kde-doc-english mailing list