livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't inject files into the source tree

master
Ansariel 2023-04-22 14:27:00 +02:00
parent 719a2d31dc
commit bea3e75d70
3 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/llfilesystem/lldir.cpp
View File

@ -1108,6 +1108,14 @@ void LLDir::setSkinFolder(const std::string &skin_folder, const std::string& the
addSearchSkinDir(mUserDefaultSkinDir);
// then user-defined skins.
addSearchSkinDir(mUserSkinDir);
// <FS:Ansariel> If working directory is different from executable directory, add executable subdirs as searchable folders
if (mExecutableDir != mWorkingDir)
{
addSearchSkinDir(add(mExecutableDir, "skins"));
addSearchSkinDir(add(mExecutableDir, "skins", "default"));
}
// </FS:Ansariel>
}
void LLDir::addSearchSkinDir(const std::string& skindir)

28
indra/newview/CMakeLists.txt
View File

@ -2432,21 +2432,23 @@ set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH
#file(COPY ${FONT_FILE_GLOB_LIST} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/fonts")
# </FS:Ansariel>
# <FS:Ansariel> Don't copy emoji characters into source folder
# Copy over the Emoji/shortcodes mapping XML files (and create dependency
# if they are changed, CMake will run again and copy over new versions)
message("Copying Emoji/shortcode mappings")
set(emoji_mapping_src_folder ${AUTOBUILD_INSTALL_DIR}/xui)
set(emoji_mapping_dst_folder ${CMAKE_CURRENT_SOURCE_DIR}/skins/default/xui)
# Note Turkey is missing from this set (not available in Emoji package yet)
set(country_codes "da;de;en;es;fr;it;ja;pl;pt;ru;zh")
foreach(elem ${country_codes})
set(emoji_mapping_src_file
"${emoji_mapping_src_folder}/${elem}/emoji_characters.xml")
set(emoji_mapping_dst_file
"${emoji_mapping_dst_folder}/${elem}/emoji_characters.xml")
configure_file(${emoji_mapping_src_file} ${emoji_mapping_dst_file} COPYONLY)
endforeach()
#message("Copying Emoji/shortcode mappings")
#set(emoji_mapping_src_folder ${AUTOBUILD_INSTALL_DIR}/xui)
#set(emoji_mapping_dst_folder ${CMAKE_CURRENT_SOURCE_DIR}/skins/default/xui)
#
## Note Turkey is missing from this set (not available in Emoji package yet)
#set(country_codes "da;de;en;es;fr;it;ja;pl;pt;ru;zh")
#foreach(elem ${country_codes})
# set(emoji_mapping_src_file
# "${emoji_mapping_src_folder}/${elem}/emoji_characters.xml")
# set(emoji_mapping_dst_file
# "${emoji_mapping_dst_folder}/${elem}/emoji_characters.xml")
# configure_file(${emoji_mapping_src_file} ${emoji_mapping_dst_file} COPYONLY)
#endforeach()
# </FS:Ansariel>
if (LINUX)
set(product Firestorm-${ARCH}-${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION})

5
indra/newview/viewer_manifest.py
View File

@ -87,6 +87,11 @@ class ViewerManifest(LLManifest,FSViewerManifest):
self.path("fonts")
# </FS:Ansariel>
# <FS:Ansariel> Copy emoji characters to build output
with self.prefix(src=pkgdir, dst="skins/default"):
self.path("xui")
# </FS:Ansariel>
if self.is_packaging_viewer():
with self.prefix(src_dst="app_settings"):
self.exclude("logcontrol.xml")