From e2d41ab459e90678a0800a614fa4640773770795 Mon Sep 17 00:00:00 2001
From: Russel Winder <russel@winder.org.uk>
Date: Wed, 21 Jun 2017 09:35:08 +0100
Subject: Keep all D tool XML files consistent.

---
 src/engine/SCons/Tool/dmd.xml |   7 --
 src/engine/SCons/Tool/gdc.xml | 144 +++++++++++++++++++++++++++++++++++++++++-
 src/engine/SCons/Tool/ldc.xml | 144 +++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 284 insertions(+), 11 deletions(-)

diff --git a/src/engine/SCons/Tool/dmd.xml b/src/engine/SCons/Tool/dmd.xml
index 301afb2..7e220dc 100644
--- a/src/engine/SCons/Tool/dmd.xml
+++ b/src/engine/SCons/Tool/dmd.xml
@@ -163,8 +163,6 @@ List of linker flags.
 </summary>
 </cvar>
 
-
-
 <cvar name="SHDC">
 <summary>
 <para>
@@ -207,7 +205,6 @@ List of linker flags.
 </summary>
 </cvar>
 
-<!-- The following are re-added because their removal breaks doc validation -->
 <cvar name="DVERSUFFIX">
   <summary>
     <para>
@@ -345,10 +342,6 @@ List of linker flags.
  </summary>
 </cvar>
 
-
-<!-- Validation fix to here -->
-
-
 <builder name="ProgramAllAtOnce">
   <summary>
     <para>
diff --git a/src/engine/SCons/Tool/gdc.xml b/src/engine/SCons/Tool/gdc.xml
index 5ef1f9a..d44489e 100644
--- a/src/engine/SCons/Tool/gdc.xml
+++ b/src/engine/SCons/Tool/gdc.xml
@@ -63,8 +63,11 @@ Sets construction variables for the D language compiler GDC.
 <item>DLIBFLAGSUFFIX</item>
 <item>DLINKFLAGPREFIX</item>
 <item>DLINKFLAGSUFFIX</item>
-<item>RPATHPREFIX</item>
-<item>RPATHSUFFIX</item>
+<item>DRPATHPREFIX</item>
+<item>DRPATHSUFFIX</item>
+<item>DShLibSonameGenerator</item>
+<item>SHDLIBVERSION</item>
+<item>SHDLIBVERSIONFLAGS</item>
 </sets>
 <uses>
 </uses>
@@ -202,6 +205,143 @@ List of linker flags.
 </summary>
 </cvar>
 
+<cvar name="DVERSUFFIX">
+  <summary>
+    <para>
+      DVERSUFFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DVERPREFIX">
+  <summary>
+    <para>
+      DVERPREFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DLINKFLAGSUFFIX">
+  <summary>
+    <para>
+      DLINKFLAGSUFFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DLINKFLAGPREFIX">
+  <summary>
+    <para>
+      DLINKFLAGPREFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DLIBLINKSUFFIX">
+  <summary>
+    <para>
+      DLIBLINKSUFFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DLIBLINKPREFIX">
+  <summary>
+    <para>
+      DLIBLINKPREFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DLIBFLAGSUFFIX">
+  <summary>
+    <para>
+      DLIBFLAGSUFFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DLIBFLAGPREFIX">
+  <summary>
+    <para>
+      DLIBFLAGPREFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DLIBDIRSUFFIX">
+  <summary>
+    <para>
+      DLIBLINKSUFFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DLIBDIRPREFIX">
+  <summary>
+    <para>
+      DLIBLINKPREFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DINCSUFFIX">
+  <summary>
+    <para>
+      DLIBFLAGSUFFIX.
+    </para>
+ </summary>
+</cvar>
+
+
+<cvar name="DINCPREFIX">
+  <summary>
+    <para>
+      DINCPREFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DFLAGSUFFIX">
+  <summary>
+    <para>
+      DFLAGSUFFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DFLAGPREFIX">
+  <summary>
+    <para>
+      DFLAGPREFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DFILESUFFIX">
+  <summary>
+    <para>
+      DFILESUFFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DDEBUGPREFIX">
+  <summary>
+    <para>
+      DDEBUGPREFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DDEBUGSUFFIX">
+  <summary>
+    <para>
+      DDEBUGSUFFIX.
+    </para>
+ </summary>
+</cvar>
+
 <builder name="ProgramAllAtOnce">
   <summary>
     <para>
diff --git a/src/engine/SCons/Tool/ldc.xml b/src/engine/SCons/Tool/ldc.xml
index 9593f41..495b8bc 100644
--- a/src/engine/SCons/Tool/ldc.xml
+++ b/src/engine/SCons/Tool/ldc.xml
@@ -63,8 +63,11 @@ Sets construction variables for the D language compiler LDC2.
 <item>DLIBFLAGSUFFIX</item>
 <item>DLINKFLAGPREFIX</item>
 <item>DLINKFLAGSUFFIX</item>
-<item>RPATHPREFIX</item>
-<item>RPATHSUFFIX</item>
+<item>DRPATHPREFIX</item>
+<item>DRPATHSUFFIX</item>
+<item>DShLibSonameGenerator</item>
+<item>SHDLIBVERSION</item>
+<item>SHDLIBVERSIONFLAGS</item>
 </sets>
 <uses>
 </uses>
@@ -202,6 +205,143 @@ List of linker flags.
 </summary>
 </cvar>
 
+<cvar name="DVERSUFFIX">
+  <summary>
+    <para>
+      DVERSUFFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DVERPREFIX">
+  <summary>
+    <para>
+      DVERPREFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DLINKFLAGSUFFIX">
+  <summary>
+    <para>
+      DLINKFLAGSUFFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DLINKFLAGPREFIX">
+  <summary>
+    <para>
+      DLINKFLAGPREFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DLIBLINKSUFFIX">
+  <summary>
+    <para>
+      DLIBLINKSUFFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DLIBLINKPREFIX">
+  <summary>
+    <para>
+      DLIBLINKPREFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DLIBFLAGSUFFIX">
+  <summary>
+    <para>
+      DLIBFLAGSUFFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DLIBFLAGPREFIX">
+  <summary>
+    <para>
+      DLIBFLAGPREFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DLIBDIRSUFFIX">
+  <summary>
+    <para>
+      DLIBLINKSUFFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DLIBDIRPREFIX">
+  <summary>
+    <para>
+      DLIBLINKPREFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DINCSUFFIX">
+  <summary>
+    <para>
+      DLIBFLAGSUFFIX.
+    </para>
+ </summary>
+</cvar>
+
+
+<cvar name="DINCPREFIX">
+  <summary>
+    <para>
+      DINCPREFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DFLAGSUFFIX">
+  <summary>
+    <para>
+      DFLAGSUFFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DFLAGPREFIX">
+  <summary>
+    <para>
+      DFLAGPREFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DFILESUFFIX">
+  <summary>
+    <para>
+      DFILESUFFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DDEBUGPREFIX">
+  <summary>
+    <para>
+      DDEBUGPREFIX.
+    </para>
+ </summary>
+</cvar>
+
+<cvar name="DDEBUGSUFFIX">
+  <summary>
+    <para>
+      DDEBUGSUFFIX.
+    </para>
+ </summary>
+</cvar>
+
 <builder name="ProgramAllAtOnce">
   <summary>
     <para>
-- 
cgit v0.12