aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README-GIT4
-rw-r--r--libbrep/.gitignore2
-rw-r--r--libbrep/buildfile6
-rw-r--r--libbrep/version.hxx0
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