livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-6928: revert previous post-move strategy, rename via self.path instead

meow-7.2.2
Glenn Glazer 2017-04-11 16:18:01 -07:00
parent 7de21de71f
commit e26b66cc6d
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/viewer_manifest.py
View File

@ -778,7 +778,7 @@ class DarwinManifest(ViewerManifest):
relpkgdir = os.path.join(pkgdir, "lib", "release")
debpkgdir = os.path.join(pkgdir, "lib", "debug")
vmpdir = os.path.join(pkgdir, "VMP")
vmp266dir = os.path.join(vmpdir, "2.6")
vmp266dir = os.path.join(vmpdir, "python26")
llbasedir = os.path.join(pkgdir, "llbase")
requestsdir = os.path.join(pkgdir, "requests")
@ -791,7 +791,7 @@ class DarwinManifest(ViewerManifest):
if self.prefix(dst="MacOS"):
#apparently the codesign tool has a problem with dir names with dots in them
vmp266nodotdir = os.path.join(self.get_dst_prefix(), "python26")
"""vmp266nodotdir = os.path.join(self.get_dst_prefix(), "python26")"""
#this copies over the python wrapper script, associated utilities and required libraries, see SL-321, SL-322, SL-323 and MAINT-6928
self.path2basename(vmpdir,"SL_Launcher")
self.path2basename(vmpdir,"*.py")
@ -813,21 +813,13 @@ class DarwinManifest(ViewerManifest):
self.end_prefix()
#these supplemental files are in case the user still has 2.6 as their default python
#https://jira.secondlife.com/browse/MAINT-6928
p266_path = os.path.join(self.get_dst_prefix(),'2.6')
p266_path = os.path.join(self.get_dst_prefix(),'python26')
if not os.path.exists(p266_path):
os.makedirs(p266_path)
if self.prefix(dst="2.6"):
if self.prefix("python26"):
self.path2basename(vmp266dir,"*.py")
self.end_prefix()
self.end_prefix()
if os.path.exists(p266_path):
try:
print "renaming python 2.6 directory %s to %s " % (p266_path, vmp266nodotdir)
if not os.path.exists(vmp266nodotdir):
shutil.move(p266_path, vmp266nodotdir)
except Exception, e:
print "Failed to rename python 2.6 supplemental directory with error %s" % repr(e)
raise
self.end_prefix()
# most everything goes in the Resources directory
if self.prefix(src="", dst="Resources"):