Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / native_client / tools.gyp

diff --git a/src/native_client/tools.gyp b/src/native_client/tools.gyp
index d154fdb..c6ee663 100644 (file)
--- a/src/native_client/tools.gyp
+++ b/src/native_client/tools.gyp
@@ -57,12 +57,6 @@
     {
       'target_name': 'untar_toolchains',
       'type': 'none',
-      'variables': {
-        'newlib_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib',
-        'glibc_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_glibc',
-        'pnacl_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_pnacl',
-        'arm_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_arm_newlib',
-      },
       'conditions': [
         ['disable_newlib==0 and disable_newlib_untar==0', {
           'actions': [
@@ -71,19 +65,18 @@
               'msvs_cygwin_shell': 0,
               'description': 'Untar x86 newlib toolchain',
               'inputs': [
-                 '<(DEPTH)/native_client/build/cygtar.py',
-                 '<(DEPTH)/native_client/toolchain/.tars/naclsdk_<(OS)_x86.tgz',
+                 '<(DEPTH)/native_client/build/package_version/package_version.py',
+                 '<(DEPTH)/native_client/toolchain/.tars/<(OS)_x86/nacl_x86_newlib.json',
               ],
-              'outputs': ['>(newlib_dir)/stamp.untar'],
+              'outputs': ['<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_newlib/nacl_x86_newlib.json'],
               'action': [
                 'python',
-                '<(DEPTH)/native_client/build/untar_toolchain.py',
-                '--tool', 'x86_newlib',
-                '--tmp', '<(SHARED_INTERMEDIATE_DIR)/untar',
-                '--sdk', '<(SHARED_INTERMEDIATE_DIR)/sdk',
-                '--os', '<(OS)',
-                '--fin', '<(newlib_dir)',
-                '<(DEPTH)/native_client/toolchain/.tars/naclsdk_<(OS)_x86.tgz',
+                '<(DEPTH)/native_client/build/package_version/package_version.py',
+                '--quiet',
+                '--packages', 'nacl_x86_newlib',
+                '--tar-dir', '<(DEPTH)/native_client/toolchain/.tars',
+                '--dest-dir', '<(SHARED_INTERMEDIATE_DIR)/sdk',
+                'extract',
               ],
             },
           ]
@@ -95,19 +88,18 @@
               'msvs_cygwin_shell': 0,
               'description': 'Untar x86 glibc toolchain',
               'inputs': [
-                 '<(DEPTH)/native_client/build/cygtar.py',
-                 '<(DEPTH)/native_client/toolchain/.tars/toolchain_<(OS)_x86.tar.bz2',
+                '<(DEPTH)/native_client/build/package_version/package_version.py',
+                '<(DEPTH)/native_client/toolchain/.tars/<(OS)_x86/nacl_x86_glibc.json',
               ],
-              'outputs': ['>(glibc_dir)/stamp.untar'],
+              'outputs': ['<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_glibc/nacl_x86_glibc.json'],
               'action': [
                 'python',
-                '<(DEPTH)/native_client/build/untar_toolchain.py',
-                '--tool', 'x86_glibc',
-                '--tmp', '<(SHARED_INTERMEDIATE_DIR)/untar',
-                '--sdk', '<(SHARED_INTERMEDIATE_DIR)/sdk',
-                '--os', '<(OS)',
-                '--fin', '<(glibc_dir)',
-                '<(DEPTH)/native_client/toolchain/.tars/toolchain_<(OS)_x86.tar.bz2',
+                '<(DEPTH)/native_client/build/package_version/package_version.py',
+                '--quiet',
+                '--packages', 'nacl_x86_glibc',
+                '--tar-dir', '<(DEPTH)/native_client/toolchain/.tars',
+                '--dest-dir', '<(SHARED_INTERMEDIATE_DIR)/sdk',
+                'extract',
               ],
             },
           ]
@@ -119,19 +111,18 @@
               'msvs_cygwin_shell': 0,
               'description': 'Untar pnacl toolchain',
               'inputs': [
-                 '<(DEPTH)/native_client/build/cygtar.py',
-                 '<(DEPTH)/native_client/toolchain/.tars/naclsdk_pnacl_<(OS)_x86.tgz',
+                '<(DEPTH)/native_client/build/package_version/package_version.py',
+                '<(DEPTH)/native_client/toolchain/.tars/<(OS)_x86/pnacl_newlib.json',
               ],
-              'outputs': ['>(pnacl_dir)/stamp.untar'],
+              'outputs': ['<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/pnacl_newlib/pnacl_newlib.json'],
               'action': [
                 'python',
-                '<(DEPTH)/native_client/build/untar_toolchain.py',
-                '--tool', 'pnacl',
-                '--tmp', '<(SHARED_INTERMEDIATE_DIR)/untar',
-                '--sdk', '<(SHARED_INTERMEDIATE_DIR)/sdk',
-                '--os', '<(OS)',
-                '--fin', '<(pnacl_dir)',
-                '<(DEPTH)/native_client/toolchain/.tars/naclsdk_pnacl_<(OS)_x86.tgz',
+                '<(DEPTH)/native_client/build/package_version/package_version.py',
+                '--quiet',
+                '--packages', 'pnacl_newlib',
+                '--tar-dir', '<(DEPTH)/native_client/toolchain/.tars',
+                '--dest-dir', '<(SHARED_INTERMEDIATE_DIR)/sdk',
+                'extract',
               ],
             },
           ]
@@ -143,25 +134,18 @@
               'msvs_cygwin_shell': 0,
               'description': 'Untar arm toolchain',
               'inputs': [
-                 '<(DEPTH)/native_client/build/cygtar.py',
-                 '<(DEPTH)/native_client/toolchain/.tars/gcc_arm_<(TOOLCHAIN_OS).tgz',
-                 '<(DEPTH)/native_client/toolchain/.tars/binutils_arm_<(TOOLCHAIN_OS).tgz',
-                 '<(DEPTH)/native_client/toolchain/.tars/newlib_arm.tgz',
-                 '<(DEPTH)/native_client/toolchain/.tars/gcc_libs_arm.tgz',
+                '<(DEPTH)/native_client/build/package_version/package_version.py',
+                '<(DEPTH)/native_client/toolchain/.tars/<(OS)_x86/nacl_arm_newlib.json',
               ],
-              'outputs': ['>(arm_dir)/stamp.untar'],
+              'outputs': ['<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_arm_newlib/nacl_arm_newlib.json'],
               'action': [
                 'python',
-                '<(DEPTH)/native_client/build/untar_toolchain.py',
-                '--tool', 'arm_newlib',
-                '--tmp', '<(SHARED_INTERMEDIATE_DIR)/untar',
-                '--sdk', '<(SHARED_INTERMEDIATE_DIR)/sdk',
-                '--os', '<(OS)',
-                '--fin', '<(arm_dir)',
-                '<(DEPTH)/native_client/toolchain/.tars/gcc_arm_<(TOOLCHAIN_OS).tgz',
-                '<(DEPTH)/native_client/toolchain/.tars/binutils_arm_<(TOOLCHAIN_OS).tgz',
-                '<(DEPTH)/native_client/toolchain/.tars/newlib_arm.tgz',
-                '<(DEPTH)/native_client/toolchain/.tars/gcc_libs_arm.tgz',
+                '<(DEPTH)/native_client/build/package_version/package_version.py',
+                '--quiet',
+                '--packages', 'nacl_arm_newlib',
+                '--tar-dir', '<(DEPTH)/native_client/toolchain/.tars',
+                '--dest-dir', '<(SHARED_INTERMEDIATE_DIR)/sdk',
+                'extract',
               ],
             },
           ]
@@ -175,10 +159,10 @@
         'untar_toolchains',
       ],
       'variables': {
-        'newlib_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_newlib',
-        'glibc_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_glibc',
-        'pnacl_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_pnacl',
-        'arm_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_arm_newlib',
+        'newlib_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_newlib',
+        'glibc_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_x86_glibc',
+        'pnacl_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/pnacl_newlib',
+        'arm_dir': '<(SHARED_INTERMEDIATE_DIR)/sdk/<(OS)_x86/nacl_arm_newlib',
       },
       'conditions': [
         ['disable_newlib==0', {
@@ -188,7 +172,7 @@
               'msvs_cygwin_shell': 0,
               'description': 'Prep x86 newlib toolchain',
               'inputs': [
-                 '<(newlib_dir)/stamp.untar',
+                 '<(newlib_dir)/nacl_x86_newlib.json',
                  '>!@pymod_do_main(prep_nacl_sdk --inputs --tool x86_newlib)',
               ],
               'outputs': ['<(newlib_dir)/stamp.prep'],
@@ -208,7 +192,7 @@
               'msvs_cygwin_shell': 0,
               'description': 'Prep x86 glibc toolchain',
               'inputs': [
-                 '<(glibc_dir)/stamp.untar',
+                 '<(glibc_dir)/nacl_x86_glibc.json',
                  '>!@pymod_do_main(prep_nacl_sdk --inputs --tool x86_glibc)',
               ],
               'outputs': ['<(glibc_dir)/stamp.prep'],
@@ -228,7 +212,7 @@
               'msvs_cygwin_shell': 0,
               'description': 'Prep arm toolchain',
               'inputs': [
-                 '<(arm_dir)/stamp.untar',
+                 '<(arm_dir)/nacl_arm_newlib.json',
                  '>!@pymod_do_main(prep_nacl_sdk --inputs --tool arm_newlib)',
               ],
               'outputs': ['<(arm_dir)/stamp.prep'],
@@ -248,7 +232,7 @@
               'msvs_cygwin_shell': 0,
               'description': 'Prep pnacl toolchain',
               'inputs': [
-                 '<(pnacl_dir)/stamp.untar',
+                 '<(pnacl_dir)/pnacl_newlib.json',
                  '>!@pymod_do_main(prep_nacl_sdk --inputs --tool pnacl)',
               ],
               'outputs': ['<(pnacl_dir)/stamp.prep'],