svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge

dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers

2 files changed, 37 insertions, 3 deletions

diff --git a/indra/lscript/lscript_execute/CMakeLists.txt b/indra/lscript/lscript_execute/CMakeLists.txt
new file mode 100644
index 0000000000..f30915bab0
--- /dev/null
+++ b/indra/lscript/lscript_execute/CMakeLists.txt
@@ -0,0 +1,34 @@
+# -*- cmake -*-
+
+include(00-Common)
+include(LLCommon)
+include(LLMath)
+include(LScript)
+
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LSCRIPT_INCLUDE_DIRS}
+    )
+
+set(lscript_execute_SOURCE_FILES
+    lscript_execute.cpp
+    lscript_heapruntime.cpp
+    lscript_readlso.cpp
+    )
+
+set(lscript_execute_HEADER_FILES
+    CMakeLists.txt
+
+    ../lscript_execute.h
+    ../lscript_rt_interface.h
+    lscript_heapruntime.h
+    lscript_readlso.h
+    )
+
+set_source_files_properties(${lscript_execute_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND lscript_execute_SOURCE_FILES ${lscript_execute_HEADER_FILES})
+
+add_library (lscript_execute ${lscript_execute_SOURCE_FILES})
diff --git a/indra/lscript/lscript_execute/lscript_execute.cpp b/indra/lscript/lscript_execute/lscript_execute.cpp
index f1c0ead118..77e24cd8f4 100644
--- a/indra/lscript/lscript_execute/lscript_execute.cpp
+++ b/indra/lscript/lscript_execute/lscript_execute.cpp
@@ -43,7 +43,7 @@
 void (*binary_operations[LST_EOF][LST_EOF])(U8 *buffer, LSCRIPTOpCodesEnum opcode);
 void (*unary_operations[LST_EOF])(U8 *buffer, LSCRIPTOpCodesEnum opcode);
 
-char* LSCRIPTRunTimeFaultStrings[LSRF_EOF] =		/*Flawfinder: ignore*/
+const char* LSCRIPTRunTimeFaultStrings[LSRF_EOF] =		/*Flawfinder: ignore*/
 {
 	"invalid",				//	LSRF_INVALID,
 	"Math Error",			//	LSRF_MATH,
@@ -296,7 +296,7 @@ void LLScriptExecute::setStateEventOpcoodeStartSafely( S32 state, LSCRIPTStateEv
 
 S32 lscript_push_variable(LLScriptLibData *data, U8 *buffer);
 
-U32 LLScriptExecute::run(BOOL b_print, const LLUUID &id, char **errorstr, BOOL &state_transition)
+U32 LLScriptExecute::run(BOOL b_print, const LLUUID &id, const char **errorstr, BOOL &state_transition)
 {
 	//  is there a fault?
 	//	if yes, print out message and exit
@@ -3687,7 +3687,7 @@ void lscript_run(char *filename, BOOL b_debug)
 	}
 	else
 	{
-		char *error;
+		const char *error;
 		BOOL b_state;
 		LLScriptExecute *execute = NULL;