Substitute type to extension_host_os, build to extension_build_type

'type' is GYP target keyword, use 'extension_host_os' instead.
'extension_build_type' is more meaningful the word 'build'.

diff --git a/common/tizen_mobile.gypi b/common/tizen_mobile.gypi
index ddb70aa..27a56ed 100644 (file)
--- a/common/tizen_mobile.gypi
+++ b/common/tizen_mobile.gypi
@@ -4,7 +4,7 @@
       'target_name': 'vconf',
       'type': 'none',
       'conditions': [
-        ['type=="mobile"', {
+        ['extension_host_os=="mobile"', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(pkg-config --cflags vconf)',
@@ -26,7 +26,7 @@
       'target_name': 'capi-system-power',
       'type': 'none',
       'conditions': [
-        ['type=="mobile"', {
+        ['extension_host_os=="mobile"', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(pkg-config --cflags capi-system-power)',
@@ -48,7 +48,7 @@
       'target_name': 'capi-system-device',
       'type': 'none',
       'conditions': [
-        ['type=="mobile"', {
+        ['extension_host_os=="mobile"', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(pkg-config --cflags capi-system-device)',
@@ -70,7 +70,7 @@
       'target_name': 'pmapi',
       'type': 'none',
       'conditions': [
-        ['type=="mobile"', {
+        ['extension_host_os=="mobile"', {
           'direct_dependent_settings': {
             'cflags': [
               '<!@(pkg-config --cflags pmapi)',

diff --git a/configure b/configure
index 47fa6f2..87daf01 100755 (executable)
--- a/configure
+++ b/configure
@@ -9,11 +9,11 @@ if [ ! `which gyp` ]; then
 fi
 
 if [ $# -eq 1 ] && [ $1 == "--desktop" ]; then
-   echo -e "\n--desktop is deprecated. Please use '-D type=desktop' instead.\n"
+   echo -e "\n--desktop is deprecated. Please use '-D extension_host_os=desktop' instead.\n"
    exit 1
 fi
 
 echo To build use: ninja -C out/Default
 echo Works with individual targets too: ninja -C out/Default tizen_notification
 
-gyp -D build=Debug $@ --depth=. tizen-wrt.gyp
+gyp -D extension_build_type=Debug $@ --depth=. tizen-wrt.gyp

diff --git a/networkbearerselection/networkbearerselection.gypi b/networkbearerselection/networkbearerselection.gypi
index 141b382..99dbd51 100644 (file)
--- a/networkbearerselection/networkbearerselection.gypi
+++ b/networkbearerselection/networkbearerselection.gypi
@@ -11,7 +11,7 @@
         'networkbearerselection_context_mobile.cc',
       ],
       'conditions': [
-        ['type=="mobile"', {
+        ['extension_host_os=="mobile"', {
           'cflags': [
             '<!@(pkg-config --cflags capi-network-connection)',
           ],

diff --git a/notification/notification.gypi b/notification/notification.gypi
index c769296..09eb284 100644 (file)
--- a/notification/notification.gypi
+++ b/notification/notification.gypi
@@ -9,17 +9,17 @@
         'notification_context.h',
         'notification_context_desktop.cc',
         'notification_context_mobile.cc',
-       'mobile/notification_manager.cc',
-       'mobile/notification_manager.h',
+        'mobile/notification_manager.cc',
+        'mobile/notification_manager.h',
       ],
 
       'conditions': [
-        [ 'type == "desktop"', {
+        [ 'extension_host_os == "desktop"', {
             'variables': { 'packages': ['libnotify'] },
         }],
-       [ 'type == "mobile"', {
-           'variables': { 'packages': ['notification'] },
-       }],
+        [ 'extension_host_os == "mobile"', {
+            'variables': { 'packages': ['notification'] },
+        }],
       ],
 
       'includes': [ '../pkg-config.gypi' ],

diff --git a/packaging/tizen-extensions-crosswalk.spec b/packaging/tizen-extensions-crosswalk.spec
index ca66b9e..8fb536d 100644 (file)
--- a/packaging/tizen-extensions-crosswalk.spec
+++ b/packaging/tizen-extensions-crosswalk.spec
@@ -36,8 +36,8 @@ cp %{SOURCE1001} .
 export GYP_GENERATORS='make'
 ./tools/gyp/gyp \
 --depth=.       \
--Dbuild=Debug   \
--Dtype=mobile   \
+-Dextension_build_type=Debug   \
+-Dextension_host_os=mobile   \
 tizen-wrt.gyp
 
 make %{?_smp_mflags}

diff --git a/power/power.gypi b/power/power.gypi
index 281a3b4..268254b 100644 (file)
--- a/power/power.gypi
+++ b/power/power.gypi
@@ -11,7 +11,7 @@
         'power_context_mobile.cc',
       ],
       'conditions': [
-        ['type=="mobile"', {
+        ['extension_host_os=="mobile"', {
           'dependencies': [
             'capi-system-device',
             'capi-system-power',
@@ -19,7 +19,7 @@
             'vconf',
           ],
         }],
-        [ 'type == "desktop"', {
+        [ 'extension_host_os == "desktop"', {
             'variables': { 'packages': ['gio-2.0'] },
             'includes': [ '../pkg-config.gypi' ],
         }],

diff --git a/system_info/system_info.gypi b/system_info/system_info.gypi
index 7b0f686..73934ed 100644 (file)
--- a/system_info/system_info.gypi
+++ b/system_info/system_info.gypi
@@ -4,14 +4,14 @@
       'target_name': 'tizen_system_info',
       'type': 'loadable_module',
       'conditions': [
-        [ 'type == "desktop"', {
+        [ 'extension_host_os == "desktop"', {
           'variables': {
             'packages': [
               'NetworkManager',
             ]
           },
         }],
-        [ 'type == "mobile"', {
+        [ 'extension_host_os == "mobile"', {
           'dependencies': [
             'vconf',
           ],

diff --git a/tizen-wrt.gyp b/tizen-wrt.gyp
index df22be2..0da2da2 100644 (file)
--- a/tizen-wrt.gyp
+++ b/tizen-wrt.gyp
@@ -2,21 +2,21 @@
   'variables': { 'type%': 'mobile' },
   'target_defaults': {
     'conditions': [
-      ['type != "mobile"', {
+      ['extension_host_os != "mobile"', {
         'sources/': [['exclude', '_mobile\\.cc$|mobile/']],
         'includes/': [['exclude', '_mobile\\.gypi$|mobile/']],
       }],
-      ['type != "desktop"', {
+      ['extension_host_os != "desktop"', {
         'sources/': [['exclude', '_desktop\\.cc$|desktop/']],
         'includes/': [['exclude', '_desktop\\.gypi$|desktop/']],
       }],
-      ['type == "mobile"', { 'defines': ['TIZEN_MOBILE'] } ],
-      ['type == "desktop"', { 'defines': ['GENERIC_DESKTOP'] } ],
-      ['build == "Debug"', {
+      ['extension_host_os == "mobile"', { 'defines': ['TIZEN_MOBILE'] } ],
+      ['extension_host_os == "desktop"', { 'defines': ['GENERIC_DESKTOP'] } ],
+      ['extensino_build_type == "Debug"', {
         'defines': ['_DEBUG', ],
         'cflags': [ '-O0', '-g', ],
       }],
-      ['build == "Release"', {
+      ['extension_build_type == "Release"', {
         'defines': ['NDEBUG', ],
         'cflags': [
           '-O2',