From a9b2296b2b5664cfc8d86c7f99c00c10268e250a Mon Sep 17 00:00:00 2001
From: Christian Goetze <cg@lindenlab.com>
Date: Mon, 7 Sep 2009 07:56:10 +0000
Subject: [PATCH] svn merge -r132705:132723
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3-stable
propagate the changes to make stabel build back down.
---
indra/llui/tests/llurlentry_stub.cpp | 2 +-
indra/llui/tests/llurlentry_test.cpp | 2 +-
indra/llui/tests/llurlmatch_test.cpp | 2 +-
indra/newview/viewer_manifest.py | 11 +++++++++--
4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/indra/llui/tests/llurlentry_stub.cpp b/indra/llui/tests/llurlentry_stub.cpp
index 05bd5d8bb30..26d1f2e0671 100644
--- a/indra/llui/tests/llurlentry_stub.cpp
+++ b/indra/llui/tests/llurlentry_stub.cpp
@@ -3,7 +3,7 @@
* @author Martin Reddy
* @brief Stub implementations for LLUrlEntry unit test dependencies
*
- * $LicenseInfo:firstyear=2009&license=internal$
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
*
* Copyright (c) 2009, Linden Research, Inc.
*
diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp
index f8e6aa65d06..610ee3349b0 100644
--- a/indra/llui/tests/llurlentry_test.cpp
+++ b/indra/llui/tests/llurlentry_test.cpp
@@ -3,7 +3,7 @@
* @author Martin Reddy
* @brief Unit tests for LLUrlEntry objects
*
- * $LicenseInfo:firstyear=2009&license=internal$
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
*
* Copyright (c) 2009, Linden Research, Inc.
*
diff --git a/indra/llui/tests/llurlmatch_test.cpp b/indra/llui/tests/llurlmatch_test.cpp
index fcf8f4d62f2..4dae49db903 100644
--- a/indra/llui/tests/llurlmatch_test.cpp
+++ b/indra/llui/tests/llurlmatch_test.cpp
@@ -3,7 +3,7 @@
* @author Martin Reddy
* @brief Unit tests for LLUrlMatch
*
- * $LicenseInfo:firstyear=2009&license=internal$
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
*
* Copyright (c) 2009, Linden Research, Inc.
*
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index ae3b1ba43e1..e85fddbc991 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -395,9 +395,16 @@ def package_finish(self):
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))
--
GitLab