diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2017-08-24 15:41:20 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2017-08-24 15:41:20 +0300 |
| commit | 30df505b480917800c5876a51b159240e2a002e2 (patch) | |
| tree | 1432c5607115e465c622ab86d694b36d7dfeaae5 | |
| parent | a685c476343a4959197c639661fe5ef4d8d4f216 (diff) | |
Add version-build2.hxx back into distribution and don't clean it up from src
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | README-GIT | 5 | ||||
| -rw-r--r-- | odb/sqlite/buildfile | 6 | ||||
| -rw-r--r-- | odb/sqlite/version-build2.hxx | 0 |
4 files changed, 11 insertions, 4 deletions
@@ -29,7 +29,3 @@ # Generated .gitignore files. # .gitignore - -# Temporarily here because of auto-generated odb/sqlite/.gitignore. -# -odb/sqlite/version-build2.hxx diff --git a/README-GIT b/README-GIT new file mode 100644 index 0000000..be3ee92 --- /dev/null +++ b/README-GIT @@ -0,0 +1,5 @@ +The checked out odb/sqlite/version-build2.hxx will be overwritten during the +build process but these changes should be ignored. To do this automatically, +run: + +git update-index --assume-unchanged odb/sqlite/version-build2.hxx diff --git a/odb/sqlite/buildfile b/odb/sqlite/buildfile index 6df413d..b0244ed 100644 --- a/odb/sqlite/buildfile +++ b/odb/sqlite/buildfile @@ -10,7 +10,13 @@ lib{odb-sqlite}: {hxx ixx txx cxx}{* -version-build2} {hxx}{version-build2} \ details/build2/{h}{*} \ $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-build2}: in{version-build2} $src_root/file{manifest} +hxx{version-build2}: dist = true +hxx{version-build2}: 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/odb/sqlite/version-build2.hxx b/odb/sqlite/version-build2.hxx new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/odb/sqlite/version-build2.hxx |