Use WrtComponentCache

Signed-off-by: Wellu Mäkinen <wellu.makinen@nokia.com>

debian/control

@@ -2,7 +2,7 @@ Source: applauncherd
 Section: admin
 Priority: important
 Maintainer: Jussi Lind <jussi.lind@nokia.com>
-Build-Depends: cmake (>= 2.6.0), debhelper (>= 7), libqt4-dev (>= 4.5.0), libmeegotouch-dev, libcreds2-dev [arm armel], aegis-builder (>= 1.4) [arm armel]
+Build-Depends: cmake (>= 2.6.0), debhelper (>= 7), libqt4-dev (>= 4.5.0), libmeegotouch-dev, libcreds2-dev [arm armel], aegis-builder (>= 1.4) [arm armel], libwrt-dev
 Standards-Version: 3.8.0
 
 Package: applauncherd

src/launcher/CMakeLists.txt

@@ -11,9 +11,19 @@ qt4_wrap_cpp(MOC_SRC ${MOC_HDRS})
 # Find libdl
 find_library(LIBDL NAMES dl)
 
+# Use webruntime if found
+# this is necessary for wrt booster to work efficiently
+pkg_check_modules(WRT webruntime)
+if(WRT_FOUND)
+  add_definitions(-DHAVE_WRT)
+  include_directories(${WRT_INCLUDE_DIRS})
+endif(WRT_FOUND)
+
+
 # Set libraries to be linked. Shared libraries to be preloaded are not linked in anymore,
-# but dlopen():ed and listed in src/launcher/preload.h instead. 
+# but dlopen():ed and listed in src/launcher/preload.h instead.
-link_libraries(${MEEGOTOUCH_LIBRARIES} ${LIBDL} ${QT_QTCORE_LIBRARY})
+# WRT_LIBRARIES is needed always as it contains the implementation of WRTComponentCache
+link_libraries(${MEEGOTOUCH_LIBRARIES} ${LIBDL} ${QT_QTCORE_LIBRARY} ${WRT_LIBRARIES})
 
 # Set executable
 add_executable(applauncherd.bin ${SRC} ${MOC_SRC})

src/launcher/wrtbooster.cpp

@@ -24,6 +24,10 @@
 #include <mcomponentcache.h>
 #endif
 
+#ifdef HAVE_WRT
+#include <wrtcomponentcache.h>
+#endif
+
 const string WRTBooster::m_socketId  = "/tmp/boostw";
 const string WRTBooster::m_temporaryProcessName = "booster-w";
 int WRTBooster::m_ProcessID = 0;
@@ -38,6 +42,10 @@ bool WRTBooster::preload()
 #ifdef HAVE_MCOMPONENTCACHE
     MComponentCache::populateForWRTApplication();
 #endif
+
+#ifdef HAVE_WRT
+    WrtComponentCache::populateCache();
+#endif
     return true;
 }