Revert "Separate aul_rsc_mgr library from aul library"

This reverts commit f74b3e5bcbe776c4efba0f805f25018deea484fe.

Change-Id: I5f21d37c3379c71361af3d5f721d0e531232b25b

diff --git a/packaging/aul-rsc-mgr.manifest b/packaging/aul-rsc-mgr.manifest
deleted file mode 100644 (file)
index 2a0cec5..0000000
--- a/packaging/aul-rsc-mgr.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-  <request>
-    <domain name="_"/>
-  </request>
-</manifest>

diff --git a/packaging/aul.spec b/packaging/aul.spec
index 09c3a72..8108fa5 100644 (file)
--- a/packaging/aul.spec
+++ b/packaging/aul.spec
@@ -8,7 +8,6 @@ Source0:    %{name}-%{version}.tar.gz
 Source1001: %{name}.manifest
 Source1002: %{name}-server.manifest
 Source1003: %{name}-exec-checker-plugin.manifest
-Source1004: %{name}-rsc-mgr.manifest
 
 Requires(post):   /sbin/ldconfig
 Requires(post):   /usr/bin/systemctl
@@ -105,24 +104,6 @@ Requires:   %{name}-server = %{version}-%{release}
 %description server-devel
 Application Utility Library (devel)
 
-#################################################
-# aul-rsc-mgr
-#################################################
-%package rsc-mgr
-Summary:    Application Utility Library (Resource Manager)
-Group:      Development/Libraries
-
-%description rsc-mgr
-Application Utility Library (Resource Manager)
-
-%package rsc-mgr-devel
-Summary:    Application Utility Library (Resource Manager)
-Group:      Development/Libraries
-Requires:   %{name}-rsc-mgr = %{version}-%{release}
-
-%description rsc-mgr-devel
-Application Utility Library (devel)
-
 %package unittests
 Summary:    %{name} unittests binary
 
@@ -145,7 +126,6 @@ sed -i 's|TZ_SYS_DB|%{TZ_SYS_DB}|g' %{SOURCE1001}
 cp %{SOURCE1001} .
 cp %{SOURCE1002} .
 cp %{SOURCE1003} .
-cp %{SOURCE1004} .
 
 %build
 %if 0%{?gcov:1}
@@ -263,12 +243,6 @@ chsmack -a 'User::Home' %{TZ_SYS_DB}/.component.db-journal
 %post server
 /sbin/ldconfig
 
-%postun rsc-mgr
-/sbin/ldconfig
-
-%post rsc-mgr
-/sbin/ldconfig
-
 %files
 %license LICENSE
 %manifest %{name}.manifest
@@ -335,15 +309,6 @@ chsmack -a 'User::Home' %{TZ_SYS_DB}/.component.db-journal
 %{_libdir}/libaul-server.so
 %{_libdir}/pkgconfig/aul-server.pc
 
-%files rsc-mgr
-%manifest %{name}-rsc-mgr.manifest
-%attr(0644,root,root) %{_libdir}/libaul-rsc-mgr.so.*
-
-%files rsc-mgr-devel
-%{_includedir}/aul/rsc-mgr/*.h
-%{_libdir}/libaul-rsc-mgr.so
-%{_libdir}/pkgconfig/aul-rsc-mgr.pc
-
 %files unittests
 %attr(0755,root,root) %{_bindir}/aul-unit-tests
 %attr(0755,root,root) %{_bindir}/app-control-tests

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 341502b..cd5f6cc 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,4 @@
 ADD_SUBDIRECTORY(aul)
 ADD_SUBDIRECTORY(parser)
-ADD_SUBDIRECTORY(rsc-mgr)
 ADD_SUBDIRECTORY(server)
 ADD_SUBDIRECTORY(tool)

diff --git a/src/aul/CMakeLists.txt b/src/aul/CMakeLists.txt
index 8349001..f372ce9 100644 (file)
--- a/src/aul/CMakeLists.txt
+++ b/src/aul/CMakeLists.txt
@@ -26,6 +26,7 @@ TARGET_INCLUDE_DIRECTORIES(${TARGET_AUL} PUBLIC
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../
   ${CMAKE_CURRENT_SOURCE_DIR}/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/internal
   ${CMAKE_CURRENT_SOURCE_DIR}/api
   ${CMAKE_CURRENT_SOURCE_DIR}/app_control
   ${CMAKE_CURRENT_SOURCE_DIR}/app_manager
@@ -47,6 +48,7 @@ APPLY_PKG_CONFIG(${TARGET_AUL} PUBLIC
   INIPARSER_DEPS
   LIBSMACK_DEPS
   LIBTZPLATFORM_CONFIG_DEPS
+  LIBXML_DEPS
   PARCEL_DEPS
   PKGMGR_INFO_DEPS
   STORAGE_DEPS

diff --git a/src/rsc-mgr/aul_rsc_mgr.c b/src/aul/aul_rsc_mgr.c
similarity index 99%
rename from src/rsc-mgr/aul_rsc_mgr.c
rename to src/aul/aul_rsc_mgr.c
index 6b67e40..460d472 100644 (file)
--- a/src/rsc-mgr/aul_rsc_mgr.c
+++ b/src/aul/aul_rsc_mgr.c
@@ -29,12 +29,10 @@
 #include <system_info.h>
 
 #include "aul.h"
+#include "aul_api.h"
 #include "aul_rsc_mgr.h"
 #include "aul_rsc_mgr_internal.h"
 
-#undef API
-#define API __attribute__ ((visibility("default")))
-
 #define WEIGHT_SCREEN_DPI 10000
 #define WEIGHT_SCREEN_DPI_RANGE 10000
 #define WEIGHT_SCREEN_BPP 1000

diff --git a/src/rsc-mgr/aul_rsc_mgr_internal.c b/src/aul/aul_rsc_mgr_internal.c
similarity index 100%
rename from src/rsc-mgr/aul_rsc_mgr_internal.c
rename to src/aul/aul_rsc_mgr_internal.c

diff --git a/src/rsc-mgr/aul_rsc_mgr_internal.h b/src/aul/aul_rsc_mgr_internal.h
similarity index 100%
rename from src/rsc-mgr/aul_rsc_mgr_internal.h
rename to src/aul/aul_rsc_mgr_internal.h

diff --git a/src/rsc-mgr/aul_rsc_mgr_schema.h b/src/aul/aul_rsc_mgr_schema.h
similarity index 100%
rename from src/rsc-mgr/aul_rsc_mgr_schema.h
rename to src/aul/aul_rsc_mgr_schema.h

diff --git a/src/rsc-mgr/include/aul_rsc_mgr.h b/src/aul/include/aul_rsc_mgr.h
similarity index 100%
rename from src/rsc-mgr/include/aul_rsc_mgr.h
rename to src/aul/include/aul_rsc_mgr.h

diff --git a/src/rsc-mgr/CMakeLists.txt b/src/rsc-mgr/CMakeLists.txt
deleted file mode 100644 (file)
index a2a38ef..0000000
--- a/src/rsc-mgr/CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-SET(TARGET_AUL_RSC_MGR "aul-rsc-mgr")
-
-AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} AUL_RSC_MGR_SRCS)
-
-ADD_LIBRARY(${TARGET_AUL_RSC_MGR} SHARED ${AUL_RSC_MGR_SRCS})
-
-TARGET_INCLUDE_DIRECTORIES(${TARGET_AUL_RSC_MGR} PUBLIC
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/include
-  ${CMAKE_CURRENT_SOURCE_DIR}/../aul/include
-)
-
-SET_TARGET_PROPERTIES(${TARGET_AUL_RSC_MGR} PROPERTIES SOVERSION ${MAJORVER})
-SET_TARGET_PROPERTIES(${TARGET_AUL_RSC_MGR} PROPERTIES VERSION ${FULLVER})
-
-APPLY_PKG_CONFIG(${TARGET_AUL_RSC_MGR} PUBLIC
-  BUNDLE_DEPS
-  CAPI_SYSTEM_INFO_DEPS
-  DLOG_DEPS
-  GLIB_DEPS
-  LIBXML_DEPS
-  VCONF_DEPS
-)
-
-TARGET_LINK_LIBRARIES(${TARGET_AUL_RSC_MGR} PRIVATE ${TARGET_AUL})
-
-INSTALL(TARGETS ${TARGET_AUL_RSC_MGR} DESTINATION ${LIB_INSTALL_DIR}
-  COMPONENT RuntimeLibraries)
-
-CONFIGURE_FILE(${TARGET_AUL_RSC_MGR}.pc.in ${TARGET_AUL_RSC_MGR}.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${TARGET_AUL_RSC_MGR}.pc
-    DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
-  DESTINATION include/aul/rsc-mgr
-  FILES_MATCHING
-  PATTERN "*.h"
-)

diff --git a/src/rsc-mgr/aul-rsc-mgr.pc.in b/src/rsc-mgr/aul-rsc-mgr.pc.in
deleted file mode 100644 (file)
index 59fe80f..0000000
--- a/src/rsc-mgr/aul-rsc-mgr.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-# Package Information for pkg-config
-
-prefix=@PREFIX@
-exec_prefix=@EXEC_PREFIX@
-libdir=@LIB_INSTALL_DIR@
-includedir=@INCLUDE_INSTALL_DIR@
-
-Name: libaul-rsc-mgr
-Description: Application Utility Libarary (Resource Manager)
-Version: @VERSION@
-Requires: bundle glib-2.0
-Libs: -L${libdir} -laul-rsc-mgr
-Cflags: -I${includedir} -I${includedir}/aul/rsc-mgr