Changeset 55

Timestamp:

07/03/09 10:50:05 (3 years ago)

Author:

Derek Parnell

Message:

* Fixed. Now uses any .def files on command line. If present it does not generate a .def file.
* Fixed the make files.

Files:

• trunk/Source/Makefile.dos (modified) (1 diff)
• trunk/Source/Makefile.gdc (modified) (1 diff)
• trunk/Source/Makefile.unix (modified) (1 diff)
• trunk/Source/build.d (modified) (7 diffs)
• trunk/Source/build_bn.d (modified) (1 diff)
• trunk/Source/opts.d (modified) (6 diffs)
• trunk/Source/opts_bn.d (modified) (1 diff)
• trunk/Source/source.d (modified) (1 diff)
• trunk/Source/source_bn.d (modified) (1 diff)
• trunk/Source/util/file2_bn.d (modified) (1 diff)
• trunk/Source/util/fileex_bn.d (modified) (1 diff)
• trunk/Source/util/linetoken_bn.d (modified) (1 diff)
• trunk/Source/util/pathex_bn.d (modified) (1 diff)
• trunk/Source/util/str_bn.d (modified) (1 diff)

trunk/Source/Makefile.dos

@@ -16 +16 @@
-SOURCES=$(SOURCES) util\linetoken.d
-SOURCES=$(SOURCES) util\linetoken_bn.d
-
+ex
-SOURCES=$(SOURCES) util\booltype.d
-SOURCES=$(SOURCES) util\file2.d

trunk/Source/Makefile.gdc

@@ -1 +1 @@
-DMD=gdmd
-DFLAGS=-op -release -inline -version=BuildVerbose
-
+ex
-
-all: build

trunk/Source/Makefile.unix

@@ -1 +1 @@
-DMD=dmd
-DFLAGS=-op -release -inline -version=BuildVerbose
-
+ex
-
-all: build

trunk/Source/build.d

@@ -128 +128 @@
-    Bool         vNames;
-    Bool         vAllObjects;
-    Bool         vNoDef;
-    Bool         vAutoImports;
-    Bool         vExecuteProgram;
@@ -184 +183 @@
-    vNames = False;
-    vAllObjects = False;
-    vNoDef = False;
-    vAutoImports = True;
-    vExecuteProgram = False;
@@ -549 +547 @@
-        if (lFullFile.length > 0)
-        {
-
+
+
+
+
-        }
-    }
@@ -863 +864 @@
-        }
-
-vNoDef
+opts.NoDefs
-        {
-            lDefName = util.pathex.ReplaceExtension(lTargetName, "def");
@@ -1493 +1494 @@
-    static uint[ string ] lElementIdx;
-
-vNoDef
+opts.NoDefs
-        return;
-
@@ -2544 +2545 @@
-
-        case "-nodef":
-vNoDef
+opts.NoDefs
-            // Not passed thru.
-            break;
@@ -2991 +2992 @@
-                else if (lArgExt == opts.ResponseExt)
-                {
+                }
+                else if (lArgExt == opts.DefExtension)
+                {
+                    opts.NoDefs = True;
+                    vCmdLineSourceFiles ~= pArg;
-                }
-                else

trunk/Source/build_bn.d

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

trunk/Source/opts.d

@@ -65 +65 @@
-    string    ShrLibExtension;
-    string    SrcExtension;
+    string    DefExtension;
-    string    SrcDInterfaceExt;
-    string    MacroExtension;
@@ -132 +133 @@
-    Bool    ShowToDo;
-    Bool    UnitTesting;
+    Bool    NoDefs;
-}
-
@@ -148 +150 @@
-    ShowToDo = False;
-    UnitTesting = False;
+    NoDefs = False;
-}
-
@@ -196 +199 @@
-        case "shrlibextension" : { ShrLibExtension  = lValue; break; }
-        case "srcextension"    : { SrcExtension     = lValue; break; }
+        case "defextension"    : { DefExtension     = lValue; break; }
-        case "macroextension"  : { MacroExtension   = lValue; break; }
-        case "ddocextension"   : { DdocExtension    = lValue; break; }
@@ -261 +265 @@
-        case "argdelim"        : { ArgDelim         = lValue; break; }
-        case "argfiledelim"    : { ArgFileDelim     = lValue; break; }
-
-        // These cater for spelling mistakes used in an earlier version.
-        case "exeextention"    : { ExeExtension     = lValue; break; }
-        case "libextention"    : { LibExtension     = lValue; break; }
-        case "objextention"    : { ObjExtension     = lValue; break; }
-        case "shrlibextention" : { ShrLibExtension  = lValue; break; }
-        case "srcextention"    : { SrcExtension     = lValue; break; }
-        case "macroextention"  : { MacroExtension   = lValue; break; }
-        case "ddocextention"   : { DdocExtension    = lValue; break; }
-        case "postswitches"    : { util.str.YesNo(lValue, PostSwitches, False); break; }
-        case "appendlinkswitches" : { util.str.YesNo(lValue, AppendLinkSwitches, False); break; }
@@ -279 +274 @@
-        case "shortpathnames"  : { util.str.YesNo(lValue, ShortPathNames, True); break; }
-        case "showtodo"        : { util.str.YesNo(lValue, ShowToDo, False); break; }
-
+
+
+
+
+
+
+
+
+
+
+
-        default:
-        {

trunk/Source/opts_bn.d

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

trunk/Source/source.d

@@ -1315 +1315 @@
-                    while ( (lCurrentToken = GetNextToken(pFileText,pPos)) !is null)
-                    {
+                        
-                        if ( (lCurrentToken == "\"") || (lCurrentToken == "`") ) {
-                            lCurrentToken = GetStringLit(pFileText,pPos, lCurrentToken[0]);

trunk/Source/source_bn.d

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

trunk/Source/util/file2_bn.d

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

trunk/Source/util/fileex_bn.d

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

trunk/Source/util/linetoken_bn.d

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

trunk/Source/util/pathex_bn.d

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

trunk/Source/util/str_bn.d

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