summaryrefslogtreecommitdiff
path: root/indra/newview/viewer_manifest.py
AgeCommit message (Collapse)Author
2009-09-18Added dependcies to create_app_config_file.Mark Palange (Mani)
Further Clean up of dll copying merge mess.
2009-09-18Applied patch for SLPlugin location from:Mark Palange (Mani)
r133676 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-6
2009-09-15More specific exepction handling to support correct crt_checking failures.Mark Palange (Mani)
2009-09-15mergeMark Palange (Mani)
2009-09-15Fixed up CopyWinLibs.cmake post moap/viewer-2.0.0-3 merge.Mark Palange (Mani)
Added CRT assembly check to viewer_manifest.py. twiddled test_win32_manifest.py for ease of use.
2009-09-14QAR-1619: At Sam's request, move SLPlugin to viewer executable dir, ↵Nat Goodspeed
consistent with Mac and Linux.
2009-09-10Merge changesNat Goodspeed
2009-09-10QAR-1619: move Linux SLPlugin executable to the viewer executable directoryNat Goodspeed
2009-09-08merged cg's automated build script changes into login-apibrad kittenbrink
2009-09-07svn merge -r132705:132723 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3-stable propagate the changes to make stabel build back down.
2009-09-02On Mac, move SLPlugin executable to the same directory as the viewer executable.Nat Goodspeed
Change LLDir_Mac::getLLPluginLauncher() to look in the viewer's executable dir instead of in the plugins dir. Change viewer_manifest.py's DarwinManifest.construct() to put SLPlugin in the new location. SLPlugin is being linked with our new libllcommon.dylib, which self-identifies as being findable via @executable_path/../Resources/libllcommon.dylib. This doesn't work from the Resources/llplugin subdir -- the above relative path ends up looking in the nonexistent Resources/Resources subdirectory. Putting SLPlugin in the Contents/MacOS directory with the viewer executable solves the problem.
2009-09-01Try double-quoting backslashesCG Linden
2009-09-01Merged login-api with viewer-2.0.0-3 up through r132290.brad kittenbrink
2009-09-01Also quite the backslashes in the argument for the sign commandCG Linden
2009-08-31Quote any backslashes so they get preserved when invoking python.CG Linden
2009-08-31Fix syntax error in viewer_manifest.pyCG Linden
2009-08-31Attempt to invoke the code signer differentlyCG Linden
2009-08-31sheesh, finish(?) gutting the flash stuff out of DEV-31438Adam Moss
2009-08-31svn merge -r130875:131962 ↵Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05_newllqtwebkit DEV-31438 Rename LLMozLib (Qt/WebKit) to something else - LLQtWebKit
2009-08-27Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 ↵brad kittenbrink
merge (r131929). Some minor post-merge cleanups still required.
2009-08-27svn merge -r 129841:129910 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05 Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-08-21svn merge -r130238:130240 ↵Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/linux-updater-6 QAR-1771 Linux Viewer Autoupdater + XUI-parse refactoring
2009-08-13Merged in backout of packaging libgobject-2.0.so.brad kittenbrink
2009-08-13Backed out changeset 75ab7d14eace. libgobject-2.0.so should not be being ↵brad kittenbrink
packaged on linux.
2009-08-13Merged latest viewer-2.0.0-3 change up through svn r130333 into login-api.brad kittenbrink
2009-08-12Add libgobject-2.0.so.0 to Linux packageNat Goodspeed
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-15DEV-34822 viewer 1.23 mergeRoxanne Skelly
DEV-32649 Merge the diamondware/vivox voice code -r124876 -r125220
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 20:45:18 +0000