2011-03-21 Adam Barth <abarth@webkit.org>

[WebKit-https.git] / Source / JavaScriptGlue / gyp / JavaScriptGlue.gyp

diff --git a/Source/JavaScriptGlue/gyp/JavaScriptGlue.gyp b/Source/JavaScriptGlue/gyp/JavaScriptGlue.gyp
index 49f36a03fd5c648fe283f95dabbb2e2dfbf96bf6..825fd860f1293092983ee16a38c319cc0221d355 100644 (file)
--- a/Source/JavaScriptGlue/gyp/JavaScriptGlue.gyp
+++ b/Source/JavaScriptGlue/gyp/JavaScriptGlue.gyp
@@ -1,8 +1,9 @@
 {
   'includes': [
 {
   'includes': [

+    '../../gyp/common.gypi',

     'JavaScriptGlue.gypi',
   ],
     'JavaScriptGlue.gypi',
   ],

-  'xcode_config_file': '../Configurations/DebugRelease.xcconfig',
+  'xcode_config_file': '<(DEPTH)/JavaScriptGlue/Configurations/DebugRelease.xcconfig',

   'targets': [
     {
       'target_name': 'JavaScriptGlue',
   'targets': [
     {
       'target_name': 'JavaScriptGlue',


@@ -11,9 +12,8 @@
         'Update Version'
       ],
       'include_dirs': [
         'Update Version'
       ],
       'include_dirs': [

-        '..',
-        '../ForwardingHeaders',
-        '../icu',
+        '<(DEPTH)/JavaScriptGlue/ForwardingHeaders',
+        '<(DEPTH)/JavaScriptGlue/icu',

         '<(PRODUCT_DIR)/include',
       ],
       'sources': [
         '<(PRODUCT_DIR)/include',
       ],
       'sources': [


@@ -24,52 +24,49 @@
         '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
       ],
       'xcode_config_file': '../Configurations/JavaScriptGlue.xcconfig',
         '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
       ],
       'xcode_config_file': '../Configurations/JavaScriptGlue.xcconfig',

-      'configurations': {
-        'Debug': {},
-      },
-      'default_configuration': 'Debug',
-      'defines': [
-        'WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST',
-      ],

       'postbuilds': [
         {
           'postbuild_name': 'Check For Global Initializers',
           'action': [
       'postbuilds': [
         {
           'postbuild_name': 'Check For Global Initializers',
           'action': [

-            'sh', 'run-if-exists.sh', 'check-for-global-initializers'
+            'sh', '<(DEPTH)/gyp/run-if-exists.sh', '<(DEPTH)/../Tools/Scripts/check-for-global-initializers'

           ],
         },
         {
           'postbuild_name': 'Check For Weak VTables and Externals',
           'action': [
           ],
         },
         {
           'postbuild_name': 'Check For Weak VTables and Externals',
           'action': [

-            'sh', 'run-if-exists.sh', 'check-for-weak-vtables-and-externals'
+            'sh', '<(DEPTH)/gyp/run-if-exists.sh', '<(DEPTH)/../Tools/Scripts/check-for-weak-vtables-and-externals'

           ],
         },
         {
           'postbuild_name': 'Remove Headers If Needed',
           'action': [
           ],
         },
         {
           'postbuild_name': 'Remove Headers If Needed',
           'action': [

-            'sh', 'remove-headers-if-needed.sh'
+            'sh', '<(DEPTH)/gyp/remove-headers-if-needed.sh'

           ],
         },
       ],
       'conditions': [
         ['OS=="mac"', {
           'mac_bundle': 1,
           ],
         },
       ],
       'conditions': [
         ['OS=="mac"', {
           'mac_bundle': 1,

+          'xcode_settings': {
+            # FIXME: Remove these overrides once JavaScriptGlue.xcconfig is
+            # used only by this project.
+            'INFOPLIST_FILE': '<(DEPTH)/JavaScriptGlue/Info.plist',
+            'EXPORTED_SYMBOLS_FILE': '<(DEPTH)/JavaScriptGlue/JavaScriptGlue.exp', 
+          },

         }],
       ],
     },
     {
       'target_name': 'Update Version',
       'type': 'none',
         }],
       ],
     },
     {
       'target_name': 'Update Version',
       'type': 'none',

-      'actions': [
-        {
-          'action_name': 'Update Info.plist with version information',
-          'inputs': [],
-          'outputs': [],
-          'action': [
-            'sh', 'update-info-plist.sh'
-          ],
-        },
-      ], # actions
+      'actions': [{
+        'action_name': 'Update Info.plist with version information',
+        'inputs': [],
+         'outputs': [],
+         'action': [
+           'sh', '<(DEPTH)/gyp/update-info-plist.sh', '<(DEPTH)/JavaScriptGlue/Info.plist'
+          ]
+      }],

     },
   ], # targets
 }
     },
   ], # targets
 }