Switch to build2

17 files changed, 39 insertions, 409 deletions

diff --git a/build/.gitignore b/build/.gitignore
new file mode 100644
index 0000000..4a730a3
--- /dev/null
+++ b/build/.gitignore
@@ -0,0 +1,3 @@
+config.build
+root/
+bootstrap/
diff --git a/build/bootstrap.build b/build/bootstrap.build
new file mode 100644
index 0000000..b479df2
--- /dev/null
+++ b/build/bootstrap.build
@@ -0,0 +1,10 @@
+# file      : build/bootstrap.build
+# license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+project = libxsd-frontend
+
+using version
+using config
+using dist
+using test
+using install
diff --git a/build/bootstrap.make b/build/bootstrap.make
deleted file mode 100644
index 16014f0..0000000
--- a/build/bootstrap.make
+++ /dev/null
@@ -1,48 +0,0 @@
-# file      : build/bootstrap.make
-# license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-project_name := libxsd-frontend
-
-# First try to include the bundled bootstrap.make if it exist. If that
-# fails, let make search for the external bootstrap.make.
-#
-build := build-0.3
-
--include $(dir $(lastword $(MAKEFILE_LIST)))../../$(build)/bootstrap.make
-
-ifeq ($(patsubst %build/bootstrap.make,,$(lastword $(MAKEFILE_LIST))),)
-include $(build)/bootstrap.make
-endif
-
-# Configuration (optional; only used in the +dep packages).
-#
-$(call -include,$(dcf_root)/configuration-dynamic.make)
-
-# Aliases
-#
-.PHONY: $(out_base)/       \
-        $(out_base)/.test  \
-        $(out_base)/.clean
-
-ifdef %interactive%
-
-.PHONY: test clean
-
-test: $(out_base)/.test
-clean: $(out_base)/.clean
-
-ifneq ($(filter $(.DEFAULT_GOAL),test clean),)
-.DEFAULT_GOAL :=
-endif
-
-endif
-
-# Don't include dependency info for certain targets.
-#
-define include-dep
-$(call -include,$1)
-endef
-
-ifneq ($(filter $(MAKECMDGOALS),clean disfigure),)
-include-dep =
-endif
diff --git a/build/export.build b/build/export.build
new file mode 100644
index 0000000..ff33e4f
--- /dev/null
+++ b/build/export.build
@@ -0,0 +1,9 @@
+# file      : build/export.build
+# license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+$out_root/
+{
+  include libxsd-frontend/
+}
+
+export $out_root/libxsd-frontend/lib{xsd-frontend}
diff --git a/build/export/libxsd-frontend/stub.make b/build/export/libxsd-frontend/stub.make
deleted file mode 100644
index 4ba6ae4..0000000
--- a/build/export/libxsd-frontend/stub.make
+++ /dev/null
@@ -1,8 +0,0 @@
-# file      : build/import/libxsd-frontend/stub.make
-# license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-$(call include-once,$(src_root)/xsd-frontend/makefile,$(out_root))
-
-$(call export,\
-  l: $(out_root)/xsd-frontend/xsd-frontend.l,\
-  cpp-options: $(out_root)/xsd-frontend/xsd-frontend.l.cpp-options)
diff --git a/build/import/libcutl/configuration-rules.make b/build/import/libcutl/configuration-rules.make
deleted file mode 100644
index 4559510..0000000
--- a/build/import/libcutl/configuration-rules.make
+++ /dev/null
@@ -1,13 +0,0 @@
-# file      : build/import/libcutl/configuration-rules.make
-# license   : MIT; see accompanying LICENSE file
-
-$(dcf_root)/import/libcutl/configuration-dynamic.make: | $(dcf_root)/import/libcutl/.
-	$(call message,,$(scf_root)/import/libcutl/configure $@)
-
-ifndef %foreign%
-
-$(dcf_root)/.disfigure::
-	$(call message,rm $(dcf_root)/import/libcutl/configuration-dynamic.make,\
-rm -f $(dcf_root)/import/libcutl/configuration-dynamic.make)
-
-endif
diff --git a/build/import/libcutl/configure b/build/import/libcutl/configure
deleted file mode 100755
index 5c182e2..0000000
--- a/build/import/libcutl/configure
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /usr/bin/env bash
-
-# file      : build/import/libcutl/configure
-# license   : MIT; see accompanying LICENSE file
-
-
-# $1           - out file
-#
-# bld_root     - build root
-# project_name - project name
-#
-
-source $bld_root/dialog.bash
-
-
-$echo
-$echo "Configuring external dependency on 'libcutl' for '$project_name'."
-$echo
-
-$echo
-$echo "Would you like to configure dependency on the installed "
-$echo "version of 'libcutl' as opposed to the development build?"
-$echo
-
-installed=`read_y_n y`
-
-path=
-
-if [ "$installed" = "n" ]; then
-
-$echo
-$echo "Please enter the src_root for 'libcutl'."
-$echo
-
-src_root=`read_path --directory --exist`
-
-$echo
-$echo "Please enter the out_root for 'libcutl'."
-$echo
-
-out_root=`read_path --directory $src_root`
-
-fi
-
-echo libcutl_installed := $installed   >$1
-
-if [ "$installed" = "n" ]; then
-
-echo src_root := $src_root            >>$1
-echo scf_root := \$\(src_root\)/build >>$1
-echo out_root := $out_root            >>$1
-
-fi
diff --git a/build/import/libcutl/stub.make b/build/import/libcutl/stub.make
deleted file mode 100644
index 11876f2..0000000
--- a/build/import/libcutl/stub.make
+++ /dev/null
@@ -1,28 +0,0 @@
-# file      : build/import/libcutl/stub.make
-# license   : MIT; see accompanying LICENSE file
-
-$(call include-once,$(scf_root)/import/libcutl/configuration-rules.make,$(dcf_root))
-
-libcutl_installed :=
-
-$(call -include,$(dcf_root)/import/libcutl/configuration-dynamic.make)
-
-ifdef libcutl_installed
-
-ifeq ($(libcutl_installed),y)
-
-$(call export,l: -lcutl,cpp-options: )
-
-else
-
-# Include export stub.
-#
-$(call include,$(scf_root)/export/libcutl/stub.make)
-
-endif
-
-else
-
-.NOTPARALLEL:
-
-endif
diff --git a/build/import/libxerces-c/configuration-rules.make b/build/import/libxerces-c/configuration-rules.make
deleted file mode 100644
index bda0a59..0000000
--- a/build/import/libxerces-c/configuration-rules.make
+++ /dev/null
@@ -1,13 +0,0 @@
-# file      : build/import/libxerces-c/configuration-rules.make
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-$(dcf_root)/import/libxerces-c/configuration-dynamic.make: | $(dcf_root)/import/libxerces-c/.
-	$(call message,,$(scf_root)/import/libxerces-c/configure $@)
-
-ifndef %foreign%
-
-disfigure::
-	$(call message,rm $(dcf_root)/import/libxerces-c/configuration-dynamic.make,\
-rm -f $(dcf_root)/import/libxerces-c/configuration-dynamic.make)
-
-endif
diff --git a/build/import/libxerces-c/configure b/build/import/libxerces-c/configure
deleted file mode 100755
index 3db09e5..0000000
--- a/build/import/libxerces-c/configure
+++ /dev/null
@@ -1,71 +0,0 @@
-#! /usr/bin/env bash
-
-# file      : build/import/libxerces-c/configure
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-
-# $1           - out config file
-#
-# bld_root     - build root
-# project_name - project name
-#
-
-source $bld_root/dialog.bash
-
-
-$echo
-$echo "Configuring external dependency on 'libxerces-c' for '$project_name'."
-$echo
-
-$echo
-$echo "Would you like to configure dependency on the installed version"
-$echo "of 'libxerces-c' as opposed to the development build?"
-$echo
-
-installed=`read_y_n y`
-
-path=
-type=
-
-if [ "$installed" = "n" ]; then
-
-  version=
-
-  while [ -z "$version" ]; do
-
-    $echo
-    $echo "Please enter the 'libxerces-c' root directory."
-    $echo
-
-    root=`read_path --directory --exist`
-
-    version=`sed -e 's/^VER=\([^_]*\)_\([^_]*\)_\([^_]*\)[ ]*$/\1.\2.\3/' \
--e t -e d $root/version.incl 2>/dev/null`
-
-    if [ $? != 0 -o -z "$version" ]; then
-
-      version=
-      echo "Unable to read version information from $root/version.incl"
-    fi
-  done
-
-  $echo
-  $echo "Please select the library type you would like to use:"
-  $echo
-  $echo "(1) archive"
-  $echo "(2) shared object"
-  $echo
-
-  type=`read_option "archive shared" "shared"`
-
-fi
-
-echo libxerces_c_installed := $installed   >$1
-
-if [ "$installed" = "n" ]; then
-
-  echo libxerces_c_root    := $root    >>$1
-  echo libxerces_c_type    := $type    >>$1
-  echo libxerces_c_version := $version >>$1
-
-fi
diff --git a/build/import/libxerces-c/rules.make b/build/import/libxerces-c/rules.make
deleted file mode 100644
index b094d22..0000000
--- a/build/import/libxerces-c/rules.make
+++ /dev/null
@@ -1,50 +0,0 @@
-# file      : build/import/libxerces-c/rules.make
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-$(dcf_root)/import/libxerces-c/%: root := $(libxerces_c_root)
-
-ifneq ($(filter 3.%,$(libxerces_c_version)),)
-
-# 3.x.y
-#
-ifeq ($(libxerces_c_type),archive)
-
-$(dcf_root)/import/libxerces-c/xerces-c.l: $(libxerces_c_root)/src/.libs/libxerces-c.a
-	@echo $< >$@
-else
-
-$(dcf_root)/import/libxerces-c/xerces-c.l: $(libxerces_c_root)/src/.libs/libxerces-c.so
-	@echo $< >$@
-	@echo rpath:$(root)/src/.libs >>$@
-endif
-
-$(dcf_root)/import/libxerces-c/xerces-c.l.cpp-options:
-	@echo include: -I$(root)/src >$@
-else
-
-#  2.x.y
-#
-ifeq ($(libxerces_c_type),archive)
-
-$(dcf_root)/import/libxerces-c/xerces-c.l: $(libxerces_c_root)/lib/libxerces-c.a
-	@echo $< >$@
-else
-
-$(dcf_root)/import/libxerces-c/xerces-c.l: $(libxerces_c_root)/lib/libxerces-c.so
-	@echo $< >$@
-	@echo rpath:$(root)/lib >>$@
-endif
-
-$(dcf_root)/import/libxerces-c/xerces-c.l.cpp-options:
-	@echo include: -I$(root)/include >$@
-endif
-
-
-ifndef %foreign%
-
-disfigure::
-	$(call message,rm $(dcf_root)/import/libxerces-c/xerces-c.l,\
-rm -f $(dcf_root)/import/libxerces-c/xerces-c.l)
-	$(call message,,rm -f $(dcf_root)/import/libxerces-c/xerces-c.l.cpp-options)
-
-endif
diff --git a/build/import/libxerces-c/stub.make b/build/import/libxerces-c/stub.make
deleted file mode 100644
index f5bb440..0000000
--- a/build/import/libxerces-c/stub.make
+++ /dev/null
@@ -1,30 +0,0 @@
-# file      : build/import/libxerces-c/stub.make
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-$(call include-once,$(scf_root)/import/libxerces-c/configuration-rules.make,$(dcf_root))
-
-libxerces_c_installed :=
-
-$(call -include,$(dcf_root)/import/libxerces-c/configuration-dynamic.make)
-
-ifdef libxerces_c_installed
-
-ifeq ($(libxerces_c_installed),y)
-
-$(call export,l: -lxerces-c,cpp-options: )
-
-else
-
-$(call include-once,$(scf_root)/import/libxerces-c/rules.make,$(dcf_root))
-
-$(call export,\
-  l: $(dcf_root)/import/libxerces-c/xerces-c.l,\
-  cpp-options: $(dcf_root)/import/libxerces-c/xerces-c.l.cpp-options)
-
-endif
-
-else
-
-.NOTPARALLEL:
-
-endif
diff --git a/build/import/libxerces-c/version b/build/import/libxerces-c/version
deleted file mode 100644
index a918a2a..0000000
--- a/build/import/libxerces-c/version
+++ /dev/null
@@ -1 +0,0 @@
-0.6.0
diff --git a/build/import/libxsd-frontend/configuration-rules.make b/build/import/libxsd-frontend/configuration-rules.make
deleted file mode 100644
index b0b16e5..0000000
--- a/build/import/libxsd-frontend/configuration-rules.make
+++ /dev/null
@@ -1,13 +0,0 @@
-# file      : build/import/libxsd-frontend/configuration-rules.make
-# license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-$(dcf_root)/import/libxsd-frontend/configuration-dynamic.make: | $(dcf_root)/import/libxsd-frontend/.
-	$(call message,,$(scf_root)/import/libxsd-frontend/configure $@)
-
-ifndef %foreign%
-
-disfigure::
-	$(call message,rm $(dcf_root)/import/libxsd-frontend/configuration-dynamic.make,\
-rm -f $(dcf_root)/import/libxsd-frontend/configuration-dynamic.make)
-
-endif
diff --git a/build/import/libxsd-frontend/configure b/build/import/libxsd-frontend/configure
deleted file mode 100755
index 1908830..0000000
--- a/build/import/libxsd-frontend/configure
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /usr/bin/env bash
-
-# file      : build/import/libxsd-frontend/configure
-# license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-
-# $1           - out file
-#
-# bld_root     - build root
-# project_name - project name
-#
-
-source $bld_root/dialog.bash
-
-
-$echo
-$echo "Configuring external dependency on 'libxsd-frontend' for '$project_name'."
-$echo
-
-$echo
-$echo "Would you like to configure dependency on the installed "
-$echo "version of 'libxsd-frontend' as opposed to the development build?"
-$echo
-
-installed=`read_y_n y`
-
-path=
-
-if [ "$installed" = "n" ]; then
-
-$echo
-$echo "Please enter the src_root for 'libxsd-frontend'."
-$echo
-
-src_root=`read_path --directory --exist`
-
-$echo
-$echo "Please enter the out_root for 'libxsd-frontend'."
-$echo
-
-out_root=`read_path --directory $src_root`
-
-fi
-
-echo libxsd_frontend_installed := $installed   >$1
-
-if [ "$installed" = "n" ]; then
-
-echo src_root := $src_root            >>$1
-echo scf_root := \$\(src_root\)/build >>$1
-echo out_root := $out_root            >>$1
-
-fi
diff --git a/build/import/libxsd-frontend/stub.make b/build/import/libxsd-frontend/stub.make
deleted file mode 100644
index 9bf00e5..0000000
--- a/build/import/libxsd-frontend/stub.make
+++ /dev/null
@@ -1,28 +0,0 @@
-# file      : build/import/libxsd-frontend/stub.make
-# license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
-
-$(call include-once,$(scf_root)/import/libxsd-frontend/configuration-rules.make,$(dcf_root))
-
-libxsd_frontend_installed :=
-
-$(call -include,$(dcf_root)/import/libxsd-frontend/configuration-dynamic.make)
-
-ifdef libxsd_frontend_installed
-
-ifeq ($(libxsd_frontend_installed),y)
-
-$(call export,l: -lxsd-frontend -lcutl -lxerces-c,cpp_options: )
-
-else
-
-# Include export stub.
-#
-$(call include,$(scf_root)/export/libxsd-frontend/stub.make)
-
-endif
-
-else
-
-.NOTPARALLEL:
-
-endif
diff --git a/build/root.build b/build/root.build
new file mode 100644
index 0000000..374118a
--- /dev/null
+++ b/build/root.build
@@ -0,0 +1,17 @@
+# file      : build/root.build
+# license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+
+cxx.std = latest
+
+using cxx
+
+hxx{*}: extension = hxx
+cxx{*}: extension = cxx
+ixx{*}: extension = ixx
+txx{*}: extension = txx
+
+if ($cxx.target.system == 'win32-msvc')
+  cxx.poptions += -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
+
+if ($cxx.class == 'msvc')
+  cxx.coptions += /wd4251 /wd4275 /wd4800