aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2016-11-24 14:25:58 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2016-11-24 14:40:05 +0300
commit0ea7f903b5f56fbf563d70fea2da40798b681c34 (patch)
treef696f0e8fbb0caba7f252ac71c58abd37e3b115a
parentbcd637fb1c041771e5bd1b2bc1238440bdc79dd2 (diff)
Finalize structure reorganization
-rw-r--r--buildfile37
-rw-r--r--msvc-common/.gitignore (renamed from .gitignore)0
-rwxr-xr-xmsvc-common/msvc-common2
-rw-r--r--msvc-common/msvc-filter.cxx (renamed from msvc-filter.cxx)2
4 files changed, 26 insertions, 15 deletions
diff --git a/buildfile b/buildfile
index 6d1467c..db3f8ea 100644
--- a/buildfile
+++ b/buildfile
@@ -6,23 +6,34 @@ define sh: file
sh{*}: extension =
sh{*}: install = bin/
-s = cl-11 cl-12 cl-14 cl-14u2 \
- lib-11 lib-12 lib-14 lib-14u2 \
- link-11 link-12 link-14 link-14u2 \
- msvc-11 msvc-12 msvc-14 msvc-14u2 \
- mt-11 mt-12 mt-14 mt-14u2 \
- rc-11 rc-12 rc-14 rc-14u2 \
- \
- msvc-cl-common msvc-common msvc-lib-common \
- msvc-link-common msvc-mt-common msvc-rc-common
+s = cl-11-32 cl-12-32 cl-14u0-32 cl-14u2-32 cl-14u2-64 \
+ lib-11-32 lib-12-32 lib-14u0-32 lib-14u2-32 lib-14u2-64 \
+ link-11-32 link-12-32 link-14u0-32 link-14u2-32 link-14u2-64 \
+ mt-11-32 mt-12-32 mt-14u0-32 mt-14u2-32 mt-14u2-64 \
+ rc-11-32 rc-12-32 rc-14u0-32 rc-14u2-32 rc-14u2-64 \
+ \
+ msvc-dispatch \
+ \
+ msvc-common/{msvc-cl-common msvc-common msvc-lib-common \
+ msvc-link-common msvc-mt-common msvc-rc-common} \
+ \
+ msvc-11/{msvc-11-32} \
+ msvc-12/{msvc-12-32} \
+ msvc-14/{msvc-14u0-32 msvc-14u2-32 msvc-14u2-64}
-./: exe{msvc-filter} sh{$s} doc{INSTALL LICENSE NEWS README version} \
- file{manifest}
-import libs = libbutl%lib{butl}
+./: msvc-common/exe{msvc-filter} sh{$s} \
+ doc{INSTALL LICENSE NEWS README version} file{manifest}
-exe{msvc-filter}: cxx{msvc-filter} $libs
+msvc-common/:
+{
+ import libs = libbutl%lib{butl}
+
+ exe{msvc-filter}: cxx{msvc-filter} $libs
+}
# Don't install INSTALL file.
#
doc{INSTALL}@./: install = false
+
+install.bin.subdirs = true # Recreate subdirectories.
diff --git a/.gitignore b/msvc-common/.gitignore
index b2ffb54..b2ffb54 100644
--- a/.gitignore
+++ b/msvc-common/.gitignore
diff --git a/msvc-common/msvc-common b/msvc-common/msvc-common
index d571f87..3f2e508 100755
--- a/msvc-common/msvc-common
+++ b/msvc-common/msvc-common
@@ -52,5 +52,5 @@ function msvc_exec () # <diag> <exe> <arg>...
# POSIX mapping. If <diag> is 1 then both stdout and stderr output are read
# and filtered.
#
- "$src_dir/msvc-filter" "$diag" wine "$@"
+ "$src_dir/msvc-common/msvc-filter" "$diag" wine "$@"
}
diff --git a/msvc-filter.cxx b/msvc-common/msvc-filter.cxx
index a0555cf..11f3235 100644
--- a/msvc-filter.cxx
+++ b/msvc-common/msvc-filter.cxx
@@ -1,4 +1,4 @@
-// file : msvc-filter/msvc-filter.cxx -*- C++ -*-
+// file : msvc-common/msvc-filter.cxx -*- C++ -*-
// copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file