Created aistatemachine library and moved files.

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)

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)
+

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)

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)

indra/cmake/StateMachine.cmake

@@ -0,0 +1,4 @@
+# -*- cmake -*-
+
+set(STATEMACHINE_INCLUDE_DIRS statemachine)
+set(STATEMACHINE_LIBRARIES statemachine)

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

indra/llmessage/llcurlrequest.cpp

@@ -41,7 +41,7 @@
 
 #include "llsdserialize.h"
 #include "llcurlrequest.h"
-#include "statemachine/aicurleasyrequeststatemachine.h"
+#include "aicurleasyrequeststatemachine.h"
 
 //-----------------------------------------------------------------------------
 // class Request

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}

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"

indra/newview/llxmlrpctransaction.cpp

@@ -43,7 +43,7 @@
 #include "llappviewer.h"
 
 #include "hippogridmanager.h"
-#include "statemachine/aicurleasyrequeststatemachine.h"
+#include "aicurleasyrequeststatemachine.h"
 
 #ifdef CWDEBUG
 #include <libcwd/buf2str.h>

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}