| Age | Commit message (Collapse) | Author |
|---|
|
|
|
|
|
The code is also moved to where it's relevant.
|
|
It didn't work before because the destination folder wouldn't exist
yet by the time it's configured, but CMake has been silent about it.
|
|
Somehow it wouldn't work when the libvlc dylibs linked by
media_plugin_libvlc were far in Frameworks, even with all the
linkages and VLC_PLUGIN_PATH set correctly.
Because of this, I had to make the libvlc files redundantly copied
(they're under 1 MB so we'll live with it) in llplugin just like
upstream for media_plugin_libvlc to link to instead, though it seems
the directory name can be anything, so I just let it be "plugins"
for installation convenience using CMake.
Also now the builder is assumed to not necessarily want VLC.app to
be installed in /Applications, though they would need to keep the
downloaded VLC disc image open.
|
|
and without having to rename the containing folder.
VLC streaming still hasn't worked (it used to) since using fixup_bundle,
since switching to FMOD, since switching from SDL to Cocoa, since
merging Maintenance B, so still no idea which of these is causing it.
|
|
|
|
|
|
We don't rely on viewer_manifest.py's extract_names any more to
generate the contributors list, it's implemented in CMake now, using
sed, paste, and sort.
|
|
|
|
This would be done in viewer_manifest.py on SLv. This needed to be
reimplemented, and now it is, just using CMake.
|
|
since the variable PACKAGE is not available to check any more by
that stage.
|
|
Just set CMAKE_INSTALL_PREFIX to the newview/Megapahit.app/Contents/Resources
inside your build folder, and set PACKAGE to OFF.
|
|
Root project finally renamed to Megapahit, which has a nice effect of
CPack: - Run preinstall target for: Megapahit
CPack: - Install project: Megapahit []
but it's really because CPack Bundle file couldn't be renamed via
CPACK_PACKAGE_NAME like on DEB, RPM, and FREEBSD.
CPack determines its own destination root folder, which is Resources
(I didn't find a way to set it to Contents).
fixup_bundle is now run on the .app deep inside CPack staging folders
so that the dependency copies will be included in the DMG.
|
|
|
|
otherwise fixup_bundle would try to fix DullahanHelper executables
when otool -L somehow can't find files that contain spaces in their
names. By postponing the chmod until after fixup_bundle is called,
fixup_bundle will ignore the DullahanHelper apps since they contain
no executables yet by that time.
Apart from that, trying to link to CEF would fail before installation
cause SLPlugin's Frameworks directory wouldn't exist yet.
|
|
but set CMAKE_INSTALL_PREFIX to newview/Megapahit.app/Contents.
|
|
Using file(CHMOD ... PERMISSIONS .._EXECUTE) somehow didn't work,
so I had to set it to reinstall the Dullahan executables, and they
are the only files that are required to be executable (CEF framework
and the .dylibs aren't).
|
|
I couldn't get CEF & Dullahan copied using this function.
fixup_bundle on SLPlugin.app was considered invalid, however, SLPlugin
itself gets install_name_tool changed but pointing to a non-existent
Frameworks directory that would be in the SLPlugin.app bundle.
We will have to create and fill such directory with links to the upper
(the root viewer app bundle Frameworks') library copies ourselves.
We wouldn't want fixup_bundle to successfully fill SLPlugin's Frameworks
with copies instead of links anyway.
See:
`man cmake-modules`
https://cmake.org/cmake/help/book/mastering-cmake/chapter/Install.html
|
|
|
|
|
|
plus some reindentations.
|
|
Except for SLPlugin since there's already a custom command for it.
|
|
After the Maintenance B merge, ironically it was Fedora's web
functionality that worked out of the box (after only
`patchelf --remove-rpath`-ing the dullahan_host binary from LL's
v1.14.0-r2 release, since rpmbuild wouldn't allow non-existent paths).
On Debian/Ubuntu somehow it wasn't working any more. It would complain
about "No usable sandbox!" in (the new, replacing cef_log.txt) cef.log.
The fix was done just by removing the chrome-sandbox' setuid permission
(that's been turned on all this time following the common practice for
CEF-based apps). On Fedora, it still works without setuid off.
It may not have been needed after all, and it's safer anyway that we
don't need to elevate the permission to use the effective UID of root to
run the sandbox.
|
|
|
|
Install libfmod.so, libfmod.so.13, and libfmod.so.13.22
|
|
https://megapahit.com/show_bug.cgi?id=26
WARNING #Messaging# llmessage/message.cpp(2050) dispatch : Ignoring unknown message ChatterBoxSessionStartReply
WARNING #Messaging# llmessage/message.cpp(2050) dispatch : Ignoring unknown message ChatterBoxSessionAgentListUpdates
WARNING #Messaging# llmessage/message.cpp(2050) dispatch : Ignoring unknown message ChatterBoxSessionAgentListUpdates
These messages are in etc/messages.xml, and it was never included
before.
|
|
as it's not part of the Dullahan package any more.
|
|
The lllibs need to be built as static libs now, otherwise SLPlugin
would lose reference to gSavedSettings. The media plugins still need to
be built as dynamic libs however, so they can't rely on the condition in
LibraryInstall.cmake any more.
Since the Megapahit viewer, when built using GCC, is using the default
value for _GLIBCXX_USE_CXX11_ABI (which is 1 for the newer C++11 ABI as
opposed to 0 for the older C++03 ABI), the Dullahan dependency needs to
be built with the very same _GLIBCXX_USE_CXX11_ABI setting too, otherwise
apr_dso would fail at loading libmedia_plugin_cef.so because of the failure
to refer to the setOnConsoleMessageCallback function with strictly the same
(not differing between std::__cxx11::basic_string vs. std::basic_string)
parameter types.
The CEF build is Spotify's, so no live streaming support, while the
Dullahan package used by the viewer was built using Kokua's dullahan
fork. After rebuilding it with _GLIBCXX_USE_CXX11_ABI kept at default
by not overriding it in variables (from the build-variables repo), the
order of the target link libraries in CEFPlugin.cmake doesn't seem to
matter any more (it did before!).
Now EXTERNAL_TOS can be safely omitted from GNU/Linux added compile
definitions (but still used on FreeBSD).
|
|
though the file is not tracked. Just put a generated one from building
on a supported platform.
|
|
|
|
|
|
First, in order for launch_url.sh to be executable, it needs to be
installed as a program.
Secondly, the spawn browser command path needs to be adjusted
accordingly.
And last, add chrome (applies to chromium too on FBSD), to the list of
browser commands to try (so chrome wasn't there :/, but dillo has always
been XD, and that's why it kept opening Dillo here haha).
|
|
When I tried using, for example, FBSD system's ca-root-nss.crt, at
runtime, the viewer would fail at downloading textures, avatar names,
and so on. So for now we're still relying on LLCA, it's just get
installed automatically without having to track the file in the viewer
project.
|
|
|
|
Since we could use the dynamic versioning from the configuration phase
of CMake, the inclusion is put in BuildVersion.cmake.
Other CPACK variables are usually static so can be set when running
cmake.
CPack somehow doesn't pick up the DESTINATION values in ViewerInstall
(slplugin & libvlc too) from UnixInstall, so they're they're partially
hardcoded again there.
|
|
|
|
|
|
|
|
|
|
|
|
back-out the back-out for this branch. yay.
|
|
Backing out this merge that I pushed (prematurely) to the wrong place.
|
|
Warn earlier, clearer and harder about missing artwork bundle - this still bites snowglobe builders regularly.
Reviewed by Aimee.
|
|
VWR-12587: Cmake install target has a hard coded secondlife-bin reference remaining
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
|
