Changeset 81655 in webkit
- Timestamp:
- Mar 22, 2011 3:49:45 AM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 10 edited
-
JavaScriptCore/ChangeLog (modified) (1 diff)
-
JavaScriptCore/JavaScriptCore.gypi (modified) (1 diff)
-
JavaScriptCore/gyp/JavaScriptCore.gyp (modified) (3 diffs)
-
JavaScriptGlue/ChangeLog (modified) (1 diff)
-
JavaScriptGlue/gyp/JavaScriptGlue.gyp (modified) (5 diffs)
-
JavaScriptGlue/gyp/JavaScriptGlue.gypi (modified) (1 diff)
-
WebCore/ChangeLog (modified) (1 diff)
-
WebCore/WebCore.gypi (modified) (1 diff)
-
WebCore/gyp/WebCore.gyp (modified) (8 diffs)
-
gyp/common.gypi (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r81649 r81655 1 2011-03-22 Adam Barth <abarth@webkit.org> 2 3 Reviewed by Eric Seidel. 4 5 Production configuration in GYP isn't set up correctly 6 https://bugs.webkit.org/show_bug.cgi?id=56786 7 8 Update JavaScriptCore.gyp with information mined from 9 JavaScriptCore.xcodeproj. 10 11 * JavaScriptCore.gypi: 12 * gyp/JavaScriptCore.gyp: 13 1 14 2011-03-22 Kent Tamura <tkent@chromium.org> 2 15 -
trunk/Source/JavaScriptCore/JavaScriptCore.gypi
r81610 r81655 1 1 { 2 2 'variables': { 3 'project_dir': [ '<(DEPTH)/JavaScriptCore'],3 'project_dir': ['.'], 4 4 # These headers are part of JavaScriptCore's public API in the Apple Mac build. 5 5 'javascriptcore_publicheader_files': [ -
trunk/Source/JavaScriptCore/gyp/JavaScriptCore.gyp
r81647 r81655 4 4 '../JavaScriptCore.gypi', 5 5 ], 6 'xcode_config_file': '<(project_dir)/Configurations/DebugRelease.xcconfig', 6 'configurations': { 7 'Production': { 8 'xcode_config_file': '<(project_dir)/Configurations/Base.xcconfig', 9 }, 10 'Release': { 11 'xcode_config_file': '<(project_dir)/Configurations/DebugRelease.xcconfig', 12 'xcode_settings': { 13 'STRIP_INSTALLED_PRODUCT': 'NO', 14 }, 15 }, 16 'Debug': { 17 'xcode_config_file': '<(project_dir)/Configurations/DebugRelease.xcconfig', 18 'xcode_settings': { 19 'DEAD_CODE_STRIPPING': '$(DEAD_CODE_STRIPPING_debug)', 20 'DEBUG_DEFINES': '$(DEBUG_DEFINES_debug)', 21 'GCC_OPTIMIZATION_LEVEL': '$(GCC_OPTIMIZATION_LEVEL_debug)', 22 'STRIP_INSTALLED_PRODUCT': '$(STRIP_INSTALLED_PRODUCT_debug)', 23 }, 24 }, 25 }, 7 26 'variables': { 8 # FIXME: We should use a header map instead of listing these explicitly.9 27 'javascriptcore_include_dirs': [ 10 28 '<(project_dir)', … … 37 55 'include_dirs': [ 38 56 '<@(javascriptcore_include_dirs)', 39 ], 40 'configurations': { 41 'Production': { 42 }, 43 'Release': { 44 'xcode_settings': { 45 'STRIP_INSTALLED_PRODUCT': 'NO', 46 }, 47 }, 48 'Debug': { 49 'xcode_settings': { 50 'DEAD_CODE_STRIPPING': '$(DEAD_CODE_STRIPPING_debug)', 51 'DEBUG_DEFINES': '$(DEBUG_DEFINES_debug)', 52 'GCC_OPTIMIZATION_LEVEL': '$(GCC_OPTIMIZATION_LEVEL_debug)', 53 'STRIP_INSTALLED_PRODUCT': '$(STRIP_INSTALLED_PRODUCT_debug)', 54 }, 55 }, 56 }, 57 '<(SHARED_INTERMEDIATE_DIR)', 58 ], 57 59 'sources': [ 58 60 '<@(javascriptcore_files)', … … 214 216 '<@(javascriptcore_include_dirs)', 215 217 ], 218 'configurations': { 219 'Production': { 220 'xcode_settings': { 221 'INSTALL_PATH': '$(JAVASCRIPTCORE_FRAMEWORKS_DIR)/JavaScriptCore.framework/Resources', 222 }, 223 }, 224 }, 216 225 'sources': [ 217 226 '<@(jsc_files)', -
trunk/Source/JavaScriptGlue/ChangeLog
r81647 r81655 1 2011-03-22 Adam Barth <abarth@webkit.org> 2 3 Reviewed by Eric Seidel. 4 5 Production configuration in GYP isn't set up correctly 6 https://bugs.webkit.org/show_bug.cgi?id=56786 7 8 Update JavaScriptGlue.gyp with information mined from 9 JavaScriptGlue.xcodeproj. 10 11 * gyp/JavaScriptGlue.gyp: 12 * gyp/JavaScriptGlue.gypi: 13 1 14 2011-03-21 Adam Barth <abarth@webkit.org> 2 15 -
trunk/Source/JavaScriptGlue/gyp/JavaScriptGlue.gyp
r81647 r81655 4 4 'JavaScriptGlue.gypi', 5 5 ], 6 'xcode_config_file': '<(DEPTH)/JavaScriptGlue/Configurations/DebugRelease.xcconfig', 6 'configurations': { 7 'Production': { 8 'xcode_config_file': '<(project_dir)/Configurations/Base.xcconfig', 9 'xcode_settings': { 10 'BUILD_VARIANTS': 'normal', 11 'SECTORDER_FLAGS': [ 12 '-sectorder', 13 '__TEXT', 14 '__text', 15 '$(APPLE_INTERNAL_DIR)/OrderFiles/JavaScriptGlue.order', 16 ], 17 }, 18 }, 19 'Release': { 20 'xcode_config_file': '<(project_dir)/Configurations/DebugRelease.xcconfig', 21 'xcode_settings': { 22 'COPY_PHASE_STRIP': 'YES', 23 'GCC_ENABLE_FIX_AND_CONTINUE': 'NO', 24 'ZERO_LINK': 'NO', 25 'STRIP_INSTALLED_PRODUCT': 'NO', 26 'INSTALL_PATH': '$(BUILT_PRODUCTS_DIR)', 27 }, 28 }, 29 'Debug': { 30 'xcode_config_file': '<(project_dir)/Configurations/DebugRelease.xcconfig', 31 'xcode_settings': { 32 'COPY_PHASE_STRIP': 'NO', 33 'GCC_DYNAMIC_NO_PIC': 'NO', 34 'DEBUG_DEFINES': '$(DEBUG_DEFINES_debug)', 35 'GCC_OPTIMIZATION_LEVEL': '$(GCC_OPTIMIZATION_LEVEL_debug)', 36 'STRIP_INSTALLED_PRODUCT': '$(STRIP_INSTALLED_PRODUCT_debug)', 37 'INSTALL_PATH': '$(BUILT_PRODUCTS_DIR)', 38 }, 39 }, 40 }, 7 41 'targets': [ 8 42 { … … 13 47 ], 14 48 'include_dirs': [ 15 '<( DEPTH)/JavaScriptGlue/ForwardingHeaders',16 '<( DEPTH)/JavaScriptGlue/icu',49 '<(project_dir)/ForwardingHeaders', 50 '<(project_dir)/icu', 17 51 '<(PRODUCT_DIR)/include', 18 52 ], … … 24 58 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', 25 59 ], 26 'xcode_config_file': ' ../Configurations/JavaScriptGlue.xcconfig',60 'xcode_config_file': '<(project_dir)/Configurations/JavaScriptGlue.xcconfig', 27 61 'postbuilds': [ 28 62 { … … 49 83 'mac_bundle': 1, 50 84 'xcode_settings': { 85 'OTHER_CFLAGS': '-Wno-deprecated-declarations', 51 86 # FIXME: Remove these overrides once JavaScriptGlue.xcconfig is 52 87 # used only by this project. 53 'INFOPLIST_FILE': '<( DEPTH)/JavaScriptGlue/Info.plist',54 'EXPORTED_SYMBOLS_FILE': '<( DEPTH)/JavaScriptGlue/JavaScriptGlue.exp',88 'INFOPLIST_FILE': '<(project_dir)/Info.plist', 89 'EXPORTED_SYMBOLS_FILE': '<(project_dir)/JavaScriptGlue.exp', 55 90 }, 56 91 }], … … 65 100 'outputs': [], 66 101 'action': [ 67 'sh', '<(DEPTH)/gyp/update-info-plist.sh', '<( DEPTH)/JavaScriptGlue/Info.plist'102 'sh', '<(DEPTH)/gyp/update-info-plist.sh', '<(project_dir)/Info.plist' 68 103 ] 69 104 }], -
trunk/Source/JavaScriptGlue/gyp/JavaScriptGlue.gypi
r81567 r81655 1 1 { 2 2 'variables': { 3 'project_dir': ['..'], 3 4 'javascriptglue_files': [ 4 5 '../JavaScriptGlue.cpp', -
trunk/Source/WebCore/ChangeLog
r81653 r81655 1 2011-03-22 Adam Barth <abarth@webkit.org> 2 3 Reviewed by Eric Seidel. 4 5 Production configuration in GYP isn't set up correctly 6 https://bugs.webkit.org/show_bug.cgi?id=56786 7 8 Update WebCore.gyp with information mined from WebCore.xcodeproj. 9 10 * WebCore.gypi: 11 * gyp/WebCore.gyp: 12 1 13 2011-03-22 Ofri Wolfus <ofri@google.com> 2 14 -
trunk/Source/WebCore/WebCore.gypi
r81623 r81655 1 1 { 2 2 'variables': { 3 'project_dir': ['.'], 3 4 # These headers are part of WebCore's private API in the Apple Mac build. 4 5 'webcore_privateheader_files': [ -
trunk/Source/WebCore/gyp/WebCore.gyp
r81623 r81655 4 4 '../WebCore.gypi', 5 5 ], 6 'xcode_config_file': '../Configurations/DebugRelease.xcconfig', 6 'configurations': { 7 'Production': { 8 'xcode_config_file': '<(project_dir)/Configurations/Base.xcconfig', 9 }, 10 'Release': { 11 'xcode_config_file': '<(project_dir)/Configurations/DebugRelease.xcconfig', 12 'xcode_settings': { 13 'STRIP_INSTALLED_PRODUCT': 'NO', 14 }, 15 }, 16 'Debug': { 17 'xcode_config_file': '<(project_dir)/Configurations/DebugRelease.xcconfig', 18 'xcode_settings': { 19 'DEAD_CODE_STRIPPING': '$(DEAD_CODE_STRIPPING_debug)', 20 'DEBUG_DEFINES': '$(DEBUG_DEFINES_debug)', 21 'GCC_OPTIMIZATION_LEVEL': '$(GCC_OPTIMIZATION_LEVEL_debug)', 22 'STRIP_INSTALLED_PRODUCT': '$(STRIP_INSTALLED_PRODUCT_debug)', 23 }, 24 }, 25 }, 7 26 'targets': [ 8 27 { … … 17 36 ], 18 37 'include_dirs': [ 19 '<( DEPTH)/WebCore',20 '<( DEPTH)/WebCore/icu',21 '<( DEPTH)/WebCore/ForwardingHeaders',38 '<(project_dir)', 39 '<(project_dir)/icu', 40 '<(project_dir)/ForwardingHeaders', 22 41 '<(PRODUCT_DIR)/usr/local/include', 23 42 '/usr/include/libxml2', … … 25 44 '<(PRODUCT_DIR)/DerivedSources/WebCore', 26 45 ], 27 'configurations': {28 'Production': {29 },30 'Release': {31 'xcode_settings': {32 'STRIP_INSTALLED_PRODUCT': 'NO',33 },34 },35 'Debug': {36 'xcode_settings': {37 'DEAD_CODE_STRIPPING': '$(DEAD_CODE_STRIPPING_debug)',38 'DEBUG_DEFINES': '$(DEBUG_DEFINES_debug)',39 'GCC_OPTIMIZATION_LEVEL': '$(GCC_OPTIMIZATION_LEVEL_debug)',40 'STRIP_INSTALLED_PRODUCT': '$(STRIP_INSTALLED_PRODUCT_debug)',41 },42 },43 },44 46 'sources': [ 45 47 '<@(webcore_files)', … … 133 135 '<@(webcore_privateheader_files)', 134 136 ], 135 'xcode_config_file': ' ../Configurations/WebCore.xcconfig',137 'xcode_config_file': '<(project_dir)/Configurations/WebCore.xcconfig', 136 138 # FIXME: A number of these actions aren't supposed to run if "${ACTION}" = "installhdrs" 137 139 'postbuilds': [ … … 167 169 # FIXME: Remove these overrides once WebCore.xcconfig is 168 170 # used only by this project. 169 'GCC_PREFIX_HEADER': '<( DEPTH)/WebCore/WebCorePrefix.h',170 'INFOPLIST_FILE': '<( DEPTH)/WebCore/Info.plist',171 'GCC_PREFIX_HEADER': '<(project_dir)/WebCorePrefix.h', 172 'INFOPLIST_FILE': '<(project_dir)/Info.plist', 171 173 'ALWAYS_SEARCH_USER_PATHS': 'NO', 172 174 }, … … 197 199 'outputs': [], 198 200 'action': [ 199 'sh', '<(DEPTH)/gyp/update-info-plist.sh', '<( DEPTH)/WebCore/Info.plist'201 'sh', '<(DEPTH)/gyp/update-info-plist.sh', '<(project_dir)/Info.plist' 200 202 ] 201 203 }], … … 207 209 'action_name': 'Generate Export File Generator', 208 210 'inputs': [ 209 '<( DEPTH)/WebCore/WebCore.exp.in',211 '<(project_dir)/WebCore.exp.in', 210 212 ], 211 213 'outputs': [ … … 224 226 ], 225 227 'include_dirs': [ 226 '<(DEPTH)/WebCore/ForwardingHeaders', 227 ], 228 '<(project_dir)/ForwardingHeaders', 229 ], 230 'xcode_config_file': '<(project_dir)/Configurations/WebCore.xcconfig', 231 'configurations': { 232 'Production': { 233 'EXPORTED_SYMBOLS_FILE': '', 234 'GCC_OPTIMIZATION_LEVEL': '0', 235 'INSTALL_PATH': '/usr/local/bin', 236 'OTHER_LDFLAGS': '', 237 'SKIP_INSTALL': 'YES', 238 }, 239 'Release': { 240 'xcode_settings': { 241 'EXPORTED_SYMBOLS_FILE': '', 242 'GCC_OPTIMIZATION_LEVEL': '0', 243 'INSTALL_PATH': '/usr/local/bin', 244 'OTHER_LDFLAGS': '', 245 'SKIP_INSTALL': 'YES', 246 }, 247 }, 248 'Debug': { 249 'xcode_settings': { 250 'EXPORTED_SYMBOLS_FILE': '', 251 'GCC_OPTIMIZATION_LEVEL': '0', 252 'INSTALL_PATH': '/usr/local/bin', 253 'OTHER_LDFLAGS': '', 254 'SKIP_INSTALL': 'YES', 255 }, 256 }, 257 }, 228 258 'sources': [ 229 259 '<@(export_file_generator_files)', -
trunk/Source/gyp/common.gypi
r80387 r81655 2 2 'target_defaults': { 3 3 'configurations': { 4 'Production': {}, 5 'Release': {}, 4 6 'Debug': {}, 5 'Release': {},6 'Production': {},7 7 }, 8 'default_configuration': 'Debug',9 8 }, 9 'default_configuration': 'Production', 10 10 }
Note: See TracChangeset
for help on using the changeset viewer.
