aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2017-05-01 14:15:50 (GMT)
committerKaren Arutyunov <karen@codesynthesis.com>2017-05-01 14:15:50 (GMT)
commit346b103d47f5c59e573f643a63d4d864c0d6e868 (patch)
tree97fdb65b382fba2b9ea884d77df873d5dc2499b8
parenta78bb6294e00af3f7d8e72a64e613adf1f743311 (diff)
Add hxx extension for header
-rw-r--r--build/root.build2
-rw-r--r--buildfile6
-rw-r--r--msvc-common/.gitignore2
-rw-r--r--msvc-common/msvc-filter.cxx10
-rw-r--r--msvc-common/version.hxx.in (renamed from msvc-common/version-impl.in)4
5 files changed, 12 insertions, 12 deletions
diff --git a/build/root.build b/build/root.build
index 833ec58..327dcda 100644
--- a/build/root.build
+++ b/build/root.build
@@ -6,7 +6,7 @@ cxx.std = 14
using cxx
-hxx{*}: extension =
+hxx{*}: extension = hxx
ixx{*}: extension = ixx
txx{*}: extension = txx
cxx{*}: extension = cxx
diff --git a/buildfile b/buildfile
index c2d94e3..d3ee204 100644
--- a/buildfile
+++ b/buildfile
@@ -48,10 +48,10 @@ msvc-common/:
{
import libs = libbutl%lib{butl}
- exe{msvc-filter}: cxx{msvc-filter} hxx{version-impl} $libs
+ exe{msvc-filter}: cxx{msvc-filter} hxx{version} $libs
- hxx{version-impl}: in{version-impl} $src_root/file{manifest}
- hxx{version-impl}: dist = true
+ hxx{version}: in{version} $src_root/file{manifest}
+ hxx{version}: dist = true
}
# Don't install INSTALL file.
diff --git a/msvc-common/.gitignore b/msvc-common/.gitignore
index 1bdc3bc..f418db3 100644
--- a/msvc-common/.gitignore
+++ b/msvc-common/.gitignore
@@ -3,4 +3,4 @@
msvc-filter
*.d
*.o
-version-impl
+version.hxx
diff --git a/msvc-common/msvc-filter.cxx b/msvc-common/msvc-filter.cxx
index 93e3ad4..9146760 100644
--- a/msvc-common/msvc-filter.cxx
+++ b/msvc-common/msvc-filter.cxx
@@ -15,12 +15,12 @@
#include <system_error>
#include <unordered_map>
-#include <butl/path> // path::traits::realize()
-#include <butl/utility> // alpha(), throw_generic_error()
-#include <butl/process>
-#include <butl/fdstream>
+#include <libbutl/path.hxx> // path::traits::realize()
+#include <libbutl/utility.hxx> // alpha(), throw_generic_error()
+#include <libbutl/process.hxx>
+#include <libbutl/fdstream.hxx>
-#include <msvc-common/version-impl>
+#include <msvc-common/version.hxx>
using namespace std;
using namespace butl;
diff --git a/msvc-common/version-impl.in b/msvc-common/version.hxx.in
index 3e787f3..44d06ea 100644
--- a/msvc-common/version-impl.in
+++ b/msvc-common/version.hxx.in
@@ -1,4 +1,4 @@
-// file : msvc-common/version-impl.in -*- C++ -*-
+// file : msvc-common/version.hxx.in -*- C++ -*-
// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
// license : MIT; see accompanying LICENSE file
@@ -37,7 +37,7 @@
#define MSVC_FILTER_SNAPSHOT $msvc-linux.version.snapshot_sn$ULL
#define MSVC_FILTER_SNAPSHOT_ID "$msvc-linux.version.snapshot_id$"
-#include <butl/version>
+#include <libbutl/version.hxx>
$libbutl.check(LIBBUTL_VERSION, LIBBUTL_SNAPSHOT)$