Change source position of appfw-server

Change-Id: Ic13086bcf2ade79099f1ea8d4e47943da0c66458
Signed-off-by: Hyunbin Lee <hyunbin.lee@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ac91b0..f6f8a74 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,5 +76,5 @@ INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/locales/inc/ DESTINATION include/osp/l
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/security/inc/ DESTINATION include/osp/security FILES_MATCHING PATTERN "*.h")
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/system/inc/ DESTINATION include/osp/system FILES_MATCHING PATTERN "*.h")
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/text/inc/ DESTINATION include/osp/text FILES_MATCHING PATTERN "*.h")
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/server/inc/ DESTINATION include/osp/server/ FILES_MATCHING PATTERN "*.h")
+INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/server/appfw/inc/ DESTINATION include/osp/server/appfw/ FILES_MATCHING PATTERN "*.h")
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/system-server/inc/ DESTINATION include/osp/server/ FILES_MATCHING PATTERN "*.h")

diff --git a/osp-appfw-server.pc.in b/osp-appfw-server.pc.in
index 23414e0..74c5d15 100755 (executable)
--- a/osp-appfw-server.pc.in
+++ b/osp-appfw-server.pc.in
@@ -3,7 +3,7 @@
 prefix=@PREFIX@
 exec_prefix=/usr
 libdir=/usr/lib/osp-server
-includedir=/usr/include/osp/server
+includedir=/usr/include/osp/server/appfw
 
 Name: @PC_NAME@
 Description: @PACKAGE_DESCRIPTION@

diff --git a/packaging/osp-appfw.spec b/packaging/osp-appfw.spec
index bcf5b08..519c8e6 100644 (file)
--- a/packaging/osp-appfw.spec
+++ b/packaging/osp-appfw.spec
@@ -206,6 +206,7 @@ chmod 444 /opt/usr/etc/clocale.list
 %{_includedir}/osp/security/*
 %{_includedir}/osp/system/*
 %{_includedir}/osp/text/*
+%{_includedir}/osp/server/appfw/*
 %{_includedir}/osp/server/*
 %{_libdir}/pkgconfig/osp-appfw.pc
 %{_libdir}/pkgconfig/osp-appfw-server.pc

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c47dac7..5ae838e 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -59,5 +59,5 @@ ADD_SUBDIRECTORY(system)
 ADD_SUBDIRECTORY(text)
 ADD_SUBDIRECTORY(appfw)
 ADD_SUBDIRECTORY(osp-string)
-ADD_SUBDIRECTORY(server osp-appfw-server)
+ADD_SUBDIRECTORY(server)
 ADD_SUBDIRECTORY(system-server osp-system-server)

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 4d0b47e..e6ef5b3 100644 (file)
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -1,78 +1,2 @@
-SET (this_target osp-appfw-server)
-
-INCLUDE_DIRECTORIES (
-       ${SLP_INCLUDE_DIRS}
-       ${CMAKE_SOURCE_DIR}/inc
-       ${CMAKE_SOURCE_DIR}/src/base/inc
-       ${CMAKE_SOURCE_DIR}/src/io/inc
-       ${CMAKE_SOURCE_DIR}/src/system/inc
-       ${CMAKE_SOURCE_DIR}/src/security/inc
-       ${CMAKE_SOURCE_DIR}/src/security
-       ${CMAKE_SOURCE_DIR}/src/app/inc
-       inc
-       )
-
-SET (${this_target}_SOURCE_FILES
-       app/FApp_AulServer.cpp
-       app/FApp_AppLaunchCondition.cpp
-       app/FApp_AppLaunchConditionHandlerBase.cpp
-       app/FApp_AppManagerEvent.cpp
-       app/package/FAppPkg_PackageManagerServer.cpp
-       io/FIo_IpcServer.cpp
-       security/FSec_PrivilegeManagerServer.cpp
-       )
-
-INCLUDE(FindPkgConfig)
-pkg_check_modules(server_pkgs REQUIRED
-       appsvc
-       chromium
-       dukgenerator
-       glib-2.0
-       pkgmgr-info
-)
-
-FOREACH(flag ${server_pkgs_CFLAGS})
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-
-## SET EXTRA COMPILER FLAGS
-SET(EXTRA_CFLAGS  "${EXTRA_CFLAGS} -fPIC -Wall -Wno-unused")
-
-## 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(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined -Wl,--as-needed")
-
-TARGET_LINK_LIBRARIES(${this_target} osp-appfw)
-TARGET_LINK_LIBRARIES(${this_target} ${server_pkgs_LDFLAGS})
-
-
-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}"
-)
-
-SET(PC_NAME ${this_target})
-SET(PC_REQUIRED ${pc_requires})
-SET(PC_LDFLAGS -l${this_target})
-SET(VERSION ${FULLVER})
-
-# pkgconfig file
-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/${this_target}.pc.in ${CMAKE_SOURCE_DIR}/${this_target}.pc @ONLY)
-
+## Add SubModules
+ADD_SUBDIRECTORY(appfw)

diff --git a/src/server/appfw/CMakeLists.txt b/src/server/appfw/CMakeLists.txt
new file mode 100644 (file)
index 0000000..3c1f56c
--- /dev/null
+++ b/src/server/appfw/CMakeLists.txt
@@ -0,0 +1,78 @@
+SET (this_target osp-appfw-server)
+
+INCLUDE_DIRECTORIES (
+       ${SLP_INCLUDE_DIRS}
+       ${CMAKE_SOURCE_DIR}/inc
+       ${CMAKE_SOURCE_DIR}/src/base/inc
+       ${CMAKE_SOURCE_DIR}/src/io/inc
+       ${CMAKE_SOURCE_DIR}/src/system/inc
+       ${CMAKE_SOURCE_DIR}/src/security/inc
+       ${CMAKE_SOURCE_DIR}/src/security
+       ${CMAKE_SOURCE_DIR}/src/app/inc
+       inc
+       )
+
+SET (${this_target}_SOURCE_FILES
+       app/FApp_AulServer.cpp
+       app/FApp_AppLaunchCondition.cpp
+       app/FApp_AppLaunchConditionHandlerBase.cpp
+       app/FApp_AppManagerEvent.cpp
+       app/package/FAppPkg_PackageManagerServer.cpp
+       io/FIo_IpcServer.cpp
+       security/FSec_PrivilegeManagerServer.cpp
+       )
+
+INCLUDE(FindPkgConfig)
+pkg_check_modules(server_pkgs REQUIRED
+       appsvc
+       chromium
+       dukgenerator
+       glib-2.0
+       pkgmgr-info
+)
+
+FOREACH(flag ${server_pkgs_CFLAGS})
+       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+ENDFOREACH(flag)
+
+## SET EXTRA COMPILER FLAGS
+SET(EXTRA_CFLAGS  "${EXTRA_CFLAGS} -fPIC -Wall -Wno-unused")
+
+## 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(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined -Wl,--as-needed")
+
+TARGET_LINK_LIBRARIES(${this_target} osp-appfw)
+TARGET_LINK_LIBRARIES(${this_target} ${server_pkgs_LDFLAGS})
+
+
+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}"
+)
+
+SET(PC_NAME ${this_target})
+SET(PC_REQUIRED ${pc_requires})
+SET(PC_LDFLAGS -l${this_target})
+SET(VERSION ${FULLVER})
+
+# pkgconfig file
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/${this_target}.pc.in ${CMAKE_SOURCE_DIR}/${this_target}.pc @ONLY)
+

diff --git a/src/server/app/FApp_AppLaunchCondition.cpp b/src/server/appfw/app/FApp_AppLaunchCondition.cpp
similarity index 100%
rename from src/server/app/FApp_AppLaunchCondition.cpp
rename to src/server/appfw/app/FApp_AppLaunchCondition.cpp

diff --git a/src/server/app/FApp_AppLaunchConditionHandlerBase.cpp b/src/server/appfw/app/FApp_AppLaunchConditionHandlerBase.cpp
similarity index 100%
rename from src/server/app/FApp_AppLaunchConditionHandlerBase.cpp
rename to src/server/appfw/app/FApp_AppLaunchConditionHandlerBase.cpp

diff --git a/src/server/app/FApp_AppManagerEvent.cpp b/src/server/appfw/app/FApp_AppManagerEvent.cpp
similarity index 100%
rename from src/server/app/FApp_AppManagerEvent.cpp
rename to src/server/appfw/app/FApp_AppManagerEvent.cpp

diff --git a/src/server/app/FApp_AulServer.cpp b/src/server/appfw/app/FApp_AulServer.cpp
similarity index 100%
rename from src/server/app/FApp_AulServer.cpp
rename to src/server/appfw/app/FApp_AulServer.cpp

diff --git a/src/server/app/package/FAppPkg_PackageManagerServer.cpp b/src/server/appfw/app/package/FAppPkg_PackageManagerServer.cpp
similarity index 100%
rename from src/server/app/package/FAppPkg_PackageManagerServer.cpp
rename to src/server/appfw/app/package/FAppPkg_PackageManagerServer.cpp

diff --git a/src/server/inc/FAppPkg_PackageManagerServer.h b/src/server/appfw/inc/FAppPkg_PackageManagerServer.h
similarity index 100%
rename from src/server/inc/FAppPkg_PackageManagerServer.h
rename to src/server/appfw/inc/FAppPkg_PackageManagerServer.h

diff --git a/src/server/inc/FApp_AppLaunchCondition.h b/src/server/appfw/inc/FApp_AppLaunchCondition.h
similarity index 100%
rename from src/server/inc/FApp_AppLaunchCondition.h
rename to src/server/appfw/inc/FApp_AppLaunchCondition.h

diff --git a/src/server/inc/FApp_AppLaunchConditionHandlerBase.h b/src/server/appfw/inc/FApp_AppLaunchConditionHandlerBase.h
similarity index 100%
rename from src/server/inc/FApp_AppLaunchConditionHandlerBase.h
rename to src/server/appfw/inc/FApp_AppLaunchConditionHandlerBase.h

diff --git a/src/server/inc/FApp_AppManagerEvent.h b/src/server/appfw/inc/FApp_AppManagerEvent.h
similarity index 100%
rename from src/server/inc/FApp_AppManagerEvent.h
rename to src/server/appfw/inc/FApp_AppManagerEvent.h

diff --git a/src/server/inc/FApp_AppManagerEventArg.h b/src/server/appfw/inc/FApp_AppManagerEventArg.h
similarity index 100%
rename from src/server/inc/FApp_AppManagerEventArg.h
rename to src/server/appfw/inc/FApp_AppManagerEventArg.h

diff --git a/src/server/inc/FApp_AulServer.h b/src/server/appfw/inc/FApp_AulServer.h
similarity index 100%
rename from src/server/inc/FApp_AulServer.h
rename to src/server/appfw/inc/FApp_AulServer.h

diff --git a/src/server/inc/FApp_IAppLaunchConditionEventListener.h b/src/server/appfw/inc/FApp_IAppLaunchConditionEventListener.h
similarity index 100%
rename from src/server/inc/FApp_IAppLaunchConditionEventListener.h
rename to src/server/appfw/inc/FApp_IAppLaunchConditionEventListener.h

diff --git a/src/server/inc/FApp_IAppManagerEventListener.h b/src/server/appfw/inc/FApp_IAppManagerEventListener.h
similarity index 100%
rename from src/server/inc/FApp_IAppManagerEventListener.h
rename to src/server/appfw/inc/FApp_IAppManagerEventListener.h

diff --git a/src/server/inc/FIo_IpcServer.h b/src/server/appfw/inc/FIo_IpcServer.h
similarity index 100%
rename from src/server/inc/FIo_IpcServer.h
rename to src/server/appfw/inc/FIo_IpcServer.h

diff --git a/src/server/inc/FSec_PrivilegeManagerServer.h b/src/server/appfw/inc/FSec_PrivilegeManagerServer.h
similarity index 100%
rename from src/server/inc/FSec_PrivilegeManagerServer.h
rename to src/server/appfw/inc/FSec_PrivilegeManagerServer.h

diff --git a/src/server/io/FIo_IpcServer.cpp b/src/server/appfw/io/FIo_IpcServer.cpp
similarity index 100%
rename from src/server/io/FIo_IpcServer.cpp
rename to src/server/appfw/io/FIo_IpcServer.cpp

diff --git a/src/server/security/FSec_PrivilegeManagerServer.cpp b/src/server/appfw/security/FSec_PrivilegeManagerServer.cpp
similarity index 100%
rename from src/server/security/FSec_PrivilegeManagerServer.cpp
rename to src/server/appfw/security/FSec_PrivilegeManagerServer.cpp