summaryrefslogtreecommitdiff
path: root/indra/newview/viewer_manifest.py
AgeCommit message (Collapse)Author
2009-08-11Add libllcommon.so to packaged/libNat Goodspeed
2009-08-07EXT-295 - Added script to generate application config file. Reviewed by PoppyMark Palange
2009-08-05Merge recent changesNat Goodspeed
2009-08-05DEV-34837: Remove dependency on Leopard-only ↵Nat Goodspeed
/usr/local/lib/libexpat.0.1.0.dylib. On Mac, add libexpat[.0.5.0].dylib to apr_suite package. Update libapr-1[.0.3.7].dylib and libaprutil-1[.0.3.8].dylib with versions that reference this expat. Make viewer_manifiest.py copy expat dylib to app bundle.
2009-08-03Merged Nat and Palmers latest build fixes with the big ↵brad kittenbrink
viewer-2.0.0-3/login-api merge work (changeset 486d51877332)
2009-07-31DEV-34837: fix viewer_manifest.py to continue supporting static llcommon buildNat Goodspeed
2009-07-31DEV-34837: update Mac apr_suite package so that each of the .dylib filesNat Goodspeed
self-identifies as @executable_path/../Resources/filename. This allows the SL executable to find it at runtime in its official place in the app bundle. Change viewer_manifest.py to copy libllcommon.dylib, libapr*.dylib to app bundle's Resources subdir.
2009-07-30Merged in viewer-2.0.0-3 changes up through r129050. Boost got clobbered so ↵brad kittenbrink
I'll need to rebuild that, plus a couple other minor clenaups.
2009-07-29DEV-35405 Viewer manifest needed some love for supporting the debug build, ↵Mark Palange (Mani)
but its still broke on llmozlib
2009-07-09Moveing around DLL copying to support building llcommon.dll and using ↵Mark Palange (Mani)
llcommon.dll while running unit tests.
2009-07-07Added copying and packaging of apr dlls and llcommon.dll.brad kittenbrink
2009-07-06Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also ↵James Cook
UI color refactoring and new FreeType font library on Linux. svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
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-04-13merge -r116796:116932 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/http-texture/http-texture-10 DEV-8668 (llkdu) DEV-30348 (set development default channel to LindenDeveloper)
2009-03-04Back out last commit, which worked on my machine and not on the build ↵James Cook
machines. Infuriating! Merging revisions 113619-113618 of svn+ssh://svn.lindenlab.com/svn/linden/trunk into E:\trunk, respecting ancestry
2009-03-04Fix problem with code signing script (sign.py) not being invoked properly on ↵James Cook
some systems. Changed "sign.py filename" to "python sign.py filename". Reviewed with bos and kelly.
2009-02-27svn merge -r 113014:113017 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-QAR-1323 Merging in QAR-1323.
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 ↵Brad Kittenbrink
(maint-render-9) and QAR-1236 (dll-msvcrt-2) svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-02-04Add another pass to keep open source export from destroying viewer_manifest.pyChristian Goetze
2009-02-04further little tweak so that viewer_manifest.py survives mangling by the ↵Christian Goetze
open source export
2009-02-04fix python fussinessChristian Goetze
2009-02-04Add comment to explain why the "pass" was insertedChristian Goetze
2009-02-04Add a "pass" to avoid breaking the open source buildChristian Goetze
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.
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-12-23QAR-1142 merging 1.22 RC0-RC4 changes.Mark Palange
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
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-21Merging the changes in viewer_1-22-0 (1.22 RC0) back into trunk, revs. ↵Mark Palange
101837 to 103519
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-11-18QAR-1022 svn merge -r101843:102448 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/opensource-drops/opensource-drops-4 -> release
2008-11-12svn merge -c102054Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/morejoy-2-r102015 QAR-1016 joystick+spacenav improvements 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-10-23A bug in viewer_manifest.py was causing Linux packages to be builtKyle Ambroff
without libapr and libaprutil. Fixed.
2008-10-10svn merge -r99056:99248 ↵Andrew Meadows
svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew/gcc-4-003-for-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-08-13Fixed DEV-19210 - reviewed by joshChristian Goetze
2008-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated
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-11svn merge -r89446:89445 indra/newview/viewer_manifest.pyBryan O'Sullivan
2008-06-10Make Mac viewer build happierBryan O'Sullivan
2008-06-03Mac open source export - cmake fixesBrian McGroarty
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-05-21add --no-run-if-empty to xargs call to avoid packing error for devsChristian Goetze
2008-05-11QAR-566 maint-viewer-5-merge-2Steven Bennetts
Effective merge: release@84102 maint-viewer-5@86348 -> maint-viewer-5-merge-2 Actual merge maint-viewer-5-merge-2 -r 87239 : 87246 -> release
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-17QAR-449 Viewer 1.20 RC 0Steven Bennetts
merge Branch_1-20-Viewer -r 84060 : 84432 -> release
2008-04-17Undid previous commit (bogus merge)Steven Bennetts
2008-04-17QAR-449 Viewer 1.20 RC 0Steven Bennetts
merge Branch_1-20-Viewer -r 84060 : 84432 -> release