From 235b37bb761082b19266bc51e44ae44b21ad1188 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 31 Oct 2019 08:13:00 -0400 Subject: DRTVWR-476: Update to VS 2017 versions of runtime DLLs. Also forget obsolete references to VS 2010 runtime DLLs. --- indra/newview/viewer_manifest.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index a403760670..ea8c341e97 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -528,11 +528,11 @@ class WindowsManifest(ViewerManifest): # These need to be installed as a SxS assembly, currently a 'private' assembly. # See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx if self.args['configuration'].lower() == 'debug': - self.path("msvcr120d.dll") - self.path("msvcp120d.dll") + self.path("msvcr150d.dll") + self.path("msvcp150d.dll") else: - self.path("msvcr120.dll") - self.path("msvcp120.dll") + self.path("msvcr150.dll") + self.path("msvcp150.dll") # SLVoice executable with self.prefix(src=os.path.join(pkgdir, 'bin', 'release')): @@ -606,8 +606,8 @@ class WindowsManifest(ViewerManifest): # MSVC DLLs needed for CEF and have to be in same directory as plugin with self.prefix(src=os.path.join(self.args['build'], os.pardir, 'sharedlibs', 'Release')): - self.path("msvcp120.dll") - self.path("msvcr120.dll") + self.path("msvcp150.dll") + self.path("msvcr150.dll") # CEF files common to all configurations with self.prefix(src=os.path.join(pkgdir, 'resources')): -- cgit v1.2.3 From e9ef66815766d87949e35498a0883286142c9665 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 31 Oct 2019 09:06:09 -0400 Subject: DRTVWR-476: Correct runtime DLL names for VS 2017. --- indra/newview/viewer_manifest.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index ea8c341e97..292b8b9122 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -528,11 +528,11 @@ class WindowsManifest(ViewerManifest): # These need to be installed as a SxS assembly, currently a 'private' assembly. # See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx if self.args['configuration'].lower() == 'debug': - self.path("msvcr150d.dll") - self.path("msvcp150d.dll") + self.path("msvcr140d.dll") + self.path("msvcp140d.dll") else: - self.path("msvcr150.dll") - self.path("msvcp150.dll") + self.path("msvcr140.dll") + self.path("msvcp140.dll") # SLVoice executable with self.prefix(src=os.path.join(pkgdir, 'bin', 'release')): @@ -606,8 +606,8 @@ class WindowsManifest(ViewerManifest): # MSVC DLLs needed for CEF and have to be in same directory as plugin with self.prefix(src=os.path.join(self.args['build'], os.pardir, 'sharedlibs', 'Release')): - self.path("msvcp150.dll") - self.path("msvcr150.dll") + self.path("msvcp140.dll") + self.path("msvcr140.dll") # CEF files common to all configurations with self.prefix(src=os.path.join(pkgdir, 'resources')): -- cgit v1.2.3 From e9a75ad31ccfb2e97d5d7bab2dec680e5b52f9a5 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 31 Oct 2019 09:14:43 -0400 Subject: DRTVWR-476: Throw some more Microsoft runtime DLLs at the viewer. --- indra/newview/viewer_manifest.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 292b8b9122..bff18afd53 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -531,8 +531,14 @@ class WindowsManifest(ViewerManifest): self.path("msvcr140d.dll") self.path("msvcp140d.dll") else: + # SL-12205: For reasons not yet diagnosed, an early build of + # the VS 2017 viewer requires VS 2013 runtime DLLs as well as + # VS 2017 runtime DLLs. + self.path("msvcr120.dll") + self.path("msvcp120.dll") self.path("msvcr140.dll") self.path("msvcp140.dll") + self.path("vcruntime140.dll") # SLVoice executable with self.prefix(src=os.path.join(pkgdir, 'bin', 'release')): @@ -606,8 +612,11 @@ class WindowsManifest(ViewerManifest): # MSVC DLLs needed for CEF and have to be in same directory as plugin with self.prefix(src=os.path.join(self.args['build'], os.pardir, 'sharedlibs', 'Release')): + self.path("msvcp120.dll") + self.path("msvcr120.dll") self.path("msvcp140.dll") self.path("msvcr140.dll") + self.path("vcruntime140.dll") # CEF files common to all configurations with self.prefix(src=os.path.join(pkgdir, 'resources')): -- cgit v1.2.3 From 70a63ca331484575fbd6ffb432e40f6555bb8a51 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 31 Oct 2019 13:54:51 -0400 Subject: DRTVWR-476, SL-12205: Update to glod built with VS 2017 runtime libs. --- indra/newview/viewer_manifest.py | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index bff18afd53..57099f8ac9 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -527,18 +527,8 @@ class WindowsManifest(ViewerManifest): # These need to be installed as a SxS assembly, currently a 'private' assembly. # See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx - if self.args['configuration'].lower() == 'debug': - self.path("msvcr140d.dll") - self.path("msvcp140d.dll") - else: - # SL-12205: For reasons not yet diagnosed, an early build of - # the VS 2017 viewer requires VS 2013 runtime DLLs as well as - # VS 2017 runtime DLLs. - self.path("msvcr120.dll") - self.path("msvcp120.dll") - self.path("msvcr140.dll") - self.path("msvcp140.dll") - self.path("vcruntime140.dll") + self.path("msvcp140.dll") + self.path("vcruntime140.dll") # SLVoice executable with self.prefix(src=os.path.join(pkgdir, 'bin', 'release')): @@ -612,10 +602,7 @@ class WindowsManifest(ViewerManifest): # MSVC DLLs needed for CEF and have to be in same directory as plugin with self.prefix(src=os.path.join(self.args['build'], os.pardir, 'sharedlibs', 'Release')): - self.path("msvcp120.dll") - self.path("msvcr120.dll") self.path("msvcp140.dll") - self.path("msvcr140.dll") self.path("vcruntime140.dll") # CEF files common to all configurations -- cgit v1.2.3 From 5918620426fd81944e6d3eb2a866d2104ad4ae69 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 1 Nov 2019 10:48:38 -0400 Subject: DRTVWR-476: Make viewer_manifest.py report its own command line. That way, if there's a problem, a developer can rerun the same command. --- indra/newview/viewer_manifest.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 57099f8ac9..2b412d01b7 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1548,6 +1548,11 @@ class Linux_x86_64_Manifest(LinuxManifest): ################################################################ if __name__ == "__main__": + # Report our own command line so that, in case of trouble, a developer can + # manually rerun the same command. + print('%s \\\n%s' % + (sys.executable, + ' '.join((("'%s'" % arg) if ' ' in arg else arg) for arg in sys.argv))) extra_arguments = [ dict(name='bugsplat', description="""BugSplat database to which to post crashes, if BugSplat crash reporting is desired""", default=''), -- cgit v1.2.3 From c91e5e3a2417e64da6f6404481741f211768eadd Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 15 Nov 2019 10:38:23 -0500 Subject: DRTVWR-476: Remove diagnostics around 'SetFile -a V' commands. Earlier versions of macOS manifested frustrating problems in finishing the built package. Those build steps seem to have been behaving better for a few years now. Eliminate (what we fervently hope has become) a bit of ancient cruft. --- indra/newview/viewer_manifest.py | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 2b412d01b7..e647ce3efb 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1201,11 +1201,6 @@ class DarwinManifest(ViewerManifest): devfile = re.search("/dev/disk([0-9]+)[^s]", hdi_output).group(0).strip() volpath = re.search('HFS\s+(.+)', hdi_output).group(1).strip() - if devfile != '/dev/disk1': - # adding more debugging info based upon nat's hunches to the - # logs to help track down 'SetFile -a V' failures -brad - print "WARNING: 'SetFile -a V' command below is probably gonna fail" - # Copy everything in to the mounted .dmg app_name = self.app_name() @@ -1233,21 +1228,6 @@ class DarwinManifest(ViewerManifest): # Hide the background image, DS_Store file, and volume icon file (set their "visible" bit) for f in ".VolumeIcon.icns", "background.jpg", ".DS_Store": pathname = os.path.join(volpath, f) - # We've observed mysterious "no such file" failures of the SetFile - # command, especially on the first file listed above -- yet - # subsequent inspection of the target directory confirms it's - # there. Timing problem with copy command? Try to handle. - for x in xrange(3): - if os.path.exists(pathname): - print "Confirmed existence: %r" % pathname - break - print "Waiting for %s copy command to complete (%s)..." % (f, x+1) - sys.stdout.flush() - time.sleep(1) - # If we fall out of the loop above without a successful break, oh - # well, possibly we've mistaken the nature of the problem. In any - # case, don't hang up the whole build looping indefinitely, let - # the original problem manifest by executing the desired command. self.run_command(['SetFile', '-a', 'V', pathname]) # Create the alias file (which is a resource file) from the .r -- cgit v1.2.3 From 582f9e156ebaf55f076edaad52fce39b79dac388 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 15 Nov 2019 10:43:17 -0500 Subject: DRTVWR-476: Have to package libhunspell dylib now, not .a lib. --- indra/newview/viewer_manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index e647ce3efb..94908d201a 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -952,7 +952,7 @@ class DarwinManifest(ViewerManifest): with self.prefix(src=relpkgdir, dst=""): self.path("libndofdev.dylib") - self.path("libhunspell-1.3.a") + self.path("libhunspell-*.dylib") with self.prefix(src_dst="cursors_mac"): self.path("*.tif") -- cgit v1.2.3