The reorg is being put in trunk, I think it's ready. Now we just get to find

out how many applications won't work anymore :)

1 files changed, 33 insertions, 5 deletions

diff --git a/build.conf b/build.conf
index 5c4dbb6..d994977 100644
--- a/build.conf
+++ b/build.conf
@@ -1,13 +1,20 @@
 # This is a build file for libbu++
 
-default action: check "libbu++.a"
-"clean" action: clean targets()
-"tests" action: check targets() filter regexp("^tests/.*$")
-"all" action: check targets()
-"fstring" action: check "tests/fstring"
+default action: check group "lnhdrs", check "libbu++.a"
+"tests" action: check group "lnhdrs", check group "tests"
+"all" action: check group "lnhdrs", check targets()
 
 set "CXXFLAGS" += "-ggdb -Wall"
 
+#set "CXXFLAGS" += "-pg"
+#set "LDFLAGS" += "-pg"
+
+filesIn("src") filter regexp("^src/(.*)\\.h$", "src/bu/{re:1}.h"):
+        rule "hln",
+        group "lnhdrs",
+        target file,
+        input "src/{re:1}.h"
+
 "libbu++.a":
         rule "lib",
         target file,
@@ -17,6 +24,7 @@ set "CXXFLAGS" += "-ggdb -Wall"
 directoriesIn("src/tests","tests/"):
         rule "exe",
         target file,
+        group "tests",
         requires "libbu++.a",
         set "CXXFLAGS" += "-Isrc",
         set "LDFLAGS" += "-L. -lbu++",
@@ -25,6 +33,18 @@ directoriesIn("src/tests","tests/"):
 filesIn("src/tests") filter regexp("^src/tests/(.*)\\.cpp$", "tests/{re:1}"):
         rule "exe",
         target file,
+        group "tests",
+        requires "libbu++.a",
+        set "CXXFLAGS" += "-Isrc",
+        set "LDFLAGS" += "-L. -lbu++",
+        input "src/{target}.cpp"
+
+["tests/itoqueue1", "tests/itoqueue2"]: set "LDFLAGS" += "-lpthread"
+
+filesIn("src/unit") filter regexp("^src/unit/(.*)\\.cpp$", "unit/{re:1}"):
+        rule "exe",
+        target file,
+        group "tests",
         requires "libbu++.a",
         set "CXXFLAGS" += "-Isrc",
         set "LDFLAGS" += "-L. -lbu++",
@@ -32,6 +52,8 @@ filesIn("src/tests") filter regexp("^src/tests/(.*)\\.cpp$", "tests/{re:1}"):
 
 "tests/plugin": set "LDFLAGS" += "-ldl"
 
+"tests/bzip2": set "LDFLAGS" += "-lbz2"
+
 rule "exe":
         matches regexp("(.*)\\.o$"),
         aggregate toString(" "),
@@ -47,3 +69,9 @@ rule "cpp":
         produces "{re:1}.o",
         requires commandToList("g++ -M {CXXFLAGS} {match}", "make"),
         perform command("g++ {CXXFLAGS} -c -o {target} {match}")
+
+rule "hln":
+        matches regexp("src/(.*)\\.h"),
+        produces "src/bu/{re:1}.h",
+        perform command("ln -s ../{re:1}.h {target}")
+