summaryrefslogtreecommitdiff
path: root/indra/newview/viewer_manifest.py
AgeCommit message (Collapse)Author
2014-01-15Pull merge from viewer-releaseMerov Linden
2014-01-09ACME-1244 : WIP : Move files around and introduced an llimagefiltersmanager ↵Merov Linden
to get the filters
2013-12-10MAINT-3571: include settings_install.xml whether it contains settings or notOz Linden
2013-11-24move setting default grid to settings_install.xml so that it works on all ↵Oz Linden
platforms
2013-11-24normalize format of and add arch to all installer namesOz Linden
2013-09-23made change to include channel name in the settings_install.xml file ↵JJ Linden
generated. changed so that sourceid is not part of a list of options pulled into that file, along with the channel
2013-09-16changes for additional packages to be packaged from the same build. see ↵JJ Linden
BuildParams for example environment variables used to specify the packages and their channels and sourceids. also updated mac packages to use a larger virtual drive and auto-open on download
2013-08-05Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2013-07-26CHOP-955: Include app_settings/settings_install.xml in file_list.Nat Goodspeed
viewer_manifest.py uses its base-class llmanifest.LLManifest.put_in_file() method to create several different files in the install image being marshalled. I based the logic to create settings_install.xml on that example. Unfortunately I failed to notice that after every existing call, the script also explicitly appended the newly-created file to self.file_list... which only matters on Windows. file_list is fed to the NSIS installer. Change put_in_file() method to implicitly append to self.file_list. Change every existing viewer_manifest.py call to pass new put_in_file(src=) param instead of explicitly appending to self.file_list.
2013-07-24added default sourceid and check that sourceid is not blank, hoping to get ↵JJ Linden
the windows builds to recognize the value
2013-07-22Automated merge with http://hg.secondlife.com/viewer-releaseNat Goodspeed
2013-07-11Merged in viewer-releaseAura Linden
2013-06-27CHOP-955, CHOP-957: Prioritize indra.util.llmanifest in same source repo.Nat Goodspeed
It seems that certain build hosts have an (obsolete? broken?) install of indra.util.llmanifest under the system Python. If we append the local repo indra/lib/python to sys.path, viewer_manifest.py pulls in the broken llmanifest. Prepend to sys.path instead to ensure we get the right one.
2013-06-24CHOP-955, CHOP-957: Platform-specific switches files => settings_install.xml.Nat Goodspeed
Instead of generating viewer command-line switch overrides into the Windows shortcut, an arguments.txt file on Mac, or a gridargs.dat file on Linux, generate a platform-independent settings_install.xml file containing 'sourceid' key (if 'sourceid' found in TeamCity environment variables). All command-line override switches previously found in the aforementioned files have happily become moot.
2013-06-13MAINT-2787: Expand viewer_manifest.py's "Release" recognitionNat Goodspeed
viewer_manifest.py currently detects specifically the channel name "Second Life Release" as a release viewer (affecting the icon and other things). The Amazon viewer uses channel name "Second Life Release - Amazon", which is currently not recognized at all, therefore uses a developer-build icon with the caution tape and the word "TEST" stamped onto it. Detect any channel name *starting* with "Second Life Release" as a release viewer.
2013-05-22merge changes for 3.5.3-releaseOz Linden
2013-05-21CHOP-947: create summary.json (really python) metadata file for TeamCity resultsOz Linden
2013-05-15Thanks mercurial.Aura Linden
2013-05-11Merge viewer-dev-materials and bugfix in LLPanelFace::getState using ↵Graham Madarasz
material instead of mMaterial
2013-05-10merge changes for 3.5.2-beta4Oz Linden
2013-05-07merge changes for DRTVWR-299Oz Linden
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-25Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-19merge up to latest viewer-development for merge to 3.5.2Oz Linden
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-17Merge with viewer-developmentcallum_linden
2013-04-16merge up to 3.5.2 developmentOz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-27Fix breakpad breakage from linux API diffsGraham Madarasz
2013-02-25MAINT-2389: add libboost_context-m5.so.* to Linux package.Nat Goodspeed
Irritating how many different places we have to touch to add a library...
2013-02-15Added ca-bundle.crt behaviors for Mac and Windows.Aura Linden
2013-02-13Merge from viewer-betaprep
2013-02-12merge up to 3.4.5-releaseOz Linden
2013-02-05Merged with head of viewer-developmentcallum_linden
2013-02-04fmodwrapper uneeded with fmodexSovereign Engineer
2013-02-04Remove FMOD 3.75 leftoversSovereign Engineer
2013-02-01Removed (most) references to older FMOD library - still a little Linux clean ↵callum_linden
up left
2013-01-18first push - patch from CmdCupCake plus force FMODEX oncallum_linden
2013-01-11MAINT-1481: Remove xmenity script and viewer_manifest.py references.Nat Goodspeed
2013-01-09MAINT-1481: remove linux-updater; move logic to Linux update_installNat Goodspeed
Now that the viewer's own background updater logic is responsible for downloading a new installer, the only functionality we still use in linux-updater that couldn't be expressed more simply in bash is the UI. But since most Linux distros capable of running SL at all have zenity, and all will have xmessage, we can handle even the UI part. Add xmenity wrapper script so update_install doesn't have to care which is present, and make the bash script that used to launch linux-updater do the real work.
2012-12-12Updating linux libGLOD to match darwin namingDon Kjer
2012-11-26Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-21Pull and merge https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-16Remove sensitivity to Boost library versions in viewer_manifest.py.Nat Goodspeed
2012-11-14Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-13Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-13merge changes for DRTVWR-209Oz Linden
2012-11-07Merge. Refresh DRTVWR-209 with 3.4.2-beta1 code.Monty Brandenberg
Two fairly simple conflicts: dead stats sending code in the texture fetch code (new llcorehttp library) and the cleanup code in llappviewer was moved around in 3.4.x.
2012-11-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-06merge changes for DRTVWR-223Oz Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 08:01:15 +0000