Changeset 654

Timestamp:

06/30/07 19:56:25 (1 year ago)

Author:

Gregor

Message:

MERGE: trunk r653

Files:

• branches/tango/docs/ChangeLog (modified) (2 diffs)
• branches/tango/docs/NEWS (modified) (1 diff)
• branches/tango/docs/README.overview (modified) (1 diff)
• branches/tango/docs/README.release (modified) (1 diff)
• branches/tango/docs/README.software_engineers (modified) (1 diff)
• branches/tango/docs/README.use (modified) (1 diff)
• branches/tango/dsss.conf (modified) (1 diff)
• branches/tango/hcf/path.d (modified) (1 diff)
• branches/tango/hcf/process.d (modified) (4 diffs)
• branches/tango/rebuild/InstallMe.command (modified) (1 diff)
• branches/tango/rebuild/Makefile (modified) (5 diffs)
• branches/tango/rebuild/attrib.c (modified) (2 diffs)
• branches/tango/rebuild/choosedc.c (modified) (5 diffs)
• branches/tango/rebuild/compile.c (modified) (1 diff)
• branches/tango/rebuild/config.c (modified) (2 diffs)
• branches/tango/rebuild/config.h (modified) (1 diff)
• branches/tango/rebuild/constfold.c (modified) (2 diffs)
• branches/tango/rebuild/dsss.conf (modified) (2 diffs)
• branches/tango/rebuild/import.c (modified) (5 diffs)
• branches/tango/rebuild/import.h (modified) (1 diff)
• branches/tango/rebuild/link.c (modified) (3 diffs)
• branches/tango/rebuild/mars.c (modified) (16 diffs)
• branches/tango/rebuild/mars.h (modified) (1 diff)
• branches/tango/rebuild/module.c (modified) (2 diffs)
• branches/tango/rebuild/rebuild.conf/dmd-posix (modified) (1 diff)
• branches/tango/rebuild/rebuild.conf/dmd-posix-tango (modified) (1 diff)
• branches/tango/rebuild/rebuild.exe (modified) (previous)
• branches/tango/rebuild/rebuild_choosedc.exe (copied) (copied from trunk/rebuild/rebuild_choosedc.exe)
• branches/tango/rebuild/response.c (modified) (2 diffs)
• branches/tango/rebuild/response.h (modified) (1 diff)
• branches/tango/rebuild/testtango.d (copied) (copied from trunk/rebuild/testtango.d)
• branches/tango/sss/build.d (modified) (5 diffs)
• branches/tango/sss/clean.d (modified) (1 diff)
• branches/tango/sss/conf.d (modified) (8 diffs)
• branches/tango/sss/main.d (modified) (6 diffs)
• branches/tango/sss/net.d (modified) (7 diffs)
• branches/tango/sss/uninstall.d (modified) (1 diff)

branches/tango/docs/ChangeLog

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        - Now exits with the proper exit code when a subcommand fails (see
-          ticket #58).
@@ -14 +42 @@
-        - Rebuild: Moved document generation back into rebuild.
-        - Rebuild: Support for pragma(nolink) (see ticket #57).
+        - Future versions should be upgradeable with `dsss net install dsss`
+          (see ticket #26).
+        - Rebuild: Made rebuild choose a D compiler at runtime when possible.
+        - The 'sss' package now installs as a sourcelibrary, so it should be
+          compilable during X-compilation, etc.
+        - Rebuild: Fixed import timestamping.
-
-0.64 from 0.63:

branches/tango/docs/NEWS

@@ +1 @@
+2006-06-29: DSSS and Rebuild 0.67 released.
+
+2007-06-25: DSSS and Rebuild 0.66 released.
+
+2007-05-18: DSSS and Rebuild 0.65 released.
+
-2007-04-22: DSSS and Rebuild 0.64 released.
-

branches/tango/docs/README.overview

@@ -20 +20 @@
- * DSSS automatically generates .di (D import) files for libraries which cause
-   code using the library to link it in automatically.
-
+
+
- * DSSS can automatically choose names for libraries generated from D packages
-   which will not conflict with libraries from other sources, or incompatible

branches/tango/docs/README.release

@@ -3 +3 @@
-instructions on how to make a release of the current version of DSSS.
-
- and rebuild/mars.c all need to b
-
+, rebuild/mars.c, rebuild/rebuild.ex
+and rebuild/rebuild_choosedc.exe all need to be 
-
-2) svn export to dsss-<version>

branches/tango/docs/README.software_engineers

@@ -207 +207 @@
-
-At build time, sections will be handled in the order that they appear in the
-
+
+
+
+
+

branches/tango/docs/README.use

@@ -32 +32 @@
-Finally, you can cause DSSS to remove /all/ compiled files, essentially leaving
-the source directory as it was before DSSS was used at all, with the command:
-build
+clean
-
-

branches/tango/dsss.conf

@@ -27 +27 @@
-
-[sss]
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-version (Windows) {
-    # Necessary on Windows, worthless elsewhere
-    [bcd/windows]
+    type = sourcelibrary
-}
-

branches/tango/hcf/path.d

@@ -29 +29 @@
-module hcf.path;
-
-public import std.path;
-
-import std.stdio;
-import std.file;
-import std.string;
-
-import std.c.stdlib;
-
-version (Windows) {
-    import bcd.windows.windows;

branches/tango/hcf/process.d

@@ -287 +287 @@
-
-/** system + use a response file */
-
+, bool deleteRFile
-{
-    int ret;
@@ -299 +299 @@
-    ret = system(elems[0] ~ " " ~ rflag ~ rfile);
-    
-
+if (deleteRFile) 
-    
-    return ret;
@@ -305 +305 @@
-
-/** systemResponse + guarantee success */
-
+, bool deleteRFile
-{
-    int res;
-
+, deleteRFile
-    if (res)  // CyberShadow 2007.02.22: Display a message before exiting
-    {
@@ -319 +319 @@
-
-/** systemResponse + output */
-
+, bool deleteRFile
-{
-    writefln("+ %s", cmd);
-
+, deleteRFile
-}
-
-/** systemROrDie + output */
-
+, bool deleteRFile
-{
-    writefln("+ %s", cmd);
-
-
+, deleteRFile
+

branches/tango/rebuild/InstallMe.command

@@ -6 +6 @@
-
-sudo install -p -m 755 rebuild $PREFIX/bin
+sudo install -p -m 755 rebuild_choosedc $PREFIX/bin
-sudo install -p -m 644 dymoduleinit.d $PREFIX/lib
-sudo install -p -m 644 rebuild.1 $PREFIX/share/man/man1
+sudo install -p -m 644 testtango.d $PREFIX/share/rebuild
-
-sudo install -d -m 755 $PREFIX/etc/rebuild

branches/tango/rebuild/Makefile

@@ -10 +10 @@
-PREFIX=/usr
-BINDIR=$(PREFIX)/bin
-
-
+
+
+
-SYSCONFDIR=$(PREFIX)/etc
-
@@ -70 +71 @@
-  whereami.o
-
-
+_choosedc$(EXEEXT) rebuild
-
-rebuild$(EXEEXT): id.c impcnvtab.c $(OBJS)
@@ -92 +93 @@
-impcnvgen.o: impcnvgen.c
-    $(NATIVECXX) $(CXXFLAGS) -c impcnvgen.c -o impcnvgen.o
-
+
-rebuild.conf/default: choosedc$(EXEEXT)
-    ./choosedc$(EXEEXT)
-
-
-
+n
+n
-
-
-
+
+
+
+
+
-
-nwhereami.o: whereami.c
@@ -115 +119 @@
-    mkdir -p $(DOCDIR)/rebuild
-    mkdir -p $(SYSCONFDIR)/rebuild
+    mkdir -p $(SHAREDIR)/rebuild
-    cp -pf rebuild$(EXEEXT) $(BINDIR)
+    cp -pf rebuild_choosedc$(EXEEXT) $(BINDIR)
-    ln -s rebuild$(EXEEXT) $(BINDIR)/rerun$(EXEEXT)
-    cp -rf rebuild.1 $(MANDIR)/man1
-    cp -pf README $(DOCDIR)/rebuild
-    cp -pRf rebuild.conf/* $(SYSCONFDIR)/rebuild/
+    cp -pf testtango.d $(SHAREDIR)/rebuild
-    ./instdymods $(PREFIX)
-
@@ -126 +133 @@
-    rm -f id.c id.h idgen$(EXEEXT) idgen.o
-    rm -f impcnvtab.c impcnvtab.h impcnvgen$(EXEEXT) impcnvgen.o
-
+
+

branches/tango/rebuild/attrib.c

@@ -274 +274 @@
-            } else if (ds->isImport()) {
-                Import *im = (Import *) ds;
-
+m, 
-                im->mod->parsepragmas();
-                
@@ -1085 +1085 @@
-            } else if (ds->isImport()) {
-                Import *im = (Import *) ds;
-
+m, 
-                im->mod->parsepragmas();
-                

branches/tango/rebuild/choosedc.c

@@ -5 +5 @@
- */
-
-
+
+
+
+
+
-#include "whereami.h"
-
-
+int argc, char **argv
-{
-
-
+
+
+
-    FILE *fout;
-    
@@ -20 +25 @@
-#endif
-    
+    // figure out our own path
+    if (!whereAmI(argv[0], &dir, &fil)) {
+        // assume "."
+        dir = ".";
+    }
+    
+    // check if we're running out of the sourcedir
+    testfile = (char *) malloc(strlen(dir) + 8);
+    sprintf(testfile, "%s/mars.c", dir);
+    if (access(testfile, F_OK) == 0) {
+        inSourceDir = 1;
+    } else {
+        inSourceDir = 0;
+    }
+    free(testfile);
+    
-    // check for DMD
-
+mdd
-        haveDMD = 1;
-    } else {
@@ -28 +49 @@
-    
-    // check for GDC
-
+gdc
-        haveGDC = 1;
-    } else {
@@ -39 +60 @@
-#ifdef __WIN32
-        compiler = "dmd";
+        haveGDC = 0;
-#else
-        compiler = "gdc";
+        haveDMD = 0;
-#endif
-    } else if (haveDMD) {
@@ -47 +70 @@
-        compiler = "gdc";
-    } else {
-
+
+
+
+
+
+
+
+
+
+
-        return 0;
-    }
-    
+    // check which corelib is available
+    if (inSourceDir) {
+        testfile = (char *) malloc(strlen(dir) + 13);
+        sprintf(testfile, "%s/testtango.d", dir);
+    } else {
+        testfile = (char *) malloc(strlen(dir) + 30);
+        sprintf(testfile, "%s/../share/rebuild/testtango.d", dir);
+    }
+    printf("Ignore any error from GDC or DMD in the following lines.\n");
+    if (haveGDC) {
+        cmd = (char *) malloc(strlen(testfile) + 22);
+        sprintf(cmd, "gdc -c -fsyntax-only %s", testfile);
+        res = system(cmd);
+    } else if (haveDMD) {
+        cmd = (char *) malloc(strlen(testfile) + 12);
+        sprintf(cmd, "dmd -c -o- %s", testfile);
+        res = system(cmd);
+    }
+    if (res == 0) {
+        corelib = "-tango";
+    } else {
+        corelib = "";
+    }
+    
-    // output the default file
-
+
+
+
+
+
+
+
+
+
-    if (!fout) { perror("fopen"); return 1; }
-\n", compiler, os
+%s\n", compiler, os, corelib
-    fclose(fout);
-    

branches/tango/rebuild/compile.c

@@ -73 +73 @@
-        } else {
-            if (useresponse)
-rsp"
+compile.rf", !(global.params.keeprfiles)
-            else
-                res = system(cline.c_str());

branches/tango/rebuild/config.c

@@ -48 +48 @@
-void readConfigFile(const string &dir, const string &fname, string &versionFile);
-
-
+, bool generate
-{
-    // find where we're installed
@@ -90 +90 @@
-    string conffile = confdir + DIRSEP + profile;
-    if (!exists(conffile.c_str())) {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    

branches/tango/rebuild/config.h

@@ -30 +30 @@
-
-// Read a configuration file
-
+, bool generate
-
-// Read from a command

branches/tango/rebuild/constfold.c

@@ -34 +34 @@
-
-#define LOG 0
+
+/* FreeBSD Workaround */
+#if defined(__FreeBSD__)
+           long double
+           fmodl (long double x, long double y)
+           {
+               long double ax, ay;
+
+               if (y == 0)
+                 return 0;
+
+               ay = fabsl (y);
+               ax = fabsl (x);
+
+               if (ax < ay)
+                 return x;
+
+               return copysignl(ax - (floorl (ax / ay)) * ay, x);
+           }
+#endif
-
-Expression *expType(Type *type, Expression *e)
@@ -487 +507 @@
-        c = complex_t(e1->toReal() % r2, e1->toImaginary() % r2);
-#else
+
-        c = complex_t(fmodl(e1->toReal(), r2), fmodl(e1->toImaginary(), r2));
-#endif

branches/tango/rebuild/dsss.conf

@@ -8 +8 @@
-
-preinstall=install rebuild$EXE_EXT $BIN_PREFIX ; \
+    install rebuild_choosedc$EXE_EXT $BIN_PREFIX ; \
-    install rebuild.conf/default $ETC_PREFIX/rebuild ; \
-    install rebuild.conf/phobos $ETC_PREFIX/rebuild ; \
@@ -18 +19 @@
-    install rebuild.conf/dmd-posix-tango $ETC_PREFIX/rebuild ; \
-    install rebuild.conf/dmd-win $ETC_PREFIX/rebuild ; \
-
+
+
-
-version (Posix) {

branches/tango/rebuild/import.c

@@ -78 +78 @@
-}
-
-
+Module *src, 
-{
-    DsymbolTable *dst;
@@ -106 +106 @@
-        mod->importedFrom = sc ? sc->module->importedFrom : Module::rootModule;
-    }
+
+    // Modules need a list of each imported module
+    if (src)
+        src->aimports.push(mod);
+    
-    if (!pkg)
-    pkg = mod;
@@ -118 +123 @@
-    //printf("Import::semantic('%s')\n", toChars());
-
-
+NULL, 
-
-    if (mod)
@@ -142 +147 @@
-    }
-
-    // Modules need a list of each imported module
-    sc->module->aimports.push(mod);
-
-    if (mod->needmoduleinfo)
-        sc->module->needmoduleinfo = 1;
@@ -231 +233 @@
-
-    if (!pkg)
-
+, NULL
-
-    // Forward it to the package/module

branches/tango/rebuild/import.h

@@ -51 +51 @@
-    char *kind();
-    Dsymbol *syntaxCopy(Dsymbol *s);    // copy only syntax trees
-
+Module *src, 
-    void semantic(Scope *sc);
-    void semantic2(Scope *sc);

branches/tango/rebuild/link.c

@@ -28 +28 @@
-#if _WIN32
-#include    <process.h>
-
-
-
+
+
-#include    <sys/types.h>
-#include    <sys/wait.h>
@@ -216 +215 @@
-            } else {
-                if (useresponse)
-rsp"
+link.rf", !(global.params.keeprfiles)
-                else
-                    res = system(cline.c_str());
@@ -241 +240 @@
-                } else {
-                    if (useresponse)
-rsp"
+postlink.rf", !(global.params.keeprfiles)
-                    else
-                        res = system(cline.c_str());

branches/tango/rebuild/mars.c

@@ -66 +66 @@
-    copyright = "Copyright (c) 1999-2007 by Digital Mars and Gregor Richards";
-    written = "written by Walter Bright and Gregor Richards";
-4
+7
-    global.structalign = 8;
-    cmodules = NULL;
@@ -182 +182 @@
-                 compile)\n\
-  -objfiles      list object files generated\n\
+  -keeprfiles    Keep response files (if they are used)\n\
-  -full          compile all source files, regardless of their age\n\
-  -explicit      only compile files explicitly named, not dependencies\n\
@@ -266 +267 @@
-    global.params.listnffiles = 0;
-    global.params.listobjfiles = 0;
+    global.params.keeprfiles = 0;
-    global.params.fullqobjs = 1;
-    global.params.fullqdocs = 0;
@@ -348 +350 @@
-    }
-    
-
+, (chooseProfile == "default")
-    
-    // if the configuration includes path=, add that path
@@ -522 +524 @@
-                if (masterConfig.find("liblink") != masterConfig.end() &&
-                    masterConfig["liblink"].find("oneatatime") != masterConfig["liblink"].end() &&
-yes
+no
-                    global.params.oneatatime = 1;
-                }
@@ -531 +533 @@
-                if (masterConfig.find("shliblink") != masterConfig.end() &&
-                    masterConfig["shliblink"].find("oneatatime") != masterConfig["shliblink"].end() &&
-yes
+no
-                    global.params.oneatatime = 1;
-                }
@@ -540 +542 @@
-                if (masterConfig.find("dyliblink") != masterConfig.end() &&
-                    masterConfig["dyliblink"].find("oneatatime") != masterConfig["dyliblink"].end() &&
-yes
+no
-                    global.params.oneatatime = 1;
-                }
@@ -607 +609 @@
-            {
-                global.params.listobjfiles = 1;
+            }
+            else if (strcmp(p + 1, "keeprfiles") == 0)
+            {
+                global.params.keeprfiles = 1;
-            }
-            else if (strcmp(p + 1, "full") == 0)
@@ -677 +683 @@
-        }
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        else if (strcmp(p + 1, "quiet") == 0)
-            {
@@ -943 +944 @@
-    global.params.link = 0;
-
+#if _WIN32
+    // Convert / to \ so linker will work
+    for (int j = 0; global.params.objname[j]; j++)
+    {
+        if (global.params.objname[j] == '/')
+            global.params.objname[j] = '\\';
+    }
+#endif
-    if (global.params.link)
-    {
@@ -955 +964 @@
-    else
-    {
-
+
+
+
+
-    {
-        error("multiple source files, but only one .obj name");
@@ -972 +984 @@
-    //backend_init();
-    
-
+
+
-        global.params.objname) {
-        global.listout = fopen(global.params.objname, "w");
@@ -1053 +1066 @@
-    p = (char *) files.data[i];
-
-/*
+
-    // Convert / to \ so linker will work
-    for (int j = 0; p[j]; j++)
@@ -1060 +1073 @@
-        p[j] = '\\';
-    }
- */
+
-
-    p = FileName::name(p);      // strip path
@@ -1504 +1517 @@
-        printf("code      %s\n", m->toChars());
-        
-
-
+/* 
+ */
-        
-        // now possibly reflect this and add the reflected module as well
@@ -1535 +1548 @@
-                // now add the module to the list
-                global.cmodules->push(new Module(
-0, 0
+global.params.doDocComments, global.params.doHdrGeneration
-            }
-        }

branches/tango/rebuild/mars.h

@@ -48 +48 @@
-    char listnffiles;   // list files which would be built but weren't found
-    char listobjfiles;  // list object files which were built
+    char keeprfiles;    // keep response files
-    char fullqobjs;     // use fully-qualified object names
-    char fullqdocs;     // use fully-qualified document names

branches/tango/rebuild/module.c

@@ -264 +264 @@
-    }
-
-0, 0
+global.params.doDocComments, global.params.doHdrGeneration
-    m->loc = loc;
-
@@ -827 +827 @@
-            } else if (ds->isImport()) {
-                Import *im = (Import *) ds;
-
+this, 
-                im->mod->parsepragmas();
-                

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

@@ -47 +47 @@
-[liblink]
-safe=yes
+oneatatime=yes
-cmd=ar rc $o $i
-

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

@@ -48 +48 @@
-[liblink]
-safe=yes
+oneatatime=yes
-cmd=ar rc $o $i
-

branches/tango/rebuild/response.c

@@ -89 +89 @@
-}
-
-
+, bool deleteRFile
-{
-    char *newcmd = mem.strdup(cmd);
@@ -126 +126 @@
-    sprintf(newcmdr, "%s %s%s", newcmd, rflag, rfile);
-    res = system(newcmdr);
-
+if (deleteRFile) 
-    
-    mem.free(newcmdr);

branches/tango/rebuild/response.h

@@ -14 +14 @@
-void parseResponseFile(int *argc, char ***argv, char *rf, int argnum);
-
-
+, bool deleteRFile
-
-#endif