Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-enabling NSIS invocation (???)

Browse Source
This commit is contained in:
Shyotl
2019-10-19 18:41:18 -05:00
parent 4043130f75
commit a36e128e57
2 changed files with 25 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/CMakeLists.txt
View File

@@ -1504,6 +1504,7 @@ if (WINDOWS)
SLPlugin SLPlugin
media_plugin_libvlc media_plugin_libvlc
media_plugin_cef media_plugin_cef
basic_plugin_filepicker
) )
if (ADDRESS_SIZE EQUAL 64) if (ADDRESS_SIZE EQUAL 64)

58
indra/newview/viewer_manifest.py
View File

@@ -458,31 +458,24 @@ class WindowsManifest(ViewerManifest):
'sharedlibs', config)): 'sharedlibs', config)):
# Get llcommon and deps. If missing assume static linkage and continue. # Get llcommon and deps. If missing assume static linkage and continue.
try: if self.path('llcommon.dll') == 0:
self.path('llcommon.dll')
self.path('libapr-1.dll')
self.path('libaprutil-1.dll')
self.path('libapriconv-1.dll')
except RuntimeError as err:
print err.message
print "Skipping llcommon.dll (assuming llcommon was linked statically)" print "Skipping llcommon.dll (assuming llcommon was linked statically)"
self.path('libapr-1.dll')
self.path('libaprutil-1.dll')
self.path('libapriconv-1.dll')
# Mesh 3rd party libs needed for auto LOD and collada reading # Mesh 3rd party libs needed for auto LOD and collada reading
try: if self.path("glod.dll") == 0:
self.path("glod.dll")
except RuntimeError as err:
print err.message
print "Skipping GLOD library (assumming linked statically)" print "Skipping GLOD library (assumming linked statically)"
# Get fmodstudio dll, continue if missing # Get fmodstudio dll, continue if missing
try: if config is "debug":
if config == 'debug': if self.path("fmodL.dll") == 0:
self.path("fmodL.dll") print "Skipping fmodstudio audio library(assuming other audio engine)"
else: else:
self.path("fmod.dll") if self.path("fmod.dll") == 0:
except: print "Skipping fmodstudio audio library(assuming other audio engine)"
print "Skipping fmodstudio audio library(assuming other audio engine)"
# Vivox runtimes # Vivox runtimes
self.path("SLVoice.exe") self.path("SLVoice.exe")
@@ -514,13 +507,12 @@ class WindowsManifest(ViewerManifest):
# For google-perftools tcmalloc allocator. # For google-perftools tcmalloc allocator.
if(self.address_size == 32): if(self.address_size == 32):
try: if config == 'debug':
if config == 'debug': if self.path('libtcmalloc_minimal-debug.dll') == 0:
self.path('libtcmalloc_minimal-debug.dll') print "Skipping libtcmalloc_minimal.dll"
else: else:
self.path('libtcmalloc_minimal.dll') if self.path('libtcmalloc_minimal.dll') == 0:
except: print "Skipping libtcmalloc_minimal.dll"
print "Skipping libtcmalloc_minimal.dll"
# For msvc redist # For msvc redist
try: try:
@@ -665,9 +657,9 @@ class WindowsManifest(ViewerManifest):
out_path = installed_dir out_path = installed_dir
result += 'SetOutPath ' + out_path + '\n' result += 'SetOutPath ' + out_path + '\n'
if install: if install:
result += 'File ' + pkg_file + '\n' result += 'File "' + pkg_file + '"\n'
else: else:
result += 'Delete ' + wpath(os.path.join('$INSTDIR', rel_file)) + '\n' result += 'Delete "' + wpath(os.path.join('$INSTDIR', rel_file)) + '"\n'
# at the end of a delete, just rmdir all the directories # at the end of a delete, just rmdir all the directories
if not install: if not install:
@@ -774,17 +766,15 @@ class WindowsManifest(ViewerManifest):
try: try:
import _winreg as reg import _winreg as reg
NSIS_path = reg.QueryValue(reg.HKEY_LOCAL_MACHINE, r"SOFTWARE\NSIS") + '\\makensis.exe' NSIS_path = reg.QueryValue(reg.HKEY_LOCAL_MACHINE, r"SOFTWARE\NSIS") + '\\makensis.exe'
# self.run_command([proper_windows_path(NSIS_path), self.dst_path_of(tempfile)]) self.run_command([proper_windows_path(NSIS_path), self.dst_path_of(tempfile)])
except: except:
try: try:
NSIS_path = os.environ['ProgramFiles'] + '\\NSIS\\makensis.exe' NSIS_path = os.environ['ProgramFiles'] + '\\NSIS\\makensis.exe'
# self.run_command([proper_windows_path(NSIS_path), self.dst_path_of(tempfile)]) self.run_command([proper_windows_path(NSIS_path), self.dst_path_of(tempfile)])
except: except:
NSIS_path = os.environ['ProgramFiles(X86)'] + '\\NSIS\\makensis.exe' NSIS_path = os.environ['ProgramFiles(X86)'] + '\\NSIS\\makensis.exe'
# self.run_command([proper_windows_path(NSIS_path),self.dst_path_of(tempfile)]) self.run_command([proper_windows_path(NSIS_path),self.dst_path_of(tempfile)])
self.remove(self.dst_path_of(tempfile))
# self.remove(self.dst_path_of(tempfile))
if 'signature' in self.args and 'VIEWER_SIGNING_PWD' in os.environ: if 'signature' in self.args and 'VIEWER_SIGNING_PWD' in os.environ:
try: try:
self.sign(self.args['dest'] + "\\" + substitution_strings['installer_file']) self.sign(self.args['dest'] + "\\" + substitution_strings['installer_file'])