Changeset 52

Timestamp:

03/01/08 11:07:11 (4 years ago)

Author:

Derek Parnell

Message:

Pre release of version 3.5

Files:

• trunk/Source/Makefile.dos (modified) (2 diffs)
• trunk/Source/Makefile.gdc (modified) (1 diff)
• trunk/Source/Makefile.unix (modified) (1 diff)
• trunk/Source/build.d (modified) (170 diffs)
• trunk/Source/build_bn.d (modified) (1 diff)
• trunk/Source/docsrc/change_log.d (modified) (1 diff)
• trunk/Source/docsrc/configuration_file.d (modified) (6 diffs)
• trunk/Source/docsrc/um.d (modified) (3 diffs)
• trunk/Source/docsrc/um.mac (added)
• trunk/Source/docsrc/user_manual.ddoc (deleted)
• trunk/Source/docsrc/user_manual_html.ddoc (added)
• trunk/Source/example_build.cfg (modified) (2 diffs)
• trunk/Source/gdc_build.cfg (added)
• trunk/Source/nix_dmd_build.cfg (modified) (2 diffs)
• trunk/Source/nix_gdmd_build.cfg (added)
• trunk/Source/nix_gnu_build.cfg (modified) (2 diffs)
• trunk/Source/opts.d (added)
• trunk/Source/opts_bn.d (added)
• trunk/Source/source.d (modified) (59 diffs)
• trunk/Source/source_bn.d (modified) (1 diff)
• trunk/Source/util/booltype.d (modified) (6 diffs)
• trunk/Source/util/fdt.d (modified) (10 diffs)
• trunk/Source/util/file2.d (modified) (4 diffs)
• trunk/Source/util/file2_bn.d (modified) (1 diff)
• trunk/Source/util/fileex.d (modified) (14 diffs)
• trunk/Source/util/fileex_bn.d (modified) (1 diff)
• trunk/Source/util/linetoken.d (modified) (5 diffs)
• trunk/Source/util/linetoken_bn.d (modified) (1 diff)
• trunk/Source/util/macro.d (deleted)
• trunk/Source/util/macroex.d (added)
• trunk/Source/util/pathex.d (modified) (29 diffs)
• trunk/Source/util/pathex_bn.d (modified) (1 diff)
• trunk/Source/util/str.d (modified) (68 diffs)
• trunk/Source/util/str_bn.d (modified) (1 diff)
• trunk/Source/win_dmd_build.cfg (modified) (2 diffs)
• trunk/Source/win_gnu_build.cfg (modified) (2 diffs)

trunk/Source/Makefile.dos

@@ -1 +1 @@
-DMD=dmd
-
+ -version=BuildVerbose
-SOURCES=$(SOURCES) build.d
-
-
+
+
+
-SOURCES=$(SOURCES) source_bn.d
-/
+\
-SOURCES=$(SOURCES) build_bn.d
-/
-/
+\
+\
-SOURCES=$(SOURCES) source.d
-/
-/
-/
-/
-/
-/
-/
-/
+\
+\
+\
+\
+\
+\
+\
+\
-
-
@@ -23 +24 @@
-
-build: $(SOURCES)
-$@
+bud
-
-clean:

trunk/Source/Makefile.gdc

@@ -1 +1 @@
-DMD=gdmd
-
-
+ -version=BuildVerbose
+opts.d 
-
-all: build
-
-build: $(SOURCES)
-$@
+bud
-
-clean:

trunk/Source/Makefile.unix

@@ -1 +1 @@
-DMD=dmd
-
-
+ -version=BuildVerbose
+opts.d 
-
-all: build
-
-build: $(SOURCES)
-$@
+bud
-
-clean:

trunk/Source/build.d

@@ -1 +1 @@
-/* *******************************************************
-Build
+This
-   using the D programming language.
-
@@ -6 +6 @@
- Authors: Derek Parnell, Melbourne
- Initial Creation: January 2005
-4
-October 2006
+5
+September 2007
- License:
-        This software is provided 'as-is', without any express or implied
@@ -30 +30 @@
-private import build_bn;    // This module's build number
-
+alias char[] text;
+
+version(D_Version2)
+{
+    mixin("alias invariant(dchar)   dcharc;");
+    mixin("alias invariant(wchar)   wcharc;");
+    mixin("alias invariant(char)    charc;");
+}
+else
+{
+    alias char[] string;
+    alias wchar[] wstring;
+    alias dchar[] dstring;
+    alias wchar   wcharc;
+    alias dchar   dcharc;
+    alias char    charc;
+}
+
+
-version(unix)   version = Unix;
-version(Unix)   version = Posix;
-version(linux)  version = Posix;
-version(darwin) version = Posix;
-
+
+
+
+
-
-version(build)
@@ -40 +62 @@
-    version(Windows) {
-        // OptLink Definition File
-
-
-
-
+
+
+
-
-private{
-    alias char[] string;
-    // --------- imports ----------------
-    static import source;          // Source File class
+    static import opts;            // Run time options
-
-    static import util.str;        // non-standard string routines.
@@ -54 +75 @@
-    static import util.pathex;     // Extended Path routines.
-    static import util.fileex;     // Extended File routines.
-
+ex
-    static import util.booltype;   // definition of True and False
-    alias util.booltype.True True;
@@ -72 +93 @@
-        static import std.c.windows.windows;
-    }
-
-    else version(linux)
-    {
@@ -93 +113 @@
-        this(string pMsg)
-        {
-App
+My
-        }
-    }
@@ -100 +120 @@
-    enum LibOpt {Implicit, Build, DontBuild}
-
-    // --------- internal strings ----------------
-    version(Windows) {
-        string vExeExtension=`exe`;
-        string vLibExtension=`lib`;
-        string vObjExtension=`obj`;
-        string vShrLibExtension=`dll`;
-        string vLinkerStdOut = ">nul";
-    }
-
-    version(Posix) {
-        string vExeExtension=``;
-        string vLibExtension=`a`;
-        string vObjExtension=`o`;
-        string vShrLibExtension=`so`;
-        string vLinkerStdOut = ">/dev/null";
-    }
-    string vSrcExtension=`d`;
-    string vSrcDInterfaceExt = `di`;
-    string vMacroExtension=`mac`;
-    string vDdocExtension=`ddoc`;
-
-    // ---------- Module scoped globals -----------
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    Bool         vScanImports;
-    Bool         vNoLink;
-    Bool         vForceCompile;
-    Bool         vSilent;
-    Bool         vSymbols;
-    Bool         vCleanup;
-    version(BuildVerbose) Bool         vVerbose;
-    Bool         vMacroInput;
-    Bool         vCollectUses;
@@ -274 +142 @@
-    Bool         vAutoImports;
-    Bool         vExecuteProgram;
-    Bool         vUseResponseFile;
-    Bool         vConsoleApp;
-    Bool         vUseFinal;
-    Bool         vEmptyArgs;
+    Bool         vCleanDummy;
-
-    string       vUsesOutput;
@@ -283 +151 @@
-    string       vRunParms;
-    string       vTargetExe;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-    string       vTargetName;           // Output name from first file name.
-    string       vPragmaTargetName;     // Output name from pragma.
-    string       vCommandTargetName;    // Output name from switches.
-    string[]     vCmdLineSourceFiles;   // List of source files from command line
-bool[string]
+string[]    
-    string[]     vCombinedArgs;         // All the args are gathered here prior to processing.
-    string[]     vBuildArgs;            // Arguments passed to build
-    string[]     vCompilerArgs;         // Arguments passed to compiler
-  
+
-    bool[string] vResourceFileTypes;
-    string[]     vUDResTypes;
-
-
-    version(Windows)
-    {
-  vWinVer = ""
-  
-  
+vWinVer
+
+
-    }
-
@@ -324 +188 @@
-    vSourceScanList ~= "." ~ std.path.sep;
-    vNoLink = False;
-    vTestRun = False;
-    vExplicit = False;
-    vScanImports = False;
-    vUseFinal = True;
-    vEmptyArgs = True;
-    vForceCompile = False;
-    vSilent = False;
-    vCleanup = False;
-    version(BuildVerbose) vVerbose = False;
-    vMacroInput = True;
-    vCollectUses = False;
@@ -340 +200 @@
-    vAutoImports = True;
-    vExecuteProgram = False;
-    vUseResponseFile = False;
-    vSymbols = False;
-    vConsoleApp = True;
+    vCleanDummy = False;
-
-    version(Posix)
-    {
-vCompilerDefs ~= v
+opts.CompilerDefs ~= opts.
-    }
-
@@ -354 +214 @@
-     }
-
-
-
-
-
-
-
-
+
+
+
-
-}
@@ -371 +227 @@
-    std.stdio.writefln(
-        "Path and Version : %s v%s(%d)\n  built on %s"
-AppPath, vApp
+MyPath, vMy
-            __TIMESTAMP__);
-    if (pFull == false)
@@ -379 +235 @@
-    std.stdio.writefln(
-        "Usage: %s sourcefile [options objectfiles libraries]"
-App
+My
-    std.stdio.writefln("  sourcefile D source file");
-    std.stdio.writefln("  -v         Verbose (passed through to D)");
@@ -388 +244 @@
-    std.stdio.writefln("             PATH list. Used if you are testing an alternate");
-    std.stdio.writefln("             version of the compiler.");
-D
-Build 
+compiler
+
-    std.stdio.writefln("  -full      Causes all source files, except ignored modules,");
-    std.stdio.writefln("              to be compiled.");
@@ -467 +323 @@
-    std.stdio.writefln("  -noautoimport Turns off the automatic addition of source paths");
-    std.stdio.writefln("              to the list of Import Roots.");
-e Build
+is
-    std.stdio.writefln("  -nodef    Prevents a Module Definition File from being created.");
-    std.stdio.writefln("  -UMB=<Yes/No> If 'Yes' this forces the utility to expect");
@@ -516 +372 @@
-            version(BuildVerbose)
-            {
-v
+opts.
-                    std.stdio.writefln("source file[%d] %s", i,
-util.pathex.AbbreviateFile
+source.ReducePath
-                }
-                else if(vNames == True) {
-util.pathex.AbbreviateFile
+source.ReducePath
-                }
-            } else {
-                if(vNames == True) {
-util.pathex.AbbreviateFile
+source.ReducePath
-                }
-            }
@@ -533 +389 @@
-                version(BuildVerbose)
-                {
-v
+opts.
-                        std.stdio.writefln("Newer time: from %s to %s",
-                                    lModsTime.toString(),
@@ -548 +404 @@
-
-    // Examine any link file dependancies too.
-.keys
+
-    {
-        util.fdt.FileDateTime lLinkTime = new util.fdt.FileDateTime(lFileName);
@@ -554 +410 @@
-        version(BuildVerbose)
-        {
-v
+opts.
-                std.stdio.writefln("link file[%d] %s %s", idx,
-util.pathex.AbbreviateFile
+source.ReducePath
-            }
-            else if(vNames == True) {
-util.pathex.AbbreviateFile
+source.ReducePath
-            }
-        } else {
-            if(vNames == True) {
-util.pathex.AbbreviateFile
+source.ReducePath
-            }
-        }
@@ -570 +426 @@
-            version(BuildVerbose)
-            {
-v
+opts.
-                    std.stdio.writefln("Newer time: from %s to %s",
-                                lModsTime.toString(),
@@ -584 +440 @@
-}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    was a problem, else return zero.
-*/
-//-------------------------------------------------------
-Build
+MakeItSo
-//-------------------------------------------------------
-{
@@ -614 +509 @@
-    string[]    lLibraryFiles;
-
-
-    lCompiling = False;
-    lLinking = False;
@@ -622 +516 @@
-    foreach( string lFile; vCmdLineSourceFiles)
-    {
-
-
+
+
+
-        {
-            version(BuildVerbose)
-            {
-v
-
-
-
-std.path.addExt( lFile, v
-
-
+opts.
+ullF
+
+
+util.pathex.ReplaceExtension( lFullFile, opts.
+ex
+ullF
-            else
-            {
-                version(BuildVerbose)
-                {
-v
-
+opts.
+ullF
-                } else {
-                    if (vSilent != True)
-
-
-
-
-
-
-
-
-
+ullF
+
+ullF
+
+
+
+ullF
+
+ullF
-        }
-    }
@@ -657 +552 @@
-    // found, and I was not explicitly told not to link.
-    lLinking =  (vLibraryAction == LibOpt.Build) ||
-f
+F
-                (vNoLink == True)
-               ? False : True;
@@ -665 +560 @@
-    // If not explictly known, set the library action
-    // based on whether or not 'main' was found in the sources.
-
-
+
+
+
+
-            vLibraryAction = LibOpt.DontBuild;
-        }
-
+
+
-            vLibraryAction = LibOpt.Build;
-        }
-    }
+
+    if (vLibraryAction == LibOpt.DontBuild &&
+        source.Source.WasMainFound == False &&
+        opts.UnitTesting == True)
+    {
+        /* Auto creation of a dummy main() to trigger unittesting to happen. */
+        util.fileex.CreateTextFile(opts.DummyMain,
+                    [
+                     "int main(string[] pArgs)",
+                     "{",
+                     "    return 1;",
+                     "}"
+                     ]);
+        new source.Source(opts.DummyMain);
+        lLinking = True;
+        vCleanDummy = True;
+    }
+
-
-    // I'm either creating a library, an executable or neither.
@@ -683 +599 @@
-        version(BuildVerbose)
-        {
-v
+opts.
-                std.stdio.writefln("Pragma target override is '%s'", std.path.getName(vTargetName));
-        }
@@ -697 +613 @@
-        version(BuildVerbose)
-        {
-v
+opts.
-                std.stdio.writefln("Cmdline target override is '%s'", vTargetName);
-        }
-    }
+
+    vTargetName = source.ExpandPathName(vTargetName, False);
-
-    // Ensure that the path to the target's location will exist.
@@ -708 +626 @@
-    if (vLibraryAction == LibOpt.Build)
-        // Target is a library.
-v
+opts.
-
-    else if (vNoLink == False)
-    {
-
+ == True
-            if (source.Source.WasMainDLL)
-                // Target is a shared library.
-v
+opts.
-            else
-            {
-                // Target is an executable
-v
+opts.
-                vTargetExe = lTargetName;
-            }
@@ -727 +645 @@
-            // so assume they know what they are doing and also assume an
-            // executable is required.
-v
+opts.
-            vTargetExe = lTargetName;
-        }
@@ -733 +651 @@
-    else
-        // Not linking and not archiving, so no target is required.
- = ""
+.length = 0
-
-    if (lTargetName.length > 0)
-    {
-        // Get the full name of the target's location.
-util.pathex.CanonicalPath(lTargetName, f
+source.ExpandPathName(lTargetName, F
-        lTargetDir = std.path.getDirName(lTargetName);
-
@@ -744 +662 @@
-        version(BuildVerbose)
-        {
-v
+opts.
-                std.stdio.writefln("\nBuilding target '%s'", lTargetName);
-        }
-
-        // Shorten the target name for future usages.
-util.pathex.AbbreviateFile
+source.ReducePath
-
-
@@ -758 +676 @@
-        version(BuildVerbose)
-        {
-v
+opts.
-                std.stdio.writefln("Time %s for %s (target)", lTargetTime.toString(), lTargetName);
-                std.stdio.writefln("Time %s (most recent)", lMostRecentTime.toString());
@@ -772 +690 @@
-        version(BuildVerbose)
-        {
-v
+opts.
-                std.stdio.writefln("\nCompiling only. No target will be built.");
-        } else {
@@ -789 +707 @@
-        // No files to compile, just link files, so collect
-        // all the object files to link in.
-.keys
+
-        {
-            // Only include OBJECT files.
-v
+opts.
-                lFilesToLink ~= lFileName;
-        }
@@ -823 +741 @@
-                string lFileType;
-
-v
+opts.
-
-                if (lCurrentSource.Ignore)
-                    return 0;
-
-util.pathex.AbbreviateFile
+source.ReducePath
-                lFileType = std.path.getExt(lShortFileName);
-vSrcExtension && lFileType != v
+opts.SrcExtension && lFileType != opts.
-                    return 0;
-
-                // Only source files are examined from here on.
-v
+opts.
-                {
-                    lNonLinkingSources ~= lCurrentSource;
@@ -843 +761 @@
-                    version(BuildVerbose)
-                    {
-v
+opts.
-                            std.stdio.writefln("%s newer than its object file", lShortFileName);
-                    }
@@ -852 +770 @@
-                    version(BuildVerbose)
-                    {
-v
+opts.
-                            std.stdio.writefln("%s has newer dependants than its object file.",
-                                        lShortFileName);
@@ -870 +788 @@
-                    // Check to see if I'm allowed to link this file.
-                    if (lCurrentSource.NoLink == false)
-util.pathex.AbbreviateFile
-
-v
+source.ReducePath
+
+opts.
-                    {
-                        if (lCurrentSource.IncrementBuildNumber())
@@ -878 +796 @@
-                            version(BuildVerbose)
-                            {
-v
+opts.
-                                    std.stdio.writefln("New build number %d for %s",
-                                               lCurrentSource.BuildNumber,
@@ -888 +806 @@
-                else if (lCurrentSource.NoLink == false)
-                {
-util.pathex.AbbreviateFile
+source.ReducePath
-                }
-
@@ -919 +837 @@
-            if (vAutoWinLibs == true)
-            {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-            }
-        }
@@ -957 +864 @@
-                lDefName = vTemporaryPath ~ std.path.getBaseName(lDefName);
-            }
-util.pathex.AbbreviateFile
+source.ReducePath
-            util.fileex.CreateTextFile(lDefName, vBuildDef);
-
@@ -965 +872 @@
-    // Add any library and any external object files required.
-    lLibraryFiles.length = 0;
-.keys
+
-    {
-        string lCmdItem;
@@ -972 +879 @@
-        {
-            lCmdItem = lFileName;
-v
+opts.
-            {
-                // Cut off extension.
-v
+opts.
-                lLibraryFiles ~= lCmdItem;
-            }
@@ -995 +902 @@
-            lCommandLine = GatherCompilerArgs(lLinking) ~ lSourcesToCompile;
-
-v
+opts.
-            {
-                lDResponseFileName = util.pathex.ReplaceExtension(lTargetName, "rsp");
@@ -1002 +909 @@
-                    lDResponseFileName = vTemporaryPath ~ std.path.getBaseName(lDResponseFileName);
-                }
-util.pathex.AbbreviateFile
+source.ReducePath
-                util.fileex.CreateTextFile(lDResponseFileName,lCommandLine);
-vCompileOnly ~ " @" ~ lDResponseFileName
+opts.CompileOnly ~ " " ~ util.str.enquote("@" ~ lDResponseFileName)
-            }
-            else
-            {   // using commandline; may run into limits
-                lCommandLine=std.string.replace(lCommandLine, "\n", " ");
-v
+opts.
-            }
-
-            version(BuildVerbose)
-            {
-v
+opts.
-                    std.stdio.writefln("Compiling with ..........\n%s\n", lCommandLine);
-            }
-
-            // Run Compiler to compile the source files that need it.
-vCompilerPath ~ vCompilerExe, lCommand
+opts.CompilerPath ~ opts.CompilerExe, lCommand, &RunCallBack
-            if (lRunResult != 0)
-                vExecuteProgram = False;
@@ -1034 +941 @@
-            if (vResourceFileTypes.length == 0)
-            {
-
-
-
-
-
+
-                {
-                    vResourceFileTypes[lResType] = true;
@@ -1044 +947 @@
-            }
-
-Build
- = ""
+Construct
+.length = 0
-            version(Windows)
-            {
@@ -1053 +956 @@
-                    if (util.str.begins(lCompileArg, "-L") == True)
-                    {
-v
-
-
-v
+opts.
+
+
+opts.
-                {
-                    if (lSwitch == "nomap")
@@ -1074 +977 @@
-                    {
-                        // Only include OBJECT files.
-v
+opts.
-                        {
-                            if (lCnt > 0)
-
-
+
+
+
-                            lCnt++;
-                        }
@@ -1086 +990 @@
-
-                // (2) Set the output file name
-util.str.enquote(util.pathex.AbbreviateFileName(lTargetName)
+source.ReducePathName(lTargetName
-
-                // (3) Set the map name
-                if (IsMapping == True)
-util.pathex.ReplaceExtension(lTargetName, "map"
+source.ReducePathName(util.pathex.ReplaceExtension(lTargetName, "map")
-
-                lCommandLine ~= "\n";
@@ -1096 +1000 @@
-                // (4) Gather the libraries names.
-                // Include the default libraries first.
-v
+opts.
-                if (lLibraryFiles.length > 0)
-                {
-                    foreach( int i, string lLib; lLibraryFiles)
-                    {
-
+
+
-                        if (i > 0)
-
-
-
+
+
+
+
-                    }
-                }
@@ -1111 +1017 @@
-
-                // Include the explictly named libraries.
-
-
-
-
-
+
+
-                    // Include the paths to the libraries.
-                    version(BuildVerbose)
-                    {
-v
-v
-
-vLibPaths[1..$]
+opts.
+opts.
+
+opts.LibPaths
-                }
-
-                // (5) Set the 'def' file name
-                if (lDefName.length > 0)
-util.str.enquote(lDefName
+source.ReducePathName(source.ExpandPathName(lDefName, False)
-                else
-                    lCommandLine ~= "\n";
@@ -1144 +1047 @@
-                        {
-                            if (lCnt > 0)
-
-
+
+
+
-                            lCnt++;
-                        }
@@ -1153 +1057 @@
-
-                // (7) Gather then switches
-v
+opts.
-            }
-
@@ -1163 +1067 @@
-                    if (util.str.begins(lCompileArg, "-L") == True)
-                    {
-v
+opts.
-                    }
-                }
@@ -1174 +1078 @@
-
-                // (2) Set the output file name
-vOutFileSwitch ~ util.str.enquote(util.pathex.AbbreviateFile
+opts.OutFileSwitch ~ util.str.enquote(source.ReducePath
-
-                // (3) Set the map name
-                if (IsMapping == True)
-vMapSwitch ~ v
+opts.MapSwitch ~ opts.
-
-                // (4) Gather the libraries names.
-                // Include the default libraries first.
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                    // Include the paths to the libraries.
-                    version(BuildVerbose)
-                    {
-v
-Setting LIB=%s", v
+opts.
+Using library paths=%s", opts.
-                    }
-
-                    string[] lLibPaths;
-vLibPaths, v
+opts.LibPaths, opts.
-                    foreach(string lLib; lLibPaths)
-                    {
-                        if (lLib.length > 0)
-
+
+
+
-                    }
-                }
-
-                // (5) Gather then switches
-v
-
-
-v
+opts.
+
+
+opts.
-            {
-                lLinkResponseFileName = util.pathex.ReplaceExtension(lTargetName, "ksp");
@@ -1219 +1124 @@
-                    lLinkResponseFileName = vTemporaryPath ~ std.path.getBaseName(lLinkResponseFileName);
-                }
-util.pathex.AbbreviateFile
-
-v
-
-v
+source.ReducePath
+
+opts.
+
+opts.
-                    {
-                        lCommandLine = util.str.stripr(lCommandLine);
@@ -1232 +1137 @@
-                    lCommandLine = lLinkerSwitches ~ "\n" ~ lCommandLine;
-                util.fileex.CreateTextFile(lLinkResponseFileName,lCommandLine);
-
+
+
+
-            }
-            else
-            {   // using commandline; may run into limits
-v
+opts.
-                    lCommandLine ~= lLinkerSwitches ~ "\n";
-                else
-                    lCommandLine = lLinkerSwitches ~ "\n" ~ lCommandLine;
-
-v
+opts.
-                // Locate switches and change delim from a comma to a blank,
-                // then remove any trailing comma too.
@@ -1248 +1155 @@
-                    int lPos = std.string.find(lCommandLine, lLinkerSwitches[0]);
-                    if (lPos > 0)
-[lPos-1] = ' '
-
-
-v
-v
+ = lCommandLine[0..lPos] ~ " " ~ lCommandLine[lPos+1..$]
+
+
+opts.
+opts.
-                lCommand = lCommandLine;
-            }
@@ -1258 +1165 @@
-            version(BuildVerbose)
-            {
-v
+opts.
-                    std.stdio.writefln("Linking with ..........\n%s\n", lCommandLine);
-            }
@@ -1265 +1172 @@
-            if (vSilent == True)
-            {
-v
-
-
-vLinkerPath ~ vLinkerExe, lCommand
+opts.
+
+
+opts.LinkerPath ~ opts.LinkerExe, lCommand, &RunCallBack
-            if (lRunResult != 0)
-                vExecuteProgram = False;
@@ -1284 +1191 @@
-    if ( (source.Source.WasMainDLL)  && (lRunResult == 0) )
-    {
-
-
-
+  
+  
+  
-        ulong[] lImpManf;
-
-        vExecuteProgram = False;
-
-v
+opts.
-        if (util.file2.FileExists(lImpLibPath))
-        {
@@ -1302 +1209 @@
-            lTargetFileName = std.path.getBaseName(lTargetName);
-            lRunResult = util.fileex.RunCommand(lImpLibPath, lImpLibArgs ~
-std.path.addExt
-std.path.addExt(lTargetFileName, "dll")
+util.pathex.ReplaceExtension
+util.pathex.ReplaceExtension(lTargetFileName, "dll"), &RunCallBack
-        }
-    }
@@ -1312 +1219 @@
-        vExecuteProgram = False;
-
-v
+opts.
-        lOutText ~= lTargetName ~  std.path.linesep;  // Create a new library
-
@@ -1318 +1225 @@
-        {
-            string lFileDir;
+            string lFullFileName;
+
-
-            lFileDir = std.path.getDirName(lFileName);
+            lFullFileName = lFileName;
-            if ((vAllObjects == True) || lFileDir == "" || lFileDir == lTargetDir)
-            {
-ileName.length > 1 + v
-
-ileName[$-vSrcExtension.length .. $] == v
-
-ileName = lFileName[0..$-vSrcExtension.length] ~ v
+ullFileName.length > 1 + opts.
+
+ullFileName[$-opts.SrcExtension.length .. $] == opts.
+
+ullFileName = lFullFileName[0..$-opts.SrcExtension.length] ~ opts.
-                    }
-                }
-                lFileCount++;
-
+ullF
-            }
-        }
@@ -1336 +1246 @@
-        if (lFileCount > 0)
-        {
-v
+opts.
-                lLResponseFileName = util.pathex.ReplaceExtension(lTargetName, "lsp");
-                if (vTemporaryPath.length != 0)
@@ -1352 +1262 @@
-            version(BuildVerbose)
-            {
-v
+opts.
-                    std.stdio.writefln("Librarian with ..........\n%s\n", lOutText);
-            }
-
-vLibrarianPath ~ vLibrarian, lCommand
+opts.LibrarianPath ~ opts.Librarian, lCommand, &RunCallBack
-        }
-    }
@@ -1367 +1277 @@
-        version(BuildVerbose)
-        {
-v
+opts.
-                std.stdio.writefln("Cleaning up ...");
-        }
@@ -1384 +1294 @@
-            }
-        );
-Build
+The utilities
-        lHitList ~= lDResponseFileName;
-        lHitList ~= lLinkResponseFileName;
@@ -1395 +1305 @@
-        lHitList ~= util.pathex.ReplaceExtension(lTargetName, "lst");
-
+
-        foreach(string lFilename; lHitList)
-        {
@@ -1403 +1314 @@
-                    version(BuildVerbose)
-                    {
-v
+opts.
-                            std.stdio.writefln("  removing %s", lFilename);
-                    }
@@ -1413 +1324 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    return lRunResult;
@@ -1436 +1368 @@
-
-// -------------------------------------------
-char []
+string
-// -------------------------------------------
-{
-    string lOutText;
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-    foreach (string lCompileArg; vCompilerArgs)
-    {
@@ -1462 +1391 @@
-                    // Strip off any trailing shell escape lead-in character.
-                    if (lCompileArg[$-1] == '\\')
-
-
+
+
+
-                }
-                else
@@ -1477 +1407 @@
-    if (pLinking == False)
-    { // No linking allowed.
-v
-
-v
-v
+opts.
+
+opts.
+opts.
-            else
-v
+opts.
-            // Terminate with a newline char.
-            lOutText ~= "\n";
-
-v
+opts.
-        }
-    }
@@ -1498 +1428 @@
-// -------------------------------------------
-{
-v
+opts.
-}
-
@@ -1506 +1436 @@
-// -------------------------------------------
-{
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1527 +1469 @@
-            if (vPragmaTargetName != pPath)
-            {
-v
+opts.
-                    std.stdio.writefln("Multiple pragma(target,...) detected. '%s' will be used and '%s' rejected.",
-                                    vPragmaTargetName, pPath );
@@ -1560 +1502 @@
-    }
-    else {
-
+
+
-        lElementIdx[ lLowerText ] = vBuildDef.length-1;
-    }
@@ -1577 +1520 @@
-        {
-            if (pArg[0..3] == `+v+`)
-v
+opts.
-        }
-
@@ -1605 +1548 @@
-        return pRootName;
-
-util.pathex.CanonicalPath(pRootName
+source.ExpandPathName(pRootName, True /* Always a path */ 
-    version(Windows) lSearchName = std.string.tolower(lFullName);
-    version(Posix)   lSearchName = lFullName;
@@ -1636 +1579 @@
-    string[] lRoots;
-    string[] lArgs;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-    foreach(string lSwitch; lArgs)
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    }
-}
-
-// -------------------------------------------
-ReadEnviron
+GetEnvironSwitches
-// -------------------------------------------
-{
@@ -1780 +1600 @@
-        version(BuildVerbose)
-        {
-v
+opts.
-                std.stdio.writefln("Analyzing environment symbol DFLAGS=%s", lSymValue);
-        }
@@ -1792 +1612 @@
-// -------------------------------------------
-{
+    string[] lPotentialPaths;
-    string   lConfigPath;
-    string[] lTextLines;
-    int      lPos;
-
-v
+opts.
-    {
-        // There is no configuration file to process
@@ -1802 +1623 @@
-    }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    else
-vConfigPath ~ v
+opts.ConfigPath ~ opts.
-    version(BuildVerbose)
-    {
-v
+opts.
-            std.stdio.writefln("Reading from config: %s", lConfigPath);
-    }
@@ -1816 +1686 @@
-    foreach(int i, string lLine; lTextLines)
-    {
+        string lText;
+
-        // Strip off trailing whitespace.
-Line
+Text
-
-        // Replace any environment symbols with their value.
-        version(BuildVerbose)
-        {
-v
-Line
-
-
-Line = util.str.ExpandEnvVar(lLine
+opts.
+Text
+
+
+Text = util.str.ExpandEnvVar(lText
-
-        // Examine DFLAGS
-Line
+Text
-        if(lPos == 0)
-        {
-Line
+Text
-        } // end of DFLAGS processing.
-
-        // Examine LIB
-Line
+Text
-        if(lPos == 0)
-        {
-            string[] lPaths;
-Line = lLine
+Text = lText
-            lPaths.length = 1;
-Line
+Text
-            {
-                if (lChar == '"') {}
@@ -1862 +1734 @@
-                if (lPath.length > 0)
-                {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-            version(BuildVerbose)
-            {
-v
-%s",v
+opts.
+library paths %s",opts.
-            }
-            continue;
@@ -1880 +1756 @@
-        if(lPos == 0)
-        {
-vLinkerPath, v
+opts.LinkerPath, opts.
-            continue;
-        }
@@ -1886 +1762 @@
-        lPos = std.string.find(lLine, "LIBCMD=");
-        if(lPos == 0) {
-vLibrarianPath, v
+opts.LibrarianPath, opts.
-            continue;
-        }
@@ -1892 +1768 @@
-    }
-
-v
-vLinkerExe.dup, vLinkerPath, v
-
-v
-vLibrarian.dup, vLibrarianPath, v
+opts.
+opts.LinkerExe, opts.LinkerPath, opts.
+
+opts.
+opts.Librarian, opts.LibrarianPath, opts.
-}
-
@@ -1905 +1781 @@
-    int lPos;
-
-pCmdValue.dup
+util.str.ExpandEnvVar(pCmdValue)
-
-    // Strip out any quotes
@@ -1913 +1789 @@
-    }
-
-v
+opts.
-    {
-        if (std.path.getExt(lCmdValue).length == 0)
-v
+opts.
-    }
-
-    if (util.pathex.IsRelativePath(lCmdValue) == True)
-    {
-v
+opts.
-        if (util.str.ends(pFilePath, std.path.sep) == False)
-            pFilePath ~= std.path.sep;
-
-util.pathex.CanonicalPath(pFilePath ~ lCmdValue, f
+source.ExpandPathName(pFilePath ~ lCmdValue, F
-    }
-    else
-    {
-util.pathex.CanonicalPath(lCmdValue, f
-
-.dup
+source.ExpandPathName(lCmdValue, F
+
+
-    pFilePath = std.path.getDirName(pFilePath) ~ std.path.sep;
-
-    version(BuildVerbose)
-    {
-v
+opts.
-        {
-            std.stdio.writefln(" %s path '%s'",pType, pFilePath);
@@ -1946 +1822 @@
-// Display each entry in the supplied list.
-// -------------------------------------------
-
+in 
-// -------------------------------------------
-{
@@ -1960 +1836 @@
-
-// -------------------------------------------
-
+in 
-// -------------------------------------------
-{
@@ -2004 +1880 @@
-string GetAppPath()
-{
-AppPath.dup
+MyPath
-}
-
@@ -2027 +1903 @@
-
-    lFileExtList ~= std.file.getExt(pFileName);
-v
-
-v
-v
+opts.
+
+opts.
+opts.
-    }
-    lFileBase = std.path.getName(pFileName);
@@ -2044 +1920 @@
-                lPossiblePath = ( lNextRoot ~ lTestFileName );
-                if(util.file2.FileExists(lPossiblePath)) {
-util.pathex.AbbreviateFile
+source.ReducePath
-                }
-            }
@@ -2052 +1928 @@
-
-        // Look for file in current folder first.
-util.pathex.CanonicalPath(lTestFileName, f
+source.ExpandPathName(lTestFileName, F
-        if(util.file2.FileExists(lLocalPath))
-        {
-util.pathex.AbbreviateFile
+source.ReducePath
-        }
-
@@ -2064 +1940 @@
-            if(util.file2.FileExists(lPossiblePath))
-            {
-util.pathex.AbbreviateFile
-
-
-
-
-util.pathex.AbbreviateFile
+source.ReducePath
+
+
+
+
+source.ReducePath
-}
-
@@ -2081 +1957 @@
-            if (util.str.begins(vReceivedArgs[i].ArgText, pArg[0..$-1]) == True)
-            {
- = ""
+.length = 0
-                vReceivedArgs[i].CompilerArg = False;
-            }
@@ -2087 +1963 @@
-        else if (vReceivedArgs[i].ArgText == pArg)
-        {
- = ""
+.length = 0
-            vReceivedArgs[i].CompilerArg = False;
-        }
@@ -2111 +1987 @@
-                    if (util.str.begins(pArgGroup[i], lArg[0..$-1]) == True)
-                    {
- = ""
+.length = 0
-                        break;
-                    }
@@ -2117 +1993 @@
-                else if (pArgGroup[i] == lArg)
-                {
- = ""
+.length = 0
-                    break;
-                }
-            }
- = ""
+= string.init
-        }
-    }
@@ -2146 +2022 @@
-    int lBuildResult;
-    string lCompPath;
-
+
+
-
-    /* Set routine addresses in the Source module. This allows
@@ -2163 +2040 @@
-    source.AddCompilerArg   = &AddCompilerArg;
-    source.GetAppPath       = &GetAppPath;
-    source.vPathId          = vPathId;
-    util.fileex.vPathId     = vPathId;
-    util.fileex.vExeExtension = vExeExtension;
-
-    // Strip off application's path from arglist.
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-    pArgs=pArgs[1..pArgs.length];
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        {
-            // No other arguments so show usage message.
@@ -2191 +2074 @@
-        else
-        {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if (lCompPath[length-1] != std.path.sep[0])
-            lCompPath ~= std.path.sep;
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    source.mCollectUses  = vCollectUses;
-    source.vForceCompile = vForceCompile;
-    source.ObjWritePath  = vTemporaryPath;
-    source.vExplicit     = vExplicit;
-
-    // Grab the external macro definitions unless otherwise told not to.
-    source.mMacroInput = vMacroInput;
-    if (vMacroInput == True)
-
-
-
-
-
-
+
-
-    if( (vTargetName.length == 0) && (vCommandTargetName.length == 0) ){
@@ -2252 +2127 @@
-    version(BuildVerbose)
-    {
-v
+opts.
-            std.stdio.writefln("Current Dir '%s'", util.pathex.GetInitCurDir());
-    } else {
@@ -2259 +2134 @@
-    }
-
-if (lSetPath
-
-version(BuildVerbose
-
-v
+version(BuildVerbose
+
+if (lSetPath
+
+opts.
-                std.stdio.writefln("%s not found in PATH symbol, so assuming current directory",
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    {
-        throw new BuildException(std.string.format("The compiler '%s' was not found.",
-vCompilerPath ~ v
+opts.CompilerPath ~ opts.
-    }
-
-    version(BuildVerbose)
-    {
-v
-v
+opts.
+opts.
-    }
-
-    source.SetKnownVersions();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-    // Rationalize the ignored modules list.
-v
-v
-v
+opts.
+opts.
+opts.
-                // Must remove from ignored list.
-vModulesToIgnore = vModulesToIgnore[0..i] ~ v
+opts.ModulesToIgnore = opts.ModulesToIgnore[0..i] ~ opts.
-                i--;
-            }
@@ -2399 +2205 @@
-
-    // Process the files
-Build
+MakeItSo
-
-    // After processing analysis.
-    version(BuildVerbose)
-    {
-v
+opts.
-        {
-            std.stdio.writefln("");
@@ -2412 +2218 @@
-            DisplayItems(source.Source.AllFiles,
-                                          "source files: ...............");
-.keys
+
-            DisplayItems(source.Externals,"externally built files: ...............");
-            DisplayItems(vImportRoots,    "import roots: .................");
-v
-v
+opts.
+opts.
-        }
-    }
@@ -2439 +2245 @@
-                if (lModuleCount == 0)
-                {
-v
+opts.
-                }
-                lModuleCount++;
@@ -2445 +2251 @@
-                if (lModuleCount > 1)
-                {
-v
-
-
-v
+opts.
+
+
+opts.
-                                                    ~ "," ~ "src=" ~ lSource.FileName
-                                               );
@@ -2456 +2262 @@
-        if (lModuleCount != 0)
-        {
-v
+opts.
-        }
-
-        if (vSymbolOutName.length == 0)
-v
-
-v
+opts.
+
+opts.
-        {
-            // ensure requested path exists.
@@ -2488 +2294 @@
-            {
-                lFile ~= lLine ~ "\n";
-.dup
+
-            }
-        }
@@ -2499 +2305 @@
-            {
-                lFile ~= lLine ~ "\n";
-.dup
+
-            }
-        }
@@ -2506 +2312 @@
-            vUsesOutput = util.pathex.GetBaseName(vTargetName) ~ ".use";
-
-v
+opts.
-        {
-            // ensure requested path exists.
@@ -2528 +2334 @@
-        std.stdio.writefln("");
-
-
-
+
+
+
+
+
+
+
+
+
-    }
-
@@ -2537 +2350 @@
-}
-
-, Bool pVerbose
+
-{
-    // A response file is being used.
@@ -2546 +2359 @@
-        return;
-    if (pArg == "@")
-v
+opts.
-    else if (pArg[0] == '@')
-.dup
+
-    else
-        lRespFileName = pArg;
-
-    if (std.path.getExt(lRespFileName).length == 0)
-    {
-v
+opts.
-    }
-
-    version(BuildVerbose)
-    {
-p
+opts.
-            std.stdio.writefln("Response file %s", lRespFileName);
-    }
-
-    lRespLines = util.fileex.GetTextLines(lRespFileName, util.fileex.GetOpt.Exists);
-
+ref 
-    {
-        // Locate any comment text in the line.
+        // 'Truncate' the line at the '#' character.
-        int lPos = std.string.find(lArg, "#");
-
-
-
-
-
-
-
+
+
+
+
+
+
-        if (lArg.length > 1)
-        {
-            version(BuildVerbose)
-            {
-p
+opts.
-                    std.stdio.writefln("Response file arg: %s", lArg);
-            }
@@ -2598 +2410 @@
-{
-    static string lImportSwitch;
-
+
+
+
-    // Handle a version switch on the command line by
-v
+opts.
-    {
-        string lVersionString;
-
-v
+opts.
-        if (lVersionString.length > 0 && lVersionString[0] == '=')
-            lVersionString = lVersionString[1..$];
@@ -2612 +2426 @@
-        }
-    }
-v
+opts.
-    {
-        source.ActivateDebug("1");
-    }
-v
+opts.
-    {
-        string lDebugString;
-
-v
+opts.
-        if (lDebugString.length > 0 && lDebugString[0] == '=')
-            lDebugString = lDebugString[1..$];
@@ -2632 +2446 @@
-    {
-        vReceivedArgs.length = vReceivedArgs.length + 1;
-.dup
+
-        vReceivedArgs[$-1].CompilerArg = False;
-        vReceivedArgs[$-1].DFlag = False;
@@ -2639 +2453 @@
-    switch(pArg) {
-        case "-full":
-v
+opts.
-            // Not passed thru.
-            break;
-
-        case "-link":
-t
+T
-            // Not passed thru.
-            break;
@@ -2714 +2528 @@
-
-        case "-test":
-v
+opts.
-            // Not passed thru.
-            break;
-
-        case "-explicit":
-v
+opts.
-            // Not passed thru.
-            break;
@@ -2743 +2557 @@
-            {
-            if (pArg[0] == '-') {
-v
+opts.
-                {
-                    // Requires symbolic debug info.
-vLinkerDefs ~= v
+opts.LinkerDefs ~= opts.
-                    vReceivedArgs[$-1].CompilerArg = True;
-                    break;
@@ -2754 +2568 @@
-                if (util.str.IsLike(pArg, "-LIBOPT*"c) == True)
-                {
-vLibrarianOpts ~= " " ~ pArg[7..$].dup
+opts.LibrarianOpts ~= " " ~ pArg[7..$]
-                    break;
-
@@ -2761 +2575 @@
-                if (util.str.begins(pArg, "-LIBPATH=") == True)
-                {
-
+
+
+
+
+
+
+
+
+
+
-                    break;
-                }
@@ -2777 +2600 @@
-                        lFile = m.match(1);
-                    }
-
-
-
-
-
-
+
-                    ExamineArgs(lLocalArgs);
+                    break;
+                }
+
+                if (util.str.begins(pArg, "-showtodo") == True)
+                {
+                    opts.ShowToDo = new Bool(util.str.YesNo(pArg, true));
-                    break;
-                }
@@ -2810 +2634 @@
-                if (util.str.IsLike(pArg, "-DCPATH?*"c) == True)
-                {
-.dup
+
-                    if (util.str.ends(lNewPath, std.path.sep) == False)
-                        lNewPath ~= std.path.sep;
-                    version(BuildVerbose)
-                    {
-v
-v
-
-v
-v
+opts.
+opts.
+
+opts.
+opts.
-                    break;
-
@@ -2826 +2650 @@
-                if (util.str.IsLike(pArg,  "-CFPATH?*"c) == True)
-                {
-.dup
+
-                    if (util.str.ends(lNewPath, std.path.sep) == False)
-                        lNewPath ~= std.path.sep;
-                    version(BuildVerbose)
-                    {
-v
-v
-
-v
-v
+opts.
+opts.
+
+opts.
+opts.
-                    break;
-
@@ -2842 +2666 @@
-                if (util.str.IsLike(pArg,  "-BCFPATH?*"c) == True)
-                {
-.dup
+
-                    if (util.str.ends(lNewPath, std.path.sep) == False)
-                        lNewPath ~= std.path.sep;
-                    version(BuildVerbose)
-                    {
-v
-v
-
-v
+opts.
+opts.
+
+opts.
-                    break;
-
@@ -2857 +2681 @@
-                if (util.str.IsLike(pArg,  "-PP?*"c) == True)
-                {
-.dup
+
-                    version(BuildVerbose)
-                    {
-v
+opts.
-                            std.stdio.writefln("Added %s to Source Scan List", lNewPath);
-                    }
@@ -2875 +2699 @@
-                    version(BuildVerbose)
-                    {
-v
-source.v
-
-
-source.vRDFName = pArg[4..$].dup
+opts.
+opts.
+
+
+opts.RDFName = pArg[4..$]
-                    break;
-
@@ -2888 +2712 @@
-                    version(BuildVerbose)
-                    {
-v
-v
-
-
-vDefMacroDefFile = pArg[4..$].dup
+opts.
+opts.
+
+
+opts.DefMacroDefFile = pArg[4..$]
-                    break;
-
-                }
-
-v
+opts.
-                {
-                    vDelayedValue = &lImportSwitch;
-                    break;
-                }
-v
-
-char []
-v
-v
+opts.
+
+string
+opts.
+opts.
-                    {
-                        lRoot = AddRoot(lCmdRoot);
@@ -2913 +2737 @@
-                            version(BuildVerbose)
-                            {
-v
+opts.
-                                    std.stdio.writefln("Added root from command line = %s",lRoot);
-                            }
@@ -2921 +2745 @@
-                }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    vExecuteProgram = True;
-                    break;
@@ -2945 +2780 @@
-                {
-
-
-
+
-                    break;
-                }
@@ -2975 +2809 @@
-
-                // Special check for Object Write Path
-
-
-
+
-                {
-                    string lRoot;
-
-v
+opts.
-                    if (vTemporaryPath.length > 0 && vTemporaryPath[$-1..$] != std.path.sep)
-                        vTemporaryPath ~= std.path.sep;
@@ -2989 +2821 @@
-                        version(BuildVerbose)
-                        {
-v
+opts.
-                                std.stdio.writefln("Added root from Object Write Path = %s",lRoot);
-                        }
-                        util.pathex.MakePath(lRoot);
-                    }
-
-
-                    // This one actually *is* passed thru.
-                    version(DigitalMars)
-                    {
-                        // Ensure we don't have both -op and -od when using dmd.
-                        RemoveRecdArg("-op");
-                    }
-                }
-                }
-
@@ -3008 +2833 @@
-                {
-                    // Modules to ignore (eg. -Xmylib)
-v
+opts.
-                    break;
-                }
@@ -3015 +2840 @@
-                {
-                    // Modules to notice (eg. -Mphobos)
-v
+opts.
-                    break;
-                }
-
+
-                if (util.str.IsLike(pArg,  "-T?*"c) == True)
-                {
-                    // Target name (eg. -Ttestapp)
-
-                    if (vCommandTargetName.length > 0)
-                    {
@@ -3030 +2855 @@
-                    }
-                    else
-.dup
+
-
-                    break;
-                }
-
-                version(DigitalMars)
-                {
-                if (util.str.IsLike(pArg,  (vOutFileSwitch ~ "*")) == True)
-                {
-                    // Target name (eg. -oftestapp)
-                    vCommandTargetName = pArg[vOutFileSwitch.length .. $];
-                    break;
-                }
-                }
-
-                version(GNU)
-                {
-                if (pArg == vOutFileSwitch)
-                {
-                    // Target name (eg. -o testapp)
-                    vDelayedValue = &vCommandTargetName;
-                    break;
-                }
-                }
-
@@ -3060 +2865 @@
-                    // Response file usage (eg. -R=Yes)
-                    if (pArg.length == 2)
-
+
+
-                    else
-v
+opts.
-                    break;
-                }
@@ -3096 +2902 @@
-                    if ( vDelayedValue == &lImportSwitch)
-                    {
-
+
+
-                        foreach(string lCmdRoot; std.string.split(pArg, ";"))
-                        {
@@ -3103 +2910 @@
-                                version(BuildVerbose)
-                                {
-v
+opts.
-                                        std.stdio.writefln("Added root from command line = %s",lRoot);
-                                }
@@ -3109 +2916 @@
-                        }
-                    }
+                    else if ( vDelayedValue == &lResponseFileRef)
+                    {
+                        vDelayedValue = null;
+                        ProcessResponseFile(pArg);
+                    }
-                    else
-                    {
-                        *vDelayedValue = pArg;
+                        vDelayedValue = null;
-                        vReceivedArgs[$-1].ArgText ~= " " ~ pArg;
-                    }
-
+
-                    break;
-                }
@@ -3124 +2937 @@
-                    pArg = std.string.replace(pArg, "/", std.path.sep);
-                }
-util.pathex.AbbreviateFileName(util.pathex.CanonicalPath(pArg, f
-auto
+source.ReducePathName(source.ExpandPathName(pArg, F
+string
-                if (lArgExt == "")
-                {
-v
+opts.
-                       vCmdLineSourceFiles ~= pArg;
-                }
-v
-v
-v
+opts.
+opts.
+opts.
-                {
-                       vCmdLineSourceFiles ~= pArg;
-                }
-v
+opts.
-                {
-                }
@@ -3146 +2959 @@
-
-                if(vTargetName is null &&
-v
-v
+opts.
+opts.
-                    )
-                  )
-                {
-std.path.getName(pArg.dup
+util.pathex.GetFileBaseName(pArg
-                    version(BuildVerbose)
-                    {
-v
+opts.
-                            std.stdio.writefln("Default target is '%s'", vTargetName);
-                    }
@@ -3167 +2980 @@
-{
-    static bool[string] lKnownArgs;
+    static string lDelayed;
-
-    pArg = std.string.strip(pArg);
@@ -3177 +2991 @@
-    }
-
+    if (lDelayed == "-f")
+    {
+        lDelayed.length = 0;
+        ProcessResponseFile(pArg);
+        return;
+    }
+
-    version(BuildVerbose)
-    {
-        if ((pArg == "-V") || (pArg == "-v"))
-v
+opts.
-    }
-
@@ -3188 +3009 @@
-        {
-            if ((pArg == "--V") || (pArg == "--v"))
-v
+opts.
-        }
-        // Defer removing the earlier arg until I've examined all args.
@@ -3197 +3018 @@
-
-    if ( (pArg[0] == '@') ||
-v
+opts.
-             )
-    {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    else if (pArg[0] == '+')
-
-
-
-
-
-
+
+
+
-    else
-    {   // Only add an argument if it is not already been added.
@@ -3220 +3053 @@
-            pArgGroup ~= pArg;
-            lKnownArgs[pArg] = true;
+            if (pArg == "-unittest")
+                opts.UnitTesting = True;
-        }
-    }
@@ -3231 +3066 @@
-       the contents of any response files.
-    */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-    // Collect from original command line.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-{
-    // From build.exe location
-pVerbose, std.path.getDirName(vAppPath)
+vMyDir
-
-    // From compiler location
-pVerbose, v
+opts.
-
-    // From current folder location
-pVerbose, 
-
-
-Bool pVerbose, 
+
+
+
+
-{
-    string lMacroDefFileName;
@@ -3326 +3098 @@
-    static bool[ string ] lUsedPaths;
-
-.dup
+
-
-    if ((lMacroDefFileName.length > 0) &&
@@ -3332 +3104 @@
-            lMacroDefFileName ~= std.path.sep;
-
-v
+opts.
-
-    if (lMacroDefFileName in lUsedPaths)
@@ -3340 +3112 @@
-    version(BuildVerbose)
-    {
-
-
+
+
+
-    }
-
-    lMacroDefLines = util.fileex.GetTextLines(lMacroDefFileName, util.fileex.GetOpt.Always);
-
-
+ex
-    version(BuildVerbose)
-    {
-p
+opts.
-        {
-            foreach(string lMsg; lMessages)
@@ -3360 +3133 @@
-}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    // From alternate location
-v
-ProcessOneBuildConfig(pArg, pVerbose, v
+opts.
+lCmdCnt += ProcessOneBuildConfig(pArg, opts.
-
-    // compiler path
-ProcessOneBuildConfig(pArg, pVerbose, v
+lCmdCnt += ProcessOneBuildConfig(pArg, opts.
-
-    // From current location
-
-
-
-
-
+
+
+
+
+
+
-{
-    string lConfigFileName;
-    string[] lConfigLines;
+    string lKey;
-    bool lFoundGroup;
-    static bool[ string ] lUsedPaths;
-
-
-
-
-
-
-
-
+
+
+
-    if (util.file2.FileExists(lConfigFileName) == false)
-    {
@@ -3398 +3191 @@
-                lConfigFileName ~= std.path.sep;
-
-
-
-
-
+
+
+
+
+
+
+
+
-    if (pArg.length == 0)
-        pArg = "+";
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -3421 +3226 @@
-    }
-
-
+ref 
-    {
-        if (lArg.length == 0)
@@ -3455 +3260 @@
-                version(BuildVerbose)
-                {
-p
-Build 
+opts.
+
-                }
-
@@ -3469 +3274 @@
-                    int lEndPos;
-                    bool lEndFound;
+
-                    lArg = std.string.strip(lArg[8..$]);
-                    lStartPos = 0;
@@ -3475 +3281 @@
-                    while(lEndPos < lArg.length)
-                    {
-!lEndFound
+lEndFound == false
-                        {
-                            if (lArg[lEndPos] == ' ')
@@ -3489 +3295 @@
-                                lStartPos = lEndPos;
-                                lEndFound = false;
+                                lCmdCnt += 1;
-                            }
-                        }
@@ -3496 +3303 @@
-                    {
-                        GatherOneArg( lArg[lStartPos..lEndPos], pArgGroup );
+                        lCmdCnt += 1;
-                    }
-
@@ -3502 +3310 @@
-                {
-                    vFinalProc ~= lArg[6..$];
+                    lCmdCnt += 1;
+                }
+                else if (util.str.begins(lArg, "FAILURE=") == True)
+                {
+                    vFailureProc ~= lArg[8..$];
+                    lCmdCnt += 1;
-                }
-                else if (util.str.begins(lArg, "LIBCMD=") == True)
-                {
-
+
+
-                }
-                else if (util.str.begins(lArg, "COMPCMD=") == True)
-                {
-
+
+
-                }
-                else if (util.str.begins(lArg, "LINKCMD=") == True)
-                {
-
+
+
-                }
-                else if (util.str.begins(lArg, "LINKSWITCH=") == True)
-                {
-
+
+
-                }
-                else if (util.str.begins(lArg, "INIT:") == True)
-                {
-
+lCmdCnt += opts.
-                }
-                else {
-                    version(BuildVerbose)
-                    {
-v
+opts.
-                            std.stdio.writefln("Bad configuration command '%s' ignored.", lArg);
-                    }
@@ -3533 +3351 @@
-        }
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/Source/build_bn.d

@@ -2 +2 @@
-// This file is automatically maintained by the BUILD utility,
-// Please refrain from manually editing it.
-2514
+3200

trunk/Source/docsrc/change_log.d

@@ -5 +5 @@
-A list of changes and fixes that have been made.
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-$(LIST
-    $(ITEM ** $(B FIX:) Correctly handle INIT:CompilerExe from configuration file

trunk/Source/docsrc/configuration_file.d

@@ -4 +4 @@
-$(SECTION
-The utility's configuration file is used to specify your default options
-
-
-
-
+
+
+
+
+
+
+
-alternative path (defined by -BCFPATH switch), then in the folder
-that the compiler is installed, and finally in the current folder.
@@ -59 +62 @@
-successfully created. There can be any number of $(I FINAL) commands
-in a configuration file; they are all executed, and in the order presented.
+$(BL)
+Note that if your program path may contain spaces, you should enclose it
+quotes so that there is no confusion.
-$(BL)
-You can place special tokens in the $(I FINAL) command line and these will
@@ -81 +87 @@
-
-$(B INIT:) $(BR)
-string
+variable
-$(I INIT:$(B stringname)) where $(I stringname) identifies the specific
-
+
+
+
+
+
+
-$(CODE
-   INIT:MapSwitch = -M
+   # Clear the automatically added Windows libraries.
+   INIT:AutoLibs =
+   # Build a new list of Windows libraries.
+   INIT:AutoLibs = gdi32,winsock2
-)
-$(INDENT
-$(SECTION The identifiers for the settable strings are detailed below.)
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-$(TABROW ShrLibExtension, The file extension for shared libraries files.$(EG dll))
-$(TABROW SrcExtension   , The file extension for D source files.$(EG d))
@@ -100 +143 @@
-                          it not to link, just compile the files instead.$(EG -c))
-$(TABROW LinkerExe      , The file name of the linker.$(EG link.exe))
+$(TABROW CFGPath        , The optional additional path to check for Bud's
+                          configuration file.  As this
+                          is set from a configuration file, its effect only
+                          starts after the current configuration file has
+                          been processed.  $(EG /var/bud/))
-$(TABROW ConfigFile     , The name of the compiler's configuration file. $(EG sc.ini))
-$(TABROW CompilerPath   , If the compiler is not in the standard search PATH,