Fix dummy plugin

Change-Id: Id169567ff751567f1ba5fe974c6581f6e7e51894
Signed-off-by: kj7.sung <kj7.sung@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a83648b..2bfcf57 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,6 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 SET(fw_name "capi-maps-service")
+SET(DUMMY_PLUGIN "maps-plugin-test")
 
 PROJECT(${fw_name})
 
@@ -12,9 +13,16 @@ SET(INTERNAL_INC_DIR
        src/api
        src/plugin
        src/session
+       test/dummy_plugin/
+       test/src/util/
        )
 INCLUDE_DIRECTORIES(${INC_DIR} ${INTERNAL_INC_DIR})
 
+SET(DUMMY_PLUGIN_SRC
+       test/dummy_plugin/dummy_plugin.cpp
+       test/src/util/maps_object.cpp
+       )
+
 SET(dependents "glib-2.0 gmodule-2.0 dlog capi-base-common")
 SET(pc_dependents "capi-base-common")
 
@@ -46,18 +54,27 @@ aux_source_directory(src SOURCES)
 aux_source_directory(src/api SOURCES_API)
 aux_source_directory(src/plugin SOURCES_PLUGIN)
 aux_source_directory(src/session SOURCES_SESSION)
-ADD_LIBRARY(${fw_name} SHARED ${SOURCES} ${SOURCES_API} ${SOURCES_PLUGIN} ${SOURCES_SESSION})
 
+ADD_LIBRARY(${fw_name} SHARED ${SOURCES} ${SOURCES_API} ${SOURCES_PLUGIN} ${SOURCES_SESSION})
 TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS})
-
 SET_TARGET_PROPERTIES(${fw_name}
        PROPERTIES
        VERSION ${FULLVER}
        SOVERSION ${MAJORVER}
        CLEAN_DIRECT_OUTPUT 1
        )
-
 INSTALL(TARGETS ${fw_name} DESTINATION ${LIBDIR})
+
+ADD_LIBRARY(${DUMMY_PLUGIN} SHARED ${DUMMY_PLUGIN_SRC})
+TARGET_LINK_LIBRARIES(${DUMMY_PLUGIN} ${fw_name} ${${DUMMY_PLUGIN}_LDFLAGS})
+SET_TARGET_PROPERTIES(${DUMMY_PLUGIN}
+       PROPERTIES
+       VERSION ${FULLVER}
+       SOVERSION ${MAJORVER}
+       CLEAN_DIRECT_OUTPUT 1
+       )
+INSTALL(TARGETS ${DUMMY_PLUGIN} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/maps/plugins)
+
 INSTALL(
        DIRECTORY ${INC_DIR}/ DESTINATION include/maps
        FILES_MATCHING

diff --git a/lib/libmaps-plugin-test.so b/lib/libmaps-plugin-test.so
deleted file mode 100755 (executable)
index 89e5594..0000000
Binary files a/lib/libmaps-plugin-test.so and /dev/null differ

diff --git a/lib/libmaps-plugin-test.so.0 b/lib/libmaps-plugin-test.so.0
deleted file mode 100755 (executable)
index 89e5594..0000000
Binary files a/lib/libmaps-plugin-test.so.0 and /dev/null differ

diff --git a/lib/libmaps-plugin-test.so.0.4.2 b/lib/libmaps-plugin-test.so.0.4.2
deleted file mode 100755 (executable)
index 89e5594..0000000
Binary files a/lib/libmaps-plugin-test.so.0.4.2 and /dev/null differ

diff --git a/packaging/capi-maps-service.spec b/packaging/capi-maps-service.spec
index 40c5b18..25e4bfa 100644 (file)
--- a/packaging/capi-maps-service.spec
+++ b/packaging/capi-maps-service.spec
@@ -46,7 +46,6 @@ mkdir -p %{buildroot}/usr/share/license
 cp LICENSE %{buildroot}/usr/share/license/%{name}
 
 mkdir -p %{buildroot}%{_prefix}/lib/maps/plugins
-cp -a lib/libmaps-plugin-test.so* %{buildroot}%{_prefix}/lib/maps/plugins
 
 %post
 /sbin/ldconfig
@@ -122,15 +121,15 @@ This is a program to test the Tizen Maps Service Library internally.
 #################################################################################
 # Test plugin library
 
-%package -n maps-plugin-test
-Summary:    Tizen Maps Service Plug-in Test (Internal Dev)
-Group:      Location/Testing
-Requires:   %{name} = %{version}-%{release}
+#%package -n maps-plugin-test
+#Summary:    Tizen Maps Service Plug-in Test (Internal Dev)
+#Group:      Location/Testing
+#Requires:   %{name} = %{version}-%{release}
 
-%description -n maps-plugin-test
-This is a program to test the Tizen Maps Service for Plug-in internally.
+#%description -n maps-plugin-test
+#This is a program to test the Tizen Maps Service for Plug-in internally.
 
-%files -n maps-plugin-test
-%manifest test/dummy_plugin/maps-plugin-test.manifest
-%defattr(-,root,root,-)
-%{_libdir}/maps/plugins/libmaps-plugin-test.so*
+#%files -n maps-plugin-test
+#%manifest test/dummy_plugin/maps-plugin-test.manifest
+#%defattr(-,root,root,-)
+#%{_libdir}/maps/plugins/libmaps-plugin-test.so*

diff --git a/test/dummy_plugin/CMakeLists.txt b/test/dummy_plugin/CMakeLists.txt
deleted file mode 100644 (file)
index a1e296a..0000000
--- a/test/dummy_plugin/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-SET(DUMMY_PLUGIN "maps-plugin-test")
-
-SET(DUMMY_PLUGIN_SRC
-       dummy_plugin.cpp
-       ../src/util/maps_object.cpp
-       )
-
-INCLUDE(FindPkgConfig)
-pkg_check_modules(${DUMMY_PLUGIN} REQUIRED)
-FOREACH(flag ${${DUMMY_PLUGIN}_CFLAGS})
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -Werror")
-
-ADD_LIBRARY(${DUMMY_PLUGIN} SHARED ${DUMMY_PLUGIN_SRC})
-SET_TARGET_PROPERTIES(${DUMMY_PLUGIN}
-       PROPERTIES
-       VERSION ${FULLVER}
-       SOVERSION ${MAJORVER}
-       CLEAN_DIRECT_OUTPUT 1
-       )
-
-TARGET_LINK_LIBRARIES(${DUMMY_PLUGIN} ${fw_name} ${${DUMMY_PLUGIN}_LDFLAGS})
-
-INSTALL(TARGETS ${DUMMY_PLUGIN} DESTINATION ${LIBDIR}/maps/plugins)

diff --git a/test/dummy_plugin/maps-plugin-test.manifest b/test/dummy_plugin/maps-plugin-test.manifest
deleted file mode 100644 (file)
index ae3e6f7..0000000
--- a/test/dummy_plugin/maps-plugin-test.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-       <request>
-               <domain name="_"/>
-       </request>
-</manifest>
\ No newline at end of file