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

        Reviewed by Dimitri Glazkov.

        Use target_defaults to reduce boilerplate in GYP build system
        https://bugs.webkit.org/show_bug.cgi?id=55790

        This file contains GYP declarations that are shared by all the modules.
        Currently, we use this to set up the configurations, albeit primitively.

        * Source/gyp/common.gypi: Added.
2011-03-04  Adam Barth  <abarth@webkit.org>

        Reviewed by Dimitri Glazkov.

        Use target_defaults to reduce boilerplate in GYP build system
        https://bugs.webkit.org/show_bug.cgi?id=55790

        Instead of setting up the configuration in each target, just defer to
        target_defaults.  Also, removed a define that was redundant with the
        xcconfig.

        * gyp/JavaScriptCore.gyp:
2011-03-04  Adam Barth  <abarth@webkit.org>

        Reviewed by Dimitri Glazkov.

        Use target_defaults to reduce boilerplate in GYP build system
        https://bugs.webkit.org/show_bug.cgi?id=55790

        Instead of setting up the configuration in each target, just defer to
        target_defaults.  Also, removed a define that was redundant with the
        xcconfig.

        * gyp/JavaScriptGlue.gyp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@80387 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index b67a0575b487edbc652c2999354c47a6ab7c1291..ae7bc61019ea84a3b9d7a224bf6c9dc58e863b1b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-03-04  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Use target_defaults to reduce boilerplate in GYP build system
+        https://bugs.webkit.org/show_bug.cgi?id=55790
+
+        This file contains GYP declarations that are shared by all the modules.
+        Currently, we use this to set up the configurations, albeit primitively.
+
+        * Source/gyp/common.gypi: Added.
+
 2011-03-03  Kevin Ollivier  <kevino@theolliviers.com>
 
         [wx] Build fix. Ensure the ICU include dir comes before JavaScriptCore/wtf on Win

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 68e612b0b4b551d6c5e55298b1ac54e9212a656f..75f41dd7b00f58f5e3ac2b21900bbf9f4becbbd0 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,16 @@
+2011-03-04  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Use target_defaults to reduce boilerplate in GYP build system
+        https://bugs.webkit.org/show_bug.cgi?id=55790
+
+        Instead of setting up the configuration in each target, just defer to
+        target_defaults.  Also, removed a define that was redundant with the
+        xcconfig.
+
+        * gyp/JavaScriptCore.gyp:
+
 2011-03-03  Gavin Barraclough  <barraclough@apple.com>
 
         Reviewed by Sam Weinig.

diff --git a/Source/JavaScriptCore/gyp/JavaScriptCore.gyp b/Source/JavaScriptCore/gyp/JavaScriptCore.gyp
index 891bf999f7dd1a7b5a04937d68d7006c74b1c5d9..4d647a510365030fa98b6bddf15f79f44913a054 100644 (file)
--- a/Source/JavaScriptCore/gyp/JavaScriptCore.gyp
+++ b/Source/JavaScriptCore/gyp/JavaScriptCore.gyp
@@ -1,5 +1,6 @@
 {
   'includes': [
+    '../../gyp/common.gypi',
     '../JavaScriptCore.gypi',
   ],
   'xcode_config_file': '<(DEPTH)/JavaScriptCore/Configurations/DebugRelease.xcconfig',
@@ -76,15 +77,6 @@
         ['exclude', '.*BSTR.*$'],
         ['exclude', 'jsc.cpp$'],
       ],
-      'configurations': {
-        'Debug': {},
-        'Release': {},
-        'Production': {},
-      },
-      'default_configuration': 'Debug',
-      'defines': [
-        'WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST',
-      ],
       'postbuilds': [
         {
           'postbuild_name': 'Check For Global Initializers',
@@ -149,12 +141,6 @@
           'sh', 'generate-derived-sources.sh',
         ],
       }],
-      'configurations': {
-        'Debug': {},
-        'Release': {},
-        'Production': {},
-      },
-      'default_configuration': 'Debug',
     },
     {
       'target_name': 'Update Version',
@@ -167,12 +153,6 @@
            'sh', '<(DEPTH)/gyp/update-info-plist.sh', '<(DEPTH)/JavaScriptCore/Info.plist'
           ]
       }],
-      'configurations': {
-        'Debug': {},
-        'Release': {},
-        'Production': {},
-      },
-      'default_configuration': 'Debug',
     },
     {
       'target_name': 'minidom',
@@ -188,12 +168,6 @@
         '<@(minidom_files)',
         '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
       ],
-      'configurations': {
-        'Debug': {},
-        'Release': {},
-        'Production': {},
-      },
-      'default_configuration': 'Debug',
     },
     {
       'target_name': 'testapi',
@@ -209,12 +183,6 @@
         '<@(testapi_files)',
         '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
       ],
-      'configurations': {
-        'Debug': {},
-        'Release': {},
-        'Production': {},
-      },
-      'default_configuration': 'Debug',
     },
     {
       'target_name': 'jsc',
@@ -231,12 +199,6 @@
         '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
         'libedit.dylib',
       ],
-      'configurations': {
-        'Debug': {},
-        'Release': {},
-        'Production': {},
-      },
-      'default_configuration': 'Debug',
     },
   ], # targets
 }

diff --git a/Source/JavaScriptGlue/ChangeLog b/Source/JavaScriptGlue/ChangeLog
index 4f4f5067cbb68c8376928dc4d3a97d3451c3cdde..ed47e76e81a4b0830511c8a426e137f32ae4987b 100644 (file)
--- a/Source/JavaScriptGlue/ChangeLog
+++ b/Source/JavaScriptGlue/ChangeLog
@@ -1,3 +1,16 @@
+2011-03-04  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Use target_defaults to reduce boilerplate in GYP build system
+        https://bugs.webkit.org/show_bug.cgi?id=55790
+
+        Instead of setting up the configuration in each target, just defer to
+        target_defaults.  Also, removed a define that was redundant with the
+        xcconfig.
+
+        * gyp/JavaScriptGlue.gyp:
+
 2011-03-03  Geoffrey Garen  <ggaren@apple.com>
 
         Rolled out 80277 and 80280 because they caused event handler layout test

diff --git a/Source/JavaScriptGlue/gyp/JavaScriptGlue.gyp b/Source/JavaScriptGlue/gyp/JavaScriptGlue.gyp
index 3044afb73912e52dccafb15c8484b884cfda0726..c3bb71198ab7982b70220a06b2e77995e731cf24 100644 (file)
--- a/Source/JavaScriptGlue/gyp/JavaScriptGlue.gyp
+++ b/Source/JavaScriptGlue/gyp/JavaScriptGlue.gyp
@@ -1,5 +1,6 @@
 {
   'includes': [
+    '../../gyp/common.gypi',
     'JavaScriptGlue.gypi',
   ],
   'xcode_config_file': '<(DEPTH)/JavaScriptGlue/Configurations/DebugRelease.xcconfig',
@@ -24,13 +25,6 @@
         '$(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',

diff --git a/Source/gyp/common.gypi b/Source/gyp/common.gypi
new file mode 100644 (file)
index 0000000..892009c
--- /dev/null
+++ b/Source/gyp/common.gypi
@@ -0,0 +1,10 @@
+{
+  'target_defaults': {
+    'configurations': {
+      'Debug': {},
+      'Release': {},
+      'Production': {},
+    },
+    'default_configuration': 'Debug',
+  },
+}