updated the osp-shell to osp-shell and osp-shell-core

Change-Id: I13f8d758212e9dc3b16bf6c15aa0662a7aa7857b
Signed-off-by: Jiban Prakash <p.jiban@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2daeaae..240a0e9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,7 @@ ENABLE_LANGUAGE(ASM)
 LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH})
 
 ADD_SUBDIRECTORY(src)
+ADD_SUBDIRECTORY(src/core)
 
 # pkgconfig file
 CONFIGURE_FILE(osp-shell.pc.in ${CMAKE_SOURCE_DIR}/osp-shell.pc @ONLY)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9789631..793c192 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -49,12 +49,6 @@ INCLUDE_DIRECTORIES(
 )
 
 SET (${this_target}_SOURCE_FILES
-       FShellNotificationManager.cpp
-       FShell_NotificationManagerImpl.cpp
-       FShellNotificationRequest.cpp
-       FShell_NotificationRequestImpl.cpp
-       FShell_NotificationManagerProxy.cpp
-       FShell_NotificationManagerIpcMessages.cpp
        FShellQuickPanelFrame.cpp
        FShell_QuickPanelFrame.cpp
        FShell_QuickPanelFrameImpl.cpp

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
new file mode 100644 (file)
index 0000000..7318b00
--- /dev/null
+++ b/src/core/CMakeLists.txt
@@ -0,0 +1,99 @@
+SET (this_target osp-shell-core)
+
+INCLUDE_DIRECTORIES(
+       ${CMAKE_SOURCE_DIR}/inc
+       ${CMAKE_SOURCE_DIR}/src
+       ${CMAKE_SOURCE_DIR}/src/inc
+       /usr/include/chromium
+       /usr/include/osp
+       /usr/include/osp/app
+       /usr/include/osp/base
+       /usr/include/osp/io
+       /usr/include/osp/graphics
+       /usr/include/osp/security
+
+       /usr/include
+       /usr/include/appfw
+       /usr/include/glib-2.0
+       /usr/lib/glib-2.0/include
+       /usr/include/cairo
+       /usr/include/chromium
+       /usr/include/dlog
+       /usr/include/dbus-1.0
+       /usr/include/dri2
+       #/usr/include/libdrm
+       /usr/include/notification
+       /usr/lib/dbus-1.0/include
+       /usr/include/e_dbus-1
+       /usr/include/elementary-1
+       /usr/include/efreet-1
+       /usr/include/ecore-1
+       /usr/include/edje-1
+       /usr/include/evas-1
+       /usr/include/eet-1
+       /usr/include/eina-1
+       /usr/include/eina-1/eina
+       /usr/include/ethumb-1
+       /usr/include/freetype2
+       /usr/include/fribidi
+       /usr/include/harfbuzz
+       /usr/include/libxml2
+       /usr/include/minizip
+       /usr/include/minicontrol
+       /usr/include/pango-1.0
+       /usr/include/pixman-1
+       /usr/include/system
+       /usr/include/vconf
+)
+
+SET (${this_target}_SOURCE_FILES
+       FShellNotificationManager.cpp
+       FShell_NotificationManagerImpl.cpp
+       FShellNotificationRequest.cpp
+       FShell_NotificationRequestImpl.cpp
+       FShell_NotificationManagerProxy.cpp
+       FShell_NotificationManagerIpcMessages.cpp
+)
+
+## Definitions
+SET(EXTRA_CFLAGS  "${EXTRA_CFLAGS} -Wall" )
+
+## SET C COMPILER FLAGS
+SET(CMAKE_C_FLAGS "${OSP_DEBUG_FLAGS} ${OSP_OPT_FLAGS} ${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} ${OSP_COMPILER_FLAGS}")
+
+## SET CPP COMPILER FLAGS
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
+SET(CMAKE_CXX_FLAGS "${OSP_DEBUG_FLAGS} ${OSP_OPT_FLAGS} ${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} ${OSP_COMPILER_FLAGS}")
+
+## Create Library
+ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES})
+
+## SET LINKER FLAGS
+SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined -Wl,--as-needed")
+
+TARGET_LINK_LIBRARIES(${this_target} "-lchromium" )
+TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib/osp -losp-appfw" )
+TARGET_LINK_LIBRARIES(${this_target} "-lcapi-appfw-application" )
+TARGET_LINK_LIBRARIES(${this_target} "-lcapi-appfw-app-manager" )
+TARGET_LINK_LIBRARIES(${this_target} "-lnotification" )
+TARGET_LINK_LIBRARIES(${this_target} "-lecore" )
+TARGET_LINK_LIBRARIES(${this_target} "-levas" )
+TARGET_LINK_LIBRARIES(${this_target} "-leina" )
+TARGET_LINK_LIBRARIES(${this_target} "-lecore_evas" )
+TARGET_LINK_LIBRARIES(${this_target} "-lminicontrol-provider" )
+#TARGET_LINK_LIBRARIES(${this_target} "-lcapi-system-runtime-info")
+
+SET_TARGET_PROPERTIES(${this_target}
+       PROPERTIES
+       VERSION ${FULLVER}
+       SOVERSION ${MAJORVER}
+       CLEAN_DIRECT_OUTPUT 1
+)
+
+ADD_CUSTOM_COMMAND(TARGET ${this_target}
+               POST_BUILD
+               COMMAND ${CMAKE_COMMAND} -E copy ${LIBRARY_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX} ${LIBRARY_OUTPUT_PATH}/debug/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX}.${FULLVER}
+               COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX}.${FULLVER} ${LIBRARY_OUTPUT_PATH}/debug/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX}.${MAJORVER}
+               COMMAND ${CMAKE_STRIP} --strip-unneeded ${LIBRARY_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX}
+               COMMENT "strip ${this_target}"
+)

diff --git a/src/FShellNotificationManager.cpp b/src/core/FShellNotificationManager.cpp
similarity index 100%
rename from src/FShellNotificationManager.cpp
rename to src/core/FShellNotificationManager.cpp

diff --git a/src/FShellNotificationRequest.cpp b/src/core/FShellNotificationRequest.cpp
similarity index 100%
rename from src/FShellNotificationRequest.cpp
rename to src/core/FShellNotificationRequest.cpp

diff --git a/src/FShell_NotificationManagerEventParamTraits.h b/src/core/FShell_NotificationManagerEventParamTraits.h
similarity index 100%
rename from src/FShell_NotificationManagerEventParamTraits.h
rename to src/core/FShell_NotificationManagerEventParamTraits.h

diff --git a/src/FShell_NotificationManagerImpl.cpp b/src/core/FShell_NotificationManagerImpl.cpp
similarity index 100%
rename from src/FShell_NotificationManagerImpl.cpp
rename to src/core/FShell_NotificationManagerImpl.cpp

diff --git a/src/FShell_NotificationManagerIpcMessages.cpp b/src/core/FShell_NotificationManagerIpcMessages.cpp
similarity index 100%
rename from src/FShell_NotificationManagerIpcMessages.cpp
rename to src/core/FShell_NotificationManagerIpcMessages.cpp

diff --git a/src/FShell_NotificationManagerIpcMessages.h b/src/core/FShell_NotificationManagerIpcMessages.h
similarity index 100%
rename from src/FShell_NotificationManagerIpcMessages.h
rename to src/core/FShell_NotificationManagerIpcMessages.h

diff --git a/src/FShell_NotificationManagerProxy.cpp b/src/core/FShell_NotificationManagerProxy.cpp
similarity index 100%
rename from src/FShell_NotificationManagerProxy.cpp
rename to src/core/FShell_NotificationManagerProxy.cpp

diff --git a/src/FShell_NotificationManagerProxy.h b/src/core/FShell_NotificationManagerProxy.h
similarity index 100%
rename from src/FShell_NotificationManagerProxy.h
rename to src/core/FShell_NotificationManagerProxy.h

diff --git a/src/FShell_NotificationRequestImpl.cpp b/src/core/FShell_NotificationRequestImpl.cpp
similarity index 100%
rename from src/FShell_NotificationRequestImpl.cpp
rename to src/core/FShell_NotificationRequestImpl.cpp

diff --git a/src/FShell_NotificationRequestImpl.h b/src/core/FShell_NotificationRequestImpl.h
similarity index 100%
rename from src/FShell_NotificationRequestImpl.h
rename to src/core/FShell_NotificationRequestImpl.h

diff --git a/src/inc/FShell_NotificationManagerImpl.h b/src/core/inc/FShell_NotificationManagerImpl.h
similarity index 100%
rename from src/inc/FShell_NotificationManagerImpl.h
rename to src/core/inc/FShell_NotificationManagerImpl.h