summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/build.yaml2
-rw-r--r--autobuild.xml62
-rw-r--r--indra/cmake/Lualibs.cmake13
-rw-r--r--indra/llcommon/CMakeLists.txt1
-rw-r--r--indra/llcommon/tests/StringVec.h10
-rw-r--r--indra/llcommon/tests/lleventfilter_test.cpp2
-rw-r--r--indra/llcommon/tests/llleap_test.cpp2
-rw-r--r--indra/llcommon/tests/llsdserialize_test.cpp2
-rw-r--r--indra/newview/CMakeLists.txt20
-rw-r--r--indra/newview/llfloaterluadebug.cpp4
-rw-r--r--indra/newview/llluamanager.cpp7
-rw-r--r--indra/newview/tests/llluamanager_test.cpp2
12 files changed, 70 insertions, 57 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 33a8cffa3f..1cd0c2526f 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -4,7 +4,7 @@ on:
workflow_dispatch:
pull_request:
push:
- branches: [main, "actions*"]
+ branches: ["*"]
tags: ["*"]
jobs:
diff --git a/autobuild.xml b/autobuild.xml
index d802d4b4a5..a85f1bda7f 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1658,47 +1658,71 @@
<key>name</key>
<string>llphysicsextensions_tpv</string>
</map>
- <key>lualibs</key>
+ <key>lua</key>
<map>
- <key>copyright</key>
- <string>Lua by Lua.org, PUC-Rio.</string>
- <key>description</key>
- <string>LUA libs API</string>
- <key>license</key>
- <string>lua</string>
- <key>license_file</key>
- <string>LICENSES/lua.txt</string>
- <key>name</key>
- <string>lualibs</string>
<key>platforms</key>
<map>
- <key>windows</key>
+ <key>darwin64</key>
<map>
<key>archive</key>
<map>
+ <key>creds</key>
+ <string>github</string>
<key>hash</key>
- <string>55bd833166d03f1467e2c7f24fa9143e</string>
+ <string>50cf091adb3e145b1b9f783415e897dc0a6dc570</string>
+ <key>hash_algorithm</key>
+ <string>sha1</string>
<key>url</key>
- <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/87775/805841/openssl-1.1.1l.563846-windows-563846.tar.bz2</string>
+ <string>https://api.github.com/repos/secondlife/3p-lua/releases/assets/133676222</string>
</map>
<key>name</key>
- <string>windows</string>
+ <string>darwin64</string>
+ </map>
+ <key>linux64</key>
+ <map>
+ <key>archive</key>
+ <map>
+ <key>creds</key>
+ <string>github</string>
+ <key>hash</key>
+ <string>5f4607c388bd9ed91bc85719696dbc1f4777e7d4</string>
+ <key>hash_algorithm</key>
+ <string>sha1</string>
+ <key>url</key>
+ <string>https://api.github.com/repos/secondlife/3p-lua/releases/assets/133676226</string>
+ </map>
+ <key>name</key>
+ <string>linux64</string>
</map>
<key>windows64</key>
<map>
<key>archive</key>
<map>
+ <key>creds</key>
+ <string>github</string>
<key>hash</key>
- <string>6dc51cd8cad422ab1dcd67cc59af119d</string>
+ <string>efde67ff252f9dbe0c4b806389da4318a619f9ac</string>
+ <key>hash_algorithm</key>
+ <string>sha1</string>
<key>url</key>
- <string>https://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/118146/1013526/lualibs-5.4.581683-windows64-581683.tar.bz2</string>
+ <string>https://api.github.com/repos/secondlife/3p-lua/releases/assets/133676232</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
+ <key>license</key>
+ <string>MIT</string>
+ <key>license_file</key>
+ <string>LICENSES/lua.txt</string>
+ <key>copyright</key>
+ <string>Copyright (c) 1994–2023 Lua.org, PUC-Rio.</string>
<key>version</key>
- <string>5.4.581683</string>
+ <string>5.4.6</string>
+ <key>name</key>
+ <string>lua</string>
+ <key>description</key>
+ <string>Lua is a powerful, efficient, lightweight, embeddable scripting language developed by a team at PUC-Rio, the Pontifical Catholic University of Rio de Janeiro in Brazil.</string>
</map>
<key>mesa</key>
<map>
@@ -3259,4 +3283,4 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<string>Second Life Viewer</string>
</map>
</map>
-</llsd>
+</llsd> \ No newline at end of file
diff --git a/indra/cmake/Lualibs.cmake b/indra/cmake/Lualibs.cmake
index ec40d0f41c..b6a7de41c6 100644
--- a/indra/cmake/Lualibs.cmake
+++ b/indra/cmake/Lualibs.cmake
@@ -8,8 +8,15 @@ add_library( ll::lualibs INTERFACE IMPORTED )
use_system_binary( lualibs )
-use_prebuilt_binary(lualibs)
+use_prebuilt_binary(lua)
-target_link_libraries(ll::lualibs INTERFACE ${lualibs})
+target_include_directories( ll::lualibs SYSTEM INTERFACE
+ ${LIBS_PREBUILT_DIR}/include
+)
-target_include_directories( ll::lualibs SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/lualibs)
+if (WINDOWS)
+ target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/lua54.lib)
+elseif (DARWIN)
+ target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/liblua.a)
+elseif (LINUX)
+endif (WINDOWS)
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 5dd4321330..ef4899978e 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -13,7 +13,6 @@ include(Copy3rdPartyLibs)
include(ZLIBNG)
include(URIPARSER)
include(Tracy)
-include(lualibs)
set(llcommon_SOURCE_FILES
diff --git a/indra/llcommon/tests/StringVec.h b/indra/llcommon/tests/StringVec.h
index a380b00a05..761956a012 100644
--- a/indra/llcommon/tests/StringVec.h
+++ b/indra/llcommon/tests/StringVec.h
@@ -18,6 +18,16 @@
typedef std::vector<std::string> StringVec;
+#if defined(LL_LLTUT_H)
+// Modern compilers require us to define operator<<(std::ostream&, StringVec)
+// before the definition of the ensure() template that engages it. The error
+// stating that the compiler can't find a viable operator<<() is so perplexing
+// that even though I've obviously hit it a couple times before, a new
+// instance still caused much head-scratching. This warning is intended to
+// demystify any inadvertent future recurrence.
+#warning "StringVec.h must be #included BEFORE lltut.h for ensure() to work"
+#endif
+
std::ostream& operator<<(std::ostream& out, const StringVec& strings)
{
out << '(';
diff --git a/indra/llcommon/tests/lleventfilter_test.cpp b/indra/llcommon/tests/lleventfilter_test.cpp
index fa2cb03e95..ed7cb56506 100644
--- a/indra/llcommon/tests/lleventfilter_test.cpp
+++ b/indra/llcommon/tests/lleventfilter_test.cpp
@@ -34,10 +34,10 @@
// std headers
// external library headers
// other Linden headers
+#include "listener.h"
#include "../test/lltut.h"
#include "stringize.h"
#include "llsdutil.h"
-#include "listener.h"
#include "tests/wrapllerrs.h"
#include <typeinfo>
diff --git a/indra/llcommon/tests/llleap_test.cpp b/indra/llcommon/tests/llleap_test.cpp
index 7197dedfbf..6fe9e3446f 100644
--- a/indra/llcommon/tests/llleap_test.cpp
+++ b/indra/llcommon/tests/llleap_test.cpp
@@ -18,6 +18,7 @@
#include <functional>
// external library headers
// other Linden headers
+#include "StringVec.h"
#include "../test/lltut.h"
#include "../test/namedtempfile.h"
#include "../test/catch_and_store_what_in.h"
@@ -26,7 +27,6 @@
#include "llprocess.h"
#include "llstring.h"
#include "stringize.h"
-#include "StringVec.h"
#if defined(LL_WINDOWS)
#define sleep(secs) _sleep((secs) * 1000)
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index ae3a94c55d..730731a927 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -53,10 +53,10 @@ typedef U32 uint32_t;
#include "llmemorystream.h"
#include "hexdump.h"
+#include "StringVec.h"
#include "../test/lltut.h"
#include "../test/namedtempfile.h"
#include "stringize.h"
-#include "StringVec.h"
#include <functional>
typedef std::function<void(const LLSD& data, std::ostream& str)> FormatterFunction;
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 6fc0f28a89..aa723c62cd 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1805,20 +1805,6 @@ if (WINDOWS)
if (PACKAGE)
add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.bz2
- COMMAND ${PYTHON_EXECUTABLE}
- ARGS
- ${CMAKE_CURRENT_SOURCE_DIR}/event_host_manifest.py
- ${CMAKE_CURRENT_SOURCE_DIR}/..
- ${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_CFG_INTDIR}
- DEPENDS
- lleventhost
- ${EVENT_HOST_SCRIPTS}
- ${CMAKE_CURRENT_SOURCE_DIR}/event_host_manifest.py
- )
-
- add_custom_command(
OUTPUT ${CMAKE_CFG_INTDIR}/touched.bat
COMMAND ${PYTHON_EXECUTABLE}
ARGS
@@ -1847,9 +1833,6 @@ if (WINDOWS)
add_custom_target(llpackage ALL DEPENDS
${CMAKE_CFG_INTDIR}/touched.bat
)
- # temporarily disable packaging of event_host until hg subrepos get
- # sorted out on the parabuild cluster...
- #${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.bz2)
endif (PACKAGE)
elseif (DARWIN)
@@ -1917,6 +1900,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
${LLPHYSICSEXTENSIONS_LIBRARIES}
ll::bugsplat
ll::tracy
+ ll::lualibs
)
if( TARGET ll::intel_memops )
@@ -2287,7 +2271,7 @@ if (LL_TESTS)
LL_ADD_INTEGRATION_TEST(llluamanager
"llluamanager.cpp"
- "${test_libs}"
+ "${test_libs};ll::lualibs"
)
LL_ADD_INTEGRATION_TEST(llsechandler_basic
diff --git a/indra/newview/llfloaterluadebug.cpp b/indra/newview/llfloaterluadebug.cpp
index 44454d7be0..32e9e4f1b7 100644
--- a/indra/newview/llfloaterluadebug.cpp
+++ b/indra/newview/llfloaterluadebug.cpp
@@ -38,10 +38,6 @@
#include "llluamanager.h"
-#if LL_WINDOWS
-#pragma comment(lib, "liblua54.a")
-#endif
-
LLFloaterLUADebug::LLFloaterLUADebug(const LLSD &key)
: LLFloater(key)
diff --git a/indra/newview/llluamanager.cpp b/indra/newview/llluamanager.cpp
index 0475122832..2bdf4fd0b0 100644
--- a/indra/newview/llluamanager.cpp
+++ b/indra/newview/llluamanager.cpp
@@ -64,12 +64,9 @@ extern LLUIListener sUIListener;
#include <boost/algorithm/string/replace.hpp>
-extern "C"
-{
#include "lua/lua.h"
#include "lua/lauxlib.h"
#include "lua/lualib.h"
-}
#include <algorithm>
#include <cstdlib> // std::rand()
@@ -80,10 +77,6 @@ extern "C"
#include <string_view>
#include <vector>
-#if LL_WINDOWS
-#pragma comment(lib, "liblua54.a")
-#endif
-
std::string lua_tostdstring(lua_State* L, int index);
void lua_pushstdstring(lua_State* L, const std::string& str);
LLSD lua_tollsd(lua_State* L, int index);
diff --git a/indra/newview/tests/llluamanager_test.cpp b/indra/newview/tests/llluamanager_test.cpp
index 6433ff1118..98a2726af7 100644
--- a/indra/newview/tests/llluamanager_test.cpp
+++ b/indra/newview/tests/llluamanager_test.cpp
@@ -18,6 +18,7 @@
#include <vector>
// external library headers
// other Linden headers
+#include "../llcommon/tests/StringVec.h"
#include "../test/lltut.h"
#include "llapp.h"
#include "lldate.h"
@@ -27,7 +28,6 @@
#include "lluri.h"
#include "lluuid.h"
#include "stringize.h"
-#include "../llcommon/tests/StringVec.h"
class LLTestApp : public LLApp
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 15:51:56 +0000