Merged parabuild work and trunk with nat's latest linux linkage and LSL tests fixes.

1 files changed, 9 insertions, 2 deletions

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index a27c4a7fb7..1e8a185ef6 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -408,9 +408,16 @@ class WindowsManifest(ViewerManifest):
         self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile))

         # self.remove(self.dst_path_of(tempfile))

         # If we're on a build machine, sign the code using our Authenticode certificate. JC

-        sign_py = 'C:\\buildscripts\\code-signing\\sign.py'

+        sign_py = os.path.expandvars("${SIGN}")

+        if not sign_py or sign_py == "${SIGN}":

+            sign_py = 'C:\\buildscripts\\code-signing\\sign.py'

+        else:

+            sign_py = sign_py.replace('\\', '\\\\\\\\')

+        python = os.path.expandvars("${PYTHON}")

+        if not python or python == "${PYTHON}":

+            python = 'python'

         if os.path.exists(sign_py):

-            self.run_command(sign_py + ' ' + self.dst_path_of(installer_file))

+            self.run_command("%s %s %s" % (python, sign_py, self.dst_path_of(installer_file).replace('\\', '\\\\\\\\')))

         else:

             print "Skipping code signing,", sign_py, "does not exist"

         self.created_path(self.dst_path_of(installer_file))