Modify register extension service directory path.

(/usr/lib/tizen-extensions-crosswalk => /usr/lib/tizen-extensions-crosswalk-service)

Change-Id: I1264d3662ebc2853fd01cd60eff378c1136e5f15

diff --git a/packaging/wrt-service.spec b/packaging/wrt-service.spec
index f7b9ff7c5e27b2be107a683c64203ff5f429e34a..9ff0c5a9bc7ec22758017db027f470e5468a846b 100644 (file)
--- a/packaging/wrt-service.spec
+++ b/packaging/wrt-service.spec
@@ -11,6 +11,8 @@ Source0:    %{name}-%{version}.tar.gz
 ExcludeArch: %{arm} %ix86 x86_64
 %endif
 
+%define crosswalk_extensions_service tizen-extensions-crosswalk-service
+
 BuildRequires: cmake
 BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(glib-2.0)
@@ -72,6 +74,9 @@ mkdir -p %{buildroot}/usr/share/license
 cp LICENSE %{buildroot}/usr/share/license/%{name}
 cat LICENSE.BSD >> %{buildroot}/usr/share/license/%{name}
 
+mkdir -p %{buildroot}%{_libdir}/%{crosswalk_extensions_service}
+cp plugins.json %{buildroot}%{_libdir}/%{crosswalk_extensions_service}
+
 cd cmake_build_tmp
 %make_install
 
@@ -88,3 +93,4 @@ rm -rf %{buildroot}
 %{_datadir}/license/%{name}
 %attr(755,root,root) %{_bindir}/wrt-service
 %{_libdir}/node/wrt-service/*.node
+%{_libdir}/%{crosswalk_extensions_service}/plugins.json
\ No newline at end of file

diff --git a/plugins.json b/plugins.json
new file mode 100644 (file)
index 0000000..d1a1120
--- /dev/null
+++ b/plugins.json
@@ -0,0 +1,52 @@
+[\r
+        {\r
+                "name":"tizen.filesystem",\r
+                "lib":"/usr/lib/tizen-extensions-crosswalk/libtizen_filesystem.so",\r
+                "entry_points": []\r
+        },\r
+        {\r
+                "name":"tizen.messageport",\r
+                "lib":"/usr/lib/tizen-extensions-crosswalk/libtizen_messageport.so",\r
+                "entry_points": []\r
+        },\r
+        {\r
+                "name":"tizen",\r
+                "lib":"/usr/lib/tizen-extensions-crosswalk/libtizen.so",\r
+                "entry_points": []\r
+        },\r
+        {\r
+                "name":"tizen.datacontrol",\r
+                "lib":"/usr/lib/tizen-extensions-crosswalk/libtizen_datacontrol.so",\r
+                "entry_points": []\r
+        },\r
+        {\r
+                "name":"tizen.application",\r
+                "lib":"/usr/lib/tizen-extensions-crosswalk/libtizen_application.so",\r
+                "entry_points": ["tizen.ApplicationControl","tizen.ApplicationControlData"]\r
+        },\r
+        {\r
+                "name":"tizen.time",\r
+                "lib":"/usr/lib/tizen-extensions-crosswalk/libtizen_time.so",\r
+                "entry_points": ["tizen.TZDate","tizen.TimeDuration"]\r
+        },\r
+        {\r
+                "name":"xwalk.utils",\r
+                "lib":"/usr/lib/tizen-extensions-crosswalk/libtizen_utils.so",\r
+                "entry_points": []\r
+        },\r
+        {\r
+                "name":"tizen.systeminfo",\r
+                "lib":"/usr/lib/tizen-extensions-crosswalk/libtizen_systeminfo.so",\r
+                "entry_points": []\r
+        },\r
+        {\r
+                "name":"tizen.package",\r
+                "lib":"/usr/lib/tizen-extensions-crosswalk/libtizen_package.so",\r
+                "entry_points": []\r
+        },\r
+        {\r
+                "name":"tizen.alarm",\r
+                "lib":"/usr/lib/tizen-extensions-crosswalk/libtizen_alarm.so",\r
+                "entry_points": ["tizen.AlarmRelative","tizen.AlarmAbsolute"]\r
+        }\r
+]\r

diff --git a/src/node/extension/extension-manager.cpp b/src/node/extension/extension-manager.cpp
index 7c836418e80053201c01af3c556c4b1ab538086a..72ed7eea9bf8ec2a9bea1fbd888108884fad66b8 100644 (file)
--- a/src/node/extension/extension-manager.cpp
+++ b/src/node/extension/extension-manager.cpp
@@ -25,6 +25,7 @@ const char kExtensionDir[] = "/usr/lib64/tizen-extensions-crosswalk";
 #else
 const char kExtensionDir[] = "/usr/lib/tizen-extensions-crosswalk";
 #endif
+const char kExtensionServiceDir[] = "/usr/lib/tizen-extensions-crosswalk-service";
 const char kExtensionPrefix[] = "lib";
 const char kExtensionSuffix[] = ".so";
 const char kExtensionMetadataSuffix[] = ".json";
@@ -82,15 +83,15 @@ void ExtensionManager::RegisterExtensionsByMetadata(const std::string& metafile_
 }
 
 void ExtensionManager::RegisterExtensionsByMetadata() {
-  std::string extension_path(kExtensionDir);
-  extension_path.append("/");
-  extension_path.append("*");
-  extension_path.append(kExtensionMetadataSuffix);
+  std::string extension_service_path(kExtensionServiceDir);
+  extension_service_path.append("/");
+  extension_service_path.append("*");
+  extension_service_path.append(kExtensionMetadataSuffix);
 
-  SLOGD("Register Extension directory path : [%s]", extension_path.c_str());
+  SLOGD("Register Extension service directory path : [%s]", extension_service_path.c_str());
 
   glob_t glob_result;
-  glob(extension_path.c_str(), GLOB_TILDE, NULL, &glob_result);
+  glob(extension_service_path.c_str(), GLOB_TILDE, NULL, &glob_result);
   for (unsigned int i = 0; i < glob_result.gl_pathc; ++i) {
     RegisterExtensionsByMetadata(glob_result.gl_pathv[i]);
   }