diff options
author | Karen Arutyunov <karen@codesynthesis.com> | 2017-08-24 15:53:36 +0300 |
---|---|---|
committer | Karen Arutyunov <karen@codesynthesis.com> | 2017-08-24 15:53:36 +0300 |
commit | 133604f163cc89639b9dfc1d892b56f0ace15792 (patch) | |
tree | c6ea2cc1750ec348716eb4232a7215d32c61b0b4 | |
parent | 86feafe96adbc62888544c838ccc618c315d824b (diff) |
Add version.hxx back into distribution and don't clean it up from src
-rw-r--r-- | .gitignore | 4 | ||||
-rw-r--r-- | README-GIT | 4 | ||||
-rw-r--r-- | cutl/buildfile | 6 | ||||
-rw-r--r-- | cutl/version.hxx | 0 |
4 files changed, 10 insertions, 4 deletions
@@ -31,7 +31,3 @@ # Generated .gitignore files. # .gitignore - -# Temporarily here because of auto-generated cutl/.gitignore. -# -cutl/version.hxx diff --git a/README-GIT b/README-GIT new file mode 100644 index 0000000..e91c9d4 --- /dev/null +++ b/README-GIT @@ -0,0 +1,4 @@ +The checked out cutl/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 cutl/version.hxx diff --git a/cutl/buildfile b/cutl/buildfile index c203a2e..17f3360 100644 --- a/cutl/buildfile +++ b/cutl/buildfile @@ -6,7 +6,13 @@ lib{cutl}: {hxx ixx txx cxx}{** -version -xml/** -details/boost/**} \ {hxx}{version} \ details/build2/{h}{*} +# 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/cutl/version.hxx b/cutl/version.hxx new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/cutl/version.hxx |