diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2017-08-24 14:03:01 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2017-08-24 16:15:58 +0300 |
| commit | 63723c0313acf3fb1539fb9a301250bbcc263ecc (patch) | |
| tree | f40e58657ab6e3f7c6d8627a276a54f8bb5b9bad | |
| parent | ef4617c665c5e281377b4fa10e462d5fb6716a4f (diff) | |
Add version.hxx back into distribution and don't clean it up from src
| -rw-r--r-- | README-GIT | 4 | ||||
| -rw-r--r-- | libbrep/.gitignore | 2 | ||||
| -rw-r--r-- | libbrep/buildfile | 6 | ||||
| -rw-r--r-- | libbrep/version.hxx | 0 |
4 files changed, 10 insertions, 2 deletions
diff --git a/README-GIT b/README-GIT new file mode 100644 index 0000000..bf1aace --- /dev/null +++ b/README-GIT @@ -0,0 +1,4 @@ +The checked out libbrep/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 libbrep/version.hxx diff --git a/libbrep/.gitignore b/libbrep/.gitignore index 48fba7b..1fbfc28 100644 --- a/libbrep/.gitignore +++ b/libbrep/.gitignore @@ -8,5 +8,3 @@ build-odb.?xx build-package-odb.?xx build.sql build-extra.hxx - -version.hxx diff --git a/libbrep/buildfile b/libbrep/buildfile index e222ec4..7ca4623 100644 --- a/libbrep/buildfile +++ b/libbrep/buildfile @@ -25,7 +25,13 @@ libs{brep}: \ {hxx ixx cxx}{common-odb package-odb build-odb build-package-odb} \ $int_libs xml{*} sql{*} +# 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/libbrep/version.hxx b/libbrep/version.hxx new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/libbrep/version.hxx |