aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2018-04-04 15:07:29 -0400
committerJack Lloyd <[email protected]>2018-04-04 15:07:29 -0400
commit4216b96b2eb68ca9371e0452b0111e033f64f2d2 (patch)
tree59161a3c58dfec52afcc8115ef35d16e77fb1d02
parent99c5424243f54153fdb6c27126b5c9bec757d592 (diff)
Move version.txt to src/build-data
It is not useful for end-users so don't put it in the top level.
-rwxr-xr-xconfigure.py2
-rw-r--r--src/build-data/version.txt (renamed from version.txt)0
-rw-r--r--src/configs/sphinx/conf.py2
-rwxr-xr-xsrc/scripts/dist.py3
4 files changed, 4 insertions, 3 deletions
diff --git a/configure.py b/configure.py
index 99240effc..8bc18bbba 100755
--- a/configure.py
+++ b/configure.py
@@ -89,7 +89,7 @@ class Version(object):
def get_data():
if not Version.data:
root_dir = os.path.dirname(os.path.realpath(__file__))
- Version.data = parse_version_file(os.path.join(root_dir, 'version.txt'))
+ Version.data = parse_version_file(os.path.join(root_dir, 'src/build-data/version.txt'))
return Version.data
@staticmethod
diff --git a/version.txt b/src/build-data/version.txt
index c0f34a598..c0f34a598 100644
--- a/version.txt
+++ b/src/build-data/version.txt
diff --git a/src/configs/sphinx/conf.py b/src/configs/sphinx/conf.py
index 0534a9fa2..92fb78ba7 100644
--- a/src/configs/sphinx/conf.py
+++ b/src/configs/sphinx/conf.py
@@ -38,7 +38,7 @@ def parse_version_file(version_path):
results[key] = val
return results
-version_info = parse_version_file('../../../version.txt')
+version_info = parse_version_file('../../build-data/version.txt')
version_major = version_info['release_major']
version_minor = version_info['release_minor']
diff --git a/src/scripts/dist.py b/src/scripts/dist.py
index 2586af560..d12ce8d05 100755
--- a/src/scripts/dist.py
+++ b/src/scripts/dist.py
@@ -357,7 +357,8 @@ def main(args=None):
version_file = None
- for possible_version_file in ['version.txt', 'botan_version.py']:
+ # location of file with version information has moved over time
+ for possible_version_file in ['src/build-data/version.txt', 'version.txt', 'botan_version.py']:
full_path = os.path.join(output_basename, possible_version_file)
if os.access(full_path, os.R_OK):
version_file = full_path