Commit Graph

115 Commits (0ccd7b37f72b62c44879b2e69b7d75debe2d44fb)

Author SHA1 Message Date
Tank_Master cc44316aed Merge LL 3.4.3,
Note: aligned some of our code with LL's, spcifically feature table, gpu table, texture fetching, and some rendering defaults behavior.
2012-12-18 00:36:35 -08:00
Tank_Master 5b5f4c8bf5 Merge LL 3.4.2 release,
broken revision, KDU package needs updating, mac packager also likely broken
2012-12-14 07:59:55 -08:00
Oz Linden d35c4f4c9d merge changes for DRTVWR-223 2012-11-06 14:54:27 -05:00
Nat Goodspeed a507df6e28 SWAT-711: Create Mac app bundle symlinks only for .dylib files that exist.
Previous viewer_manifest.py unconditionally created Mac symlinks for all expected
.dylib files. Recent change to revert to statically linking llcommon means we
no longer build libllcommon.dylib, therefore we no longer copy it, therefore
any symlink to that library will be broken by definition.
Change to create symlinks for .dylib files that were successfully copied.
2012-09-18 11:40:45 -04:00
callum_linden 78854c9baa Fix to build with code signing option (patch from STORM-1900) 2012-07-25 16:42:37 -07:00
Tank_Master 991d43709c merge LL 3.3.3 beta 2012-06-16 07:22:27 -07:00
Nat Goodspeed acd46062fd Eliminate ManifestError for wildcards matching 0 files.
Turns out that some (many?) wildcard LLManifest.path(wildcard) calls are "just
in case": sweep up any (e.g.) "*.tga" files there may be, but no problem if
there are none.
Change path() logic so it tries the next tree (source, artwork, build) if
either a specific (non-wildcard) filename doesn't exist, as now, OR if a
wildcard matches 0 files in the current tree. This continues to support "just
in case" wildcards, while permitting wildcards to work in the artwork and
build trees as well as the source tree.
Use a more specific exception than ManifestError for missing file. Only in
that case should we try the next tree. Any other ManifestError should
propagate.
2012-02-10 16:45:18 -05:00
Nat Goodspeed 028a05e794 Use wildcards instead of many version-specific lib names on Linux.
viewer_manifest.py's Linux_i686Manifest class has contained directives to copy
library files with names like (e.g.) "libapr-1.so.0.4.2", which means that
every update to any such library requires messing with viewer_manifest.py.
But LLManifest.path() claims to support wildcards, and it's more robust to
specify "libapr-1.so*" instead.
Unfortunately LLManifest.path()'s wildcard support only used to work for files
in the source tree (vs. the artwork tree or the build tree). The logic in
path() tries each tree in turn, relying on an exception to make it try the
next tree. This exception was raised for a nonexistent specific filename --
but it never used to raise that exception for a wildcard matching 0 files.
Instead it would simply report "0 files" and proceed, producing an invalid
viewer install.
Raise that exception for a wildcard matching nothing. This forces path() to
consider the artwork tree and the build tree, permitting us to use wildcards
in library names.
Define an exception specific to LLManifest: ManifestException rather than the
generic Python RuntimeException. Make it a subclass of RuntimeException so any
existing callers expecting to catch RuntimeException will continue to work.
2012-02-10 12:04:27 -05:00
Oz Linden 7e5be23686 add proper license headers to files that did not have them 2011-08-17 14:43:39 -04:00
Oz Linden f0bc8a0f71 convert tabs to spaces where they are forbidden 2011-08-17 12:33:23 -04:00
Merov Linden 10cf492ef1 STORM-937 : Use subprocess instead os commands in python, suppress crufty svn code 2011-02-11 16:56:28 -08:00
Merov Linden 896bc12a2b STORM-937 : Fix python scripts shebang line and license header for consistency 2011-02-09 15:23:07 -08:00
Merov Linden 01dd9929e2 STORM-937 : Makes all python paths use consistent syntax 2011-01-28 16:00:57 -08:00
Robin Cornelius 061c3a5ab6 VWR-20879: Allow find_vc_dir() to work with VCExpress 2010-12-27 12:18:19 +00:00
Arrehn 7394730eaa Merge up to LL FUI 2011-10-28 02:00:09 -04:00
Arrehn afe5c530b9 Use ".in" files for source files that contain build-specific data. 2011-08-08 07:41:56 -04:00
Arrehn e277b8a4ac Merge with LL 2.6.9, initial work. Needs tests, extra XUI merging with particular skins. 2011-08-04 11:53:40 -04:00
Arrehn a2e86bf04a Windows packaging workaround 2011-05-10 15:12:20 -04:00
Tank_Master b04a325088 fix for FIRE-867 (VC express on 64bit OS patch) 2011-04-13 10:44:03 -07:00
Arrehn 10e88f3891 Merge with RLVa-LL2.5.2 2011-04-09 22:24:22 -07:00
Liny f96328b8e2 Fixing build with the manifest mython script. 2011-01-27 14:47:15 -08:00
Liny be934f3c7b Changing version numbers to be done in a cpp file rather than a h file. 2011-01-25 16:25:56 -08:00
Arrehn 3070ce747f Manually importing WolfSpirit's 2008 patch to firestorm lgpl, because we don't merge from gpl to lgpl. 2010-11-19 14:31:03 -05:00
Arrehn 348d15f836 Phoenix branding, part 1, macintosh build 2010-10-19 23:31:37 -04:00
Leyla Farazha a4b223248e Merge 2010-09-27 17:54:52 -07:00
Aimee Linden ffae589843 Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution 2010-09-03 17:41:39 +01:00
Merov Linden a36033853a STORM-168 : Python modules cleanup 2010-09-16 14:27:42 -07:00
Aimee Linden fcb240792f VWR-20747 (SNOW-527) FIXED Don't import deprecated python module sets 2010-08-18 11:58:24 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Oz Linden fedb5a25a2 correct license tags from "internal" to "viewergpl" 2010-08-12 20:30:21 -04:00
Nat Goodspeed d34d8e491b Make run_command() use subprocess.Popen() rather than os.popen().
This lets us capture the command's stderr as well as stdout. I've been
perplexed recently by errors from Mac SetFile commands that didn't report
stderr.
2010-06-18 17:43:30 -04:00
Tofu Linden cbc0674a7a EXT-4163 Don't strip viewer symbols, or tar the result, in DEBUG builds 2010-01-11 14:35:39 -08:00
Mark Palange (Mani) 9e69702fe7 Added calls to ll_deploy_sharedlibs_command
Using viewer_manifest.py for windows dependency deployment during build.
Added SHARED_LIBS_REL_PATH var to cmake cache.
2009-11-05 08:52:07 -08:00
Mark Palange (Mani) 0d0840de0e Routing mt.exe output to NUL to hopefully fix expected error build failures... 2009-10-01 14:51:35 -07:00
brad kittenbrink 292aecbb3e Updated test_win32_manifest.py to throw custom exception objects, rather than relying on string comparison. 2009-09-30 18:57:00 -07:00
Mark Palange (Mani) 17f9fd5f96 Changes force no crt manifest linking in windows plugin files. 2009-09-25 19:23:24 -07:00
brad kittenbrink afb053ebd7 Minor tweaks of test_win32_manifest output. 2009-09-18 19:30:10 -04:00
brad kittenbrink bb1d4592bd Merged latest viewer/viewer-20 into login-api. 2009-09-18 15:22:25 -04:00
Mark Palange (Mani) 93869a8ef2 Fixed up CopyWinLibs.cmake post moap/viewer-2.0.0-3 merge.
Added CRT assembly check to viewer_manifest.py.
twiddled test_win32_manifest.py for ease of use.
2009-09-15 12:32:22 -07:00
brad kittenbrink 11d10bd53a merged cg's automated build script changes into login-api 2009-09-08 16:44:38 -04:00
Bryan O'Sullivan 7ad3af45a6 Merge 2009-09-08 13:27:05 -07:00
Bryan O'Sullivan dd628f29af Use rev numbers instead of changeset IDs for now. 2009-09-01 11:54:34 -07:00
Bryan O'Sullivan 5f3a7fa6f3 Patch in some other useful scripts from trunk. 2009-09-01 11:18:33 -07:00
Bryan O'Sullivan ff11d74820 Add Mercurial-specific build version info.
Pilfered from billc.
2009-08-26 10:57:38 -07:00
Christian Goetze e588d1f284 svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654
QAR-1654 merge completed.
2009-07-01 00:22:05 +00:00
Bryan O'Sullivan 5f4c09fa1f Python 2.4 and 2.6 improvements
The sets module is no longer needed with Python 2.4, and causes a
DeprecationWarning with 2.6, so drop it

The md5 module causes a DeprecationWarning with 2.6, so try to import
hashlib (its replacement) instead, else fall back

Reviewed by Poppy.
2009-06-22 22:36:36 +00:00
Robert Knop 99660542bb Adding back the setting of "DEBUG", the lack of which caused many unit
tests to fail.
2009-05-19 15:19:39 +00:00
Aaron Brashears 6df2755ba6 Result of svn merge -r119432:120464 svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462 2009-05-18 23:38:35 +00:00
Ryan Williams 2768539bfe svn merge -r116334:116916 svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rad-chilies-trunkmerge-2 2009-04-08 22:39:01 +00:00
Aaron Brashears a60c54568c Result of svn merge -r115238:115240 svn+ssh://svn/svn/linden/branches/trivial-changes/trivial_slave_merge into trunk. In turn a result of svn merge -r113279:113280 svn+ssh://svn/svn/linden/branches/trivial-changes/trivial-changes-1 into trivial_slave_merge and svn merge -r107805:110030 svn+ssh://svn/svn/user/phoenix/slave-ds into trivial_slave_merge. QAR-1329 2009-03-27 19:40:03 +00:00