Merge pull request #3912 from mwichmann/drop-cvars

Remove old deprecated construction variables

7 files changed, 33 insertions, 89 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 4f7d41175..31b3fb17a 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -42,6 +42,9 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - Do not treat --site-dir=DIR and --no-site-dir as distinct options.
       Allows a later instance to override an earlier one.
     - Ignore empty cmdline arguments when computing targets (issue 2986)
+    - Remove long-deprecated construction variables PDFCOM, WIN32_INSERT_DEF,
+      WIN32DEFPREFIX, WIN32DEFSUFFIX, WIN32EXPPREFIX, WIN32EXPSUFFIX.
+      All have been replaced by other names since at least 1.0.
 
   From Dillan Mills:
     - Add support for the (TARGET,SOURCE,TARGETS,SOURCES,CHANGED_TARGETS,CHANGED_SOURCES}.relpath property.
diff --git a/RELEASE.txt b/RELEASE.txt
index 08cf8cc6b..22961b104 100755
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -34,6 +34,9 @@ CHANGED/ENHANCED EXISTING FUNCTIONALITY
     - Internal has_key methods removed from SCons' dictionary-like objects
       SubstitutionEnvironment and OverrideEnvironment - in other words,
       an env - to match Python 3 which no longer has dict.has_key.
+    - Removed long-deprecated construction variables PDFCOM, WIN32_INSERT_DEF,
+      WIN32DEFPREFIX, WIN32DEFSUFFIX, WIN32EXPPREFIX, WIN32EXPSUFFIX.
+      All have been replaced by other names since at least 1.0.
 
 FIXES
 -----
diff --git a/SCons/Tool/dvipdf.py b/SCons/Tool/dvipdf.py
index f1e951313..e0622072d 100644
--- a/SCons/Tool/dvipdf.py
+++ b/SCons/Tool/dvipdf.py
@@ -111,9 +111,6 @@ def generate(env):
     env['DVIPDFFLAGS'] = SCons.Util.CLVar('')
     env['DVIPDFCOM']   = 'cd ${TARGET.dir} && $DVIPDF $DVIPDFFLAGS ${SOURCE.file} ${TARGET.file}'
 
-    # Deprecated synonym.
-    env['PDFCOM']      = ['$DVIPDFCOM']
-
 def exists(env):
     SCons.Tool.tex.generate_darwin(env)
     return env.Detect('dvipdf')
diff --git a/SCons/Tool/dvipdf.xml b/SCons/Tool/dvipdf.xml
index 4ecc46e30..51d40301a 100644
--- a/SCons/Tool/dvipdf.xml
+++ b/SCons/Tool/dvipdf.xml
@@ -73,12 +73,4 @@ If this is not set, then &cv-link-DVIPDFCOM; (the command line) is displayed.
 </summary>
 </cvar>
 
-<cvar name="PDFCOM">
-<summary>
-<para>
-A deprecated synonym for &cv-link-DVIPDFCOM;.
-</para>
-</summary>
-</cvar>
-
 </sconsdoc>
diff --git a/SCons/Tool/mingw.py b/SCons/Tool/mingw.py
index 90c41d010..2df3c3b74 100644
--- a/SCons/Tool/mingw.py
+++ b/SCons/Tool/mingw.py
@@ -173,10 +173,8 @@ def generate(env):
     env.Append(LDMODULEEMITTER=[shlib_emitter])
     env['AS'] = 'as'
 
-    env['WIN32DEFPREFIX'] = ''
-    env['WIN32DEFSUFFIX'] = '.def'
-    env['WINDOWSDEFPREFIX'] = '${WIN32DEFPREFIX}'
-    env['WINDOWSDEFSUFFIX'] = '${WIN32DEFSUFFIX}'
+    env['WINDOWSDEFPREFIX'] = ''
+    env['WINDOWSDEFSUFFIX'] = '.def'
 
     env['SHOBJSUFFIX'] = '.o'
     env['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 1
diff --git a/SCons/Tool/mslink.py b/SCons/Tool/mslink.py
index 795807cd4..9c34108ba 100644
--- a/SCons/Tool/mslink.py
+++ b/SCons/Tool/mslink.py
@@ -254,61 +254,56 @@ def generate(env):
     SCons.Tool.createSharedLibBuilder(env, shlib_suffix='$SHLIBSUFFIX')
     SCons.Tool.createProgBuilder(env)
 
-    env['SHLINK']      = '$LINK'
+    env['SHLINK'] = '$LINK'
     env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS /dll')
     env['_SHLINK_TARGETS'] = windowsShlinkTargets
     env['_SHLINK_SOURCES'] = windowsShlinkSources
-    env['SHLINKCOM']   =  compositeShLinkAction
-    env.Append(SHLIBEMITTER = [windowsLibEmitter])
-    env.Append(LDMODULEEMITTER = [windowsLibEmitter])
-    env['LINK']        = 'link'
-    env['LINKFLAGS']   = SCons.Util.CLVar('/nologo')
+    env['SHLINKCOM'] = compositeShLinkAction
+    env.Append(SHLIBEMITTER=[windowsLibEmitter])
+    env.Append(LDMODULEEMITTER=[windowsLibEmitter])
+    env['LINK'] = 'link'
+    env['LINKFLAGS'] = SCons.Util.CLVar('/nologo')
     env['_PDB'] = pdbGenerator
     env['LINKCOM'] = compositeLinkAction
-    env.Append(PROGEMITTER = [prog_emitter])
-    env['LIBDIRPREFIX']='/LIBPATH:'
-    env['LIBDIRSUFFIX']=''
-    env['LIBLINKPREFIX']=''
-    env['LIBLINKSUFFIX']='$LIBSUFFIX'
-
-    env['WIN32DEFPREFIX']        = ''
-    env['WIN32DEFSUFFIX']        = '.def'
-    env['WIN32_INSERT_DEF']      = 0
-    env['WINDOWSDEFPREFIX']      = '${WIN32DEFPREFIX}'
-    env['WINDOWSDEFSUFFIX']      = '${WIN32DEFSUFFIX}'
-    env['WINDOWS_INSERT_DEF']    = '${WIN32_INSERT_DEF}'
-
-    env['WIN32EXPPREFIX']        = ''
-    env['WIN32EXPSUFFIX']        = '.exp'
-    env['WINDOWSEXPPREFIX']      = '${WIN32EXPPREFIX}'
-    env['WINDOWSEXPSUFFIX']      = '${WIN32EXPSUFFIX}'
+    env.Append(PROGEMITTER=[prog_emitter])
+    env['LIBDIRPREFIX'] = '/LIBPATH:'
+    env['LIBDIRSUFFIX'] = ''
+    env['LIBLINKPREFIX'] = ''
+    env['LIBLINKSUFFIX'] = '$LIBSUFFIX'
+
+    env['WINDOWSDEFPREFIX'] = ''
+    env['WINDOWSDEFSUFFIX'] = '.def'
+    env['WINDOWSEXPPREFIX'] = ''
+    env['WINDOWSEXPSUFFIX'] = '.exp'
+    env['WINDOWS_INSERT_DEF'] = 0
 
     env['WINDOWSSHLIBMANIFESTPREFIX'] = ''
     env['WINDOWSSHLIBMANIFESTSUFFIX'] = '${SHLIBSUFFIX}.manifest'
-    env['WINDOWSPROGMANIFESTPREFIX']  = ''
-    env['WINDOWSPROGMANIFESTSUFFIX']  = '${PROGSUFFIX}.manifest'
+    env['WINDOWSPROGMANIFESTPREFIX'] = ''
+    env['WINDOWSPROGMANIFESTSUFFIX'] = '${PROGSUFFIX}.manifest'
 
     env['REGSVRACTION'] = regServerCheck
-    env['REGSVR'] = os.path.join(SCons.Platform.win32.get_system_root(),'System32','regsvr32')
+    env['REGSVR'] = os.path.join(
+        SCons.Platform.win32.get_system_root(), 'System32', 'regsvr32'
+    )
     env['REGSVRFLAGS'] = '/s '
     env['REGSVRCOM'] = '$REGSVR $REGSVRFLAGS ${TARGET.windows}'
 
     env['WINDOWS_EMBED_MANIFEST'] = 0
     env['MT'] = 'mt'
-    #env['MTFLAGS'] = ['-hashupdate']
+    # env['MTFLAGS'] = ['-hashupdate']
     env['MTFLAGS'] = SCons.Util.CLVar('/nologo')
     # Note: use - here to prevent build failure if no manifest produced.
     # This seems much simpler than a fancy system using a function action to see
     # if the manifest actually exists before trying to run mt with it.
-    env['MTEXECOM']   = '-$MT $MTFLAGS -manifest ${TARGET}.manifest $_MANIFEST_SOURCES -outputresource:$TARGET;1'
+    env['MTEXECOM'] = '-$MT $MTFLAGS -manifest ${TARGET}.manifest $_MANIFEST_SOURCES -outputresource:$TARGET;1'
     env['MTSHLIBCOM'] = '-$MT $MTFLAGS -manifest ${TARGET}.manifest $_MANIFEST_SOURCES -outputresource:$TARGET;2'
     # TODO Future work garyo 27-Feb-11
-    env['_MANIFEST_SOURCES'] = None # _windowsManifestSources
+    env['_MANIFEST_SOURCES'] = None  # _windowsManifestSources
 
     # Set-up ms tools paths
     msvc_setup_env_once(env)
 
-
     # Loadable modules are on Windows the same as shared libraries, but they
     # are subject to different build parameters (LDMODULE* variables).
     # Therefore LDMODULE* variables correspond as much as possible to
diff --git a/SCons/Tool/mslink.xml b/SCons/Tool/mslink.xml
index 3de7d0d67..8683e0519 100644
--- a/SCons/Tool/mslink.xml
+++ b/SCons/Tool/mslink.xml
@@ -40,13 +40,9 @@ Sets construction variables for the Microsoft linker.
 <item>LIBDIRSUFFIX</item>
 <item>LIBLINKPREFIX</item>
 <item>LIBLINKSUFFIX</item>
-<item>WIN32DEFPREFIX</item>
-<item>WIN32DEFSUFFIX</item>
 <item>WINDOWSDEFPREFIX</item>
 <item>WINDOWSDEFSUFFIX</item>
 <item>WINDOWS_INSERT_DEF</item>
-<item>WIN32EXPPREFIX</item>
-<item>WIN32EXPSUFFIX</item>
 <item>WINDOWSEXPPREFIX</item>
 <item>WINDOWSEXPSUFFIX</item>
 <item>WINDOWSSHLIBMANIFESTPREFIX</item>
@@ -212,46 +208,6 @@ and requiring user attention.
 </summary>
 </cvar>
 
-<cvar name="WIN32_INSERT_DEF">
-<summary>
-<para>
-A deprecated synonym for &cv-link-WINDOWS_INSERT_DEF;.
-</para>
-</summary>
-</cvar>
-
-<cvar name="WIN32DEFPREFIX">
-<summary>
-<para>
-A deprecated synonym for &cv-link-WINDOWSDEFPREFIX;.
-</para>
-</summary>
-</cvar>
-
-<cvar name="WIN32DEFSUFFIX">
-<summary>
-<para>
-A deprecated synonym for &cv-link-WINDOWSDEFSUFFIX;.
-</para>
-</summary>
-</cvar>
-
-<cvar name="WIN32EXPPREFIX">
-<summary>
-<para>
-A deprecated synonym for &cv-link-WINDOWSEXPSUFFIX;.
-</para>
-</summary>
-</cvar>
-
-<cvar name="WIN32EXPSUFFIX">
-<summary>
-<para>
-A deprecated synonym for &cv-link-WINDOWSEXPSUFFIX;.
-</para>
-</summary>
-</cvar>
-
 <cvar name="WINDOWS_INSERT_DEF">
 <summary>
 <para>