summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicky <nicky.dasmijn@gmail.com>2022-04-07 02:39:30 +0200
committerNicky <nicky.dasmijn@gmail.com>2022-04-07 02:39:30 +0200
commit6cb984022afb54bb8ff71ee36787883edd3468cf (patch)
tree5cb538453f6e3f24c8a443c7d6f22973239b446b
parent4f2831c54be3d684293f28bede0e6f609fa16bc0 (diff)
When opening contributions.txt viewer_manifest.py was making assumptios of the build
tree layout and how it should be relative to the source tree. This is not necessarily correct. By using 'source' and constructiong the path relative to this directory we always get a correct answer.
-rwxr-xr-xindra/newview/viewer_manifest.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index ae3ed56b3d..5de5c71771 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -75,7 +75,7 @@ class ViewerManifest(LLManifest):
# include the entire shaders directory recursively
self.path("shaders")
# include the extracted list of contributors
- contributions_path = "../../doc/contributions.txt"
+ contributions_path = os.path.join(self.args['source'], "..", "..", "doc", "contributions.txt")
contributor_names = self.extract_names(contributions_path)
self.put_in_file(contributor_names.encode(), "contributors.txt", src=contributions_path)