Working on CMake build for ipaaca-cpp

cpp/CMakeLists.txt

+cmake_minimum_required (VERSION 2.6)
+
+# project name
+project (ipaaca)
+
+## use the following line to enable console debug messages in ipaaca
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DIPAACA_DEBUG_MESSAGES")
+
+# find cmake modules locally too
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules)
+
+set(BOOSTLIBS boost_regex-mt boost_date_time-mt boost_program_options-mt boost_thread-mt boost_filesystem-mt boost_signals-mt boost_system-mt)
+set(PROTOLIBS protobuf)
+set(RSBLIBS rsc rsbcore)
+
+set(LIBS ${LIBS} ${BOOSTLIBS} ${PROTOLIBS} ${RSBLIBS})
+
+# enhance the default search paths (headers, libs ...)
+set(CMAKE_PREFIX_PATH ${PROJECT_SOURCE_DIR}:/opt/local:${CMAKE_PREFIX_PATH})
+
+## Ace2 uses deprecated style (non-template friend functions and non-const char*s)
+##  We just hide the warnings here
+#set(CXX_OLD_CODE_CONVENIENCE_FLAGS "-Wno-non-template-friend -Wno-write-strings")
+
+# Compiler defines copied from the old build system
+set(CXX_DEFINES "-D_BSD_SOURCE -DUSE_AV -DMGC_USE_DOUBLE -DLEDA_PREFIX -D__NO_CAST_TO_LOCAL_TYPE__ -DDBGLVL=0")
+if (DEFINED APPLE)
+	message(STATUS "Adding extra options for building on Mac OS X")
+	set(CXX_DEFINES "${CXX_DEFINES} -D__MACOSX__")
+	link_directories( /opt/local/lib )
+	include_directories( /opt/local/include )
+endif(DEFINED APPLE)
+
+# Combine the extra compiler flags
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_OLD_CODE_CONVENIENCE_FLAGS} ${CXX_DEFINES}")
+
+# add include dir for auto-generated headers placed in build/
+include_directories( ${PROJECT_SOURCE_DIR}/build )
+
+# add local include directory
+include_directories( ${PROJECT_SOURCE_DIR}/include )
+# add lib and include directory from pulled dependencies
+include_directories( ${PROJECT_SOURCE_DIR}/lib/include )
+link_directories( ${PROJECT_SOURCE_DIR}/lib )
+
+# specify source files for ipaaca (auto-generated ones are in build/ )
+set (SOURCE
+	src/ipaaca.cc
+	build/ipaaca.pb.cc
+	)
+
+# compile all files to "ipaaca" shared library
+add_library(ipaaca SHARED ${SOURCE})
+# and link all the required external libs (found above using find_package etc.)
+target_link_libraries(ipaaca ${LIBS})
+
+set(DEFAULT_BIN_SUBDIR bin)
+set(DEFAULT_LIB_SUBDIR lib)
+set(DEFAULT_DATA_SUBDIR share/data)
+set(DEFAULT_INCLUDE_SUBDIR include)
+set(CMAKE_INSTALL_PREFIX "")
+install (
+	TARGETS ipaaca
+	RUNTIME DESTINATION bin
+	LIBRARY DESTINATION lib
+	ARCHIVE DESTINATION lib
+	)
+install(
+	DIRECTORY include
+	DESTINATION /
+	FILES_MATCHING PATTERN "*.h" PATTERN "*.hh" PATTERN "*.hpp" PATTERN "*.inl"
+	)
+
+

cpp/build.properties

 language=cpp
 resolve.status=beta
-resource.path=${shared.resources}/Shared3DModels/resource;${shared.resources}/DefaultShaders/resource;${shared.resources}/LogbackConfigs/resource;${shared.resources}/HmiHumanoidBodyControl/resource;${shared.resources}/HmiHumanoidEmbodiments/resource;
+resource.path=${shared.resources}/;
 rebuild.list=
 

cpp/build.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<project name="IpaacaCpp"  default="run">
+<project name="IpaacaCpp"  default="dist">
    <import file="../../soashared/ant/build.xml" />
    <target name="-pre-compilation">
      <echo message="Compiling protobuf file" />

cpp/ivy.xml

 <ivy-module version="2.0">
-   <info organisation="HMI" module="IpaacaCpp" />
+   <info organisation="ipaaca" module="IpaacaCpp" />
    <dependencies>
+      <dependency org="google" name="protobuf" rev="latest.release"/>
+      <dependency org="rsb" name="rsb" rev="latest.release"/>
    </dependencies>
 </ivy-module>

cpp/test/src/rsb.conf

+[transport.spread]
+host = localhost
+port = 4803
+enabled = 1
+

python/test/src/ipaacaspam.py

@@ -97,6 +97,24 @@ class Sender(object):
 				self.counter = 0
 				#print ".",
 				#sys.stdout.flush()
+
+class TestAcker(object):
+	def __init__(self):
+		self.ib = ipaaca.InputBuffer('TestIn', ['testcategory'])
+		self.ib.register_handler(self.handle_iu_event)
+	
+	def handle_iu_event(self, iu, event_type, local):
+		print "Received a testcategory event ", event_type
+		if event_type=='ADDED':
+			try:
+				iu.payload['ack'] = 'ack'
+			except ipaaca.IUUpdateFailedError, e:
+				print "== tried to send an initial update, but someone else was quicker."
+	
+	def run(self):
+		while True:
+			time.sleep(1)
+
 	
 if __name__ == '__main__':
 	if len(sys.argv)<2:
@@ -125,6 +143,9 @@ if __name__ == '__main__':
 			sys.exit(1)
 		s = Sender(send_frequency=freq)
 		s.run()
+	elif sys.argv[1] == 'testacker':
+		r = TestAcker()
+		r.run()
 	else:
 		print "specify either 'sender', 'receiver', 'ping' or 'pong' as an argument"
 		sys.exit(1)