Merged my missing eventhost module error handling with palmer's linux build fixes.
commit
29607ab70e
|
|
@ -123,7 +123,7 @@ MACRO(LL_ADD_PROJECT_UNIT_TESTS project sources)
|
|||
IF(WINDOWS)
|
||||
set(LD_LIBRARY_PATH ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR})
|
||||
ELSE(WINDOWS)
|
||||
set(LD_LIBRARY_PATH ${ARCH_PREBUILT_DIRS}:/usr/lib)
|
||||
set(LD_LIBRARY_PATH ${ARCH_PREBUILT_DIRS}:${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}:/usr/lib)
|
||||
ENDIF(WINDOWS)
|
||||
|
||||
IF(LL_TEST_VERBOSE)
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ if (NOT STANDALONE)
|
|||
endif (VIEWER)
|
||||
set(ARCH_PREBUILT_DIRS_RELEASE ${ARCH_PREBUILT_DIRS})
|
||||
set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS})
|
||||
set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs CACHE FILEPATH "Location of staged .sos")
|
||||
elseif (DARWIN)
|
||||
set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release)
|
||||
set(ARCH_PREBUILT_DIRS ${ARCH_PREBUILT_DIRS_RELEASE})
|
||||
|
|
|
|||
|
|
@ -245,6 +245,20 @@ if(LLCOMMON_LINK_SHARED)
|
|||
# Also this directory is shared with RunBuildTest.cmake, y'know, for the tests.
|
||||
set_target_properties(llcommon PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${SHARED_LIB_STAGING_DIR})
|
||||
endif(SHARED_LIB_STAGING_DIR)
|
||||
|
||||
get_target_property(LLCOMMON_PATH llcommon LOCATION)
|
||||
get_filename_component(LLCOMMON_FILE ${LLCOMMON_PATH} NAME)
|
||||
add_custom_command(
|
||||
TARGET llcommon POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND}
|
||||
ARGS
|
||||
-E
|
||||
copy_if_different
|
||||
${LLCOMMON_FILE}
|
||||
${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/${LLCOMMON_FILE}
|
||||
COMMENT "Copying llcommon to the staging folder."
|
||||
)
|
||||
|
||||
else(LLCOMMON_LINK_SHARED)
|
||||
add_library (llcommon ${llcommon_SOURCE_FILES})
|
||||
endif(LLCOMMON_LINK_SHARED)
|
||||
|
|
@ -263,6 +277,7 @@ target_link_libraries(
|
|||
|
||||
add_dependencies(llcommon stage_third_party_libs)
|
||||
|
||||
|
||||
include(LLAddBuildTest)
|
||||
SET(llcommon_TEST_SOURCE_FILES
|
||||
# WARNING: Please don't write tests against LLCommon or LLMath until this issue is resolved: https://jira.lindenlab.com/jira/browse/DEV-29456
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ public:
|
|||
};
|
||||
#endif
|
||||
|
||||
class LLApp
|
||||
class LL_COMMON_API LLApp
|
||||
{
|
||||
friend class LLErrorThread;
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -167,8 +167,8 @@ private:
|
|||
apr_uint32_t mData;
|
||||
};
|
||||
|
||||
typedef LL_COMMON_API LLAtomic32<U32> LLAtomicU32;
|
||||
typedef LL_COMMON_API LLAtomic32<S32> LLAtomicS32;
|
||||
typedef LLAtomic32<U32> LLAtomicU32;
|
||||
typedef LLAtomic32<S32> LLAtomicS32;
|
||||
|
||||
// File IO convenience functions.
|
||||
// Returns NULL if the file fails to openm sets *sizep to file size of not NULL
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ namespace LLError
|
|||
They are not intended for general use.
|
||||
*/
|
||||
|
||||
class LL_COMMON_API CallSite;
|
||||
class CallSite;
|
||||
|
||||
class LL_COMMON_API Log
|
||||
{
|
||||
|
|
|
|||
|
|
@ -41,10 +41,10 @@
|
|||
namespace LLOldEvents
|
||||
{
|
||||
|
||||
class LL_COMMON_API LLEventListener;
|
||||
class LL_COMMON_API LLEvent;
|
||||
class LL_COMMON_API LLEventDispatcher;
|
||||
class LL_COMMON_API LLObservable;
|
||||
class LLEventListener;
|
||||
class LLEvent;
|
||||
class LLEventDispatcher;
|
||||
class LLObservable;
|
||||
|
||||
// Abstract event. All events derive from LLEvent
|
||||
class LL_COMMON_API LLEvent : public LLThreadSafeRefCount
|
||||
|
|
@ -104,7 +104,7 @@ protected:
|
|||
std::vector<LLEventDispatcher *> mDispatchers;
|
||||
};
|
||||
|
||||
class LL_COMMON_API LLObservable; // defined below
|
||||
class LLObservable; // defined below
|
||||
|
||||
// A structure which stores a Listener and its metadata
|
||||
struct LLListenerEntry
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ private:
|
|||
/*****************************************************************************
|
||||
* LLEventPumps
|
||||
*****************************************************************************/
|
||||
class LL_COMMON_API LLEventPump;
|
||||
class LLEventPump;
|
||||
|
||||
/**
|
||||
* LLEventPumps is a Singleton manager through which one typically accesses
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
|
||||
class LLLogImpl;
|
||||
class LLApp;
|
||||
class LL_COMMON_API LLSD;
|
||||
class LLSD;
|
||||
|
||||
class LL_COMMON_API LLLog
|
||||
{
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
#define LL_LLMETRICS_H
|
||||
|
||||
class LLMetricsImpl;
|
||||
class LL_COMMON_API LLSD;
|
||||
class LLSD;
|
||||
|
||||
class LL_COMMON_API LLMetrics
|
||||
{
|
||||
|
|
|
|||
|
|
@ -138,12 +138,14 @@
|
|||
#if LL_WINDOWS
|
||||
#define LL_DLLEXPORT __declspec(dllexport)
|
||||
#define LL_DLLIMPORT __declspec(dllimport)
|
||||
#elif LL_LINUX
|
||||
#define LL_DLLEXPORT __attribute__ ((visibility("default")))
|
||||
#define LL_DLLIMPORT
|
||||
#else
|
||||
#define LL_DLLEXPORT
|
||||
#define LL_DLLIMPORT
|
||||
#endif // LL_WINDOWS
|
||||
|
||||
|
||||
#if LL_COMMON_LINK_SHARED
|
||||
# if LL_COMMON_BUILD
|
||||
# define LL_COMMON_API LL_DLLEXPORT
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
#include <vector>
|
||||
#include <boost/shared_ptr.hpp>
|
||||
|
||||
class LL_COMMON_API LLRunnable;
|
||||
class LLRunnable;
|
||||
|
||||
/**
|
||||
* @class LLRunner
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#ifndef LL_LLSDUTIL_H
|
||||
#define LL_LLSDUTIL_H
|
||||
|
||||
class LL_COMMON_API LLSD;
|
||||
class LLSD;
|
||||
|
||||
// U32
|
||||
LL_COMMON_API LLSD ll_sd_from_U32(const U32);
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
#include "llframetimer.h"
|
||||
#include "llfile.h"
|
||||
|
||||
class LL_COMMON_API LLSD;
|
||||
class LLSD;
|
||||
|
||||
// Set this if longer stats are needed
|
||||
#define ENABLE_LONG_TIME_STATS 0
|
||||
|
|
|
|||
|
|
@ -345,9 +345,9 @@ public:
|
|||
template<class T> std::basic_string<T> LLStringUtilBase<T>::null;
|
||||
template<class T> std::string LLStringUtilBase<T>::sLocale;
|
||||
|
||||
typedef LL_COMMON_API LLStringUtilBase<char> LLStringUtil;
|
||||
typedef LL_COMMON_API LLStringUtilBase<llwchar> LLWStringUtil;
|
||||
typedef LL_COMMON_API std::basic_string<llwchar> LLWString;
|
||||
typedef LLStringUtilBase<char> LLStringUtil;
|
||||
typedef LLStringUtilBase<llwchar> LLWStringUtil;
|
||||
typedef std::basic_string<llwchar> LLWString;
|
||||
|
||||
//@ Use this where we want to disallow input in the form of "foo"
|
||||
// This is used to catch places where english text is embedded in the code
|
||||
|
|
@ -419,7 +419,7 @@ LL_COMMON_API std::string rawstr_to_utf8(const std::string& raw);
|
|||
//
|
||||
// We should never use UTF16 except when communicating with Win32!
|
||||
//
|
||||
typedef LL_COMMON_API std::basic_string<U16> llutf16string;
|
||||
typedef std::basic_string<U16> llutf16string;
|
||||
|
||||
LL_COMMON_API LLWString utf16str_to_wstring(const llutf16string &utf16str, S32 len);
|
||||
LL_COMMON_API LLWString utf16str_to_wstring(const llutf16string &utf16str);
|
||||
|
|
|
|||
|
|
@ -38,9 +38,9 @@
|
|||
|
||||
#include "apr_thread_cond.h"
|
||||
|
||||
class LL_COMMON_API LLThread;
|
||||
class LL_COMMON_API LLMutex;
|
||||
class LL_COMMON_API LLCondition;
|
||||
class LLThread;
|
||||
class LLMutex;
|
||||
class LLCondition;
|
||||
|
||||
class LL_COMMON_API LLThread
|
||||
{
|
||||
|
|
|
|||
|
|
@ -37,9 +37,9 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
class LL_COMMON_API LLSD;
|
||||
class LL_COMMON_API LLUUID;
|
||||
class LL_COMMON_API LLApp;
|
||||
class LLSD;
|
||||
class LLUUID;
|
||||
class LLApp;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
|
|||
|
|
@ -40,9 +40,9 @@
|
|||
|
||||
#include "stdtypes.h"
|
||||
|
||||
class LL_COMMON_API LLReflective;
|
||||
class LL_COMMON_API LLMetaProperty;
|
||||
class LL_COMMON_API LLMetaMethod;
|
||||
class LLReflective;
|
||||
class LLMetaProperty;
|
||||
class LLMetaMethod;
|
||||
class LL_COMMON_API LLMetaClass
|
||||
{
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -39,8 +39,8 @@
|
|||
#include "llsd.h"
|
||||
#include "reflective.h"
|
||||
|
||||
class LL_COMMON_API LLMetaClass;
|
||||
class LL_COMMON_API LLReflective;
|
||||
class LLMetaClass;
|
||||
class LLReflective;
|
||||
class LL_COMMON_API LLMetaProperty
|
||||
{
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#ifndef LL_REFLECTIVE_H
|
||||
#define LL_REFLECTIVE_H
|
||||
|
||||
class LL_COMMON_API LLMetaClass;
|
||||
class LLMetaClass;
|
||||
class LL_COMMON_API LLReflective
|
||||
{
|
||||
public:
|
||||
|
|
|
|||
Loading…
Reference in New Issue