diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2017-08-24 14:21:55 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2017-08-24 14:21:55 +0300 |
| commit | 16909271763c62c6a3515afeadb2c610d331b17d (patch) | |
| tree | b43c59f768a862df73abeb8bce4a7b132916965a | |
| parent | c9b8a114e9ceaf58a0f8be79e442e658ff651872 (diff) | |
Add version.hxx back into distribution and don't clean it up from src
| -rw-r--r-- | README-GIT | 4 | ||||
| -rw-r--r-- | libbbot/.gitignore | 1 | ||||
| -rw-r--r-- | libbbot/buildfile | 6 | ||||
| -rw-r--r-- | libbbot/version.hxx | 0 |
4 files changed, 10 insertions, 1 deletions
diff --git a/README-GIT b/README-GIT new file mode 100644 index 0000000..f259ab9 --- /dev/null +++ b/README-GIT @@ -0,0 +1,4 @@ +The checked out libbbot/version.hxx will be overwritten during the build +process but these changes should be ignored. To do this automatically, run: + +git update-index --assume-unchanged libbbot/version.hxx diff --git a/libbbot/.gitignore b/libbbot/.gitignore deleted file mode 100644 index 426db9e..0000000 --- a/libbbot/.gitignore +++ /dev/null @@ -1 +0,0 @@ -version.hxx diff --git a/libbbot/buildfile b/libbbot/buildfile index e30e1e9..3b53be3 100644 --- a/libbbot/buildfile +++ b/libbbot/buildfile @@ -6,7 +6,13 @@ import int_libs = libbutl%lib{butl} libbpkg%lib{bpkg} lib{bbot}: {hxx ixx txx cxx}{* -version} {hxx}{version} $int_libs +# Include the generated version header into the distribution (so that we don't +# pick up an installed one) and don't remove it when cleaning in src (so that +# clean results in a state identical to distributed). +# hxx{version}: in{version} $src_root/file{manifest} +hxx{version}: dist = true +hxx{version}: clean = ($src_root != $out_root) # For pre-releases use the complete version to make sure they cannot be used # in place of another pre-release or the final version. diff --git a/libbbot/version.hxx b/libbbot/version.hxx new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/libbbot/version.hxx |