diff options
| -rw-r--r-- | indra/lib/python/indra/util/llmanifest.py | 2 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py index 9679650104..858034bad6 100644 --- a/indra/lib/python/indra/util/llmanifest.py +++ b/indra/lib/python/indra/util/llmanifest.py @@ -238,6 +238,7 @@ class LLManifest(object): def __init__(self, srctree, dsttree, args): super(LLManifest, self).__init__() self.args = args + self.dir_list = [] self.file_list = [] self.excludes = [] self.actions = [] @@ -424,6 +425,7 @@ class LLManifest(object): if(not self.includes(src, dst)): print "Excluding: ", src, dst return + self.dir_list.append([src, dst]) names = os.listdir(src) self.cmakedirs(dst) errors = [] diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index e87fe8d8ff..1d89b6cf18 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -479,6 +479,15 @@ class LinuxManifest(ViewerManifest): if re.search("lib/lib.+\.so.*", d): self.run_command('strip -S %s' % d) + # Fixing access permissions + for s,d in self.dir_list: + self.run_command("chmod 755 '%s'" % d) + for s,d in self.file_list: + if os.access(d, os.X_OK): + self.run_command("chmod 755 '%s'" % d) + else: + self.run_command("chmod 644 '%s'" % d) + def package_finish(self): if(self.args.has_key('installer_name')): |