Commit Graph

396 Commits (4c2d4e32addd95dedf01acf254db9b41b0813fdb)

Author SHA1 Message Date
Andrey Lihatskiy 793bed7d06 Merge branch 'main' into DRTVWR-489
# Conflicts:
#	indra/newview/fonts/DejaVu-license.txt
#	indra/newview/fonts/DejaVuSans-Bold.ttf
#	indra/newview/fonts/DejaVuSans-BoldOblique.ttf
#	indra/newview/fonts/DejaVuSans-Oblique.ttf
#	indra/newview/fonts/DejaVuSans.ttf
#	indra/newview/fonts/DejaVuSansMono.ttf
2023-12-15 07:06:15 +02:00
Alexander Gavriliuk c9cd5631e4 Merge branch 'main' into DRTVWR-489 2023-12-05 03:37:06 +01:00
Andrey Lihatskiy d1c0a5b840 Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-merge
# Conflicts:
#	indra/llcommon/CMakeLists.txt
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llviewergenericmessage.cpp
#	indra/newview/llvoavatar.cpp
2023-11-29 10:45:43 +02:00
Brad Linden 673b3309dd Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-10-25 16:12:13 -07:00
Andrey Lihatskiy 4c6ae49c88 Merge branch 'main' into DRTVWR-587-maint-V
# Conflicts:
#	autobuild.xml
#	indra/llcommon/tests/llleap_test.cpp
#	indra/newview/viewer_manifest.py
2023-10-25 21:28:26 +03:00
Nat Goodspeed c7546ea65e SL-18837: Make llsdserialize_test debug output conditional.
Move hexdump() and hexmix() stream formatters to new hexdump.h for potential
use by other tests.

In toPythonUsing() helper function, add a temp file to receive Python script
debug output, and direct debug output to that file. On test failure, dump the
contents of that file to the log.

Give NamedTempFile::peep() an optional target std::ostream; refactor
implementation as peep_via() that accepts a callable to process each text
line. Add operator<<() to stream the contents of a NamedTempFile object to
ostream -- but don't use that with LL_DEBUGS(), as it flattens the file
contents into a single log line. Instead add peep_log(), which streams each
individual text line to LL_DEBUGS().
2023-09-08 14:14:09 -04:00
Nat Goodspeed eb84585875 SL-18837: NamedTempFile must be binary mode on Windows. 2023-09-08 09:50:38 -04:00
Andrey Kleshchev 0cc9a2d8fd MacOS gmock build fix
Updated gmock complains about missing regex_t. This is likely a macos
configuration issue and needs to be fixed, but fot now just forcing the
declaration
2023-08-25 23:56:17 +03:00
Nat Goodspeed 2f39489f2c DRTVWR-558: Demangle names of exceptions reported by TUT tests.
(cherry picked from commit 2ffbadc7a1275f662eb97ff9ce163a18cdb62c7c)
2023-07-13 12:47:58 -04:00
Nat Goodspeed 324f0d9b8a DRTVWR-558: Fix builds on macOS 12.5 Monterey.
Always search for python3[.exe] instead of plain 'python'. macOS Monterey no
longer bundles Python 2 at all.

Explicitly make PYTHON_EXECUTABLE a cached value so if the user edits it in
CMakeCache.txt, it won't be overwritten by indra/cmake/Python.cmake.

Do NOT set DYLD_LIBRARY_PATH for test executables! That has Bad Effects, as
discussed in https://stackoverflow.com/q/73418423/5533635. Instead, create
symlinks from build-mumble/sharedlibs/Resources -> Release/Resources and from
build-mumble/test/Resources -> ../sharedlibs/Release/Resources. For test
executables in sharedlibs/RelWithDebInfo and test/RelWithDebInfo, this
supports our dylibs' baked-in load path @executable_path/../Resources. That
load path assumes running in a standard app bundle (which the viewer in fact
does), but we've been avoiding creating an app bundle for every test program.
These symlinks allow us to continue doing that while avoiding
DYLD_LIBRARY_PATH.

Add indra/llcommon/apply.h. The LL::apply() function and its wrapper macro
VAPPLY were very useful in diagnosing the problem.

Tweak llleap_test.cpp. This source was modified extensively for diagnostic
purposes; these are the small improvements that remain.

(cherry picked from commit 15d37713b9)
(cherry picked from commit a1adcf1905d1fbc5fe07ff5a627295ccfe461ac4)
2023-07-13 12:32:15 -04:00
Nat Goodspeed e933ace53b SL-18837: Try to bypass Windows perm problem with Python indirection. 2023-07-07 14:07:12 -04:00
Nat Goodspeed f54c121567 SL-18837: Try putting generated Python scripts in RUNNER_TEMP dir.
The claim is that the Windows Python interpreter is integrated somehow with
the OS such that a command line that tries to run Python with a script that
"looks suspicious" (i.e. in a system temp directory) fails with "Access
denied" without even loading the interpreter. At least that theory would
explain the "Access denied" errors we've been getting trying to run Python
scripts generated into the system temp directory by our integration tests.

Our hope is that generating such scripts into the GitHub RUNNER_TEMP directory
will work better.

As this test is specific to Windows, don't even bother running Mac builds.
2023-07-07 10:06:02 -04:00
Nat Goodspeed 004150a530 SL-18837: Concat path part with / rather than +=.
Using concatenation appends the intended filename to the parent directory
name, instead of putting the filename in the parent directory.
2023-06-06 16:27:43 -04:00
Nat Goodspeed e63c571d13 SL-18837: On Windows, NamedTempFile must convert from wstring 2023-06-06 13:34:01 -04:00
Nat Goodspeed 1db7ac7139 SL-18837: Make NamedTempFile name template compatible with Python.
The recommended template uses hyphens; change to underscores to be valid
Python temp module names.
2023-06-06 10:02:57 -04:00
Nat Goodspeed 6516c9d07d SL-18837: NamedTempFile back to std::function, use boost::phoenix <<
It seems the problem addressed by aab769e wasn't some synergy between
Boost.Phoenix and Boost.Function, but rather the lack of a Phoenix header file
introducing operator<<().
2023-06-06 07:44:42 -04:00
Nat Goodspeed 26ca3e14d6 SL-18837: NamedTempFile must still disambiguate string literals. 2023-06-05 23:46:43 -04:00
Nat Goodspeed aab769e9d7 SL-18837: Make NamedTempFile revert to boost::function
from std::function, since some consumers still use (e.g.)
boost::phoenix::placeholders::arg1 to generate an inline callable.
2023-06-05 23:24:34 -04:00
Nat Goodspeed 6914ff6113 SL-18837: Use Boost.Filesystem for NamedTempFile, instead of APR. 2023-06-05 21:51:28 -04:00
Brad Linden a22d62e8ed Merge remote-tracking branch 'origin/zap-LLSDArray' into DRTVWR-559 2023-05-04 11:39:03 -07:00
Nat Goodspeed e7c5b9fb0f SL-19647: Eliminate LLSDArray entirely.
Newer C++ compilers have different semantics around LLSDArray's special copy
constructor, which was essential to proper LLSD nesting. In short, we can no
longer trust LLSDArray to behave correctly. Now that we have variadic
functions, get rid of LLSDArray and replace every reference with llsd::array().
2023-05-03 17:38:30 -04:00
Brad Linden a548c16989 Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-03-29 14:54:06 -07:00
Nicky Dasmijn c47b2ae745 We probably want this (have to guess as I cannot run the tests). 2022-09-17 17:58:08 +02:00
Nicky Dasmijn e840b5eb40 MacOs packaging is weird, as Nat already did point out :(
Part of his change was omly taking Release builds into account, the other
part from me made the same mistake.
Use a generator expression with a custom command to get the symlink the way
we want.
2022-09-17 17:37:45 +02:00
Nicky Dasmijn 0710d95f4b Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-568_cmake 2022-09-16 23:15:49 +02:00
Nat Goodspeed 675cfedb8a DRTVWR-568: Ensure parent directory exists before CREATE_LINK. 2022-09-01 12:27:08 -04:00
Nat Goodspeed 2dc4aec993 DRTVWR-568: Eliminate more blockers to C++17 language standard. 2022-08-26 17:21:01 -04:00
Nat Goodspeed 15d37713b9 DRTVWR-558: Fix builds on macOS 12.5 Monterey.
Always search for python3[.exe] instead of plain 'python'. macOS Monterey no
longer bundles Python 2 at all.

Explicitly make PYTHON_EXECUTABLE a cached value so if the user edits it in
CMakeCache.txt, it won't be overwritten by indra/cmake/Python.cmake.

Do NOT set DYLD_LIBRARY_PATH for test executables! That has Bad Effects, as
discussed in https://stackoverflow.com/q/73418423/5533635. Instead, create
symlinks from build-mumble/sharedlibs/Resources -> Release/Resources and from
build-mumble/test/Resources -> ../sharedlibs/Release/Resources. For test
executables in sharedlibs/RelWithDebInfo and test/RelWithDebInfo, this
supports our dylibs' baked-in load path @executable_path/../Resources. That
load path assumes running in a standard app bundle (which the viewer in fact
does), but we've been avoiding creating an app bundle for every test program.
These symlinks allow us to continue doing that while avoiding
DYLD_LIBRARY_PATH.

Add indra/llcommon/apply.h. The LL::apply() function and its wrapper macro
VAPPLY were very useful in diagnosing the problem.

Tweak llleap_test.cpp. This source was modified extensively for diagnostic
purposes; these are the small improvements that remain.
2022-08-22 21:00:42 -04:00
Nat Goodspeed 50dca86f64 SL-17483: Recast LLImageDecodeThread as a facade for ThreadPool.
Remove all references to LLQueuedThread (but emulate a couple bits of its API
such as handle_t and getPending()).

Migrate ImageRequest into llimageworker.cpp. It has never been part of
LLImageDecodeThread's public API. Remove ImageRequest tests.

Remove all references to LLImageDecodeThread::pause(). The idea of pausing
another thread is bizarre to me, and LLThreadPool has no such operation. Nor
does it have an abortRequest().
2022-06-09 12:06:23 -04:00
Nicky 95d5938eef Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-543-maint_cmake 2022-06-05 14:27:28 +02:00
Nicky 283c2a20cc Remove setting of HEADER_FILE_ONLY on .h* files, cmake automatically
sets the property on those.
2022-05-01 00:38:40 +02:00
Andrey Kleshchev ce4c694b66 Merge branch master (D540) into DRTVWR-546
# Conflicts:
#	indra/llcommon/llsdutil.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolwater.cpp
2022-04-18 23:42:39 +03:00
Nicky ca839307f9 Merge remote-tracking branch 'origin/DRTVWR-543-maint' into DRTVWR-543-maint_cmake 2022-04-18 19:57:34 +02:00
Nicky 3ac18ad993 Streamline bugsplat target:
- Fix usage of bugsplat::bugsplat by using ll::bugsplat
- Use bugsplat define by importing target not by using hand crafted magic
2022-04-16 22:08:40 +02:00
Nicky b9f94c0897 Now there is a oslibrary target get rid of some more obsolete vars:
LEGACY_STDIO_LIBS (was only used for Windows)
PTHREAD_LIBRARY (only Linux)
LLDATABASE_LIBRARIES (that one was supposed for Linux, but never needed anyway)
2022-04-16 15:33:32 +02:00
Nicky bb85651d98 Create a new target ll::oslibrary to link against libs specific to the OS compiled on.
This gets rid of the a few OS specific set and uses variables (which some even seemed mostly
duplicate like WINDOWS_LIBRARIES ans UI_LIBRARIES) and it also solves the problem of
having them to tack on every target, as of no they come as a transitive dependency from llcommon
2022-04-16 15:29:02 +02:00
Nicky 241919e7f7 Rework cmake, the original plan was to maybe be able to use conan targets with the same name (that's why 3ps had names like apr::apr),
but it's safer and saner to put the LL 3ps under the ll:: prefix.
This also allows means it is possible to get rid of that bad "if( TRAGET ...) return() endif()" pattern and rather use include_guard().
2022-04-13 19:21:55 +02:00
Nicky d1b6a52fef Googlemock target 2022-04-06 23:33:06 +02:00
Nicky bed0b80374 Remove obsolete include directives 2022-04-06 20:23:54 +02:00
Nicky 786b291d9c Move CMake files to modernized cmake syntax, step 1.
Change projects to cmake targetsto get rid of havig to hardcore
include directories and link libraries in consumer projects.
2022-04-06 16:32:52 +02:00
Andrey Kleshchev 97a103255e Merge branch 'master' (DRTVWR-557) into DRTVWR-546
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/cmake/GLOD.cmake
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/viewer_manifest.py
2022-03-01 13:41:42 +02:00
Andrey Lihatskiy 73eec89131 Merge branch 'master' into DRTVWR-540-maint
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llsys.cpp
#	indra/newview/app_settings/key_bindings.xml
#	indra/newview/llfloatereditextdaycycle.cpp
2022-02-28 21:54:21 +02:00
Andrey Lihatskiy 747dbb7da2 Merge branch 'master' into DRTVWR-540-maint 2021-12-26 14:01:06 +02:00
Andrey Lihatskiy 83b4ea59fc Merge branch 'SL-15742' into DRTVWR-527-maint 2021-12-16 00:58:44 +02:00
Dave Houlton cf35d27dfb DRTVWR-546 merge up to 6.5.2 2021-12-15 14:37:18 -07:00
Bennett Goble f729cfc33f SL-15742: Convert build scripts to Python 3
This changeset makes it possible to build the Second Life viewer using
Python 3. It is designed to be used with an equivalent Autobuild branch
so that a developer can compile without needing Python 2 on their
machine.

Breaking change: Python 2 support ending

Rather than supporting two versions of Python, including one that was
discontinued at the beginning of the year, this branch focuses on
pouring future effort into Python 3 only. As a result, scripts do not
need to be backwards compatible. This means that build environments,
be they on personal computers and on build agents, need to have a
compatible interpreter.

Notes

- SLVersionChecker will still use Python 2 on macOS
- Fixed the message template url used by template_verifier.py
2021-12-10 14:42:49 -08:00
Nat Linden 79c6557f16 Merged in DRTVWR-540-syncpatch (pull request #796)
DRTVWR-540: Make Sync test failure more informative

* DRTVWR-540: Make Sync test failure more informative


Approved-by: Andrey Kleshchev
Approved-by: Andrey Lihatskiy
2021-12-02 20:08:02 +00:00
Dave Parks 675514bdb3 SL-16093 Don't force the console window to be open on developer builds because it causes frame stalls while logging. 2021-09-27 23:56:06 +00:00
Callum Prentice 8631a7a077 Merge with tip of Master after a Viewer release 2021-07-19 14:35:44 -07:00
Nat Goodspeed 28862ab53b SL-10297: Clean up a few merge glitches. 2021-05-12 14:21:27 -04:00