From 4591736bee496d3e8a697fb66a12eef7e2a43309 Mon Sep 17 00:00:00 2001 From: Martin Marmsoler Date: Tue, 29 Aug 2023 15:50:17 +0200 Subject: [PATCH 1/6] Imlement Dev Version changelog --- cmake/generate_appdata.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/generate_appdata.cmake b/cmake/generate_appdata.cmake index 0aedce195..fba7bce55 100644 --- a/cmake/generate_appdata.cmake +++ b/cmake/generate_appdata.cmake @@ -5,6 +5,6 @@ file(READ "${CHANGELOG_HTML}" HTML_CHANGELOGS) string(REGEX REPLACE "

([^<]*)<\\/p>" "\\1" RELEASES ${HTML_CHANGELOGS}) # remove paragraph environment string(REGEX REPLACE "

([A-Za-z0-9]*)<\\/h4>" "

\\1

" RELEASES ${RELEASES}) # h4 is unknow to appdata so change it to a paragraph environment string(REPLACE "\n" "\n\t" RELEASES ${RELEASES}) # add tabulator -string(REGEX REPLACE "

(v[1-9]\\.[0-9]\\.[0-9]) - ([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9])<\\/h3>" "\n\t" RELEASES ${RELEASES}) +string(REGEX REPLACE "

(v[1-9]\\.[0-9]\\.[0-9]|vX\\.X\\.X) - ([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]) \\((WIP){0,1}\\)<\\/h3>" "\n\t" RELEASES ${RELEASES}) string(REGEX REPLACE "
" "\n\t" RELEASES ${RELEASES}) configure_file(${APPDATA_CONF} ${APPDATA}) From ae0dd2133ed63d1ecea1eb3a140106d4f540e0fa Mon Sep 17 00:00:00 2001 From: Martin Marmsoler Date: Tue, 29 Aug 2023 15:50:29 +0200 Subject: [PATCH 2/6] add changelog --- docs/changelog.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/changelog.md b/docs/changelog.md index ddf03c3e7..376f25c3c 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,3 +1,13 @@ +### vX.X.X - 2023-04-20 (WIP) + +Description + +#### Added + +#### Changed + +---- + ### v1.3.0 - 2023-04-20 Performance Improvement and feature release From 6edac2ccb5124f1fde84ec225393dd252d36c2a9 Mon Sep 17 00:00:00 2001 From: Martin Marmsoler Date: Tue, 29 Aug 2023 15:52:16 +0200 Subject: [PATCH 3/6] add comment --- cmake/generate_appdata.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/generate_appdata.cmake b/cmake/generate_appdata.cmake index fba7bce55..6fc5e94c0 100644 --- a/cmake/generate_appdata.cmake +++ b/cmake/generate_appdata.cmake @@ -5,6 +5,7 @@ file(READ "${CHANGELOG_HTML}" HTML_CHANGELOGS) string(REGEX REPLACE "

([^<]*)<\\/p>" "\\1" RELEASES ${HTML_CHANGELOGS}) # remove paragraph environment string(REGEX REPLACE "

([A-Za-z0-9]*)<\\/h4>" "

\\1

" RELEASES ${RELEASES}) # h4 is unknow to appdata so change it to a paragraph environment string(REPLACE "\n" "\n\t" RELEASES ${RELEASES}) # add tabulator +# For Dev Version "vX.X.X - (WIP)" can be used to show in the changelog the current progress string(REGEX REPLACE "

(v[1-9]\\.[0-9]\\.[0-9]|vX\\.X\\.X) - ([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]) \\((WIP){0,1}\\)<\\/h3>" "\n\t" RELEASES ${RELEASES}) string(REGEX REPLACE "
" "\n\t" RELEASES ${RELEASES}) configure_file(${APPDATA_CONF} ${APPDATA}) From 09ab8e0ca65e1bf035bad130e1b062a445e0af52 Mon Sep 17 00:00:00 2001 From: Martin Marmsoler Date: Tue, 29 Aug 2023 17:31:40 +0200 Subject: [PATCH 4/6] fix regex --- cmake/generate_appdata.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/generate_appdata.cmake b/cmake/generate_appdata.cmake index 6fc5e94c0..e823f92c0 100644 --- a/cmake/generate_appdata.cmake +++ b/cmake/generate_appdata.cmake @@ -6,6 +6,6 @@ string(REGEX REPLACE "

([^<]*)<\\/p>" "\\1" RELEASES ${HTML_CHANGELOGS}) # rem string(REGEX REPLACE "

([A-Za-z0-9]*)<\\/h4>" "

\\1

" RELEASES ${RELEASES}) # h4 is unknow to appdata so change it to a paragraph environment string(REPLACE "\n" "\n\t" RELEASES ${RELEASES}) # add tabulator # For Dev Version "vX.X.X - (WIP)" can be used to show in the changelog the current progress -string(REGEX REPLACE "

(v[1-9]\\.[0-9]\\.[0-9]|vX\\.X\\.X) - ([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]) \\((WIP){0,1}\\)<\\/h3>" "\n\t" RELEASES ${RELEASES}) +string(REGEX REPLACE "

((v[1-9]\\.[0-9]\\.[0-9])|(vX\\.X\\.X)) - ([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9])( \\(WIP\\)){0,1}<\\/h3>" "\n\t" RELEASES ${RELEASES}) string(REGEX REPLACE "
" "\n\t" RELEASES ${RELEASES}) configure_file(${APPDATA_CONF} ${APPDATA}) From 4a34691855ff20171187d4827c9aaa46688ca20e Mon Sep 17 00:00:00 2001 From: Murmele Date: Tue, 29 Aug 2023 17:39:40 +0200 Subject: [PATCH 5/6] Use DEV instead of WIP --- cmake/generate_appdata.cmake | 2 +- docs/changelog.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/generate_appdata.cmake b/cmake/generate_appdata.cmake index e823f92c0..9f1d80dd6 100644 --- a/cmake/generate_appdata.cmake +++ b/cmake/generate_appdata.cmake @@ -6,6 +6,6 @@ string(REGEX REPLACE "

([^<]*)<\\/p>" "\\1" RELEASES ${HTML_CHANGELOGS}) # rem string(REGEX REPLACE "

([A-Za-z0-9]*)<\\/h4>" "

\\1

" RELEASES ${RELEASES}) # h4 is unknow to appdata so change it to a paragraph environment string(REPLACE "\n" "\n\t" RELEASES ${RELEASES}) # add tabulator # For Dev Version "vX.X.X - (WIP)" can be used to show in the changelog the current progress -string(REGEX REPLACE "

((v[1-9]\\.[0-9]\\.[0-9])|(vX\\.X\\.X)) - ([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9])( \\(WIP\\)){0,1}<\\/h3>" "\n\t" RELEASES ${RELEASES}) +string(REGEX REPLACE "

((v[1-9]\\.[0-9]\\.[0-9])|(vX\\.X\\.X)) - ([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9])( \\(DEV\\)){0,1}<\\/h3>" "\n\t" RELEASES ${RELEASES}) string(REGEX REPLACE "
" "\n\t" RELEASES ${RELEASES}) configure_file(${APPDATA_CONF} ${APPDATA}) diff --git a/docs/changelog.md b/docs/changelog.md index 376f25c3c..bd984193b 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,4 +1,4 @@ -### vX.X.X - 2023-04-20 (WIP) +### vX.X.X - 2023-04-20 (DEV) Description From 3e544afad5018a254cce9e2fd03ba903301add5f Mon Sep 17 00:00:00 2001 From: Martin Marmsoler Date: Tue, 29 Aug 2023 21:49:53 +0200 Subject: [PATCH 6/6] fix regex --- cmake/generate_appdata.cmake | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/cmake/generate_appdata.cmake b/cmake/generate_appdata.cmake index 9f1d80dd6..783913dad 100644 --- a/cmake/generate_appdata.cmake +++ b/cmake/generate_appdata.cmake @@ -1,3 +1,12 @@ +# For testing enable +#set(CMAKE_SOURCE_DIR ) +#set(CMAKE_BINARY_DIR ) +#set(DOC_SOURCE_DIR ${CMAKE_SOURCE_DIR}/docs) +#set(DOC_BINARY_DIR ${CMAKE_BINARY_DIR}/docs) +#set(CHANGELOG_HTML ${DOC_BINARY_DIR}/changelog.html) +#set(APPDATA_CONF ${CMAKE_SOURCE_DIR}/rsrc/linux/com.github.Murmele.Gittyup.appdata.xml.in) +#set(APPDATA ${CMAKE_BINARY_DIR}/rsrc/linux/com.github.Murmele.Gittyup.appdata.xml) + # add release notes to the appdata file file(READ "${CHANGELOG_HTML}" HTML_CHANGELOGS) # it is not allowed to have multiple texts without being in an environment @@ -5,7 +14,7 @@ file(READ "${CHANGELOG_HTML}" HTML_CHANGELOGS) string(REGEX REPLACE "

([^<]*)<\\/p>" "\\1" RELEASES ${HTML_CHANGELOGS}) # remove paragraph environment string(REGEX REPLACE "

([A-Za-z0-9]*)<\\/h4>" "

\\1

" RELEASES ${RELEASES}) # h4 is unknow to appdata so change it to a paragraph environment string(REPLACE "\n" "\n\t" RELEASES ${RELEASES}) # add tabulator -# For Dev Version "vX.X.X - (WIP)" can be used to show in the changelog the current progress -string(REGEX REPLACE "

((v[1-9]\\.[0-9]\\.[0-9])|(vX\\.X\\.X)) - ([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9])( \\(DEV\\)){0,1}<\\/h3>" "\n\t" RELEASES ${RELEASES}) +# For Dev Version "vX.X.X - (DEV)" can be used to show in the changelog the current progress +string(REGEX REPLACE "

(v[1-9]\\.[0-9]\\.[0-9]|vX\\.X\\.X) - ([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9])( \\(DEV\\))?<\\/h3>" "\n\t" RELEASES ${RELEASES}) string(REGEX REPLACE "
" "\n\t" RELEASES ${RELEASES}) configure_file(${APPDATA_CONF} ${APPDATA})