2011-03-22 Adam Barth <abarth@webkit.org>
authorabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 22 Mar 2011 10:49:45 +0000 (10:49 +0000)
committerabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 22 Mar 2011 10:49:45 +0000 (10:49 +0000)
        Reviewed by Eric Seidel.

        Production configuration in GYP isn&apos;t set up correctly
        https://bugs.webkit.org/show_bug.cgi?id=56786

        Update JavaScriptCore.gyp with information mined from
        JavaScriptCore.xcodeproj.

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

        Reviewed by Eric Seidel.

        Production configuration in GYP isn&apos;t set up correctly
        https://bugs.webkit.org/show_bug.cgi?id=56786

        Update JavaScriptGlue.gyp with information mined from
        JavaScriptGlue.xcodeproj.

        * gyp/JavaScriptGlue.gyp:
        * gyp/JavaScriptGlue.gypi:
2011-03-22  Adam Barth  <abarth@webkit.org>

        Reviewed by Eric Seidel.

        Production configuration in GYP isn&apos;t set up correctly
        https://bugs.webkit.org/show_bug.cgi?id=56786

        Update WebCore.gyp with information mined from WebCore.xcodeproj.

        * WebCore.gypi:
        * gyp/WebCore.gyp:

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

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/JavaScriptCore.gypi
Source/JavaScriptCore/gyp/JavaScriptCore.gyp
Source/JavaScriptGlue/ChangeLog
Source/JavaScriptGlue/gyp/JavaScriptGlue.gyp
Source/JavaScriptGlue/gyp/JavaScriptGlue.gypi
Source/WebCore/ChangeLog
Source/WebCore/WebCore.gypi
Source/WebCore/gyp/WebCore.gyp
Source/gyp/common.gypi

index fd8d5728684746ae90ca6803f3173f6f9839a77c..48d3f69f16496894955a998962ded0748288504e 100644 (file)
@@ -1,3 +1,16 @@
+2011-03-22  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Production configuration in GYP isn&apos;t set up correctly
+        https://bugs.webkit.org/show_bug.cgi?id=56786
+
+        Update JavaScriptCore.gyp with information mined from
+        JavaScriptCore.xcodeproj.
+
+        * JavaScriptCore.gypi:
+        * gyp/JavaScriptCore.gyp:
+
 2011-03-22  Kent Tamura  <tkent@chromium.org>
 
         Reviewed by Eric Seidel.
index 35ae9c0e50d8ee6c3a6d6fe6c81148b9da22b6e4..5d460d7af4fb915426d390ccaf104afdc3e20402 100644 (file)
@@ -1,6 +1,6 @@
 {
     'variables': {
-        'project_dir': [ '<(DEPTH)/JavaScriptCore' ],
+        'project_dir': ['.'],
         # These headers are part of JavaScriptCore's public API in the Apple Mac build.
         'javascriptcore_publicheader_files': [
             'API/JSBase.h',
index 358bf272ed55880da79fdbb8457ca506435157d2..2cf2ff728dfaf2b80a5b9ffc47ea11996fce27de 100644 (file)
@@ -3,9 +3,27 @@
     '../../gyp/common.gypi',
     '../JavaScriptCore.gypi',
   ],
-  'xcode_config_file': '<(project_dir)/Configurations/DebugRelease.xcconfig',
+  'configurations': {
+    'Production': {
+      'xcode_config_file': '<(project_dir)/Configurations/Base.xcconfig',
+    },
+    'Release': {
+      'xcode_config_file': '<(project_dir)/Configurations/DebugRelease.xcconfig',
+      'xcode_settings': {
+        'STRIP_INSTALLED_PRODUCT': 'NO',
+      },
+    },
+    'Debug': {
+      'xcode_config_file': '<(project_dir)/Configurations/DebugRelease.xcconfig',
+      'xcode_settings': {
+        'DEAD_CODE_STRIPPING': '$(DEAD_CODE_STRIPPING_debug)',
+        'DEBUG_DEFINES': '$(DEBUG_DEFINES_debug)',
+        'GCC_OPTIMIZATION_LEVEL': '$(GCC_OPTIMIZATION_LEVEL_debug)',
+        'STRIP_INSTALLED_PRODUCT': '$(STRIP_INSTALLED_PRODUCT_debug)',
+      },
+    },
+  },
   'variables': {
-    # FIXME: We should use a header map instead of listing these explicitly.
     'javascriptcore_include_dirs': [
       '<(project_dir)',
       '<(project_dir)/icu',
       ],
       'include_dirs': [
         '<@(javascriptcore_include_dirs)',
+        '<(SHARED_INTERMEDIATE_DIR)',
       ],
-      'configurations': {
-        'Production': {
-        },
-        'Release': {
-          'xcode_settings': {
-            'STRIP_INSTALLED_PRODUCT': 'NO',
-          },
-        },
-        'Debug': {
-          'xcode_settings': {
-            'DEAD_CODE_STRIPPING': '$(DEAD_CODE_STRIPPING_debug)',
-            'DEBUG_DEFINES': '$(DEBUG_DEFINES_debug)',
-            'GCC_OPTIMIZATION_LEVEL': '$(GCC_OPTIMIZATION_LEVEL_debug)',
-            'STRIP_INSTALLED_PRODUCT': '$(STRIP_INSTALLED_PRODUCT_debug)',
-          },
-        },
-      },
       'sources': [
         '<@(javascriptcore_files)',
         '<@(javascriptcore_publicheader_files)',
       'include_dirs': [
         '<@(javascriptcore_include_dirs)',
       ],
+      'configurations': {
+        'Production': {
+          'xcode_settings': {
+            'INSTALL_PATH': '$(JAVASCRIPTCORE_FRAMEWORKS_DIR)/JavaScriptCore.framework/Resources',
+          },
+        },
+      },
       'sources': [
         '<@(jsc_files)',
         '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
index 13cb9c1d9dda926ba85cdf66e98b46d7baa04019..8ade7afc3cf2c3a2525fa1fbf230bbad00140b1e 100644 (file)
@@ -1,3 +1,16 @@
+2011-03-22  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Production configuration in GYP isn&apos;t set up correctly
+        https://bugs.webkit.org/show_bug.cgi?id=56786
+
+        Update JavaScriptGlue.gyp with information mined from
+        JavaScriptGlue.xcodeproj.
+
+        * gyp/JavaScriptGlue.gyp:
+        * gyp/JavaScriptGlue.gypi:
+
 2011-03-21  Adam Barth  <abarth@webkit.org>
 
         Reviewed by Eric Seidel.
index 825fd860f1293092983ee16a38c319cc0221d355..b970d4b5b53cfe283fc24f29799cce5d73894c34 100644 (file)
@@ -3,7 +3,41 @@
     '../../gyp/common.gypi',
     'JavaScriptGlue.gypi',
   ],
-  'xcode_config_file': '<(DEPTH)/JavaScriptGlue/Configurations/DebugRelease.xcconfig',
+  'configurations': {
+    'Production': {
+      'xcode_config_file': '<(project_dir)/Configurations/Base.xcconfig',
+      'xcode_settings': {
+        'BUILD_VARIANTS': 'normal',
+        'SECTORDER_FLAGS': [
+          '-sectorder',
+          '__TEXT',
+          '__text',
+          '$(APPLE_INTERNAL_DIR)/OrderFiles/JavaScriptGlue.order',
+        ],
+      },
+    },
+    'Release': {
+      'xcode_config_file': '<(project_dir)/Configurations/DebugRelease.xcconfig',
+      'xcode_settings': {
+        'COPY_PHASE_STRIP': 'YES',
+        'GCC_ENABLE_FIX_AND_CONTINUE': 'NO',
+        'ZERO_LINK': 'NO',
+        'STRIP_INSTALLED_PRODUCT': 'NO',
+        'INSTALL_PATH': '$(BUILT_PRODUCTS_DIR)',
+      },
+    },
+    'Debug': {
+      'xcode_config_file': '<(project_dir)/Configurations/DebugRelease.xcconfig',
+      'xcode_settings': {
+        'COPY_PHASE_STRIP': 'NO',
+        'GCC_DYNAMIC_NO_PIC': 'NO',
+        'DEBUG_DEFINES': '$(DEBUG_DEFINES_debug)',
+        'GCC_OPTIMIZATION_LEVEL': '$(GCC_OPTIMIZATION_LEVEL_debug)',
+        'STRIP_INSTALLED_PRODUCT': '$(STRIP_INSTALLED_PRODUCT_debug)',
+        'INSTALL_PATH': '$(BUILT_PRODUCTS_DIR)',
+      },
+    },
+  },
   'targets': [
     {
       'target_name': 'JavaScriptGlue',
@@ -12,8 +46,8 @@
         'Update Version'
       ],
       'include_dirs': [
-        '<(DEPTH)/JavaScriptGlue/ForwardingHeaders',
-        '<(DEPTH)/JavaScriptGlue/icu',
+        '<(project_dir)/ForwardingHeaders',
+        '<(project_dir)/icu',
         '<(PRODUCT_DIR)/include',
       ],
       'sources': [
@@ -23,7 +57,7 @@
         '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
         '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
       ],
-      'xcode_config_file': '../Configurations/JavaScriptGlue.xcconfig',
+      'xcode_config_file': '<(project_dir)/Configurations/JavaScriptGlue.xcconfig',
       'postbuilds': [
         {
           'postbuild_name': 'Check For Global Initializers',
         ['OS=="mac"', {
           'mac_bundle': 1,
           'xcode_settings': {
+            'OTHER_CFLAGS': '-Wno-deprecated-declarations',
             # 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', 
+            'INFOPLIST_FILE': '<(project_dir)/Info.plist',
+            'EXPORTED_SYMBOLS_FILE': '<(project_dir)/JavaScriptGlue.exp', 
           },
         }],
       ],
@@ -64,7 +99,7 @@
         'inputs': [],
          'outputs': [],
          'action': [
-           'sh', '<(DEPTH)/gyp/update-info-plist.sh', '<(DEPTH)/JavaScriptGlue/Info.plist'
+           'sh', '<(DEPTH)/gyp/update-info-plist.sh', '<(project_dir)/Info.plist'
           ]
       }],
     },
index adb35c483682d97b6860a140e9873908963f7768..47952723c7d9fd38aaf19b344b43fc922e602941 100644 (file)
@@ -1,5 +1,6 @@
 {
     'variables': {
+        'project_dir': ['..'],
         'javascriptglue_files': [
             '../JavaScriptGlue.cpp',
             '../JSBase.cpp',
index 526ebe126247631288885f4401a26b44cd29d9e5..d771850c0d3a22b7c9d3525a3324dbcf6c4dfbb9 100644 (file)
@@ -1,3 +1,15 @@
+2011-03-22  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Production configuration in GYP isn&apos;t set up correctly
+        https://bugs.webkit.org/show_bug.cgi?id=56786
+
+        Update WebCore.gyp with information mined from WebCore.xcodeproj.
+
+        * WebCore.gypi:
+        * gyp/WebCore.gyp:
+
 2011-03-22  Ofri Wolfus  <ofri@google.com>
 
         Reviewed by Eric Seidel.
index 0ec68e4e9206f4aa611a4628b7f15bc0ff51929e..3e031b8c169b2d88d394bbcbae23b1b09ba0f111 100644 (file)
@@ -1,5 +1,6 @@
 {
     'variables': {
+        'project_dir': ['.'],
         # These headers are part of WebCore's private API in the Apple Mac build.
         'webcore_privateheader_files': [
             '<(PRODUCT_DIR)/DerivedSources/WebCore/CSSPropertyNames.h',
index 890289191569bc29ccf4a72080c08d7094ca8f2e..2c62d2c0d1d169b7b0cc41534453b83f3beda4cf 100644 (file)
@@ -3,7 +3,26 @@
     '../../gyp/common.gypi',
     '../WebCore.gypi',
   ],
-  'xcode_config_file': '../Configurations/DebugRelease.xcconfig',
+  'configurations': {
+    'Production': {
+      'xcode_config_file': '<(project_dir)/Configurations/Base.xcconfig',
+    },
+    'Release': {
+      'xcode_config_file': '<(project_dir)/Configurations/DebugRelease.xcconfig',
+      'xcode_settings': {
+        'STRIP_INSTALLED_PRODUCT': 'NO',
+      },
+    },
+    'Debug': {
+      'xcode_config_file': '<(project_dir)/Configurations/DebugRelease.xcconfig',
+      'xcode_settings': {
+        'DEAD_CODE_STRIPPING': '$(DEAD_CODE_STRIPPING_debug)',
+        'DEBUG_DEFINES': '$(DEBUG_DEFINES_debug)',
+        'GCC_OPTIMIZATION_LEVEL': '$(GCC_OPTIMIZATION_LEVEL_debug)',
+        'STRIP_INSTALLED_PRODUCT': '$(STRIP_INSTALLED_PRODUCT_debug)',
+      },
+    },
+  },
   'targets': [
     {
       'target_name': 'WebCore',
         # FIXME: Add 'Copy Inspector Resources',
       ],
       'include_dirs': [
-        '<(DEPTH)/WebCore',
-        '<(DEPTH)/WebCore/icu',
-        '<(DEPTH)/WebCore/ForwardingHeaders',
+        '<(project_dir)',
+        '<(project_dir)/icu',
+        '<(project_dir)/ForwardingHeaders',
         '<(PRODUCT_DIR)/usr/local/include',
         '/usr/include/libxml2',
         '<(PRODUCT_DIR)/DerivedSources',
         '<(PRODUCT_DIR)/DerivedSources/WebCore',
       ],
-      'configurations': {
-        'Production': {
-        },
-        'Release': {
-          'xcode_settings': {
-            'STRIP_INSTALLED_PRODUCT': 'NO',
-          },
-        },
-        'Debug': {
-          'xcode_settings': {
-            'DEAD_CODE_STRIPPING': '$(DEAD_CODE_STRIPPING_debug)',
-            'DEBUG_DEFINES': '$(DEBUG_DEFINES_debug)',
-            'GCC_OPTIMIZATION_LEVEL': '$(GCC_OPTIMIZATION_LEVEL_debug)',
-            'STRIP_INSTALLED_PRODUCT': '$(STRIP_INSTALLED_PRODUCT_debug)',
-          },
-        },
-      },
       'sources': [
         '<@(webcore_files)',
         '<@(webcore_privateheader_files)',
       'mac_framework_private_headers': [
         '<@(webcore_privateheader_files)',
       ],
-      'xcode_config_file': '../Configurations/WebCore.xcconfig',
+      'xcode_config_file': '<(project_dir)/Configurations/WebCore.xcconfig',
       # FIXME: A number of these actions aren't supposed to run if "${ACTION}" = "installhdrs"
       'postbuilds': [
         {
           'xcode_settings': {
             # FIXME: Remove these overrides once WebCore.xcconfig is
             # used only by this project.
-            'GCC_PREFIX_HEADER': '<(DEPTH)/WebCore/WebCorePrefix.h',
-            'INFOPLIST_FILE': '<(DEPTH)/WebCore/Info.plist',
+            'GCC_PREFIX_HEADER': '<(project_dir)/WebCorePrefix.h',
+            'INFOPLIST_FILE': '<(project_dir)/Info.plist',
             'ALWAYS_SEARCH_USER_PATHS': 'NO',
           },
         }],
         'inputs': [],
          'outputs': [],
          'action': [
-           'sh', '<(DEPTH)/gyp/update-info-plist.sh', '<(DEPTH)/WebCore/Info.plist'
+           'sh', '<(DEPTH)/gyp/update-info-plist.sh', '<(project_dir)/Info.plist'
           ]
       }],
     },
       'actions': [{
         'action_name': 'Generate Export File Generator',
         'inputs': [
-          '<(DEPTH)/WebCore/WebCore.exp.in',
+          '<(project_dir)/WebCore.exp.in',
         ],
         'outputs': [
           '<@(export_file_generator_files)',
         'WebCoreExportFileGenerator Generator',
       ],
       'include_dirs': [
-        '<(DEPTH)/WebCore/ForwardingHeaders',
+        '<(project_dir)/ForwardingHeaders',
       ],
+      'xcode_config_file': '<(project_dir)/Configurations/WebCore.xcconfig',
+      'configurations': {
+        'Production': {
+            'EXPORTED_SYMBOLS_FILE': '',
+            'GCC_OPTIMIZATION_LEVEL': '0',
+            'INSTALL_PATH': '/usr/local/bin',
+            'OTHER_LDFLAGS': '',
+            'SKIP_INSTALL': 'YES',
+        },
+        'Release': {
+          'xcode_settings': {
+            'EXPORTED_SYMBOLS_FILE': '',
+            'GCC_OPTIMIZATION_LEVEL': '0',
+            'INSTALL_PATH': '/usr/local/bin',
+            'OTHER_LDFLAGS': '',
+            'SKIP_INSTALL': 'YES',
+          },
+        },
+        'Debug': {
+          'xcode_settings': {
+            'EXPORTED_SYMBOLS_FILE': '',
+            'GCC_OPTIMIZATION_LEVEL': '0',
+            'INSTALL_PATH': '/usr/local/bin',
+            'OTHER_LDFLAGS': '',
+            'SKIP_INSTALL': 'YES',
+          },
+        },
+      },
       'sources': [
         '<@(export_file_generator_files)',
       ],
index 892009c7d47df0ba128c4c908f0260f6d3b09415..db0a56b43ce1513fca592fd825a8803930ba0f7d 100644 (file)
@@ -1,10 +1,10 @@
 {
   'target_defaults': {
     'configurations': {
-      'Debug': {},
-      'Release': {},
       'Production': {},
+      'Release': {},
+      'Debug': {},
     },
-    'default_configuration': 'Debug',
   },
+  'default_configuration': 'Production',
 }