mirror of
https://github.com/humbletim/firestorm-gha.git
synced 2026-08-14 00:48:09 +00:00
reconfigure 7.1.13 avx2
This commit is contained in:
humbletim
@@ -1,11 +1,11 @@
|
||||
#!/bin/bash
|
||||
maybe-clone viewer ${hub:-github.com} $repo "$ref"
|
||||
maybe-clone p373r github.com ${GITHUB_REPOSITORY} P373R_6.6.8
|
||||
echo "snapshot test" -- skipping > repo/p373r/applied
|
||||
#echo "snapshot test" -- skipping > repo/p373r/applied
|
||||
|
||||
echo '#include <string>' | tee build/dummy.cpp
|
||||
mkdir -p build/newview
|
||||
touch build/newview/firestorm-bin.exe
|
||||
#touch build/newview/firestorm-bin.exe
|
||||
|
||||
pushd repo/viewer
|
||||
patch -p1 < <(cat <<'EOF'
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
PCH=/Yunewview\cmake_pch.hxx /Fpnewview\cmake_pch.cxx.pch /FInewview\cmake_pch.hxx -I.
|
||||
WX=/DWIN32 /D_WINDOWS /GR /EHsc /MD /O2 /Ob2 /Zc:wchar_t- /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1 -MD /GS /TP /W3 /c /Zc:forScope /nologo /Oy- /Oi /Ot /fp:precise /MP /arch:AVX2 -std:c++latest
|
||||
WX=/DWIN32 /D_WINDOWS /GR /EHsc /MD /O2 /Ob2 /Zc:wchar_t- /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1 -MD
|
||||
LCF=/DWIN32 /D_WINDOWS /GR /EHsc /MD /O2 /Ob2 /Zc:wchar_t- /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1 -MD
|
||||
LCFX=/GS /TP /W3 /c /Zc:forScope /nologo /Oy- /Oi /Ot /fp:precise /MP /arch:AVX2 -std:c++latest
|
||||
INCLUDE_1=-Inewview -I$source_dir\llaudio -I$source_dir\llcommon -I$source_dir\llmath -I$source_dir\llmeshoptimizer -I$source_dir\llmessage -I$source_dir\llfilesystem -I$source_dir\llcorehttp -I$source_dir\llxml -I$source_dir\llcharacter -I$source_dir\llimage -I$source_dir\llinventory -I$source_dir\llplugin -I$source_dir\llrender -I$source_dir\llwindow -I$source_dir\llprimitive -I$source_dir\llui -I$source_dir\llwebrtc -I$source_dir\viewer_components\login -I$source_dir\llappearance -I$packages_dir\include\apr-1 -I$packages_dir\include -I$packages_dir\include\zlib-ng -I$packages_dir\include\meshoptimizer -I$packages_dir\include\nghttp2 -I$packages_dir\include\AL -I$packages_dir\include\openjpeg -I$packages_dir\include\libpng16 -I$packages_dir\include\freetype2 -I$packages_dir\include\collada -I$packages_dir\include\collada\1.4 -I$packages_dir\include\hunspell -I$packages_dir\include\glod -I$packages_dir\include\discord-rpc -I$packages_dir\include\Growl
|
||||
@@ -28,19 +28,13 @@ DEFINES_7=-DADDRESS_SIZE=64 -DBOOST_BIND_GLOBAL_PLACEHOLDERS -DGLM_ENABLE_EXPERI
|
||||
DEFINES_8=-DADDRESS_SIZE=64 -DBOOST_BIND_GLOBAL_PLACEHOLDERS -DGLM_ENABLE_EXPERIMENTAL=1 -DGLM_FORCE_DEFAULT_ALIGNED_GENTYPES=1 -DGLM_FORCE_SSE2=1 -DNOMINMAX -DOPENSIM -DUSE_AVX2_OPTIMIZATION -DWIN32_LEAN_AND_MEAN -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS -Dllwebrtc_EXPORTS
|
||||
DEFINES_9=-DADDRESS_SIZE=64 -DAPI_DECLARE_STATIC=1 -DAPR_DECLARE_STATIC=1 -DAPU_DECLARE_STATIC=1 -DBOOST_BIND_GLOBAL_PLACEHOLDERS -DGLM_ENABLE_EXPERIMENTAL=1 -DGLM_FORCE_DEFAULT_ALIGNED_GENTYPES=1 -DGLM_FORCE_SSE2=1 -DNOMINMAX -DOPENSIM -DUSE_AVX2_OPTIMIZATION -DWIN32_LEAN_AND_MEAN -DXML_STATIC=1 -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS -Dmedia_plugin_libvlc_EXPORTS
|
||||
DEFINES_10=-DADDRESS_SIZE=64 -DAPI_DECLARE_STATIC=1 -DAPR_DECLARE_STATIC=1 -DAPU_DECLARE_STATIC=1 -DBOOST_BIND_GLOBAL_PLACEHOLDERS -DGLM_ENABLE_EXPERIMENTAL=1 -DGLM_FORCE_DEFAULT_ALIGNED_GENTYPES=1 -DGLM_FORCE_SSE2=1 -DHUNSPELL_STATIC=1 -DLIB_NDOF=1 -DLL_OPENAL=1 -DLL_OS_DRAGDROP_ENABLED=1 -DNOMINMAX -DOPENSIM -DUSE_AVX2_OPTIMIZATION -DWIN32_LEAN_AND_MEAN -DXML_STATIC=1 -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS -DFS_VIEWER_VERSION_GITHASH="" -DLLBUILD_CONFIG=\"Release\" -DLL_VIEWER_CHANNEL=$viewer_channel -DLL_VIEWER_VERSION_BUILD=$version_release -DLL_VIEWER_VERSION_MAJOR=$version_major -DLL_VIEWER_VERSION_MINOR=$version_minor -DLL_VIEWER_VERSION_PATCH=$version_patch
|
||||
FLAGS_1=/DWIN32 /D_WINDOWS /GR /EHsc /MD /O2 /Ob2 /Zc:wchar_t- /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1 -MD /GS /TP /W3 /c /Zc:forScope /nologo /Oy- /Oi /Ot /fp:precise /MP /arch:AVX2 -std:c++latest
|
||||
FLAGS_2=/DWIN32 /D_WINDOWS /GR /EHsc /MD /O2 /Ob2 /Zc:wchar_t- /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1 -MD /GS /TP /W3 /c /Zc:forScope /nologo /Oy- /Oi /Ot /fp:precise /MP /arch:AVX2 -std:c++latest -FIchrono
|
||||
FLAGS_3=/DWIN32 /D_WINDOWS /GR /EHsc /MD /O2 /Ob2 /Zc:wchar_t- /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1 -MD /GS /TP /W3 /c /Zc:forScope /nologo /Oy- /Oi /Ot /fp:precise /MP /arch:AVX2 -std:c++latest -Z7 -Y-
|
||||
FLAGS_4=/DWIN32 /D_WINDOWS /GR /EHsc /MD /O2 /Ob2 /Zc:wchar_t- /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1 -MD /GS /TP /W3 /c /Zc:forScope /nologo /Oy- /Oi /Ot /fp:precise /MP /arch:AVX2 -std:c++latest -I$packages_dir/include/collada -I$packages_dir/include/collada/1.4
|
||||
FLAGS_5=/DWIN32 /D_WINDOWS /GR /EHsc /MD /O2 /Ob2 /Zc:wchar_t- /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1 -MD /GS /TP /W3 /c /Zc:forScope /nologo /Oy- /Oi /Ot /fp:precise /MP /arch:AVX2 -std:c++latest /bigobj
|
||||
FLAGS_6=/DWIN32 /D_WINDOWS /GR /EHsc /MD /O2 /Ob2 /Zc:wchar_t- /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1 -MD /GS /TP /W3 /c /Zc:forScope /nologo /Oy- /Oi /Ot /fp:precise /MP /arch:AVX2 -std:c++latest -I$packages_dir/include/Growl
|
||||
FLAGS_7=/DWIN32 /D_WINDOWS /GR /EHsc /MD /O2 /Ob2 /Zc:wchar_t- /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1 -MD /GS /TP /W3 /c /Zc:forScope /nologo /Oy- /Oi /Ot /fp:precise /MP /arch:AVX2 -std:c++latest -I$packages_dir/include/collada -I$packages_dir/include/collada/1.4 -FIchrono
|
||||
FLAGS_8=/DWIN32 /D_WINDOWS /GR /EHsc /MD /O2 /Ob2 /Zc:wchar_t- /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1 -MD /GS /TP /W3 /c /Zc:forScope /nologo /Oy- /Oi /Ot /fp:precise /MP /arch:AVX2 -std:c++latest -FIllpreprocessor.h -FIllevents.h
|
||||
FLAGS_9=-DWIN32 -I$source_dir/newview/res
|
||||
FLAGS_10=/DWIN32 /D_WINDOWS /GR /EHsc /MD /O2 /Ob2 /Zc:wchar_t- /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1 -MTd /GS /TP /W3 /c /Zc:forScope /nologo /Oy- /Oi /Ot /fp:precise /MP /arch:AVX2 /MT -std:c++latest -Z7 -Y-
|
||||
FLAGS_11=/DWIN32 /D_WINDOWS /GR /EHsc /MD /O2 /Ob2 /Zc:wchar_t- /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1 -MD
|
||||
FLAGS_12=/DWIN32 /D_WINDOWS /GR /EHsc /MD /O2 /Ob2 /Zc:wchar_t- /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1 -MD /GS /TP /W3 /c /Zc:forScope /nologo /Oy- /Oi /Ot /fp:precise /MP /arch:AVX2 -std:c++latest -I$packages_dir/include/zlib-ng
|
||||
FLAGS_13=/DWIN32 /D_WINDOWS /GR /EHsc /MD /O2 /Ob2 /Zc:wchar_t- /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1 -MD /GS /TP /W3 /c /Zc:forScope /nologo /Oy- /Oi /Ot /fp:precise /MP /arch:AVX2 -std:c++latest -FIqueue
|
||||
FLAGS_14=/DWIN32 /D_WINDOWS /GR /EHsc /MD /O2 /Ob2 /Zc:wchar_t- /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1 -MD /GS /TP /W3 /c /Zc:forScope /nologo /Oy- /Oi /Ot /fp:precise /MP /arch:AVX2 -std:c++latest -FIchrono -Z7 -Y-
|
||||
FLAGS_15=/DWIN32 /D_WINDOWS /GR /EHsc /MD /O2 /Ob2 /Zc:wchar_t- /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1 -MD /GS /TP /W3 /c /Zc:forScope /nologo /Oy- /Oi /Ot /fp:precise /MP /arch:AVX2 -std:c++latest -FI$nunja_dir/GetModuleFileName.inline.h -Z7 -Y-
|
||||
FLAGS_16=/DWIN32 /D_WINDOWS /GR /EHsc /MD /O2 /Ob2 /Zc:wchar_t- /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1 -MD /GS /TP /W3 /c /Zc:forScope /nologo /Oy- /Oi /Ot /fp:precise /MP /arch:AVX2 -std:c++latest "-DmScreen=mRT->screen" "-Inewview" "/FIglh/glh_linear.h"
|
||||
FLAGS_1=/DWIN32 /D_WINDOWS /GR /EHsc /MD /O2 /Ob2 /Zc:wchar_t- /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1 -MD /GS /TP /W3 /c /Zc:forScope /nologo /Oy- /Oi /Ot /fp:precise /MP /arch:AVX2 /bigobj -std:c++latest /Yunewview\cmake_pch.hxx /Fpnewview\cmake_pch.cxx.pch /FInewview\cmake_pch.hxx -I. -I.
|
||||
FLAGS_2=/DWIN32 /D_WINDOWS /GR /EHsc /MD /O2 /Ob2 /Zc:wchar_t- /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1 -MD /GS /TP /W3 /c /Zc:forScope /nologo /Oy- /Oi /Ot /fp:precise /MP /arch:AVX2 -std:c++latest
|
||||
FLAGS_3=/DWIN32 /D_WINDOWS /GR /EHsc /MD /O2 /Ob2 /Zc:wchar_t- /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1 -MD /GS /TP /W3 /c /Zc:forScope /nologo /Oy- /Oi /Ot /fp:precise /MP /arch:AVX2 /bigobj -std:c++latest -Z7 -Y- /Yunewview\cmake_pch.hxx /Fpnewview\cmake_pch.cxx.pch /FInewview\cmake_pch.hxx -I. -I.
|
||||
FLAGS_4=/DWIN32 /D_WINDOWS /GR /EHsc /MD /O2 /Ob2 /Zc:wchar_t- /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1 -MD /GS /TP /W3 /c /Zc:forScope /nologo /Oy- /Oi /Ot /fp:precise /MP /arch:AVX2 -std:c++latest -Z7 -Y-
|
||||
FLAGS_5=/DWIN32 /D_WINDOWS /GR /EHsc /MD /O2 /Ob2 /Zc:wchar_t- /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1 -MD
|
||||
FLAGS_6=/DWIN32 /D_WINDOWS /GR /EHsc /MD /O2 /Ob2 /Zc:wchar_t- /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1 -MD /GS /TP /W3 /c /Zc:forScope /nologo /Oy- /Oi /Ot /fp:precise /MP /arch:AVX2 /bigobj -std:c++latest /bigobj /Yunewview\cmake_pch.hxx /Fpnewview\cmake_pch.cxx.pch /FInewview\cmake_pch.hxx -I. -I.
|
||||
FLAGS_7=-DWIN32 -I$source_dir/newview/res
|
||||
FLAGS_8=/DWIN32 /D_WINDOWS /GR /EHsc /MD /O2 /Ob2 /Zc:wchar_t- /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1 -MTd /GS /TP /W3 /c /Zc:forScope /nologo /Oy- /Oi /Ot /fp:precise /MP /arch:AVX2 /MT -std:c++latest -Z7 -Y-
|
||||
FLAGS_9=/DWIN32 /D_WINDOWS /GR /EHsc /MD /O2 /Ob2 /Zc:wchar_t- /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1 -MD /GS /TP /W3 /c /Zc:forScope /nologo /Oy- /Oi /Ot /fp:precise /MP /arch:AVX2 /bigobj -std:c++latest /Ycnewview\cmake_pch.hxx /Fpnewview\cmake_pch.cxx.pch /FInewview\cmake_pch.hxx -I. -I.
|
||||
FLAGS_10=/DWIN32 /D_WINDOWS /GR /EHsc /MD /O2 /Ob2 /Zc:wchar_t- /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1 -MD /GS /TP /W3 /c /Zc:forScope /nologo /Oy- /Oi /Ot /fp:precise /MP /arch:AVX2 /bigobj -std:c++latest "-DmScreen=mRT->screen" "-Inewview" "/FIglh/glh_linear.h" /Yunewview\cmake_pch.hxx /Fpnewview\cmake_pch.cxx.pch /FInewview\cmake_pch.hxx -I. -I.
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -502,34 +502,27 @@ rule CXX_COMPILER__firestorm-bin_Release
|
||||
description = Building CXX object $out
|
||||
|
||||
|
||||
#############################################
|
||||
# Rule for linking CXX static library.
|
||||
|
||||
rule CXX_STATIC_LIBRARY_LINKER__firestorm-bin_Release
|
||||
command = $cmd_exe /C "$PRE_LINK && $lib_exe /nologo $LINK_FLAGS /out:$TARGET_FILE $in && $POST_BUILD"
|
||||
description = Linking CXX static library $TARGET_FILE
|
||||
restat = $RESTAT
|
||||
|
||||
|
||||
#############################################
|
||||
# Rule for compiling CXX files.
|
||||
|
||||
rule CXX_COMPILER__firestorm-bin_objects_Release
|
||||
deps = msvc
|
||||
command = $cl_exe /nologo /TP $DEFINES $INCLUDES $FLAGS /showIncludes /Fo$out /FS -c $in
|
||||
description = Building CXX object $out
|
||||
|
||||
|
||||
#############################################
|
||||
# Rule for compiling RC files.
|
||||
|
||||
rule RC_COMPILER__firestorm-bin_objects_Release
|
||||
rule RC_COMPILER__firestorm-bin_Release
|
||||
depfile = $DEP_FILE
|
||||
deps = gcc
|
||||
command = $cmcldeps_exe RC $in $DEP_FILE $out "Note: including file: " $cl_exe $rc_exe $DEFINES $INCLUDES $FLAGS /fo $out $in
|
||||
description = Building RC object $out
|
||||
|
||||
|
||||
#############################################
|
||||
# Rule for linking CXX executable.
|
||||
|
||||
rule CXX_EXECUTABLE_LINKER__firestorm-bin_Release
|
||||
command = $cmd_exe /C "$PRE_LINK && $cmake_exe -E vs_link_exe --intdir=$OBJECT_DIR --rc=$rc_exe --mt=$mt_exe --manifests $MANIFESTS -- $link_exe /nologo @$RSP_FILE /out:$TARGET_FILE /implib:$TARGET_IMPLIB /version:0.0 $LINK_FLAGS && $POST_BUILD"
|
||||
description = Linking CXX executable $TARGET_FILE
|
||||
rspfile = $RSP_FILE
|
||||
rspfile_content = $in_newline $LINK_PATH $LINK_LIBRARIES
|
||||
restat = $RESTAT
|
||||
|
||||
|
||||
#############################################
|
||||
# Rule for re-running cmake.
|
||||
|
||||
|
||||
@@ -1,189 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -Euo pipefail
|
||||
|
||||
source $ghash/gha.upload-artifact.bash
|
||||
|
||||
snapshot_dir=$build_dir/${base}
|
||||
mkdir -pv $snapshot_dir
|
||||
|
||||
cpsync() { cp -lunrp "$@" ; }
|
||||
|
||||
###########################################################################
|
||||
echo "SNAPSHOT EMERGED OBJECT FILES..." >&2
|
||||
mkdir -pv $snapshot_dir/objs
|
||||
build_dir_rel=$(realpath --relative-to="$(pwd -W)" $build_dir || echo $build_dir)
|
||||
(
|
||||
(
|
||||
# echo ~+/llwebrtc/llwebrtc.lib
|
||||
# grep -vE '/(llwebrtc|media_plugins|slplugin)/
|
||||
for x in `ls -1d $build_dir_rel/{ll*,newview,viewer_components/login,newview/llphysicsextensions}/CMakeFiles/ | grep -v /llwebrtc/`; do
|
||||
y=$(basename $(dirname "$x"))
|
||||
objs=$(find $x -name \*.c*.obj -o -name \*.res)
|
||||
test -z "$objs" || {
|
||||
mkdir -pv $snapshot_dir/objs/$y/
|
||||
cpsync $objs $snapshot_dir/objs/$y/
|
||||
}
|
||||
done
|
||||
cpsync $build_dir_rel/llwebrtc/llwebrtc.lib $snapshot_dir/objs/
|
||||
cpsync $build_dir_rel/newview/llphysicsextensions/llphysicsextensionsstub.lib $snapshot_dir/objs/
|
||||
)
|
||||
# > $snapshot_dir/metadata/all.objs.rsp
|
||||
# time (
|
||||
# tar -cf - -T $snapshot_dir/metadata/all.objs.rsp --show-transformed-names \
|
||||
# --transform "s|^${PWD#/}/||" \
|
||||
# --transform 's|^([^/]+)/.*[.]dir|\1|x' \
|
||||
# 2>$snapshot_dir/metadata/objs.tar.rsp \
|
||||
# | tar -xf - -C$snapshot_dir/objs # xz -T0 - -c > snapshot/objs.tar.xz
|
||||
# )
|
||||
)
|
||||
|
||||
(
|
||||
cd $snapshot_dir
|
||||
find objs/ -name \*.obj -o -name \*.res | sed 's@^@${snapshot_dir}/@' > $snapshot_dir/llobjs.rsp.in || exit 77
|
||||
cd ..
|
||||
)
|
||||
|
||||
###########################################################################
|
||||
echo "SNAPSHOT METADATA..." >&2
|
||||
mkdir -pv $snapshot_dir/metadata
|
||||
mkdir -pv $snapshot_dir/metadata/tmp
|
||||
cp -ua env.d $snapshot_dir/metadata
|
||||
|
||||
cp -ua $nunja_dir $snapshot_dir/metadata/tmp
|
||||
cp -ua $build_dir/msvc.nunja.env $snapshot_dir/metadata/tmp
|
||||
|
||||
test ! -s fstuple.json || cp -av fstuple.json $snapshot_dir/metadata/
|
||||
cp -ua $build_dir/packages-info.json $snapshot_dir/metadata/
|
||||
cp -ua $nunja_dir/viewer_version.txt $snapshot_dir/metadata/
|
||||
env | grep INPUT > $snapshot_dir/metadata/tmp/INPUT.env
|
||||
env | grep -i version= > $snapshot_dir/metadata/tmp/version.env
|
||||
find $build_dir/ -type f > $snapshot_dir/metadata/tmp/build_dir.files
|
||||
|
||||
( cat /d/a/_temp/_runner_file_commands/step_summary_*-scrubbed > $snapshot_dir/metadata/summary.md ) || true
|
||||
( ninja -C $build_dir -t commands ${viewer_bin}-bin | grep -Eo '(")?[-]D[^ =]+(=[^ ]*)?\1?' | grep -vE '_EXPORTS$' | awk '!seen[$0]++' > $snapshot_dir/lldefines.rsp ) || true
|
||||
cp -uav $nunja_dir/*defines.rsp $snapshot_dir/metadata/ 2>/dev/null || true
|
||||
###########################################################################
|
||||
echo "SNAPSHOT PACKAGES..." >&2
|
||||
mkdir -pv $snapshot_dir/3p/lib
|
||||
for x in `ls -1 $packages_dir/lib/release | grep -v webrtc` ; do
|
||||
cpsync $packages_dir/lib/release/$x $snapshot_dir/3p/lib/
|
||||
done
|
||||
mkdir -pv $snapshot_dir/3p/include
|
||||
for x in `ls -1 $packages_dir/include| grep -v webrtc` ; do
|
||||
cpsync $packages_dir/include/$x $snapshot_dir/3p/include/
|
||||
done
|
||||
cpsync $build_dir/newview/licenses.txt $snapshot_dir/3p/
|
||||
cpsync $build_dir/newview/packages-info.txt $snapshot_dir/3p/
|
||||
|
||||
###########################################################################
|
||||
echo "SNAPSHOT CORRESPONDING SOURCE..." >&2
|
||||
mkdir -pv $snapshot_dir/source
|
||||
cp -ua $source_dir/../LICENSE $snapshot_dir/
|
||||
|
||||
if [[ $viewer_bin == firestorm ]] ; then
|
||||
cp -ua $build_dir/newview/fsversionvalues.h $snapshot_dir/source/ || true
|
||||
fi
|
||||
cp -ua $build_dir/newview/viewerRes.rc $snapshot_dir/source/ || true
|
||||
|
||||
if [[ $viewer_bin == secondlife ]] ; then
|
||||
cpsync $packages_dir/llphysicsextensions $snapshot_dir/source
|
||||
fi
|
||||
|
||||
(
|
||||
cd $source_dir
|
||||
find ~+ -name \*.cpp -o -name \*.inl -o -name \*.h -o -name \*.hpp \
|
||||
| grep -vE '/tests?/' > $snapshot_dir/metadata/tmp/primary.source.txt
|
||||
time (
|
||||
tar -cf - -T $snapshot_dir/metadata/tmp/primary.source.txt --show-transformed-names \
|
||||
--transform "s|^${PWD#/}/||" \
|
||||
2>/dev/null \
|
||||
| tar -xf - -C$snapshot_dir/source #xz -T0 - -c > $snapshot_dir/includes.tar.xz
|
||||
)
|
||||
cd ..
|
||||
)
|
||||
|
||||
for x in `grep -Eo '[^"]+[.](cur|ico)' $build_dir/newview/viewerRes.rc | sort -u ` ; do
|
||||
if [[ -f $source_dir/newview/res/$x ]]; then
|
||||
echo "$build_dir/newview/viewerRes.rc::$x found in $source_dir/newview/res/ ..." >&2
|
||||
cpsync $source_dir/newview/res/$x $snapshot_dir/source/newview/res/
|
||||
elif [[ -f $build_dir/newview/$x ]]; then
|
||||
echo "$build_dir/newview/viewerRes.rc::$x found in $build_dir/newview/ ..." >&2
|
||||
cpsync $build_dir/newview/$x $snapshot_dir/source/newview/res/
|
||||
else
|
||||
echo "$build_dir/newview/viewerRes.rc::$x source icon not found..." >&2
|
||||
fi
|
||||
done
|
||||
|
||||
mkdir -pv $snapshot_dir/metadata/tmp/icons/
|
||||
for x in `ls $source_dir/newview/icons/*/*.ico` ; do
|
||||
cp -ua $x $snapshot_dir/metadata/tmp/icons/$viewer_bin-$(basename $(dirname $x)).ico
|
||||
done
|
||||
|
||||
(
|
||||
cd $snapshot_dir
|
||||
for x in `ls source/* -1d` ; do
|
||||
if [[ -d "$x" ]]; then
|
||||
echo "$x" | sed 's@^@-I${snapshot_dir}/@'
|
||||
else
|
||||
echo "skipping non-directory source/ entry: $x" >&2
|
||||
fi
|
||||
done
|
||||
cd ..
|
||||
) > $snapshot_dir/llincludes.rsp.in
|
||||
|
||||
###########################################################################
|
||||
# stage installer/runtime
|
||||
|
||||
cp -ua $build_dir/runtime.installer.original.nsi $snapshot_dir/metadata/tmp/
|
||||
|
||||
mkdir -pv $snapshot_dir/metadata/nsi/
|
||||
sed 's@"[^"]\+\\newview\\installers\\windows\\@\${snapshot_dir}/metadata/nsi/@g' $build_dir/runtime.installer.nsi \
|
||||
> $snapshot_dir/metadata/installer.nsi.in
|
||||
grep -Eo '[^"]+\\newview\\installers\\windows\\[^"]+' $build_dir/runtime.installer.nsi | sort -u > $build_dir/nsis.txt
|
||||
for x in `cat $build_dir/nsis.txt` ; do
|
||||
cpsync "$x" $snapshot_dir/metadata/nsi/
|
||||
done
|
||||
|
||||
cp -av $build_dir/APPLICATION_EXE.env $snapshot_dir/metadata/tmp/
|
||||
. $build_dir/APPLICATION_EXE.env
|
||||
sed "s@^$viewer_channel-$version_full/@$base/runtime/@g;" $build_dir/installer.txt \
|
||||
| grep -vE "${application_bin}|${APPLICATION_EXE}" \
|
||||
| tr '\\' '/' > $build_dir/runtime.txt
|
||||
head -2 $build_dir/runtime.txt
|
||||
cp -av $build_dir/runtime.txt $snapshot_dir/metadata/tmp/
|
||||
sed "s@$base/runtime/@\${snapshot_dir}/runtime/@g" $build_dir/runtime.txt > $snapshot_dir/metadata/runtime.rsp.in
|
||||
sed "s@$base/runtime/@runtime/@g" $build_dir/runtime.txt > $snapshot_dir/metadata/runtime.rsp
|
||||
head -2 $snapshot_dir/metadata/runtime.rsp.in
|
||||
|
||||
###########################################################################
|
||||
bundle=${base}-${upstream_rel}-${version_shas}
|
||||
echo "[7z] GENERATING ${bundle}-(devtime|runtime|snapshot).zip..." >&2
|
||||
|
||||
cd $build_dir
|
||||
|
||||
test ! -d $base/runtime || rm -v $base/runtime
|
||||
# package ${base:-fs-beta-7.1.12-e}/ => "devtime" capture
|
||||
time ${_7z:-7z} -mx5 -bd -tzip a ${bundle}-devtime.zip $base
|
||||
|
||||
# stage fs-beta-7.1.12-e/runtime/
|
||||
ht-ln $build_dir/newview $base/runtime
|
||||
time ${_7z:-7z} -mx5 -bd -tzip a ${bundle}-runtime.zip @$build_dir/runtime.txt
|
||||
|
||||
# make a copy of devtime and append @precision manifested runtime/ folder (to emerge a combined snapshot)
|
||||
cp -av ${bundle}-devtime.zip ${bundle}-snapshot.zip
|
||||
time ${_7z:-7z} -mx5 -bd -tzip a ${bundle}-snapshot.zip @$build_dir/runtime.txt
|
||||
|
||||
test "${_7z:-7z}" == 7z || { echo "NOUPLOAD 7z=${_7z}" >&2 ; exit 141 ; }
|
||||
echo "UPLOADING ARTIFACTS...${GITHUB_ACTIONS}" >&2
|
||||
gha-have-runtime || { echo "gha runtime unavailable" && exit 0 ; }
|
||||
grep gha-patch-upload-artifact /d/a/_actions/actions/upload-artifact/v4/dist/upload/index.js || gha-patch-upload-artifact
|
||||
|
||||
zipUploadStream=${bundle}-devtime.zip gha-upload-artifact-fast ${bundle}-devtime ${bundle}-devtime.zip
|
||||
zipUploadStream=${bundle}-runtime.zip gha-upload-artifact-fast ${bundle}-runtime ${bundle}-runtime.zip
|
||||
zipUploadStream=${bundle}-snapshot.zip gha-upload-artifact-fast ${bundle}-snapshot ${bundle}-snapshot.zip
|
||||
|
||||
# UPLOAD SNAPSHOT
|
||||
|
||||
# cd $snapshot_dir
|
||||
# gha-upload-artifact-fast ${version_full}-snapshot .
|
||||
Reference in New Issue
Block a user