Fix header and library name for backward compatibility (Tizen 2.4)

*version : 1.1.3 -> 1.1.4
*shared library : libservice-adaptor.so -> libservice-adaptor-client.so
*header : (changed) service_adaptor.h -> service_adaptor_client.h
          (new) service_adaptor_client_plugin.h
          (new) service_adaptor_client_storage.h

Change-Id: I93252920ceb61ac8bc2e9b8d509baf596ae3df58
Signed-off-by: Jiwon Kim <jiwon177.kim@samsung.com>

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 28fe269..9c026d8 100644 (file)
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -22,7 +22,7 @@ ADD_DEFINITIONS("-D_SERVICE_ADAPTOR_IPC_CLIENT")
 # Define Service Adaptor CLIENT
 ##########################################################
 
-SET(ADAPTOR-CLIENT-LIB "service-adaptor")
+SET(ADAPTOR-CLIENT-LIB "service-adaptor-client")
 SET(ADAPTOR-CLIENT-SRCS
         ${CMAKE_SOURCE_DIR}/client/sal_service_adaptor.c
         ${CMAKE_SOURCE_DIR}/client/sal_service_task.c
@@ -59,7 +59,9 @@ SET_TARGET_PROPERTIES(${ADAPTOR-CLIENT-LIB} PROPERTIES VERSION ${VERSION})
 INSTALL(TARGETS ${ADAPTOR-CLIENT-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
 
 SET(SAL-ADAPTOR-CLIENT-HEADERS
-        ${CMAKE_SOURCE_DIR}/include/service_adaptor.h
+        ${CMAKE_SOURCE_DIR}/include/service_adaptor_client.h
+        ${CMAKE_SOURCE_DIR}/include/service_adaptor_client_plugin.h
+        ${CMAKE_SOURCE_DIR}/include/service_adaptor_client_storage.h
         ${CMAKE_SOURCE_DIR}/include/service_adaptor_types.h
         ${CMAKE_SOURCE_DIR}/include/service_adaptor_errors.h
         ${CMAKE_SOURCE_DIR}/include/service_adaptor_internal.h

diff --git a/include/service_adaptor.h b/include/service_adaptor_client.h
similarity index 76%
rename from include/service_adaptor.h
rename to include/service_adaptor_client.h
index 5c3cef1..3d01f7a 100644 (file)
--- a/include/service_adaptor.h
+++ b/include/service_adaptor_client.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __TIZEN_CONVERGENCE_SERVICE_ADAPTOR_H__
-#define __TIZEN_CONVERGENCE_SERVICE_ADAPTOR_H__
+#ifndef __TIZEN_CONVERGENCE_SERVICE_ADAPTOR_CLIENT_H__
+#define __TIZEN_CONVERGENCE_SERVICE_ADAPTOR_CLIENT_H__
 
 #include <service_adaptor_errors.h>
 
@@ -27,4 +27,7 @@
 #include "sal_service_auth.h"
 #include "sal_service_storage.h"
 
-#endif /* __TIZEN_CONVERGENCE_SERVICE_ADAPTOR_H__ */
+#include "service_adaptor_client_plugin.h"
+#include "service_adaptor_client_storage.h"
+
+#endif /* __TIZEN_CONVERGENCE_SERVICE_ADAPTOR_CLIENT_H__ */

diff --git a/include/service_adaptor_client_plugin.h b/include/service_adaptor_client_plugin.h
new file mode 100644 (file)
index 0000000..6addbbb
--- /dev/null
+++ b/include/service_adaptor_client_plugin.h
@@ -0,0 +1,23 @@
+/*
+ * Service Adaptor
+ *
+ * Copyright (c) 2014 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#ifndef __TIZEN_CONVERGENCE_SERVICE_ADAPTOR_CLIENT_PLUGIN_H__
+#define __TIZEN_CONVERGENCE_SERVICE_ADAPTOR_CLIENT_PLUGIN_H__
+
+#endif /* __TIZEN_CONVERGENCE_SERVICE_ADAPTOR_CLIENT_PLUGIN_H__ */

diff --git a/include/service_adaptor_client_storage.h b/include/service_adaptor_client_storage.h
new file mode 100644 (file)
index 0000000..e11169d
--- /dev/null
+++ b/include/service_adaptor_client_storage.h
@@ -0,0 +1,24 @@
+/*
+ * Service Adaptor
+ *
+ * Copyright (c) 2014 - 2015 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#ifndef __TIZEN_CONVERGENCE_SERVICE_ADAPTOR_CLIENT_STORAGE_H__
+#define __TIZEN_CONVERGENCE_SERVICE_ADAPTOR_CLIENT_STORAGE_H__
+
+
+#endif /* __TIZEN_CONVERGENCE_SERVICE_ADAPTOR_CLIENT_STORAGE_H__ */

diff --git a/packaging/service-adaptor.spec b/packaging/service-adaptor.spec
index 80510ed..c50af57 100644 (file)
--- a/packaging/service-adaptor.spec
+++ b/packaging/service-adaptor.spec
@@ -1,6 +1,6 @@
 Name:       service-adaptor
 Summary:    Service Adaptor Framework for Convergence
-Version:    1.1.3
+Version:    1.1.4
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/service-adaptor.pc.in b/service-adaptor.pc.in
index ef06945..ea30104 100644 (file)
--- a/service-adaptor.pc.in
+++ b/service-adaptor.pc.in
@@ -8,5 +8,5 @@ Description: service-adaptor library 1.0
 Requires: capi-base-common
 Version: @VERSION@
 
-Libs: -L${libdir} -lsal-common-client -lservice-adaptor -lservice-provider
+Libs: -L${libdir} -lsal-common-client -lservice-adaptor-client -lservice-provider
 Cflags: -I${includedir}/service-adaptor -I${includedir}/service-provider

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4141487..456c0df 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -42,5 +42,5 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
 
 ADD_EXECUTABLE(${TEST-EXE} ${TEST-SRCS})
-TARGET_LINK_LIBRARIES(${TEST-EXE} ${test_pkgs_LDFLAGS} service-adaptor)
+TARGET_LINK_LIBRARIES(${TEST-EXE} ${test_pkgs_LDFLAGS} service-adaptor-client)
 INSTALL(TARGETS ${TEST-EXE} DESTINATION bin)

diff --git a/test/test.c b/test/test.c
index c3786ec..c280d25 100644 (file)
--- a/test/test.c
+++ b/test/test.c
@@ -4,7 +4,7 @@
 #include <glib-object.h>
 #include <glib-unix.h>
 
-#include "service_adaptor.h"
+#include "service_adaptor_client.h"
 
 service_plugin_h service_plugin = NULL;