Changeset 393

Timestamp:

02/23/07 19:16:00 (2 years ago)

Author:

Gregor

Message:

rebuild/*: Added support for using response files.

RELEASE: Rebuild 0.12 (try 2)

Files:

• trunk/rebuild/compile.c (modified) (4 diffs)
• trunk/rebuild/compile.h (modified) (1 diff)
• trunk/rebuild/config.c (modified) (1 diff)
• trunk/rebuild/link.c (modified) (7 diffs)
• trunk/rebuild/rebuild.conf/dmd-win (modified) (2 diffs)
• trunk/rebuild/rebuild.conf/dmd-win-tango (modified) (3 diffs)
• trunk/rebuild/rebuild.exe (modified) (previous)
• trunk/rebuild/response.c (modified) (1 diff)
• trunk/rebuild/response.h (modified) (2 diffs)

trunk/rebuild/compile.c

@@ -18 +18 @@
-#include "mars.h"
-#include "module.h"
+#include "response.h"
-
-
+, string &response, bool &useresponse
-{
-    int varLoc;
@@ -29 +30 @@
-        global.errors++;
-        return "";
+    }
+    
+    // check if we need to use a response file
+    useresponse = false;
+    if (masterConfig["compile"].find("response") != masterConfig["compile"].end()) {
+        useresponse = true;
+        response = masterConfig["compile"]["response"];
-    }
-    
@@ -49 +57 @@
-void runCompile(const std::string &files)
-{
-
+
+
+
-    
-    if (global.params.verbose)
@@ -55 +65 @@
-    
-    // run it
-
-
+
+
+
+
+
+
+
+
+
+
-        global.errors++;
+    }
-}

trunk/rebuild/compile.h

@@ -12 +12 @@
-#include <string>
-
-
+, std::string &response, bool &useresponse
-
-void runCompile(const std::string &files);

trunk/rebuild/config.c

@@ -114 +114 @@
-    
-    // get the compile line
-
+
+
+
-    
-    // test it

trunk/rebuild/link.c

@@ -40 +40 @@
-#include    "mars.h"
-#include    "mem.h"
+#include        "response.h"
-#include    "root.h"
-
@@ -51 +52 @@
- */
-
-char post = 0
+string &response, bool &useresponse, char post
-{
-    int varLoc;
@@ -77 +78 @@
-    }
-    
+    // check if we need to use a response file
+    useresponse = false;
+    if (masterConfig.find(linkset) != masterConfig.end() &&
+        masterConfig[linkset].find("response") != masterConfig[linkset].end()) {
+        useresponse = true;
+        response = masterConfig[linkset]["response"];
+    }
+    
-    // config: compile=[g]dmd -c $i -o $o
-    string cline = masterConfig[linkset]["cmd"];
-
+
-    // there are some flags that should be added only on non-darwin
-    if (!findCondition(global.params.versionids, new Identifier("darwin", 0))) {
@@ -123 +132 @@
-{
-    // get the list of input files, as well as the age if they're necessary
-
+
+
-    time_t mtime = 0;
-    struct stat sbuf, osbuf;
@@ -177 +187 @@
-        osbuf.st_mtime <= mtime) {
-        string cline = linkCommand(
-
+, response, useresponse, 0
-        
-        if (global.params.verbose)
@@ -183 +193 @@
-        
-        // run it
-
-
+
+
+
+
+
+
+
+
+
+
-            global.errors++;
-            return -1;
@@ -191 +209 @@
-        if (global.params.lib) {
-            // do postlib link
-
+response, useresponse, 
-            if (global.params.verbose)
-                printf("postlink  %s\n", cline.c_str());
-
-
+
+
+
+
+
+
+
+
+
+
+
-                global.errors++;
-                return -1;

trunk/rebuild/rebuild.conf/dmd-win

@@ -30 +30 @@
-[compile]
-cmd=dmd -c $i
+response=@
-
-flag=$i
@@ -49 +50 @@
-safe=yes
-cmd=lib -c -p256 $o $i
+response=@
-
-libdir=

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

@@ -31 +31 @@
-[compile]
-cmd=dmd -version=Tango -c $i
+response=@
-
-flag=$i
@@ -41 +42 @@
-[link]
-cmd=dmd $i -of$o
+response=@
-
-libdir=-L+$i\
@@ -50 +52 @@
-safe=yes
-cmd=lib -c -p256 $o $i
+response=@
-
-libdir=

trunk/rebuild/response.c

@@ -87 +87 @@
-    *argv = nargv;
-}
+
+int systemResponse(const char *cmd, const char *rflag, const char *rfile)
+{
+    char *newcmd = mem.strdup(cmd);
+    int res;
+    
+    // open the output file
+    FILE *of = fopen(rfile, "w");
+    if (!of) {
+        perror(rfile);
+        exit(1);
+    }
+    
+    // break up the command
+    int i, slen;
+    slen = strlen(newcmd);
+    char *cur = newcmd;
+    for (i = 0; i <= slen; i++) {
+        if (newcmd[i] == ' ' ||
+            newcmd[i] == '\0' ||
+            newcmd[i] == '\n' ||
+            newcmd[i] == '\r') {
+            newcmd[i] = '\0';
+            
+            // add the previous one
+            if (cur != newcmd &&
+                *cur != '\0') {
+                fprintf(of, "%s\n", cur);
+            }
+            cur = newcmd + i + 1;
+        }
+    }
+    fclose(of);
+    
+    // form the response file line
+    char *newcmdr = (char *) mem.malloc(strlen(newcmd) + strlen(rflag) + strlen(rfile) + 2);
+    sprintf(newcmdr, "%s %s%s", newcmd, rflag, rfile);
+    res = system(newcmdr);
+    remove(rfile);
+    
+    mem.free(newcmdr);
+    mem.free(newcmd);
+    
+    return res;
+}

trunk/rebuild/response.h

@@ -1 +1 @@
-
-
+and generate 
-// Copyright (c) 2007  Gregor Richards
-// License for redistribution is by either the Artistic License
@@ -14 +14 @@
-void parseResponseFile(int *argc, char ***argv, char *rf, int argnum);
-
+int systemResponse(const char *cmd, const char *rflag, const char *rfile);
+
-#endif