[frameworks/kdoctools] /: Rename checkXML5 to checkXML6

Friedrich W. H. Kossebau null at kde.org
Sun May 21 17:21:58 BST 2023


Git commit df419151ffcbaafbfd70e0fbcb2c3263afc78dfe by Friedrich W. H. Kossebau.
Committed on 21/05/2023 at 16:06.
Pushed by ltoscano into branch 'master'.

Rename checkXML5 to checkXML6

M  +3    -3    KF6DocToolsConfig.cmake.in
M  +1    -1    autotests/kdoctools+install/test.cmake
M  +1    -1    docs/CMakeLists.txt
D  +0    -1    docs/checkXML5/CMakeLists.txt
A  +1    -0    docs/checkXML6/CMakeLists.txt
R  +6    -6    docs/checkXML6/man-checkXML6.1.docbook [from: docs/checkXML5/man-checkXML5.1.docbook - 076% similarity]
M  +10   -10   src/CMakeLists.txt
R  +0    -0    src/checkXML6.cpp [from: src/checkXML5.cpp - 100% similarity]

https://invent.kde.org/frameworks/kdoctools/commit/df419151ffcbaafbfd70e0fbcb2c3263afc78dfe

diff --git a/KF6DocToolsConfig.cmake.in b/KF6DocToolsConfig.cmake.in
index 49a0c62f..82ea1aee 100644
--- a/KF6DocToolsConfig.cmake.in
+++ b/KF6DocToolsConfig.cmake.in
@@ -24,9 +24,9 @@ else()
         set_target_properties(KF6::docbookl10nhelper PROPERTIES IMPORTED_LOCATION ${DOCBOOKL10NHELPER_EXECUTABLE})
     endif()
 
-    if(CMAKE_CROSSCOMPILING AND CHECKXML5_EXECUTABLE)
-        set_target_properties(KF6::checkXML5 PROPERTIES IMPORTED_LOCATION_NONE ${CHECKXML5_EXECUTABLE})
-        set_target_properties(KF6::checkXML5 PROPERTIES IMPORTED_LOCATION ${CHECKXML5_EXECUTABLE})
+    if(CMAKE_CROSSCOMPILING AND CHECKXML6_EXECUTABLE)
+        set_target_properties(KF6::checkXML6 PROPERTIES IMPORTED_LOCATION_NONE ${CHECKXML6_EXECUTABLE})
+        set_target_properties(KF6::checkXML6 PROPERTIES IMPORTED_LOCATION ${CHECKXML6_EXECUTABLE})
     endif()
 endif()
 
diff --git a/autotests/kdoctools+install/test.cmake b/autotests/kdoctools+install/test.cmake
index 0aadd46d..18cf7111 100644
--- a/autotests/kdoctools+install/test.cmake
+++ b/autotests/kdoctools+install/test.cmake
@@ -3,7 +3,7 @@ set(MANPATH ${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_MANDIR})
 set(HTMLPATH ${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_DOCBUNDLEDIR})
 set(FILES
 # from kdoctools_install
-    ${MANPATH}/man1/checkXML5.1
+    ${MANPATH}/man1/checkXML6.1
     ${MANPATH}/man1/meinproc6.1
     ${MANPATH}/man7/kf5options.7
     ${MANPATH}/man7/qt5options.7
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index 26eaae43..85b65578 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_subdirectory(checkXML5)
+add_subdirectory(checkXML6)
 add_subdirectory(meinproc6)
 
 add_subdirectory(kf5options)
diff --git a/docs/checkXML5/CMakeLists.txt b/docs/checkXML5/CMakeLists.txt
deleted file mode 100644
index 64ce90c0..00000000
--- a/docs/checkXML5/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-kdoctools_create_manpage(man-checkXML5.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR})
diff --git a/docs/checkXML6/CMakeLists.txt b/docs/checkXML6/CMakeLists.txt
new file mode 100644
index 00000000..8d1647fe
--- /dev/null
+++ b/docs/checkXML6/CMakeLists.txt
@@ -0,0 +1 @@
+kdoctools_create_manpage(man-checkXML6.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR})
diff --git a/docs/checkXML5/man-checkXML5.1.docbook b/docs/checkXML6/man-checkXML6.1.docbook
similarity index 76%
rename from docs/checkXML5/man-checkXML5.1.docbook
rename to docs/checkXML6/man-checkXML6.1.docbook
index c06cd68b..16f61d58 100644
--- a/docs/checkXML5/man-checkXML5.1.docbook
+++ b/docs/checkXML6/man-checkXML6.1.docbook
@@ -5,33 +5,33 @@
 
 <refentry lang="&language;">
 <refentryinfo>
-<title>checkXML5 User's Manual</title>
+<title>checkXML6 User's Manual</title>
 <author><personname><firstname>Lauri</firstname><surname>Watts</surname></personname><email>lauri at kde.org</email></author>
 <date>2014-03-04</date>
-<releaseinfo>Frameworks 5.0</releaseinfo>
+<releaseinfo>Frameworks 6.0</releaseinfo>
 <productname>KDE Frameworks</productname>
 </refentryinfo>
 
 <refmeta>
-<refentrytitle><command>checkXML5</command></refentrytitle>
+<refentrytitle><command>checkXML6</command></refentrytitle>
 <manvolnum>1</manvolnum>
 </refmeta>
 
 <refnamediv>
-<refname><command>checkXML5</command></refname>
+<refname><command>checkXML6</command></refname>
 <refpurpose>An &XML; lint tool for &kde; DocBook &XML; documents</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 <cmdsynopsis>
-<command>checkXML5</command> <arg><replaceable>filename</replaceable></arg>
+<command>checkXML6</command> <arg><replaceable>filename</replaceable></arg>
 </cmdsynopsis>
 </refsynopsisdiv>
 
 <refsect1>
 <title>Description</title>
 
-<para><command>checkXML5</command> is a tool to check for syntax errors in &kde;
+<para><command>checkXML6</command> is a tool to check for syntax errors in &kde;
 DocBook &XML; files. It can also be used for other DocBook based
 &XML; files, but you should use the less specific xmllint(1) tool if
 you are not writing or otherwise working on &kde;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2a984f65..2a199daf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -246,17 +246,17 @@ add_custom_command( TARGET docbookl10nhelper POST_BUILD
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/customization/xsl/all-l10n.xml
     DESTINATION ${KDE_INSTALL_DATADIR_KF}/kdoctools/customization/xsl/ )
 
-########### checkxml5 helper ###############
+########### checkXML6 helper ###############
 
-set( checkXML5_SRCS checkXML5.cpp ${kdoctoolslog_core_SRCS})
-add_executable( checkXML5 ${checkXML5_SRCS} )
-ecm_mark_nongui_executable( checkXML5 )
-target_link_libraries( checkXML5 Qt6::Core )
-install(TARGETS checkXML5 EXPORT KF6DocToolsToolsTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS})
+set( checkXML6_SRCS checkXML6.cpp ${kdoctoolslog_core_SRCS})
+add_executable( checkXML6 ${checkXML6_SRCS} )
+ecm_mark_nongui_executable( checkXML6 )
+target_link_libraries( checkXML6 Qt6::Core )
+install(TARGETS checkXML6 EXPORT KF6DocToolsToolsTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS})
 
-if(CMAKE_CROSSCOMPILING AND CHECKXML5_EXECUTABLE)
-    add_executable(KF6::checkXML5 IMPORTED GLOBAL)
-    set_target_properties(KF6::checkXML5 PROPERTIES IMPORTED_LOCATION ${CHECKXML5_EXECUTABLE})
+if(CMAKE_CROSSCOMPILING AND CHECKXML6_EXECUTABLE)
+    add_executable(KF6::checkXML6 IMPORTED GLOBAL)
+    set_target_properties(KF6::checkXML6 PROPERTIES IMPORTED_LOCATION ${CHECKXML6_EXECUTABLE})
 else()
-    add_executable(KF6::checkXML5 ALIAS checkXML5)
+    add_executable(KF6::checkXML6 ALIAS checkXML6)
 endif()
diff --git a/src/checkXML5.cpp b/src/checkXML6.cpp
similarity index 100%
rename from src/checkXML5.cpp
rename to src/checkXML6.cpp


More information about the kde-doc-english mailing list