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

Fix regression of not having a working viewer build without PACKAGE on

Browse Source
This commit is contained in:
Lirusaito
2019-01-14 00:35:52 -05:00
parent 2dc609ff6b
commit 15ef9140da
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/viewer_manifest.py
View File

@@ -79,7 +79,7 @@ class ViewerManifest(LLManifest):
self.path(src="../../scripts/messages/message_template.msg", dst="app_settings/message_template.msg") self.path(src="../../scripts/messages/message_template.msg", dst="app_settings/message_template.msg")
self.path(src="../../etc/message.xml", dst="app_settings/message.xml") self.path(src="../../etc/message.xml", dst="app_settings/message.xml")
if self.is_packaging_viewer(): if True: #self.is_packaging_viewer():
if self.prefix(src="app_settings"): if self.prefix(src="app_settings"):
self.exclude("logcontrol.xml") self.exclude("logcontrol.xml")
self.exclude("logcontrol-dev.xml") self.exclude("logcontrol-dev.xml")
@@ -298,7 +298,7 @@ class WindowsManifest(ViewerManifest):
relpkgdir = os.path.join(pkgdir, "lib", "release") relpkgdir = os.path.join(pkgdir, "lib", "release")
debpkgdir = os.path.join(pkgdir, "lib", "debug") debpkgdir = os.path.join(pkgdir, "lib", "debug")
if self.is_packaging_viewer(): if True: #self.is_packaging_viewer():
# Find singularity-bin.exe in the 'configuration' dir, then rename it to the result of final_exe. # Find singularity-bin.exe in the 'configuration' dir, then rename it to the result of final_exe.
self.path(src='%s/%s-bin.exe' % (self.args['configuration'],self.viewer_branding_id()), dst=self.final_exe()) self.path(src='%s/%s-bin.exe' % (self.args['configuration'],self.viewer_branding_id()), dst=self.final_exe())