Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)

2 files changed, 8 insertions, 138 deletions

diff --git a/Source/JavaScriptCore/JavaScriptCore.gyp/.gitignore b/Source/JavaScriptCore/JavaScriptCore.gyp/.gitignore
new file mode 100644
index 000000000..9b06f58bf
--- /dev/null
+++ b/Source/JavaScriptCore/JavaScriptCore.gyp/.gitignore
@@ -0,0 +1,5 @@
+*.Makefile
+*.mk
+*.sln
+*.vcproj*
+JavaScriptCore.xcodeproj
diff --git a/Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp b/Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
index 34b4e08e5..f0de2f073 100644
--- a/Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
+++ b/Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
@@ -57,146 +57,10 @@
   ],
   'targets': [
     {
-      # This target sets up defines and includes that are required by WTF and
-      # its dependents.
-      'target_name': 'wtf_config',
-      'type': 'none',
-      'direct_dependent_settings': {
-        'defines': [
-          # Import features_defines from features.gypi
-          '<@(feature_defines)',
-
-          # Turns on #if PLATFORM(CHROMIUM)
-          'BUILDING_CHROMIUM__=1',
-          # Controls wtf/FastMalloc
-          # FIXME: consider moving into config.h
-          'USE_SYSTEM_MALLOC=1',
-        ],
-        'conditions': [
-          ['OS=="win"', {
-            'defines': [
-              '__STD_C',
-              '_CRT_SECURE_NO_DEPRECATE',
-              '_SCL_SECURE_NO_DEPRECATE',
-              'CRASH=__debugbreak',
-            ],
-            'include_dirs': [
-              '../os-win32',
-            ],
-          }],
-          ['OS=="mac"', {
-            'defines': [
-              # Use USE_NEW_THEME on Mac.
-              'WTF_USE_NEW_THEME=1',
-            ],
-          }],
-          ['os_posix == 1 and OS != "mac"', {
-            'defines': [
-              'WTF_USE_PTHREADS=1',
-            ],
-          }],
-        ],
-      }
-    },
-    {
-      'target_name': 'wtf',
-      'type': 'static_library',
-      'variables': { 'optimize': 'max' },
-      'dependencies': [
-        'wtf_config',
-        '<(chromium_src_dir)/third_party/icu/icu.gyp:icui18n',
-        '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
-      ],
-      'include_dirs': [
-        '../',
-        '../wtf',
-        '../wtf/unicode',
-      ],
-      'sources': [
-        '<@(javascriptcore_publicheader_files)',
-        '<@(javascriptcore_privateheader_files)',
-        '<@(javascriptcore_files)',
-      ],
-      'sources/': [
-        # First exclude everything ...
-        ['exclude', '../'],
-        # ... Then include what we want.
-        ['include', '../wtf/'],
-        # FIXME: This is clearly not sustainable.
-        ['exclude', '../wtf/efl'],
-        ['exclude', '../wtf/gobject'],
-        ['exclude', '../wtf/gtk'],
-        ['exclude', '../wtf/mac'],
-        ['exclude', '../wtf/qt'],
-        ['exclude', '../wtf/url'],
-        ['exclude', '../wtf/wince'],
-        ['exclude', '../wtf/wx'],
-        ['exclude', '../wtf/unicode/wince'],
-        ['exclude', '../wtf/unicode/glib'],
-        ['exclude', '../wtf/unicode/qt4'],
-        # GLib/GTK, even though its name doesn't really indicate.
-        ['exclude', '/(gtk|glib|gobject)/.*\\.(cpp|h)$'],
-        ['exclude', '(Default|Gtk|Mac|None|Qt|Win|Wx|Efl|Symbian)\\.(cpp|mm)$'],
-        ['exclude', 'wtf/CurrentTime\\.cpp$'],
-        ['exclude', 'wtf/OSRandomSource\\.cpp$'],
-        ['exclude', 'wtf/MainThread.cpp$'],
-        ['exclude', 'wtf/TC.*\\.(cpp|h)$'],
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '../',
-          '../wtf',
-        ],
-        # Some warnings occur in JSC headers, so they must also be disabled
-        # in targets that use JSC.
-        'msvs_disabled_warnings': [
-          # Don't complain about calling specific versions of templatized
-          # functions (e.g. in RefPtrHashMap.h).
-          4344,
-          # Don't complain about using "this" in an initializer list
-          # (e.g. in StringImpl.h).
-          4355,
-        ],
-      },
-      'export_dependent_settings': [
-        'wtf_config',
-        '<(chromium_src_dir)/third_party/icu/icu.gyp:icui18n',
-        '<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
-      ],
-      'msvs_disabled_warnings': [4127, 4355, 4510, 4512, 4610, 4706],
-      'conditions': [
-        ['OS=="win"', {
-          'sources/': [
-            ['exclude', 'ThreadIdentifierDataPthreads\\.(h|cpp)$'],
-            ['exclude', 'ThreadingPthreads\\.cpp$'],
-            ['include', 'Thread(ing|Specific)Win\\.cpp$'],
-            ['exclude', 'OSAllocatorPosix\\.cpp$'],
-            ['include', 'OSAllocatorWin\\.cpp$'],
-            ['include', 'win/OwnPtrWin\\.cpp$'],
-          ],
-          'include_dirs!': [
-            '<(SHARED_INTERMEDIATE_DIR)/webkit',
-          ],
-          'conditions': [
-            ['inside_chromium_build==1 and component=="shared_library"', {
-              # Chromium windows multi-dll build enables c++ exception and this
-              # causes wtf generates 4291 warning due to operator new/delete
-              # implementations. Disable the warning for chromium windows
-              # multi-dll build.
-              'msvs_disabled_warnings': [4291],
-              'direct_dependent_settings': {
-                'msvs_disabled_warnings': [4291],
-              },
-            }],
-          ],
-        }],
-      ],
-    },
-    {
       'target_name': 'yarr',
       'type': 'static_library',
       'dependencies': [
-        'wtf',
+        '../../WTF/WTF.gyp/WTF.gyp:wtf',
       ],
       'variables': { 'optimize': 'max' },
       'actions': [
@@ -216,6 +80,7 @@
       ],
       'include_dirs': [
         '<(INTERMEDIATE_DIR)',
+        '..',
         '../runtime',
       ],
       'sources': [
@@ -230,7 +95,7 @@
         ['exclude', '../yarr/YarrJIT\\.(h|cpp)$'],
       ],
       'export_dependent_settings': [
-        'wtf',
+        '../../WTF/WTF.gyp/WTF.gyp:wtf',
       ],
     },
   ], # targets