check_tree.pl: Added handling of xml files.

diff --git a/pwx/check_tree.pl b/pwx/check_tree.pl
index e0d6c7ad17946964c4a2bb46ed9039969e4f8bc2..2a43ad142ef6f8b5264369d34e6ca9d32e9ff070 100755 (executable)
--- a/pwx/check_tree.pl
+++ b/pwx/check_tree.pl
@@ -12,14 +12,11 @@
 # 0.8.2    2018-03-06  sed, PrydeWorX  Added checks for elogind_*() function call removals.
 # 0.8.3    2018-03-08  sed, PrydeWorX  Handle systemd-logind <=> elogind renames. Do not allow moving of
 #                                        commented out includes under out elogind block.
-# 0.8.4    2018-03-09  sed, PrydeWorX  Added handling of .gperf files.
+# 0.8.4    2018-03-09  sed, PrydeWorX  Added handling of .gperf and .xml files.
 #
 # ========================
 # === Little TODO list ===
 # ========================
-# - Add masking for XML code. It is a nuisance that the XML templates in the
-#   python tools and man sources always generate useless patches. Real patches
-#   are in danger of getting overlooked.
 # - Add handling of the *.sym files.
 #
 use strict;
@@ -32,7 +29,7 @@ use Readonly;
 # ================================================================
 # ===        ==> ------ Help Text and Version ----- <==        ===
 # ================================================================
-Readonly my $VERSION     => "0.8.3"; ## Please keep this current!
+Readonly my $VERSION     => "0.8.4"; ## Please keep this current!
 Readonly my $VERSMIN     => "-" x length($VERSION);
 Readonly my $PROGDIR     => dirname($0);
 Readonly my $PROGNAME    => basename($0);
@@ -848,7 +845,7 @@ sub check_includes {
 # --- Check $hHunk for elogind preprocessor masks and additions       ---
 # --- Rules:                                                          ---
 # --- 1) If we need an alternative for an existing systemd code block,---
-# ---    we do it like this:                                          ---
+# ---    we do it like this: (*)                                      ---
 # ---      #if 0 /// <some comment with the word "elogind" in it>     ---
 # ---        (... systemd code block, unaltered ...)                  ---
 # ---        -> Any change in this block is okay.                     ---
@@ -856,11 +853,16 @@ sub check_includes {
 # ---        (... elogind alternative code ...)                       ---
 # ---        -> Any change in this block is *NOT* okay.               ---
 # ---      #endif // 0                                                ---
-# --- 2) If we need an addition for elogind, we do it like this:      ---
+# --- 2) If we need an addition for elogind, we do it like this: (*)  ---
 # ---      #if 1 /// <some comment with the word "elogind" in it>     ---
 # ---        (... elogind additional code ...)                        ---
 # ---        -> Any change in this block is *NOT* okay.               ---
 # ---      #endif // 1                                                ---
+# --- (*) : To be able to handle XML content, masking and unmasking   ---
+# ---       can also be done with :                                   ---
+# ---       Masking : "<!-- 0 /// <comment>" and "// 0 -->"           ---
+# ---       Adding  : "<!-- 1 /// <comment> --> and "<!-- // 1 -->"   ---
+# ---       Else    : "<!-- else -->"                                 ---
 # -----------------------------------------------------------------------
 sub check_masks {
 
@@ -877,7 +879,9 @@ sub check_masks {
 
                # Entering an elogind mask
                # ---------------------------------------
-               if ( $$line =~ m/^-#if\s+0.+elogind/ ) {
+               if ( ($$line =~ m/^-#if\s+0.+elogind/ ) 
+                 || (  ($$line =~ m/<!--\s+0.+elogind/  )
+                   && !($$line =~ m/-->\s*$/) ) ) {
                        $in_mask_block
                                and return hunk_failed("check_masks: Mask start found while being in a mask block!");
                        $in_insert_block
@@ -889,7 +893,8 @@ sub check_masks {
 
                # Entering an elogind insert
                # ---------------------------------------
-               if ( $$line =~ m/^-#if\s+1.+elogind/ ) {
+               if ( ( $$line =~ m/^-#if\s+1.+elogind/ )
+                 || ( $$line =~ m/<!--\s+1.+elogind.+ -->\s*$/  ) ) {
                        $in_mask_block
                                and return hunk_failed("check_masks: Insert start found while being in a mask block!");
                        $in_insert_block
@@ -905,7 +910,9 @@ sub check_masks {
                # Switching from Mask to else.
                # Note: Inserts have no #else, they make no sense.
                # ---------------------------------------
-               if ( ($$line =~ m/^-#else/ ) && $in_mask_block && !$regular_ifs) {
+               if ( $in_mask_block && !$regular_ifs
+                 && ( ( $$line =~ m/^-#else/ )
+                   || ( $$line =~ m/<!--\s+else\s+-->\s*$/ ) ) ) {
                        substr($$line, 0, 1) = " "; ## Remove '-'
                        $in_else_block = 1;
                        next;
@@ -914,7 +921,8 @@ sub check_masks {
                # Ending a Mask/Insert block
                # ---------------------------------------
                # Note: The regex supports "#endif /** 0 **/", too.
-               if ( $$line =~ m,^-#endif\s*/(?:[*/]+)\s*([01]), ) {
+               if ( ( $$line =~ m,^-#endif\s*/(?:[*/]+)\s*([01]), )
+                 || ( $$line =~ m,\s+//\s+([01])\s+-->\s*$, ) ) {
                        if (0 == $1) {
                                (!$in_mask_block)
                                        and return hunk_failed("check_masks: #endif // 0 found outside any mask block");

diff --git a/src/login/org.freedesktop.login1.policy.in b/src/login/org.freedesktop.login1.policy.in
index 6adbc317eed487c4768eda2885d849f2642c9295..b0825a33f405b98e478cdad62ce0a17a6130e54d 100644 (file)
--- a/src/login/org.freedesktop.login1.policy.in
+++ b/src/login/org.freedesktop.login1.policy.in
@@ -14,7 +14,11 @@
 <policyconfig>
 
         <vendor>The elogind Project</vendor>
+        <!-- 0 /// Need to set this to the elogind project url
+        <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url>
+        --><!-- else -->
         <vendor_url>https://github.com/elogind/elogind</vendor_url>
+        <!-- // 0 -->
 
         <action id="org.freedesktop.login1.inhibit-block-shutdown">
                 <_description>Allow applications to inhibit system shutdown</_description>

diff --git a/tools/make-man-index.py b/tools/make-man-index.py
index dab8b9f08e522a170019badad386c9bfab26ae9a..9c08f510eeb34227cd78af437c904001cc87ddfe 100755 (executable)
--- a/tools/make-man-index.py
+++ b/tools/make-man-index.py
@@ -40,12 +40,14 @@ TEMPLATE = '''\
         <surname>Poettering</surname>
         <email>lennart@poettering.net</email>
       </author>
+      <!-- 1 /// Must add elogind authors for the additions and changes -->
       <author>
         <contrib>Developer</contrib>
         <firstname>Sven</firstname>
         <surname>Eden</surname>
         <email>sven.eden@gmx.de</email>
       </author>
+      <!-- // 1 -->
     </authorgroup>
   </refentryinfo>