Yay for cleaned up dsss.conf. Add targets for static libraries. Some …

…fixups and commenting out so everything compiles.

dsss.conf

@@ -1,93 +1,86 @@
+version (Windows) {
+[*]
+buildflags=-version=WindowsVista
+}
+
 [mordor/common/examples/benchmark.d]
 target=bin/examples/benchmark
-buildflags=-version=WindowsVista
 
 [mordor/common/examples/cat.d]
 target=bin/examples/cat
-buildflags=-version=WindowsVista
 
 [mordor/common/examples/echoserver.d]
 target=bin/examples/echoserver
-buildflags=-version=WindowsVista
 
 [mordor/common/examples/fibers.d]
 target=bin/examples/fibers
 
 [mordor/common/examples/simpleclient.d]
 target=bin/examples/simpleclient
-buildflags=-version=WindowsVista
 
 [mordor/common/examples/streamclient.d]
 target=bin/examples/streamclient
-buildflags=-version=WindowsVista
 
 [mordor/common/examples/wget.d]
 target=bin/examples/wget
-buildflags=-version=WindowsVista
 
 [mordor/common/unittests.d]
 target=bin/unittests
-buildflags=-version=WindowsVista -unittest
+buildflags+=-unittest
 
 [mordor/kalypso/examples/mirror.d]
 target=bin/examples/mirror
-buildflags=-version=WindowsVista
 
 [mordor/kalypso/examples/scan.d]
 target=bin/examples/scan
-buildflags=-version=WindowsVista
 
 [mordor/kalypso/examples/watcher.d]
 target=bin/examples/watcher
-buildflags=-version=WindowsVista
 
 [mordor/kalypso/vfs/fuse.d]
 target=bin/kalypso/fuse
 
 [mordor/triton/client/containermetadata.d]
 target=bin/triton/containermetadata
-buildflags=-version=WindowsVista -debug=containermetadata
+buildflags+=-debug=containermetadata
 
 [mordor/triton/client/get.d]
 target=bin/triton/get
-buildflags=-version=WindowsVista
 
 [mordor/triton/client/head.d]
 target=bin/triton/head
-buildflags=-version=WindowsVista -debug=head
+buildflags+=-debug=head
 
 [mordor/triton/client/list.d]
 target=bin/triton/list
-buildflags=-version=WindowsVista -debug=list
+buildflags+=-debug=list
 
 [mordor/triton/client/raw.d]
 target=bin/triton/raw
-buildflags=-version=WindowsVista
 
 [mordor/triton/client/store.d]
 target=bin/triton/store
-buildflags=-version=WindowsVista
 
 [mordor/triton/py/manifest.d]
 target=bin/triton/parsemanifest
-buildflags=-version=WindowsVista -debug=parsemanifest
+buildflags+=-debug=parsemanifest
 
 [mordor/triton/tdn/main.d]
 target=bin/triton/dtdn
 
 [mordor/utils/deflate.d]
 target=bin/utils/deflate
-buildflags=-version=WindowsVista
 
 [mordor/utils/inflate.d]
 target=bin/utils/inflate
-buildflags=-version=WindowsVista
 
 [mordor/utils/manifestparser.d]
 target=bin/utils/manifestparser
-buildflags=-version=WindowsVista
 
 [mordor/utils/sha0sum.d]
 target=bin/utils/sha0sum
-buildflags=-version=WindowsVista
 
+[mordor/common]
+exclude=mordor/common/streams/handle.d
+
+[mordor/triton]

mordor/common/http/dispatcher.d

@@ -1,6 +1,6 @@
 module mordor.common.http.dispatcher;
-
-import mordor.common.http.http;
+/+
+import mordor.common.http.parser;
 import mordor.common.http.servlet;
 import mordor.common.streams.stream;
 
@@ -62,3 +62,4 @@ private:
     static Servlet _defaultServlet;
     Servlet[] _servlets;
 }
++/

mordor/common/http/server.d

@@ -1,5 +1,5 @@
 module mordor.common.http.server;
-
+/+
 import tango.core.Thread;
 import tango.util.log.Log;
 
@@ -170,3 +170,4 @@ private:
     Stream _requestStream, _responseStream;
     ServerConnection _conn;
 }
++/

mordor/common/sqlite.d

@@ -177,12 +177,13 @@ public:
 
     int executeUpdate()
     {
+        int rc;
         scope (exit) {
             rc = sqlite3_reset(_stmt);
             if (rc != SQLITE_OK)
                 throw new SqliteException(_db._db, rc);
         }
-        int rc = sqlite3_step(_stmt);
+        rc = sqlite3_step(_stmt);
         switch (rc) {
             case SQLITE_ROW:
                 assert(false);

mordor/common/streams/singleplex.d

@@ -1,4 +1,4 @@
-module mordor.common.streams.singleplexer;
+module mordor.common.streams.singleplex;
 
 public import mordor.common.streams.filter;