summaryrefslogtreecommitdiff
path: root/indra/newview/installers/windows/installer_template.nsi
AgeCommit message (Collapse)Author
2011-11-24merge changes for vmrg-193Oz Linden
2011-11-17SH-2663 WIP, SH-2667 FIX - better logic for when to copy temp files, only ↵Brad Payne (Vir Linden)
uninstall V2 when called from auto-update, clean temp files when done
2011-11-15mergeDave Parks
2011-10-19mergeBrad Payne (Vir Linden)
2011-10-17STORM-1646 FIX Update language list in Windows installercallum
2011-10-10SH-2515 FIX - small tweaks to cleanupBrad Payne (Vir Linden)
2011-10-10SH-2515 FIX - some cleanup and test stuffBrad Payne (Vir Linden)
2011-10-10SH-2515 FIX - uninstall viewer 2 while preserving settingsBrad Payne (Vir Linden)
2011-10-10SH-2515 WIPBrad Payne (Vir Linden)
2011-10-08CHOP-280 FIX - remove settings on uninstallBrad Payne (Vir Linden)
2011-10-08Preserve logs and user_settings on uninstallBrad Payne (Vir Linden)
2011-10-06SH-2515 WIP, STORM-280 WIP - ported over Oz fix for cache overdeletion ↵Brad Payne (Vir Linden)
during uninstall
2011-10-06SH-2515 WIPBrad Payne (Vir Linden)
2011-10-06SH-2515 WIP - uninstall viewer 2 when installing viewer 3+Brad Payne (Vir Linden)
2011-10-05SH-2515 WIP - Preserve user settingsBrad Payne (Vir Linden)
2011-08-17correct line endingsOz Linden
2011-04-22mergeDave Parks
2011-02-15SH-845 FIX - installer checks for SSE2 support and offers option to quit if ↵Brad Payne (Vir Linden)
not found (note the needed API is not present on win2k, so the check will not run there)
2010-11-11CHOP-178 Add a non-interactive moe to the windows installer. Rev by BradMark Palange (Mani)
2010-10-06PLAT-40 Fix changing the lang code for polish from 'da' to 'pl' reviewed by bradMark Palange (Mani)
2010-08-26EXT-8668 - Fixing accidental case change for the sake of OCD.Mark Palange (Mani)
2010-08-19EXT-8668 Added da and pl langs to the windows installerMark Palange (Mani)
2010-08-14Changed viewer channel to "Second Life Development"Aimee Linden
2010-04-07Re-insert backed out SLE checkin so we can fix itRoxie Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2009-07-09DEV-34822 - merge 1.23Roxanne Skelly
merge -r119443 - basic slurl handling ignore dead branch
2009-10-03Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new ↵James Cook
tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming. Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-05-04QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3Adam Moss
svn merge -r118927:118939 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476 this is a composite of... svn merge -r115088:118182 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23 conflicts resolved: C doc/contributions.txt C indra/llaudio/audioengine.cpp C indra/newview/CMakeLists.txt C indra/newview/llfloaterlandholdings.cpp C indra/newview/llpaneldirbrowser.cpp C indra/newview/llpanelgrouplandmoney.cpp C indra/newview/llpreviewscript.cpp C indra/newview/llviewermenu.cpp C indra/newview/skins/default/xui/en-us/notifications.xml and... svn merge -r116937:118673 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 minor-to-trivial conflicts resolved: C indra/llcommon/llversionserver.h C indra/newsim/llrezdata.cpp C indra/newsim/llstate.cpp C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
2009-02-03QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergemeAdam Moss
svn merge -r108355:109316 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314 Whew.
2008-12-02QAR-1040 maint-viewer-11 + OpenAL combo mergemeAdam Moss
svn merge -c104451 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
2008-11-19QAR-1018 Lightweight Windows Setup App (windows-setup-3). svn merge ↵James Cook
-r102882:102883 svn+ssh://svn.lindenlab.com/svn/linden/branches/windows-setup/windows-setup-3-merge
2008-10-28svn merge -r100302:100467 installer-james-combo-merge for QAR-972, ↵James Cook
incorporating: QAR-892 Windows installer that pings secondlife.com on launch QAR-837 Six New Languages in the Installer QAR-908 downloader-support-1 merge
2008-09-29QAR-872 Viewer 1.21 RC 3Steven Bennetts
merge viewer_1-21 96116-97380 -> release
2008-08-28merge viewer/viewer_1-21 94170-94770 -> releaseSteven Bennetts
merge viewer/viewer_1-21-0 94830-95157 -> release Includes: QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki! QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
2008-07-22QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> ReleaseSteven Bennetts
merge Branch_1-20-14-Viewer-merge -> release Includes Branch_1-20-Viewer-2 through 92456
2008-06-02svn merge -r88066:88786 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers
2008-04-17QAR-460 Automatic XUI selection & Kick-ass Linux Fonts MergeMeAdam Moss
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@84983 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/fontconfig-merge1
2008-04-031.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426Steven Bennetts
QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release (Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
2008-03-20merge release@82383 viewer-cleanup2-7-merge@82828Steven Bennetts
QAR-369
2008-03-15reverting premature commit at 82410.Steven Bennetts
2008-03-14[NOTE: This was an erroneous commit, and was reverted in the next revision]Mark Palange
QAR-369 - viewer-cleanup2-7 81916 merged into release.
2008-03-04svn merge -r 81304:81392 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge QAR-343 - merge maint-ui-7 and maint-ui-8 to release
2008-02-27Merge of windlight into release (QAR-286). This includes all changes inBrad Kittenbrink
windlight14 which have passed QA (up through r79932). svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2007-06-22"Merged" over from release-candidate - addition of Japanese and German ↵Callum Prentice
options in Installer language menu Add German option to the language menu in the installer. https://jira.lindenlab.com/browse/SL-45054 Addition of Japanese language option to the installer. https://jira.lindenlab.com/browse/SL-45907
2007-06-04svn merge -r 62602:62831 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-02-28Mac .dmgs generated by the manifest have upper-case grid names again.Ryan Williams
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.
2007-02-21SL-33966: Viewer installed files are not described in a centralized sourceRyan Williams
This introduces the viewer_manifest.py and associated libraries. Check out https://osiris.lindenlab.com/mediawiki/index.php/Installer_Manifest for some more information. The gist of it is that all files to be included in the viewer installations are described in viewer_manifest.py. viewer_manifest.py also acts as a packager, if you give it the right options. All of the old methods of packaging (Makefile_Mac, scons, and the various .bat files) still work, but they are mostly just shells for calls to viewer_manifest.py. You're now required to have python 2.3 or later on your machine to be able to package up an installer, but thankfully most people already have this.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 04:26:07 +0000