From 109cd6845b5ad338d3b10f3b482c5a8fc27000ba Mon Sep 17 00:00:00 2001 From: Ryan Williams Date: Wed, 28 Feb 2007 00:16:34 +0000 Subject: Mac .dmgs generated by the manifest have upper-case grid names again. Refactored a lot of the command-line options so that it's more self-documenting. Now we have a --help option. Created a separate action for creating unpackeds, which is not part of the default actions (yet). This should speed up the packaging process. In the process of doing this, I also made sure to enforce the constraint that no actions are performed on the files in the destination directory after the construct method ends. To accomplish this I simply moved some strip method calls up into the construct method. Lastly, I added our copyright notice to installer_template.nsi, and fixed a reference to a non-existant variable. Hopefully this last won't cause spurious conflicts with Callum's work. Reviewed by Richard. Also, the tabs were a little screwed up in the python files, so I untabified and all is good. --- indra/newview/installers/windows/installer_template.nsi | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'indra/newview/installers/windows') diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index 6178cfbc96..8ab7c4fdae 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -1,10 +1,14 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; secondlife setup.nsi -;;; Copyright 2004-2006, Linden Research, Inc. +;;; @file viewer_manifest.py +;;; @author James Cook, Don Kjer +;;; @brief NSIS script for creating a Windows installer. +;;; This file has variables expanded by viewer_manifest.py +;;; to produce the complete nsi script file. ;;; For info, see http://www.nullsoft.com/free/nsis/ -;;; ;;; NSIS 2.02 or higher required -;;; Author: James Cook, Don Kjer +;;; +;;; Copyright (c) 2006-$CurrentYear$, Linden Research, Inc. +;;; $License$ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -612,7 +616,7 @@ ShowUninstDetails show Section Uninstall ; Start with some default values. -StrCpy $INSTFLAGS "${FARMFLAG}" +StrCpy $INSTFLAGS "${INSTFLAGS}" StrCpy $INSTPROG "${INSTNAME}" StrCpy $INSTEXE "${INSTEXE}" StrCpy $INSTSHORTCUT "${SHORTCUT}" -- cgit v1.2.3