aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2018-07-16 16:12:17 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2018-07-16 16:12:17 +0200
commit0d8e5265a54d4362c83d292dd90330f81da6836c (patch)
tree25078e4520e1a30e512b992a99c476f2ae478bd0
parent4f63afc1177021d6345502892dbd028f5d6db5eb (diff)
Update bootstrap scripts with new module directory (in)
-rw-r--r--bootstrap-mingw.bat1
-rw-r--r--bootstrap-msvc.bat1
-rw-r--r--bootstrap.gmake3
-rwxr-xr-xbootstrap.sh1
4 files changed, 5 insertions, 1 deletions
diff --git a/bootstrap-mingw.bat b/bootstrap-mingw.bat
index 5937e2e..68b6b7b 100644
--- a/bootstrap-mingw.bat
+++ b/bootstrap-mingw.bat
@@ -72,6 +72,7 @@ set "src=%src% build2\test\*.cxx"
set "src=%src% build2\test\script\*.cxx"
set "src=%src% build2\version\*.cxx"
set "src=%src% build2\install\*.cxx"
+set "src=%src% build2\in\*.cxx"
set "src=%src% %libbutl%\libbutl\*.cxx"
rem Get the compile options.
diff --git a/bootstrap-msvc.bat b/bootstrap-msvc.bat
index 9710372..ff1360b 100644
--- a/bootstrap-msvc.bat
+++ b/bootstrap-msvc.bat
@@ -103,6 +103,7 @@ set "src=%src% build2\test"
set "src=%src% build2\test\script"
set "src=%src% build2\version"
set "src=%src% build2\install"
+set "src=%src% build2\in"
set "src=%src% %libbutl%\libbutl"
rem Get the compile options.
diff --git a/bootstrap.gmake b/bootstrap.gmake
index a50268c..58ee069 100644
--- a/bootstrap.gmake
+++ b/bootstrap.gmake
@@ -140,7 +140,8 @@ cli \
test/script \
test \
version \
-install
+install \
+in
build2_src := $(wildcard $(src_root)/build2/*.cxx)
build2_src += $(foreach d,$(sub_dirs),$(wildcard $(src_root)/build2/$d/*.cxx))
diff --git a/bootstrap.sh b/bootstrap.sh
index f8bfd3b..3b9ffda 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -128,6 +128,7 @@ src="$src build2/test/*.cxx"
src="$src build2/test/script/*.cxx"
src="$src build2/version/*.cxx"
src="$src build2/install/*.cxx"
+src="$src build2/in/*.cxx"
src="$src $libbutl/libbutl/*.cxx"
# Note that for as long as we support GCC 4.9 we have to compile in the C++14