From 2149be5df273e4b68bae3c797f26e507bb7951be Mon Sep 17 00:00:00 2001 From: CG Linden Date: Mon, 31 Aug 2009 17:16:02 -0700 Subject: Attempt to invoke the code signer differently --- indra/newview/viewer_manifest.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index ae3b1ba43e..6476e56681 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -395,9 +395,14 @@ 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' + 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))) else: print "Skipping code signing,", sign_py, "does not exist" self.created_path(self.dst_path_of(installer_file)) -- cgit v1.2.3 From 7eafa3209c6b8a7ef9b7d677943752f5345ff3f2 Mon Sep 17 00:00:00 2001 From: CG Linden Date: Mon, 31 Aug 2009 18:34:03 -0700 Subject: Fix syntax error in viewer_manifest.py --- 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 6476e56681..66ebd607c4 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -402,7 +402,7 @@ class WindowsManifest(ViewerManifest): if not python or python == "${PYTHON}": python = 'python' if os.path.exists(sign_py): - self.run_command("%s %s %s" % (python, sign_py self.dst_path_of(installer_file))) + self.run_command("%s %s %s" % (python, sign_py, self.dst_path_of(installer_file))) else: print "Skipping code signing,", sign_py, "does not exist" self.created_path(self.dst_path_of(installer_file)) -- cgit v1.2.3 From 1a6be4eb17372273b74fd9b849799372f23a15e9 Mon Sep 17 00:00:00 2001 From: CG Linden Date: Mon, 31 Aug 2009 20:09:56 -0700 Subject: Quote any backslashes so they get preserved when invoking python. --- indra/newview/viewer_manifest.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 66ebd607c4..024f2f655c 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -398,6 +398,8 @@ class WindowsManifest(ViewerManifest): 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' -- cgit v1.2.3 From a6ff5974c36f8ea860b2065c549333d8cfc6a458 Mon Sep 17 00:00:00 2001 From: CG Linden Date: Tue, 1 Sep 2009 09:00:02 -0700 Subject: Also quite the backslashes in the argument for the sign command --- 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 024f2f655c..99c9abfddf 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -404,7 +404,7 @@ class WindowsManifest(ViewerManifest): if not python or python == "${PYTHON}": python = 'python' if os.path.exists(sign_py): - self.run_command("%s %s %s" % (python, 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)) -- cgit v1.2.3 From 40743eaf99c9cbfee08f0bb44bc7c614bc660f34 Mon Sep 17 00:00:00 2001 From: CG Linden Date: Tue, 1 Sep 2009 13:36:08 -0700 Subject: Try double-quoting backslashes --- indra/newview/viewer_manifest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/viewer_manifest.py') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 99c9abfddf..e85fddbc99 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -399,12 +399,12 @@ class WindowsManifest(ViewerManifest): if not sign_py or sign_py == "${SIGN}": sign_py = 'C:\\buildscripts\\code-signing\\sign.py' else: - sign_py = sign_py.replace('\\', '\\\\') + 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("%s %s %s" % (python, sign_py, self.dst_path_of(installer_file).replace('\\', '\\\\'))) + 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)) -- cgit v1.2.3