From 722cf9d345e38b6f5ff4ed538d1f68bc75b2ab51 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 10 Jul 2015 15:29:42 +0200
Subject: Implement automatic subproject discovery

Currently we only capture their directories without the project
names. We will need project names when we hook import search into
this.
---
 tests/amalgam/config/build/bootstrap.build  | 1 -
 tests/amalgam/simple/build/bootstrap.build  | 2 --
 tests/amalgam/simple/buildfile              | 9 ---------
 tests/amalgam/simple/driver.cxx             | 4 ----
 tests/amalgam/simple1/build/bootstrap.build | 2 ++
 tests/amalgam/simple1/buildfile             | 9 +++++++++
 tests/amalgam/simple1/driver.cxx            | 4 ++++
 tests/amalgam/simple2/build/bootstrap.build | 2 ++
 tests/amalgam/simple2/buildfile             | 9 +++++++++
 tests/amalgam/simple2/driver.cxx            | 4 ++++
 10 files changed, 30 insertions(+), 16 deletions(-)
 delete mode 100644 tests/amalgam/simple/build/bootstrap.build
 delete mode 100644 tests/amalgam/simple/buildfile
 delete mode 100644 tests/amalgam/simple/driver.cxx
 create mode 100644 tests/amalgam/simple1/build/bootstrap.build
 create mode 100644 tests/amalgam/simple1/buildfile
 create mode 100644 tests/amalgam/simple1/driver.cxx
 create mode 100644 tests/amalgam/simple2/build/bootstrap.build
 create mode 100644 tests/amalgam/simple2/buildfile
 create mode 100644 tests/amalgam/simple2/driver.cxx

(limited to 'tests/amalgam')

diff --git a/tests/amalgam/config/build/bootstrap.build b/tests/amalgam/config/build/bootstrap.build
index 5a01046..52d415a 100644
--- a/tests/amalgam/config/build/bootstrap.build
+++ b/tests/amalgam/config/build/bootstrap.build
@@ -1,4 +1,3 @@
 project = amalgam-config
 amalgamation = # Shall not be amalgamated.
-subprojects = 1/ 2/
 using config
diff --git a/tests/amalgam/simple/build/bootstrap.build b/tests/amalgam/simple/build/bootstrap.build
deleted file mode 100644
index 698a248..0000000
--- a/tests/amalgam/simple/build/bootstrap.build
+++ /dev/null
@@ -1,2 +0,0 @@
-project = amalgam-simple
-using config
diff --git a/tests/amalgam/simple/buildfile b/tests/amalgam/simple/buildfile
deleted file mode 100644
index ec6a4e1..0000000
--- a/tests/amalgam/simple/buildfile
+++ /dev/null
@@ -1,9 +0,0 @@
-using cxx
-
-hxx.ext = hxx
-cxx.ext = cxx
-ixx.ext = ixx
-
-cxx.poptions += -I$out_root
-
-exe{driver}: cxx{driver}
diff --git a/tests/amalgam/simple/driver.cxx b/tests/amalgam/simple/driver.cxx
deleted file mode 100644
index 70b4146..0000000
--- a/tests/amalgam/simple/driver.cxx
+++ /dev/null
@@ -1,4 +0,0 @@
-int
-main ()
-{
-}
diff --git a/tests/amalgam/simple1/build/bootstrap.build b/tests/amalgam/simple1/build/bootstrap.build
new file mode 100644
index 0000000..e4502f8
--- /dev/null
+++ b/tests/amalgam/simple1/build/bootstrap.build
@@ -0,0 +1,2 @@
+project = amalgam-simple1
+using config
diff --git a/tests/amalgam/simple1/buildfile b/tests/amalgam/simple1/buildfile
new file mode 100644
index 0000000..ec6a4e1
--- /dev/null
+++ b/tests/amalgam/simple1/buildfile
@@ -0,0 +1,9 @@
+using cxx
+
+hxx.ext = hxx
+cxx.ext = cxx
+ixx.ext = ixx
+
+cxx.poptions += -I$out_root
+
+exe{driver}: cxx{driver}
diff --git a/tests/amalgam/simple1/driver.cxx b/tests/amalgam/simple1/driver.cxx
new file mode 100644
index 0000000..70b4146
--- /dev/null
+++ b/tests/amalgam/simple1/driver.cxx
@@ -0,0 +1,4 @@
+int
+main ()
+{
+}
diff --git a/tests/amalgam/simple2/build/bootstrap.build b/tests/amalgam/simple2/build/bootstrap.build
new file mode 100644
index 0000000..599ec1d
--- /dev/null
+++ b/tests/amalgam/simple2/build/bootstrap.build
@@ -0,0 +1,2 @@
+project = amalgam-simple2
+using config
diff --git a/tests/amalgam/simple2/buildfile b/tests/amalgam/simple2/buildfile
new file mode 100644
index 0000000..ec6a4e1
--- /dev/null
+++ b/tests/amalgam/simple2/buildfile
@@ -0,0 +1,9 @@
+using cxx
+
+hxx.ext = hxx
+cxx.ext = cxx
+ixx.ext = ixx
+
+cxx.poptions += -I$out_root
+
+exe{driver}: cxx{driver}
diff --git a/tests/amalgam/simple2/driver.cxx b/tests/amalgam/simple2/driver.cxx
new file mode 100644
index 0000000..70b4146
--- /dev/null
+++ b/tests/amalgam/simple2/driver.cxx
@@ -0,0 +1,4 @@
+int
+main ()
+{
+}
-- 
cgit v1.1