From cd93aba002bb3248e3e099d80ce68242531035c0 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Wed, 25 Jul 2012 03:27:02 +0200 Subject: [PATCH] Created aistatemachine library and moved files. --- indra/CMakeLists.txt | 1 + indra/aistatemachine/CMakeLists.txt | 46 +++++++++++++++++++ .../{llmessage => aistatemachine}/aicurl.cpp | 0 indra/{llmessage => aistatemachine}/aicurl.h | 0 .../aicurleasyrequeststatemachine.cpp | 0 .../aicurleasyrequeststatemachine.h | 0 .../aicurlprivate.h | 0 .../aicurlthread.cpp | 0 .../aicurlthread.h | 0 .../aistatemachine.cpp | 0 .../aistatemachine.h | 0 .../aitimer.cpp | 0 .../statemachine => aistatemachine}/aitimer.h | 0 indra/cmake/AIStateMachine.cmake | 4 +- indra/cmake/LLMessage.cmake | 4 +- indra/cmake/StateMachine.cmake | 4 ++ indra/llmessage/CMakeLists.txt | 9 ++-- .../{newview => llmessage}/llcurlrequest.cpp | 2 +- indra/{newview => llmessage}/llcurlrequest.h | 0 indra/newview/CMakeLists.txt | 7 ++- indra/newview/llviewercontrol.cpp | 2 +- indra/newview/llxmlrpctransaction.cpp | 2 +- indra/newview/statemachine/CMakeLists.txt | 6 --- 23 files changed, 66 insertions(+), 21 deletions(-) create mode 100644 indra/aistatemachine/CMakeLists.txt rename indra/{llmessage => aistatemachine}/aicurl.cpp (100%) rename indra/{llmessage => aistatemachine}/aicurl.h (100%) rename indra/{newview/statemachine => aistatemachine}/aicurleasyrequeststatemachine.cpp (100%) rename indra/{newview/statemachine => aistatemachine}/aicurleasyrequeststatemachine.h (100%) rename indra/{llmessage => aistatemachine}/aicurlprivate.h (100%) rename indra/{llmessage => aistatemachine}/aicurlthread.cpp (100%) rename indra/{llmessage => aistatemachine}/aicurlthread.h (100%) rename indra/{newview/statemachine => aistatemachine}/aistatemachine.cpp (100%) rename indra/{newview/statemachine => aistatemachine}/aistatemachine.h (100%) rename indra/{newview/statemachine => aistatemachine}/aitimer.cpp (100%) rename indra/{newview/statemachine => aistatemachine}/aitimer.h (100%) create mode 100644 indra/cmake/StateMachine.cmake rename indra/{newview => llmessage}/llcurlrequest.cpp (98%) rename indra/{newview => llmessage}/llcurlrequest.h (100%) diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index e81965cc6..0e7e1b472 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -46,6 +46,7 @@ endif(NOT STANDALONE) add_custom_target(prepare DEPENDS ${prepare_depends}) add_subdirectory(cmake) +add_subdirectory(${LIBS_OPEN_PREFIX}aistatemachine) add_subdirectory(${LIBS_OPEN_PREFIX}cwdebug) add_subdirectory(${LIBS_OPEN_PREFIX}llaudio) add_subdirectory(${LIBS_OPEN_PREFIX}llcharacter) diff --git a/indra/aistatemachine/CMakeLists.txt b/indra/aistatemachine/CMakeLists.txt new file mode 100644 index 000000000..b8dc762a7 --- /dev/null +++ b/indra/aistatemachine/CMakeLists.txt @@ -0,0 +1,46 @@ +# -*- cmake -*- + +project(aistatemachine) + +include(00-Common) +include(LLCommon) +include(LLMessage) +include(LLMath) +include(LLXML) + +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + +include_directories( + ${LLCOMMON_INCLUDE_DIRS} + ${LLMESSAGE_INCLUDE_DIRS} + ${LLMATH_INCLUDE_DIRS} + ${LLXML_INCLUDE_DIRS} + ) + +set(aistatemachine_SOURCE_FILES + aistatemachine.cpp + aitimer.cpp + aicurl.cpp + aicurlthread.cpp + aicurleasyrequeststatemachine.cpp + ) + +set(aistatemachine_HEADER_FILES + CMakeLists.txt + + aistatemachine.h + aitimer.h + aicurlprivate.h + aicurl.h + aicurlthread.h + aicurleasyrequeststatemachine.h + ) + +set_source_files_properties(${aistatemachine_HEADER_FILES} + PROPERTIES HEADER_FILE_ONLY TRUE) + +list(APPEND aistatemachine_SOURCE_FILES ${aistatemachine_HEADER_FILES}) + +add_library (aistatemachine ${aistatemachine_SOURCE_FILES}) +add_dependencies(aistatemachine prepare) + diff --git a/indra/llmessage/aicurl.cpp b/indra/aistatemachine/aicurl.cpp similarity index 100% rename from indra/llmessage/aicurl.cpp rename to indra/aistatemachine/aicurl.cpp diff --git a/indra/llmessage/aicurl.h b/indra/aistatemachine/aicurl.h similarity index 100% rename from indra/llmessage/aicurl.h rename to indra/aistatemachine/aicurl.h diff --git a/indra/newview/statemachine/aicurleasyrequeststatemachine.cpp b/indra/aistatemachine/aicurleasyrequeststatemachine.cpp similarity index 100% rename from indra/newview/statemachine/aicurleasyrequeststatemachine.cpp rename to indra/aistatemachine/aicurleasyrequeststatemachine.cpp diff --git a/indra/newview/statemachine/aicurleasyrequeststatemachine.h b/indra/aistatemachine/aicurleasyrequeststatemachine.h similarity index 100% rename from indra/newview/statemachine/aicurleasyrequeststatemachine.h rename to indra/aistatemachine/aicurleasyrequeststatemachine.h diff --git a/indra/llmessage/aicurlprivate.h b/indra/aistatemachine/aicurlprivate.h similarity index 100% rename from indra/llmessage/aicurlprivate.h rename to indra/aistatemachine/aicurlprivate.h diff --git a/indra/llmessage/aicurlthread.cpp b/indra/aistatemachine/aicurlthread.cpp similarity index 100% rename from indra/llmessage/aicurlthread.cpp rename to indra/aistatemachine/aicurlthread.cpp diff --git a/indra/llmessage/aicurlthread.h b/indra/aistatemachine/aicurlthread.h similarity index 100% rename from indra/llmessage/aicurlthread.h rename to indra/aistatemachine/aicurlthread.h diff --git a/indra/newview/statemachine/aistatemachine.cpp b/indra/aistatemachine/aistatemachine.cpp similarity index 100% rename from indra/newview/statemachine/aistatemachine.cpp rename to indra/aistatemachine/aistatemachine.cpp diff --git a/indra/newview/statemachine/aistatemachine.h b/indra/aistatemachine/aistatemachine.h similarity index 100% rename from indra/newview/statemachine/aistatemachine.h rename to indra/aistatemachine/aistatemachine.h diff --git a/indra/newview/statemachine/aitimer.cpp b/indra/aistatemachine/aitimer.cpp similarity index 100% rename from indra/newview/statemachine/aitimer.cpp rename to indra/aistatemachine/aitimer.cpp diff --git a/indra/newview/statemachine/aitimer.h b/indra/aistatemachine/aitimer.h similarity index 100% rename from indra/newview/statemachine/aitimer.h rename to indra/aistatemachine/aitimer.h diff --git a/indra/cmake/AIStateMachine.cmake b/indra/cmake/AIStateMachine.cmake index c1bda40c4..5a0aba0d7 100644 --- a/indra/cmake/AIStateMachine.cmake +++ b/indra/cmake/AIStateMachine.cmake @@ -1,4 +1,4 @@ # -*- cmake -*- -set(AISTATEMACHINE_INCLUDE_DIRS statemachine) -set(AISTATEMACHINE_LIBRARIES statemachine) +set(AISTATEMACHINE_INCLUDE_DIRS ${LIBS_OPEN_DIR}/aistatemachine) +set(AISTATEMACHINE_LIBRARIES aistatemachine) diff --git a/indra/cmake/LLMessage.cmake b/indra/cmake/LLMessage.cmake index 0143d04fd..da2bbc43b 100644 --- a/indra/cmake/LLMessage.cmake +++ b/indra/cmake/LLMessage.cmake @@ -4,12 +4,14 @@ include(CARes) include(CURL) include(OpenSSL) include(XmlRpcEpi) +include(AIStateMachine) set(LLMESSAGE_INCLUDE_DIRS ${LIBS_OPEN_DIR}/llmessage ${CARES_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIRS} + ${AISTATEMACHINE_INCLUDE_DIRS} ) -set(LLMESSAGE_LIBRARIES llmessage) +set(LLMESSAGE_LIBRARIES llmessage aistatemachine) diff --git a/indra/cmake/StateMachine.cmake b/indra/cmake/StateMachine.cmake new file mode 100644 index 000000000..8a478c647 --- /dev/null +++ b/indra/cmake/StateMachine.cmake @@ -0,0 +1,4 @@ +# -*- cmake -*- + +set(STATEMACHINE_INCLUDE_DIRS statemachine) +set(STATEMACHINE_LIBRARIES statemachine) diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt index b2b8eb4ec..90eed3756 100644 --- a/indra/llmessage/CMakeLists.txt +++ b/indra/llmessage/CMakeLists.txt @@ -4,6 +4,7 @@ project(llmessage) include(00-Common) include(LLCommon) +include(AIStateMachine) include(LLMath) include(LLMessage) include(LLVFS) @@ -12,6 +13,7 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR}) include_directories( ${LLCOMMON_INCLUDE_DIRS} + ${AISTATEMACHINE_INCLUDE_DIRS} ${LLMATH_INCLUDE_DIRS} ${LLMESSAGE_INCLUDE_DIRS} ${LLVFS_INCLUDE_DIRS} @@ -29,8 +31,7 @@ set(llmessage_SOURCE_FILES llchainio.cpp llcircuit.cpp llclassifiedflags.cpp - aicurl.cpp - aicurlthread.cpp + llcurlrequest.cpp lldatapacker.cpp lldispatcher.cpp llfiltersd2xmlrpc.cpp @@ -116,9 +117,7 @@ set(llmessage_HEADER_FILES llcircuit.h llclassifiedflags.h llcurl.h - aicurl.h - aicurlprivate.h - aicurlthread.h + llcurlrequest.h lldatapacker.h lldbstrings.h lldispatcher.h diff --git a/indra/newview/llcurlrequest.cpp b/indra/llmessage/llcurlrequest.cpp similarity index 98% rename from indra/newview/llcurlrequest.cpp rename to indra/llmessage/llcurlrequest.cpp index 75706af6d..89338dfce 100644 --- a/indra/newview/llcurlrequest.cpp +++ b/indra/llmessage/llcurlrequest.cpp @@ -41,7 +41,7 @@ #include "llsdserialize.h" #include "llcurlrequest.h" -#include "statemachine/aicurleasyrequeststatemachine.h" +#include "aicurleasyrequeststatemachine.h" //----------------------------------------------------------------------------- // class Request diff --git a/indra/newview/llcurlrequest.h b/indra/llmessage/llcurlrequest.h similarity index 100% rename from indra/newview/llcurlrequest.h rename to indra/llmessage/llcurlrequest.h diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 26e29533c..151568ca1 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -30,7 +30,7 @@ include(LLInventory) include(LLMath) include(LLMessage) include(LLPlugin) -include(AIStateMachine) +include(StateMachine) include(LLPrimitive) include(LLRender) include(LLUI) @@ -54,6 +54,7 @@ endif (WINDOWS) include_directories( ${CMAKE_SOURCE_DIR}/newview + ${STATEMACHINE_INCLUDE_DIRS} ${DBUSGLIB_INCLUDE_DIRS} ${HUNSPELL_INCLUDE_DIR} ${ELFIO_INCLUDE_DIR} @@ -152,7 +153,6 @@ set(viewer_SOURCE_FILES llconfirmationmanager.cpp llconsole.cpp llcontainerview.cpp - llcurlrequest.cpp llcurrencyuimanager.cpp llcylinder.cpp lldebugmessagebox.cpp @@ -650,7 +650,6 @@ set(viewer_HEADER_FILES llconfirmationmanager.h llconsole.h llcontainerview.h - llcurlrequest.h llcurrencyuimanager.h llcylinder.h lldebugmessagebox.h @@ -1541,7 +1540,7 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${LLINVENTORY_LIBRARIES} ${LLMESSAGE_LIBRARIES} ${LLPLUGIN_LIBRARIES} - ${AISTATEMACHINE_LIBRARIES} + ${STATEMACHINE_LIBRARIES} ${LLPRIMITIVE_LIBRARIES} ${LLRENDER_LIBRARIES} ${FREETYPE_LIBRARIES} diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index 6440652ef..e6322efed 100644 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -78,7 +78,7 @@ #include "llnetmap.h" #include "llrender.h" #include "llfloaterchat.h" -#include "statemachine/aistatemachine.h" +#include "aistatemachine.h" #include "aithreadsafe.h" #include "lldrawpoolbump.h" #include "emeraldboobutils.h" diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp index b160e2c33..38c78e045 100644 --- a/indra/newview/llxmlrpctransaction.cpp +++ b/indra/newview/llxmlrpctransaction.cpp @@ -43,7 +43,7 @@ #include "llappviewer.h" #include "hippogridmanager.h" -#include "statemachine/aicurleasyrequeststatemachine.h" +#include "aicurleasyrequeststatemachine.h" #ifdef CWDEBUG #include diff --git a/indra/newview/statemachine/CMakeLists.txt b/indra/newview/statemachine/CMakeLists.txt index 08ecccecf..1100c7872 100644 --- a/indra/newview/statemachine/CMakeLists.txt +++ b/indra/newview/statemachine/CMakeLists.txt @@ -37,23 +37,17 @@ include_directories( ) set(statemachine_SOURCE_FILES - aistatemachine.cpp - aicurleasyrequeststatemachine.cpp aifilepicker.cpp aifetchinventoryfolder.cpp aievent.cpp - aitimer.cpp ) set(statemachine_HEADER_FILES CMakeLists.txt - aistatemachine.h - aicurleasyrequeststatemachine.h aifilepicker.h aidirpicker.h aifetchinventoryfolder.h aievent.h - aitimer.h ) set_source_files_properties(${statemachine_HEADER_FILES}