Make wrt target separate from the main target

Make main target as none, so that libs can be
generated separately if required, else all the .so
needs to be statically linked with wrt target

Change-Id: I149b467e1ba4c2b152f73388fb44d830a29ae246
Signed-off-by: Prathmesh <prathmesh.m@samsung.com>

diff --git a/packaging/electron-efl.spec b/packaging/electron-efl.spec
index 0e1a392..ea9690e 100755 (executable)
--- a/packaging/electron-efl.spec
+++ b/packaging/electron-efl.spec
@@ -103,7 +103,7 @@ DEFINE_ARGS+="
     -v
 %endif
 
-./script/build.py -c D -t wrt
+./script/build.py -c D -t wrt_all
 
 %install
 install -d %{_out}/packaging
@@ -157,8 +157,6 @@ install -p -m 755 %{_out}/lib/libxwalk_injected_bundle.so %{buildroot}%{_libdir}
 # widget plugin
 install -p -m 644 %{_out}/lib/libwidget_plugin.so %{buildroot}%{extension_path}
 install -p -m 644 %{_out}/gen/widget.json %{buildroot}%{extension_path}
-# Need to remove the below line later
-install -p -m 644 %{_out}/lib/libwidget_plugin.so %{buildroot}%{_libdir}
 
 # pwrt_env file
 mkdir -p %{buildroot}%{_sysconfdir}/profile.d/
@@ -167,8 +165,6 @@ install -p -m 755 %{_out}/gen/pwrt_env.sh %{buildroot}%{_sysconfdir}/profile.d/p
 # screen_plugin
 install -p -m 644 %{_out}/lib/libsplash_screen_plugin.so %{buildroot}%{extension_path}
 install -p -m 644 %{_out}/gen/splash_screen.json %{buildroot}%{extension_path}
-# Need to remove the below line later
-install -p -m 644 %{_out}/lib/libsplash_screen_plugin.so %{buildroot}%{_libdir}
 
 %post
 # FIXME: Until electron-efl is released to platform,
@@ -201,7 +197,4 @@ rm -fr %{buildroot}
 %attr(644,root,root) %{extension_path}/widget.json
 %attr(644,root,root) %{extension_path}/libsplash_screen_plugin.so
 %attr(644,root,root) %{extension_path}/splash_screen.json
-# Need to remove these below lines later
-%attr(644,root,root) %{_libdir}/libwidget_plugin.so
-%attr(644,root,root) %{_libdir}/libsplash_screen_plugin.so
 %attr(755,root,root) %{_sysconfdir}/profile.d/pwrt_env.sh

diff --git a/script/update.py b/script/update.py
index 5c9c957..08bdf58 100755 (executable)
--- a/script/update.py
+++ b/script/update.py
@@ -98,7 +98,7 @@ def run_gyp(target_arch, component):
 
   if 'use_efl=1' in [d.strip() for d in args.defines.split(' ')]:
     return subprocess.call([python, gyp, '-f', generator, '--depth', '.',
-                            'wrt.gyp', '-I' + os.path.join('tizen', 'common.gypi')] + defines, env=env)
+                            'wrt_all.gyp', '-I' + os.path.join('tizen', 'common.gypi')] + defines, env=env)
 
   return subprocess.call([python, gyp, '-f', generator, '--depth', '.',
                           'electron.gyp', '-Icommon.gypi'] + defines, env=env)

diff --git a/wrt.gyp b/wrt.gyp
index 7fadfec..83132ca 100644 (file)
--- a/wrt.gyp
+++ b/wrt.gyp
@@ -14,8 +14,6 @@
         'wrt-service',
         '<(DEPTH)/tizen/common/common.gyp:wrt_common',
         '<(DEPTH)/tizen/loader/loader.gyp:wrt-loader',
-        '<(DEPTH)/tizen/extensions/extensions.gyp:widget_plugin',
-        '<(DEPTH)/tizen/extensions/extensions.gyp:splash_screen_plugin',
         '<(DEPTH)/tizen/renderer/injected_bundle.gyp:xwalk_injected_bundle',
         '<(DEPTH)/efl/build/system.gyp:ecore',
         '<(DEPTH)/efl/build/system.gyp:launchpad',

diff --git a/wrt_all.gyp b/wrt_all.gyp
new file mode 100644 (file)
index 0000000..31b6291
--- /dev/null
+++ b/wrt_all.gyp
@@ -0,0 +1,13 @@
+{
+  'targets': [
+    {
+      'target_name': 'wrt_all',
+      'type': 'none',
+      'dependencies': [
+        '<(DEPTH)/tizen/extensions/extensions.gyp:widget_plugin',
+        '<(DEPTH)/tizen/extensions/extensions.gyp:splash_screen_plugin',
+        '<(DEPTH)/wrt.gyp:wrt',
+      ],
+    }, # end of target 'wrt_all'
+  ], # end of targets
+}
\ No newline at end of file