Update to mainline.

6 files changed, 313 insertions, 37 deletions

diff --git a/src/engine/SCons/Tool/dmd.py b/src/engine/SCons/Tool/dmd.py
index 7c142eb1..dbdf57b4 100644
--- a/src/engine/SCons/Tool/dmd.py
+++ b/src/engine/SCons/Tool/dmd.py
@@ -107,9 +107,9 @@ def generate(env):
     env['DLINKFLAGS'] = SCons.Util.CLVar('')
     env['DLINKCOM'] = '$DLINK -of$TARGET $DLINKFLAGS $__DRPATH $SOURCES $_DLIBDIRFLAGS $_DLIBFLAGS'
 
-    env['DSHLINK'] = '$DC'
-    env['DSHLINKFLAGS'] = SCons.Util.CLVar('$DLINKFLAGS -shared -defaultlib=libphobos2.so')
-    env['SHDLINKCOM'] = '$DLINK -of$TARGET $DSHLINKFLAGS $__DSHLIBVERSIONFLAGS $__DRPATH $SOURCES $_DLIBDIRFLAGS $_DLIBFLAGS'
+    env['SHDLINK'] = '$DC'
+    env['SHDLINKFLAGS'] = SCons.Util.CLVar('$DLINKFLAGS -shared -defaultlib=libphobos2.so')
+    env['SHDLINKCOM'] = '$DLINK -of$TARGET $SHDLINKFLAGS $__SHDLIBVERSIONFLAGS $__DRPATH $SOURCES $_DLIBDIRFLAGS $_DLIBFLAGS'
 
     env['DLIBLINKPREFIX'] = '' if env['PLATFORM'] == 'win32' else '-L-l'
     env['DLIBLINKSUFFIX'] = '.lib' if env['PLATFORM'] == 'win32' else ''
@@ -134,15 +134,15 @@ def generate(env):
     env['_DRPATH'] = '${_concat(DRPATHPREFIX, RPATH, DRPATHSUFFIX, __env__)}'
 
     # Support for versioned libraries
-    env['_DSHLIBVERSIONFLAGS'] = '$DSHLIBVERSIONFLAGS -L-soname=$_DSHLIBSONAME'
-    env['_DSHLIBSONAME'] = '${DShLibSonameGenerator(__env__,TARGET)}'
+    env['_SHDLIBVERSIONFLAGS'] = '$SHDLIBVERSIONFLAGS -L-soname=$_SHDLIBSONAME'
+    env['_SHDLIBSONAME'] = '${DShLibSonameGenerator(__env__,TARGET)}'
     # NOTE: this is a quick hack, the soname will only work if there is
     # c/c++ linker loaded which provides callback for the ShLibSonameGenerator
     env['DShLibSonameGenerator'] = SCons.Tool.ShLibSonameGenerator
-    # NOTE: this is only for further reference, currently $DSHLIBVERSION does
+    # NOTE: this is only for further reference, currently $SHDLIBVERSION does
     # not work, the user must use $SHLIBVERSION
-    env['DSHLIBVERSION'] = '$SHLIBVERSION'
-    env['DSHLIBVERSIONFLAGS'] = []
+    env['SHDLIBVERSION'] = '$SHLIBVERSION'
+    env['SHDLIBVERSIONFLAGS'] = []
 
     env['BUILDERS']['ProgramAllAtOnce'] = SCons.Builder.Builder(
         action='$DC $_DINCFLAGS $_DVERFLAGS $_DDEBUGFLAGS $_DFLAGS -of$TARGET $DLINKFLAGS $__DRPATH $SOURCES $_DLIBDIRFLAGS $_DLIBFLAGS',
diff --git a/src/engine/SCons/Tool/dmd.xml b/src/engine/SCons/Tool/dmd.xml
index 8fb22ced..7e220dca 100644
--- a/src/engine/SCons/Tool/dmd.xml
+++ b/src/engine/SCons/Tool/dmd.xml
@@ -63,8 +63,11 @@ Sets construction variables for D language compiler DMD.
 <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>
@@ -160,8 +163,6 @@ List of linker flags.
 </summary>
 </cvar>
 
-
-
 <cvar name="SHDC">
 <summary>
 <para>
@@ -204,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>
@@ -342,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.py b/src/engine/SCons/Tool/gdc.py
index a8e037ca..0c6a8ab4 100644
--- a/src/engine/SCons/Tool/gdc.py
+++ b/src/engine/SCons/Tool/gdc.py
@@ -97,9 +97,9 @@ def generate(env):
     env['DLINKFLAGS'] = SCons.Util.CLVar('')
     env['DLINKCOM'] = '$DLINK -o $TARGET $DLINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS'
 
-    env['DSHLINK'] = '$DC'
-    env['DSHLINKFLAGS'] = SCons.Util.CLVar('$DLINKFLAGS -shared -shared-libphobos')
-    env['SHDLINKCOM'] = '$DLINK -o $TARGET $DSHLINKFLAGS $__DSHLIBVERSIONFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS'
+    env['SHDLINK'] = '$DC'
+    env['SHDLINKFLAGS'] = SCons.Util.CLVar('$DLINKFLAGS -shared -shared-libphobos')
+    env['SHDLINKCOM'] = '$DLINK -o $TARGET $SHDLINKFLAGS $__SHDLIBVERSIONFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS'
 
     env['DLIB'] = 'lib' if env['PLATFORM'] == 'win32' else 'ar cr'
     env['DLIBCOM'] = '$DLIB $_DLIBFLAGS {0}$TARGET $SOURCES $_DLINKLIBFLAGS'.format('-c ' if env['PLATFORM'] == 'win32' else '')
@@ -118,15 +118,15 @@ def generate(env):
     env['_RPATH'] = '${_concat(RPATHPREFIX, RPATH, RPATHSUFFIX, __env__)}'
 
     # Support for versioned libraries
-    env['_DSHLIBVERSIONFLAGS'] = '$DSHLIBVERSIONFLAGS -Wl,-soname=$_DSHLIBSONAME'
-    env['_DSHLIBSONAME'] = '${DShLibSonameGenerator(__env__,TARGET)}'
+    env['_SHDLIBVERSIONFLAGS'] = '$SHDLIBVERSIONFLAGS -Wl,-soname=$_SHDLIBSONAME'
+    env['_SHDLIBSONAME'] = '${DShLibSonameGenerator(__env__,TARGET)}'
     # NOTE: this is a quick hack, the soname will only work if there is
     # c/c++ linker loaded which provides callback for the ShLibSonameGenerator
     env['DShLibSonameGenerator'] = SCons.Tool.ShLibSonameGenerator
-    # NOTE: this is only for further reference, currently $DSHLIBVERSION does
+    # NOTE: this is only for further reference, currently $SHDLIBVERSION does
     # not work, the user must use $SHLIBVERSION
-    env['DSHLIBVERSION'] = '$SHLIBVERSION'
-    env['DSHLIBVERSIONFLAGS'] = '$SHLIBVERSIONFLAGS'
+    env['SHDLIBVERSION'] = '$SHLIBVERSION'
+    env['SHDLIBVERSIONFLAGS'] = '$SHLIBVERSIONFLAGS'
 
     env['BUILDERS']['ProgramAllAtOnce'] = SCons.Builder.Builder(
         action='$DC $_DINCFLAGS $_DVERFLAGS $_DDEBUGFLAGS $_DFLAGS -o $TARGET $DLINKFLAGS $__DRPATH $SOURCES $_DLIBDIRFLAGS $_DLIBFLAGS',
diff --git a/src/engine/SCons/Tool/gdc.xml b/src/engine/SCons/Tool/gdc.xml
index 5ef1f9a7..d44489e6 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.py b/src/engine/SCons/Tool/ldc.py
index b10bb75a..3e12199b 100644
--- a/src/engine/SCons/Tool/ldc.py
+++ b/src/engine/SCons/Tool/ldc.py
@@ -102,10 +102,10 @@ def generate(env):
     env['DLINKFLAGS'] = SCons.Util.CLVar('')
     env['DLINKCOM'] = '$DLINK -of=$TARGET $DLINKFLAGS $__DRPATH $SOURCES $_DLIBDIRFLAGS $_DLIBFLAGS'
 
-    env['DSHLINK'] = '$DC'
-    env['DSHLINKFLAGS'] = SCons.Util.CLVar('$DLINKFLAGS -shared -defaultlib=phobos2-ldc')
+    env['SHDLINK'] = '$DC'
+    env['SHDLINKFLAGS'] = SCons.Util.CLVar('$DLINKFLAGS -shared -defaultlib=phobos2-ldc')
 
-    env['SHDLINKCOM'] = '$DLINK -of=$TARGET $DSHLINKFLAGS $__DSHLIBVERSIONFLAGS $__DRPATH $SOURCES $_DLIBDIRFLAGS $_DLIBFLAGS -L-ldruntime-ldc'
+    env['SHDLINKCOM'] = '$DLINK -of=$TARGET $SHDLINKFLAGS $__SHDLIBVERSIONFLAGS $__DRPATH $SOURCES $_DLIBDIRFLAGS $_DLIBFLAGS -L-ldruntime-ldc'
 
     env['DLIBLINKPREFIX'] = '' if env['PLATFORM'] == 'win32' else '-L-l'
     env['DLIBLINKSUFFIX'] = '.lib' if env['PLATFORM'] == 'win32' else ''
@@ -131,15 +131,15 @@ def generate(env):
     env['_DRPATH'] = '${_concat(DRPATHPREFIX, RPATH, DRPATHSUFFIX, __env__)}'
 
     # Support for versioned libraries
-    env['_DSHLIBVERSIONFLAGS'] = '$DSHLIBVERSIONFLAGS -L-soname=$_DSHLIBSONAME'
-    env['_DSHLIBSONAME'] = '${DShLibSonameGenerator(__env__,TARGET)}'
+    env['_SHDLIBVERSIONFLAGS'] = '$SHDLIBVERSIONFLAGS -L-soname=$_SHDLIBSONAME'
+    env['_SHDLIBSONAME'] = '${DShLibSonameGenerator(__env__,TARGET)}'
     # NOTE: this is a quick hack, the soname will only work if there is
     # c/c++ linker loaded which provides callback for the ShLibSonameGenerator
     env['DShLibSonameGenerator'] = SCons.Tool.ShLibSonameGenerator
-    # NOTE: this is only for further reference, currently $DSHLIBVERSION does
+    # NOTE: this is only for further reference, currently $SHDLIBVERSION does
     # not work, the user must use $SHLIBVERSION
-    env['DSHLIBVERSION'] = '$SHLIBVERSION'
-    env['DSHLIBVERSIONFLAGS'] = []
+    env['SHDLIBVERSION'] = '$SHLIBVERSION'
+    env['SHDLIBVERSIONFLAGS'] = []
 
     env['BUILDERS']['ProgramAllAtOnce'] = SCons.Builder.Builder(
         action='$DC $_DINCFLAGS $_DVERFLAGS $_DDEBUGFLAGS $_DFLAGS -of=$TARGET $DLINKFLAGS $__DRPATH $SOURCES $_DLIBDIRFLAGS $_DLIBFLAGS',
diff --git a/src/engine/SCons/Tool/ldc.xml b/src/engine/SCons/Tool/ldc.xml
index 9593f410..495b8bc7 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>