| Age | Commit message (Collapse) | Author |
|---|
|
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
|
|
merge Branch_1-20-14-Viewer-merge -> release
Includes Branch_1-20-Viewer-2 through 92456
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
|
|
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@84983
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/fontconfig-merge1
|
|
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)
|
|
QAR-369
|
|
|
|
QAR-369 - viewer-cleanup2-7 81916 merged into release.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge
QAR-343 - merge maint-ui-7 and maint-ui-8 to release
|
|
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
|
|
(https://jira.lindenlab.com/browse/SL-46075)
|
|
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
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
|
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.
|
|
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.
|
