From 966dddf8631d77adcaaca4ba6dc37082368647a4 Mon Sep 17 00:00:00 2001
From: William Deegan <bill@baddogconsulting.com>
Date: Tue, 20 Jun 2023 16:19:57 +0000
Subject: changed new vars to be DI_FILE_* instead of DINTF*. Updated docs,
 changes, release

---
 RELEASE.txt            |  6 ++++--
 SCons/Tool/DCommon.xml |  8 ++++----
 SCons/Tool/dmd.py      | 10 +++++-----
 SCons/Tool/gdc.py      | 12 ++++++------
 SCons/Tool/ldc.py      | 11 +++++------
 5 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/RELEASE.txt b/RELEASE.txt
index b6ab921..ce05c11 100644
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -16,8 +16,10 @@ Here is a summary of the changes since 4.5.2:
 NEW FUNCTIONALITY
 -----------------
 
-- D compilers : added support for generation of .di interface files
-
+- D compilers : added support for generation of .di interface files. 
+  New variables DI_FILE_DIR, DI_FILE_DIR_PREFIX, DI_FILE_DIR_SUFFIX,
+  DI_FILE_SUFFIX.
+  
 DEPRECATED FUNCTIONALITY
 ------------------------
 
diff --git a/SCons/Tool/DCommon.xml b/SCons/Tool/DCommon.xml
index 6b4ebf1..80b0b15 100644
--- a/SCons/Tool/DCommon.xml
+++ b/SCons/Tool/DCommon.xml
@@ -349,7 +349,7 @@ See also &cv-link-DLINKFLAGS; for linking static objects.
 </summary>
 </cvar>
 
-<cvar name="DIFILESUFFIX">
+<cvar name="DI_FILE_SUFFIX">
 <summary>
 <para>
 Suffix of d include files default is .di
@@ -357,7 +357,7 @@ Suffix of d include files default is .di
 </summary>
 </cvar>
 
-<cvar name="DINTFDIR">
+<cvar name="DI_FILE_DIR">
 <summary>
 <para>
 Path where .di files will be generated
@@ -365,7 +365,7 @@ Path where .di files will be generated
 </summary>
 </cvar>
 
-<cvar name="DINTFDIRPREFIX">
+<cvar name="DI_FILE_DIR_PREFIX">
 <summary>
 <para>
 Prefix to send the di path argument to compiler
@@ -373,7 +373,7 @@ Prefix to send the di path argument to compiler
 </summary>
 </cvar>
 
-<cvar name="DINTFDIRSUFFIX">
+<cvar name="DI_FILE_DIR_SUFFFIX">
 <summary>
 <para>
 Suffix to send the di path argument to compiler
diff --git a/SCons/Tool/dmd.py b/SCons/Tool/dmd.py
index c61e503..c3ac0ca 100644
--- a/SCons/Tool/dmd.py
+++ b/SCons/Tool/dmd.py
@@ -91,17 +91,17 @@ def generate(env) -> None:
     shared_obj.add_emitter('.d', DCommon.DSharedObjectEmitter)
 
     env['DC'] = env.Detect(['dmd', 'ldmd2', 'gdmd']) or 'dmd'
-    env['DCOM'] = '$DC $_DINCFLAGS $_DVERFLAGS $_DDEBUGFLAGS $_DFLAGS $_DINTFDIR -c -of$TARGET $SOURCES'
+    env['DCOM'] = '$DC $_DINCFLAGS $_DVERFLAGS $_DDEBUGFLAGS $_DFLAGS $_DI_FLAGS -c -of$TARGET $SOURCES'
     env['_DINCFLAGS'] = '${_concat(DINCPREFIX, DPATH, DINCSUFFIX, __env__, RDirs, TARGET, SOURCE)}'
     env['_DVERFLAGS'] = '${_concat(DVERPREFIX, DVERSIONS, DVERSUFFIX, __env__)}'
     env['_DDEBUGFLAGS'] = '${_concat(DDEBUGPREFIX, DDEBUG, DDEBUGSUFFIX, __env__)}'
 
-    env['_DINTFDIR'] = "${DI_FILE_DIR and DINTFDIRPREFIX+DI_FILE_DIR+DINTFDIRSUFFIX}"
+    env['_DI_FLAGS'] = "${DI_FILE_DIR and DI_FILE_DIR_PREFIX+DI_FILE_DIR+DI_FILE_DIR_SUFFFIX}"
 
     env['_DFLAGS'] = '${_concat(DFLAGPREFIX, DFLAGS, DFLAGSUFFIX, __env__)}'
 
     env['SHDC'] = '$DC'
-    env['SHDCOM'] = '$DC $_DINCFLAGS $_DVERFLAGS $_DDEBUGFLAGS $_DFLAGS $_DINTFDIR -c -fPIC -of$TARGET $SOURCES'
+    env['SHDCOM'] = '$DC $_DINCFLAGS $_DVERFLAGS $_DDEBUGFLAGS $_DFLAGS $_DI_FLAGS -c -fPIC -of$TARGET $SOURCES'
 
     env['DPATH'] = ['#/']
     env['DFLAGS'] = []
@@ -124,8 +124,8 @@ def generate(env) -> None:
     env['DI_FILE_DIR'] = ''
     env['DI_FILE_SUFFIX'] = '.di'
 
-    env['DINTFDIRPREFIX'] = '-Hd='
-    env['DINTFDIRSUFFIX'] = ''
+    env['DI_FILE_DIR_PREFIX'] = '-Hd='
+    env['DI_FILE_DIR_SUFFFIX'] = ''
 
     env['DLINK'] = '$DC'
     env['DLINKFLAGS'] = SCons.Util.CLVar('')
diff --git a/SCons/Tool/gdc.py b/SCons/Tool/gdc.py
index 4a99edc..9f29d72 100644
--- a/SCons/Tool/gdc.py
+++ b/SCons/Tool/gdc.py
@@ -63,21 +63,20 @@ def generate(env) -> None:
     shared_obj.add_emitter('.d', DCommon.DSharedObjectEmitter)
 
     env['DC'] = env.Detect('gdc') or 'gdc'
-    env['DCOM'] = '$DC $_DINCFLAGS $_DVERFLAGS $_DDEBUGFLAGS $_DFLAGS $_DINTFDIR -c -o $TARGET $SOURCES'
+    env['DCOM'] = '$DC $_DINCFLAGS $_DVERFLAGS $_DDEBUGFLAGS $_DFLAGS $_DI_FLAGS -c -o $TARGET $SOURCES'
     env['_DINCFLAGS'] = '${_concat(DINCPREFIX, DPATH, DINCSUFFIX, __env__, RDirs, TARGET, SOURCE)}'
     env['_DVERFLAGS'] = '${_concat(DVERPREFIX, DVERSIONS, DVERSUFFIX, __env__)}'
     env['_DDEBUGFLAGS'] = '${_concat(DDEBUGPREFIX, DDEBUG, DDEBUGSUFFIX, __env__)}'
-    env['_DINTFDIR'] = "${DI_FILE_DIR and DINTFDIRPREFIX+DI_FILE_DIR+DINTFDIRSUFFIX}"
+    env['_DI_FLAGS'] = "${DI_FILE_DIR and DI_FILE_DIR_PREFIX+DI_FILE_DIR+DI_FILE_DIR_SUFFFIX}"
     env['_DFLAGS'] = '${_concat(DFLAGPREFIX, DFLAGS, DFLAGSUFFIX, __env__)}'
 
     env['SHDC'] = '$DC'
-    env['SHDCOM'] = '$SHDC $_DINCFLAGS $_DVERFLAGS $_DDEBUGFLAGS $_DFLAGS $_DINTFDIR -fPIC -c -o $TARGET $SOURCES'
+    env['SHDCOM'] = '$SHDC $_DINCFLAGS $_DVERFLAGS $_DDEBUGFLAGS $_DFLAGS $_DI_FLAGS -fPIC -c -o $TARGET $SOURCES'
 
     env['DPATH'] = ['#/']
     env['DFLAGS'] = []
     env['DVERSIONS'] = []
     env['DDEBUG'] = []
-    env['DINTFDIR'] = []
 
     if env['DC']:
         DCommon.addDPATHToEnv(env, env['DC'])
@@ -91,10 +90,11 @@ def generate(env) -> None:
     env['DFLAGPREFIX'] = '-'
     env['DFLAGSUFFIX'] = ''
     env['DFILESUFFIX'] = '.d'
+
     env['DI_FILE_DIR'] = ''
     env['DI_FILE_SUFFIX'] = '.di'
-    env['DINTFDIRPREFIX'] = '-Hd'
-    env['DINTFDIRSUFFIX'] = ''
+    env['DI_FILE_DIR_PREFIX'] = '-Hd'
+    env['DI_FILE_DIR_SUFFFIX'] = ''
 
     env['DLINK'] = '$DC'
     env['DLINKFLAGS'] = SCons.Util.CLVar('')
diff --git a/SCons/Tool/ldc.py b/SCons/Tool/ldc.py
index 9fe4343..5fb6070 100644
--- a/SCons/Tool/ldc.py
+++ b/SCons/Tool/ldc.py
@@ -67,23 +67,22 @@ def generate(env) -> None:
     shared_obj.add_emitter('.d', DCommon.DSharedObjectEmitter)
 
     env['DC'] = env.Detect('ldc2') or 'ldc2'
-    env['DCOM'] = '$DC $_DINCFLAGS $_DVERFLAGS $_DDEBUGFLAGS $_DFLAGS $_DINTFDIR -c -of=$TARGET $SOURCES'
+    env['DCOM'] = '$DC $_DINCFLAGS $_DVERFLAGS $_DDEBUGFLAGS $_DFLAGS $_DI_FLAGS -c -of=$TARGET $SOURCES'
     env['_DINCFLAGS'] = '${_concat(DINCPREFIX, DPATH, DINCSUFFIX, __env__, RDirs, TARGET, SOURCE)}'
     env['_DVERFLAGS'] = '${_concat(DVERPREFIX, DVERSIONS, DVERSUFFIX, __env__)}'
     env['_DDEBUGFLAGS'] = '${_concat(DDEBUGPREFIX, DDEBUG, DDEBUGSUFFIX, __env__)}'
 
-    env['_DINTFDIR'] = "${DI_FILE_DIR and DINTFDIRPREFIX+DI_FILE_DIR+DINTFDIRSUFFIX}"
+    env['_DI_FLAGS'] = "${DI_FILE_DIR and DI_FILE_DIR_PREFIX+DI_FILE_DIR+DI_FILE_DIR_SUFFFIX}"
     
     env['_DFLAGS'] = '${_concat(DFLAGPREFIX, DFLAGS, DFLAGSUFFIX, __env__)}'
 
     env['SHDC'] = '$DC'
-    env['SHDCOM'] = '$DC $_DINCFLAGS $_DVERFLAGS $_DDEBUGFLAGS $_DFLAGS $_DINTFDIR -c -relocation-model=pic -of=$TARGET $SOURCES'
+    env['SHDCOM'] = '$DC $_DINCFLAGS $_DVERFLAGS $_DDEBUGFLAGS $_DFLAGS $_DI_FLAGS -c -relocation-model=pic -of=$TARGET $SOURCES'
 
     env['DPATH'] = ['#/']
     env['DFLAGS'] = []
     env['DVERSIONS'] = []
     env['DDEBUG'] = []
-    env['DINTFDIR'] = []
 
     if env['DC']:
         DCommon.addDPATHToEnv(env, env['DC'])
@@ -101,8 +100,8 @@ def generate(env) -> None:
     env['DI_FILE_DIR'] = ''
     env['DI_FILE_SUFFIX'] = '.di'
     
-    env['DINTFDIRPREFIX'] = '-Hd='
-    env['DINTFDIRSUFFIX'] = ''
+    env['DI_FILE_DIR_PREFIX'] = '-Hd='
+    env['DI_FILE_DIR_SUFFFIX'] = ''
 
     env['DLINK'] = '$DC'
     env['DLINKFLAGS'] = SCons.Util.CLVar('')
-- 
cgit v0.12