From a7432e49d4c5009990da9bafb9c62a9542b04ac6 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 25 Apr 2017 12:56:59 +0200
Subject: Rename version header to version-impl to give way to version module

---
 build2/b.cxx        |  1 -
 build2/buildfile    |  2 +-
 build2/context.cxx  |  1 -
 build2/parser.cxx   |  2 --
 build2/utility      |  1 +
 build2/version      | 37 -------------------------------------
 build2/version-impl | 37 +++++++++++++++++++++++++++++++++++++
 7 files changed, 39 insertions(+), 42 deletions(-)
 delete mode 100644 build2/version
 create mode 100644 build2/version-impl

(limited to 'build2')

diff --git a/build2/b.cxx b/build2/b.cxx
index 89c3d9c..47541c4 100644
--- a/build2/b.cxx
+++ b/build2/b.cxx
@@ -17,7 +17,6 @@
 
 #include <build2/types>
 #include <build2/utility>
-#include <build2/version>
 
 #include <build2/spec>
 #include <build2/operation>
diff --git a/build2/buildfile b/build2/buildfile
index 90faa6e..83f0a08 100644
--- a/build2/buildfile
+++ b/build2/buildfile
@@ -41,7 +41,7 @@ exe{b}:                                                   \
             {hxx         cxx}{ types-parsers            } \
             {hxx ixx txx cxx}{ utility                  } \
             {hxx ixx txx cxx}{ variable                 } \
-            {hxx            }{ version                  } \
+            {hxx            }{ version-impl             } \
         bin/{hxx         cxx}{ guess                    } \
         bin/{hxx         cxx}{ init                     } \
         bin/{hxx         cxx}{ rule                     } \
diff --git a/build2/context.cxx b/build2/context.cxx
index fa3edfa..40537b4 100644
--- a/build2/context.cxx
+++ b/build2/context.cxx
@@ -9,7 +9,6 @@
 #include <build2/rule>
 #include <build2/scope>
 #include <build2/target>
-#include <build2/version>
 #include <build2/diagnostics>
 
 // For command line variable parsing.
diff --git a/build2/parser.cxx b/build2/parser.cxx
index eacece1..b95aeae 100644
--- a/build2/parser.cxx
+++ b/build2/parser.cxx
@@ -8,8 +8,6 @@
 
 #include <butl/filesystem> // path_search(), path_match()
 
-#include <build2/version>
-
 #include <build2/file>
 #include <build2/scope>
 #include <build2/module>
diff --git a/build2/utility b/build2/utility
index d7b4797..5e2fd22 100644
--- a/build2/utility
+++ b/build2/utility
@@ -23,6 +23,7 @@
 
 #include <build2/types>
 #include <build2/b-options>
+#include <build2/version-impl>
 
 namespace build2
 {
diff --git a/build2/version b/build2/version
deleted file mode 100644
index 2abfd15..0000000
--- a/build2/version
+++ /dev/null
@@ -1,37 +0,0 @@
-// file      : build2/version -*- C++ -*-
-// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license   : MIT; see accompanying LICENSE file
-
-#ifndef BUILD2_VERSION // Note: using the version macro itself.
-
-#include <butl/version> // LIBBUTL_VERSION
-
-// Version format is AABBCCDD where
-//
-// AA - major version number
-// BB - minor version number
-// CC - bugfix version number
-// DD - alpha / beta (DD + 50) version number
-//
-// When DD is not 00, 1 is subtracted from AABBCC. For example:
-//
-// Version     AABBCCDD
-// 2.0.0       02000000
-// 2.1.0       02010000
-// 2.1.1       02010100
-// 2.2.0-a1    02019901
-// 3.0.0-b2    02999952
-//
-#define BUILD2_VERSION 49901
-#define BUILD2_VERSION_STR "0.5.0-a1"
-
-// Generally, we expect minor versions to be source code backwards-
-// compatible, thought we might have a minimum version requirement.
-//
-// Note: does not apply during early development.
-//
-#if LIBBUTL_VERSION != 49901
-#  error incompatible libbutl version
-#endif
-
-#endif // BUILD2_VERSION
diff --git a/build2/version-impl b/build2/version-impl
new file mode 100644
index 0000000..3df315e
--- /dev/null
+++ b/build2/version-impl
@@ -0,0 +1,37 @@
+// file      : build2/version-impl -*- C++ -*-
+// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+// license   : MIT; see accompanying LICENSE file
+
+#ifndef BUILD2_VERSION // Note: using the version macro itself.
+
+#include <butl/version> // LIBBUTL_VERSION
+
+// Version format is AABBCCDD where
+//
+// AA - major version number
+// BB - minor version number
+// CC - bugfix version number
+// DD - alpha / beta (DD + 50) version number
+//
+// When DD is not 00, 1 is subtracted from AABBCC. For example:
+//
+// Version     AABBCCDD
+// 2.0.0       02000000
+// 2.1.0       02010000
+// 2.1.1       02010100
+// 2.2.0-a1    02019901
+// 3.0.0-b2    02999952
+//
+#define BUILD2_VERSION 49901
+#define BUILD2_VERSION_STR "0.5.0-a1"
+
+// Generally, we expect minor versions to be source code backwards-
+// compatible, thought we might have a minimum version requirement.
+//
+// Note: does not apply during early development.
+//
+#if LIBBUTL_VERSION != 49901
+#  error incompatible libbutl version
+#endif
+
+#endif // BUILD2_VERSION
-- 
cgit v1.1