From 346b103d47f5c59e573f643a63d4d864c0d6e868 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Mon, 1 May 2017 17:15:50 +0300 Subject: Add hxx extension for header --- msvc-common/.gitignore | 2 +- msvc-common/msvc-filter.cxx | 10 +++++----- msvc-common/version-impl.in | 44 -------------------------------------------- msvc-common/version.hxx.in | 44 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+), 50 deletions(-) delete mode 100644 msvc-common/version-impl.in create mode 100644 msvc-common/version.hxx.in (limited to 'msvc-common') 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 #include -#include // path::traits::realize() -#include // alpha(), throw_generic_error() -#include -#include +#include // path::traits::realize() +#include // alpha(), throw_generic_error() +#include +#include -#include +#include using namespace std; using namespace butl; diff --git a/msvc-common/version-impl.in b/msvc-common/version-impl.in deleted file mode 100644 index 3e787f3..0000000 --- a/msvc-common/version-impl.in +++ /dev/null @@ -1,44 +0,0 @@ -// file : msvc-common/version-impl.in -*- C++ -*- -// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd -// license : MIT; see accompanying LICENSE file - -#ifndef MSVC_FILTER_VERSION // Note: using the version macro itself. - -// Note: using build2 standard versioning scheme. The numeric version format -// is AAABBBCCCDDDE where: -// -// AAA - major version number -// BBB - minor version number -// CCC - bugfix version number -// DDD - alpha / beta (DDD + 500) version number -// E - final (0) / snapshot (1) -// -// When DDDE is not 0, 1 is subtracted from AAABBBCCC. For example: -// -// Version AAABBBCCCDDDE -// -// 0.1.0 0000010000000 -// 0.1.2 0000010010000 -// 1.2.3 0010020030000 -// 2.2.0-a.1 0020019990010 -// 3.0.0-b.2 0029999995020 -// 2.2.0-a.1.z 0020019990011 -// -#define MSVC_FILTER_VERSION $msvc-linux.version.project_number$ULL -#define MSVC_FILTER_VERSION_STR "$msvc-linux.version.project$" -#define MSVC_FILTER_VERSION_ID "$msvc-linux.version.project_id$" - -#define MSVC_FILTER_VERSION_MAJOR $msvc-linux.version.major$ -#define MSVC_FILTER_VERSION_MINOR $msvc-linux.version.minor$ -#define MSVC_FILTER_VERSION_PATCH $msvc-linux.version.patch$ - -#define MSVC_FILTER_PRE_RELEASE $msvc-linux.version.pre_release$ - -#define MSVC_FILTER_SNAPSHOT $msvc-linux.version.snapshot_sn$ULL -#define MSVC_FILTER_SNAPSHOT_ID "$msvc-linux.version.snapshot_id$" - -#include - -$libbutl.check(LIBBUTL_VERSION, LIBBUTL_SNAPSHOT)$ - -#endif // MSVC_FILTER_VERSION diff --git a/msvc-common/version.hxx.in b/msvc-common/version.hxx.in new file mode 100644 index 0000000..44d06ea --- /dev/null +++ b/msvc-common/version.hxx.in @@ -0,0 +1,44 @@ +// file : msvc-common/version.hxx.in -*- C++ -*- +// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd +// license : MIT; see accompanying LICENSE file + +#ifndef MSVC_FILTER_VERSION // Note: using the version macro itself. + +// Note: using build2 standard versioning scheme. The numeric version format +// is AAABBBCCCDDDE where: +// +// AAA - major version number +// BBB - minor version number +// CCC - bugfix version number +// DDD - alpha / beta (DDD + 500) version number +// E - final (0) / snapshot (1) +// +// When DDDE is not 0, 1 is subtracted from AAABBBCCC. For example: +// +// Version AAABBBCCCDDDE +// +// 0.1.0 0000010000000 +// 0.1.2 0000010010000 +// 1.2.3 0010020030000 +// 2.2.0-a.1 0020019990010 +// 3.0.0-b.2 0029999995020 +// 2.2.0-a.1.z 0020019990011 +// +#define MSVC_FILTER_VERSION $msvc-linux.version.project_number$ULL +#define MSVC_FILTER_VERSION_STR "$msvc-linux.version.project$" +#define MSVC_FILTER_VERSION_ID "$msvc-linux.version.project_id$" + +#define MSVC_FILTER_VERSION_MAJOR $msvc-linux.version.major$ +#define MSVC_FILTER_VERSION_MINOR $msvc-linux.version.minor$ +#define MSVC_FILTER_VERSION_PATCH $msvc-linux.version.patch$ + +#define MSVC_FILTER_PRE_RELEASE $msvc-linux.version.pre_release$ + +#define MSVC_FILTER_SNAPSHOT $msvc-linux.version.snapshot_sn$ULL +#define MSVC_FILTER_SNAPSHOT_ID "$msvc-linux.version.snapshot_id$" + +#include + +$libbutl.check(LIBBUTL_VERSION, LIBBUTL_SNAPSHOT)$ + +#endif // MSVC_FILTER_VERSION -- cgit v1.1