Changeset 692

Timestamp:

07/23/07 12:34:39 (1 year ago)

Author:

Gregor

Message:

Added --test option to test built libraries.

Files:

• trunk/docs/ChangeLog (modified) (1 diff)
• trunk/dsss.conf (modified) (1 diff)
• trunk/sss/build.d (modified) (3 diffs)
• trunk/sss/clean.d (modified) (2 diffs)
• trunk/sss/conf.d (modified) (4 diffs)
• trunk/sss/dsss_lib_test.d (added)
• trunk/sss/main.d (modified) (3 diffs)

trunk/docs/ChangeLog

@@ +1 @@
+SVN from 0.68:
+    - Added --test option to test built libraries.
+
-0.68 from 0.67:
-        - Rebuild: -of<name> now converts / to \ on Windows (see ticket #85).

trunk/dsss.conf

@@ -29 +29 @@
-# Install this as a sourcelibrary, so it will work on any platform/compiler combination
-type = sourcelibrary
+exclude = sss/dsss_lib_test.d sss/dsssdll.d sss/main.d sss/stub.d
+buildflags = -Irebuild
+
+# dsss_lib_test is special, so put it in share/
+postinstall = install sss/dsss_lib_test.d $PREFIX/share/dsss
-
-version (Windows) {

trunk/sss/build.d

@@ -234 +234 @@
-            // if we should, build the library
-            if ((type == "library" && libsSafe()) ||
-
+
+
-                
-                if (targetGNUOrPosix()) {
@@ -241 +242 @@
-                    char[] stbl = bl ~ docbl ~ bflags ~ " -explicit -lib -full " ~ fileList ~ " -oflibS" ~ target ~ ".a";
-                    saySystemRDie(stbl, "-rf", target ~ "_static.rf", deleteRFiles);
+
+                    // perhaps test the static library
+                    if (testLibs) {
+                        writefln("Testing %s", target);
+                        char[] tbl = bl ~ bflags ~ " -unittest -full " ~ fileList ~ " " ~ dsssLibTestDPrefix ~ " -oftest_" ~ target;
+                        saySystemRDie(tbl, "-rf", target ~ "_test.rf", deleteRFiles);
+                        saySystemDie("./test_" ~ target);
+                    }
-                    
-                    if (shLibSupport() &&
@@ -258 +267 @@
-                    char[] stbl = bl ~ docbl ~ bflags ~ " -explicit -lib -full " ~ fileList ~ " -ofS" ~ target ~ ".lib";
-                    saySystemRDie(stbl, "-rf", target ~ "_static.rf", deleteRFiles);
+
+                    // perhaps test the static library
+                    if (testLibs) {
+                        writefln("Testing %s", target);
+                        char[] tbl = bl ~ bflags ~ " -unittest -full " ~ fileList ~ " " ~ dsssLibTestDPrefix ~ " -oftest_" ~ target ~ ".exe";
+                        saySystemRDie(tbl, "-rf", target ~ "_test.rf", deleteRFiles);
+                        saySystemDie("test_" ~ target ~ ".exe");
+                    }
+
-                } else {
-                    assert(0);

trunk/sss/clean.d

@@ -106 +106 @@
-                // first remove the static library
-                tryRemove("libS" ~ target ~ ".a");
+
+                // then any testing binary
+                tryRemove("test_" ~ target);
-                
-                // then remove the shared libraries
@@ -119 +122 @@
-                // first remove the static library
-                tryRemove("S" ~ target ~ ".lib");
+
+                // then any testing binary
+                tryRemove("test_" ~ target);
-                
-                // then remove the shared libraries

trunk/sss/conf.d

@@ -109 +109 @@
-char[] candyDocPrefix;
-
+/** The location of dsss_lib_test.d */
+char[] dsssLibTestDPrefix;
+
-/** Are we doing documentation? */
-bool doDocs = false;
@@ -114 +117 @@
-/** Should we delete response files? */
-bool deleteRFiles = true;
+
+/** Should we generate test binaries? */
+bool testLibs = false;
-
-/** The prefix for scratch work */
@@ -196 +202 @@
-                installPrefix ~ std.path.sep ~
-                "candydoc.tar.gz");
+        if (!dsssLibTestDPrefix.length)
+            dsssLibTestDPrefix = canonPath(
+                installPrefix ~ std.path.sep ~
+                "sss" ~ std.path.sep ~
+                "dsss_lib_test.d");
-    } else {
-        inSourceDir = false;
@@ -258 +269 @@
-                "dsss" ~ std.path.sep ~
-                "candydoc.tar.gz");
+        if (!dsssLibTestDPrefix.length)
+            dsssLibTestDPrefix = canonPath(
+                installPrefix ~ std.path.sep ~
+                ".." ~ std.path.sep ~
+                "share" ~ std.path.sep ~
+                "dsss" ~ std.path.sep ~
+                "dsss_lib_test.d");
-    }
-    

trunk/sss/main.d

@@ -206 +206 @@
-                       arg[0] == '-') {
-                // perhaps specific to a command
-
+
+
+
+
+
+
+
+
-                    if (parseArg(arg, "source", true, &val)) {
-                        forceMirror = val;
@@ -315 +322 @@
-    } else if (command == cmd_t.BUILD) {
-        writefln(
-
+
+
+
-            );
-        
@@ -346 +355 @@
-        writefln(
-`Usage: dsss [dsss options] net <net command> [options] <package name>
-C
+c
-    deps:    install (from the network source) dependencies of the present
-             package