Git commit 9cdbad0c5ae86e81ba317c85c17933140019fc60 by Volker Krause. Committed on 29/01/2023 at 14:41. Pushed by cullmann into branch 'master'.
Remove preparetips5 This is now obsolete with KTipDialog gone. M +0 -4 .kde-ci.yml M +0 -8 CMakeLists.txt D +0 -1 docs/CMakeLists.txt D +0 -1 docs/preparetips5/CMakeLists.txt D +0 -71 docs/preparetips5/man-preparetips5.1.docbook M +0 -1 src/CMakeLists.txt D +0 -66 src/preparetips5 https://invent.kde.org/frameworks/kconfigwidgets/commit/9cdbad0c5ae86e81ba317c85c17933140019fc60 diff --git a/.kde-ci.yml b/.kde-ci.yml index 83c2c739..1fa70201 100644 --- a/.kde-ci.yml +++ b/.kde-ci.yml @@ -9,10 +9,6 @@ Dependencies: 'frameworks/ki18n' : '@same' 'frameworks/kwidgetsaddons' : '@same' -- 'on': ['Linux', 'FreeBSD', 'Windows', 'macOS'] - 'require': - 'frameworks/kdoctools' : '@same' - - 'on': ['Linux', 'FreeBSD'] 'require': 'frameworks/kauth' : '@same' diff --git a/CMakeLists.txt b/CMakeLists.txt index dc7e8c77..f81ff6b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,6 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KCONFIGWIDGETS find_package(KF6CoreAddons ${KF_DEP_VERSION} REQUIRED) find_package(KF6Codecs ${KF_DEP_VERSION} REQUIRED) find_package(KF6Config ${KF_DEP_VERSION} REQUIRED) -find_package(KF6DocTools ${KF_DEP_VERSION}) find_package(KF6GuiAddons ${KF_DEP_VERSION} REQUIRED) find_package(KF6I18n ${KF_DEP_VERSION} REQUIRED) find_package(KF6WidgetsAddons ${KF_DEP_VERSION} REQUIRED) @@ -69,9 +68,6 @@ ecm_set_disabled_deprecation_versions( add_definitions(-DTRANSLATION_DOMAIN=\"kconfigwidgets5\") ki18n_install(po) -if (KF6DocTools_FOUND) - kdoctools_install(po) -endif() if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") file(GLOB lang_dirs "po/*") @@ -83,10 +79,6 @@ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") endforeach() endif() -if (KF6DocTools_FOUND) - add_subdirectory(docs) -endif() - add_subdirectory(src) if (BUILD_TESTING) add_subdirectory(tests) diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt deleted file mode 100644 index 17692827..00000000 --- a/docs/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(preparetips5) diff --git a/docs/preparetips5/CMakeLists.txt b/docs/preparetips5/CMakeLists.txt deleted file mode 100644 index 9a16d45c..00000000 --- a/docs/preparetips5/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -kdoctools_create_manpage(man-preparetips5.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR}) diff --git a/docs/preparetips5/man-preparetips5.1.docbook b/docs/preparetips5/man-preparetips5.1.docbook deleted file mode 100644 index 54773545..00000000 --- a/docs/preparetips5/man-preparetips5.1.docbook +++ /dev/null @@ -1,71 +0,0 @@ -<?xml version="1.0" ?> -<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" -"dtd/kdedbx45.dtd" [ -<!ENTITY % English "INCLUDE"> -]> - -<refentry lang="&language;"> -<refentryinfo> -<title>Translation Tool</title> - -<author> -<firstname>Matthias</firstname> -<surname>Kiefer</surname> -<affiliation> -<address> -<email>matthias.kie...@gmx.de</email> -</address> -</affiliation> -</author> - -<date>2014-03-04</date> -<releaseinfo>Frameworks 5.0</releaseinfo> -<productname>KDE Frameworks</productname> -</refentryinfo> - -<refmeta> -<refentrytitle> -<command>preparetips5</command> -</refentrytitle> -<manvolnum>1</manvolnum> -</refmeta> - -<refnamediv> -<refname> -<command>preparetips5</command> -</refname> -<refpurpose>extract text from tips file</refpurpose> -</refnamediv> - -<refsynopsisdiv> -<cmdsynopsis> -<command>preparetips5</command> -</cmdsynopsis> -</refsynopsisdiv> - -<refsect1> -<title>Description</title> -<para> -<command>preparetips5</command> is a script to extract the text from a tips file. It outputs the text so <command>xgettext</command> can add the tips to a PO file. PO files provide a human-readable string format used for translations. -</para> - -<para> -<command>preparetips5</command> looks for <emphasis role="underline">data/tips</emphasis> as tips file. -</para> -</refsect1> - -<refsect1> -<title>See Also</title> -<para> -<command>kf5options</command>(7) -</para> -</refsect1> - -<refsect1> -<title>Bugs</title> -<para> -Please use <ulink url="https://bugs.kde.org";>&kde;'s bugtracker</ulink> to report bugs, do not mail the author directly. -</para> -</refsect1> - -</refentry> diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 092b6374..c492eb33 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -124,7 +124,6 @@ install(FILES DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KConfigWidgets COMPONENT Devel ) -install(PROGRAMS preparetips5 DESTINATION ${KDE_INSTALL_BINDIR} ) install( FILES entry.desktop DESTINATION ${KDE_INSTALL_LOCALEDIR}/en_US RENAME kf5_entry.desktop ) ecm_qt_install_logging_categories( diff --git a/src/preparetips5 b/src/preparetips5 deleted file mode 100755 index 6261a8b0..00000000 --- a/src/preparetips5 +++ /dev/null @@ -1,66 +0,0 @@ -#! /usr/bin/perl -# little script to extract the text from the tips file -# and output it, so xgettext can add the tips to the po file -# -# SPDX-FileCopyrightText: 2000 Matthias Kiefer <matthias.kie...@gmx.de> - -# IMPORTANT NOTE: Do not change the output without checking if -# translations still work! - -sub printText -{ - my $text = $_[0]; - - if ( $text cmp "" ) - { - - # replace \ with \\ - $text =~ s/\\/\\\\/g; - - # replace " with \" - $text =~ s/"/\\"/g; - - print "\"$text\\n\"\n"; - } -} - -open(FILE,"<","tips") or die "unable to open tips file"; -if ( $^V ge v5.8.0 ) -{ - binmode(FILE,":utf8"); - binmode(STDOUT,":utf8"); -} - -$inTip=0; - -while(<FILE>) -{ - chomp; - - # tip starts with <html> - if(/^\s*<html>(.*)/io) - { - $inTip=1; - print "// i18n: file: tips:$.\n// i18n: ectx: \@info:tipoftheday\n"; - print "i18n("; - printText($1); - next; - } - - if($inTip!=0) - { - # tip ends with </html> - if(/^(.*)\s*<\/html>/io) - { - printText($1); - print ");\n\n"; - $inTip=0; - } - else - { - printText($_); - } - } -} - -close(FILE);
