Changeset 777

Timestamp:

08/25/07 18:30:51 (1 year ago)

Author:

Gregor

Message:

*: More DMD fixes - now always compiles one file at a time.

Files:

• trunk/docs/ChangeLog (modified) (1 diff)
• trunk/rebuild/dsss.conf (modified) (1 diff)
• trunk/rebuild/mars.c (modified) (2 diffs)
• trunk/rebuild/rebuild.conf/dmd-posix (modified) (1 diff)
• trunk/rebuild/rebuild.conf/dmd-posix-tango (modified) (1 diff)
• trunk/rebuild/rebuild.conf/dmd-win (modified) (1 diff)
• trunk/rebuild/rebuild.conf/dmd-win-tango (modified) (1 diff)
• trunk/rebuild/rebuild.conf/native (added)

trunk/docs/ChangeLog

@@ +1 @@
+SVN from 0.71:
+        - More DMD fixes - now always compiles one file at a time.
+
-0.71 from 0.70:
-        - Much-improved README.software_engineers.

trunk/rebuild/dsss.conf

@@ -10 +10 @@
-    install rebuild_choosedc$EXE_EXT $BIN_PREFIX ; \
-    install rebuild.conf/default $ETC_PREFIX/rebuild ; \
+    install rebuild.conf/native $ETC_PREFIX/rebuild ; \
-    install rebuild.conf/phobos $ETC_PREFIX/rebuild ; \
-    install rebuild.conf/tango $ETC_PREFIX/rebuild ; \

trunk/rebuild/mars.c

@@ -521 +521 @@
-            else if (strcmp(p + 1, "lib") == 0)
-            {
-                if (masterConfig.find("liblink") != masterConfig.end() &&
-                    masterConfig["liblink"].find("oneatatime") != masterConfig["liblink"].end() &&
-                    masterConfig["liblink"]["oneatatime"] != "no") {
-                    global.params.oneatatime = 1;
-                }
-                global.params.lib = 1;
-            }
-            else if (strcmp(p + 1, "shlib") == 0)
-            {
-                if (masterConfig.find("shliblink") != masterConfig.end() &&
-                    masterConfig["shliblink"].find("oneatatime") != masterConfig["shliblink"].end() &&
-                    masterConfig["shliblink"]["oneatatime"] != "no") {
-                    global.params.oneatatime = 1;
-                }
-                global.params.shlib = 1;
-            }
-            else if (strcmp(p + 1, "dylib") == 0)
-            {
-                if (masterConfig.find("dyliblink") != masterConfig.end() &&
-                    masterConfig["dyliblink"].find("oneatatime") != masterConfig["dyliblink"].end() &&
-                    masterConfig["dyliblink"]["oneatatime"] != "no") {
-                    global.params.oneatatime = 1;
-                }
-                global.params.dylib = 1;
-            }
@@ -996 +981 @@
-    }
-    
+    // figure out if we need to link one-at-time
+    char *sect;
+    if (global.params.lib) {
+        sect = "liblink";
+    } else if (global.params.shlib) {
+        sect = "shliblink";
+    } else if (global.params.dylib) {
+        sect = "dyliblink";
+    } else {
+        sect = "link";
+    }
+    if (masterConfig.find(sect) != masterConfig.end() &&
+        masterConfig[sect].find("oneatatime") != masterConfig[sect].end() &&
+        masterConfig[sect]["oneatatime"] != "no") {
+        global.params.oneatatime = 1;
+    }
+
-    // add include= paths
-    if (masterConfig.find("") != masterConfig.end() &&

trunk/rebuild/rebuild.conf/dmd-posix

@@ -38 +38 @@
-
-[link]
+oneatatime=yes
-cmd=dmd -L--start-group -L-lphobos $i -of$o
-

trunk/rebuild/rebuild.conf/dmd-posix-tango

@@ -39 +39 @@
-
-[link]
+oneatatime=yes
-cmd=dmd -L--start-group -L-lphobos $i -of$o
-

trunk/rebuild/rebuild.conf/dmd-win

@@ -40 +40 @@
-
-[link]
+oneatatime=yes
-cmd=dmd $i -of$o
-response=@

trunk/rebuild/rebuild.conf/dmd-win-tango

@@ -41 +41 @@
-
-[link]
+oneatatime=yes
-cmd=dmd $i -of$o
-response=@