Changeset 171212 in webkit


Ignore:
Timestamp:
Jul 17, 2014 8:59:47 PM (10 years ago)
Author:
ddkilzer@apple.com
Message:

SECTORDER_FLAGS should be defined in target's xcconfig file, not Base.xcconfig
<​http://webkit.org/b/135006>

Reviewed by Darin Adler.

Source/JavaScriptCore:

  • Configurations/Base.xcconfig: Move SECTORDER_FLAGS to

JavaScriptCore.xcconfig.

  • Configurations/CompileRuntimeToLLVMIR.xcconfig: Remove empty

SECTORDER_FLAGS definition.

  • Configurations/DebugRelease.xcconfig: Ditto.
  • Configurations/JavaScriptCore.xcconfig: Use $(CONFIGURATION)

so SECTORDER_FLAGS is only set on Production builds.

Source/WebCore:

  • Configurations/Base.xcconfig: Move SECTORDER_FLAGS to

WebCore.xcconfig.

  • Configurations/DebugRelease.xcconfig: Remove empty

SECTORDER_FLAGS definition.

  • Configurations/WebCoreTestShim.xcconfig: Ditto.
  • Configurations/WebCoreTestSupport.xcconfig: Ditto.
  • Configurations/WebCore.xcconfig: Use $(CONFIGURATION) so

SECTORDER_FLAGS is only set on Production builds.

Source/WebKit:

  • WebKit.xcodeproj/project.pbxproj: Remove references to unused

WebKit.xcconfig file.

Source/WebKit/mac:

  • Configurations/Base.xcconfig: Move SECTORDER_FLAGS to

WebKitLegacy.xcconfig.

  • Configurations/DebugRelease.xcconfig: Remove empty

SECTORDER_FLAGS definition.

  • Configurations/WebKit.xcconfig: Removed. Unused.
  • Configurations/WebKitLegacy.xcconfig: Use $(CONFIGURATION) so

SECTORDER_FLAGS is only set on Production builds.

Source/WebKit2:

  • Configurations/Base.xcconfig: Move SECTORDER_FLAGS to

WebKit.xcconfig.

  • Configurations/DebugRelease.xcconfig: Remove empty

SECTORDER_FLAGS definition.

  • Configurations/WebKit.xcconfig: Use $(CONFIGURATION) so

SECTORDER_FLAGS is only set on Production builds.

Location:
trunk/Source
Files:
1 deleted
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r171208 r171212  
     12014-07-17  David Kilzer  <ddkilzer@apple.com>
     2
     3        SECTORDER_FLAGS should be defined in target's xcconfig file, not Base.xcconfig
     4        <http://webkit.org/b/135006>
     5
     6        Reviewed by Darin Adler.
     7
     8        * Configurations/Base.xcconfig: Move SECTORDER_FLAGS to
     9        JavaScriptCore.xcconfig.
     10        * Configurations/CompileRuntimeToLLVMIR.xcconfig: Remove empty
     11        SECTORDER_FLAGS definition.
     12        * Configurations/DebugRelease.xcconfig: Ditto.
     13        * Configurations/JavaScriptCore.xcconfig: Use $(CONFIGURATION)
     14        so SECTORDER_FLAGS is only set on Production builds.
     15
    1162014-07-17  Juergen Ributzka  <juergen@apple.com>
    217

  • trunk/Source/JavaScriptCore/Configurations/Base.xcconfig

    r167671 r171212  
    1 // Copyright (C) 2009, 2010, 2011, 2013 Apple Inc. All rights reserved.
     1// Copyright (C) 2009, 2010, 2011, 2013, 2014 Apple Inc. All rights reserved.
    22//
    33// Redistribution and use in source and binary forms, with or without
    … …  
    145145DEAD_CODE_STRIPPING = $(DEAD_CODE_STRIPPING_$(CURRENT_VARIANT));
    146146
    147 SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(PLATFORM_NAME));
    148 SECTORDER_FLAGS_iphoneos = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/JavaScriptCore.order;
    149 SECTORDER_FLAGS_macosx = -Wl,-order_file,JavaScriptCore.order;
    150 
    151147SDKROOT = macosx.internal;
    152148

  • trunk/Source/JavaScriptCore/Configurations/CompileRuntimeToLLVMIR.xcconfig

    r167149 r171212  
    3535HEADER_SEARCH_PATHS = "${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore" $(HEADER_SEARCH_PATHS);
    3636
    37 SECTORDER_FLAGS = ;
    38 
    3937OTHER_CFLAGS = -c -flto;
    4038OTHER_CPLUSPLUSFLAGS = -c -flto;

  • trunk/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig

    r165549 r171212  
    1 // Copyright (C) 2009, 2010, 2013 Apple Inc. All rights reserved.
     1// Copyright (C) 2009, 2010, 2013, 2014 Apple Inc. All rights reserved.
    22//
    33// Redistribution and use in source and binary forms, with or without
    … …  
    3939DEBUG_INFORMATION_FORMAT = dwarf;
    4040
    41 SECTORDER_FLAGS = ;
    42 
    4341OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
    4442OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);

  • trunk/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig

    r165432 r171212  
    1 // Copyright (C) 2009 Apple Inc. All rights reserved.
     1// Copyright (C) 2009, 2014 Apple Inc. All rights reserved.
    22//
    33// Redistribution and use in source and binary forms, with or without
    … …  
    4242OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
    4343OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -framework CoreServices;
     44
     45SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION)_$(PLATFORM_NAME));
     46SECTORDER_FLAGS_Production_iphoneos = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/JavaScriptCore.order;
     47SECTORDER_FLAGS_Production_macosx = -Wl,-order_file,JavaScriptCore.order;
     48
    4449GCC_PREFIX_HEADER = JavaScriptCorePrefix.h;
    4550GCC_SYMBOLS_PRIVATE_EXTERN = YES;

  • trunk/Source/WebCore/ChangeLog

    r171210 r171212  
     12014-07-17  David Kilzer  <ddkilzer@apple.com>
     2
     3        SECTORDER_FLAGS should be defined in target's xcconfig file, not Base.xcconfig
     4        <http://webkit.org/b/135006>
     5
     6        Reviewed by Darin Adler.
     7
     8        * Configurations/Base.xcconfig: Move SECTORDER_FLAGS to
     9        WebCore.xcconfig.
     10        * Configurations/DebugRelease.xcconfig: Remove empty
     11        SECTORDER_FLAGS definition.
     12        * Configurations/WebCoreTestShim.xcconfig: Ditto.
     13        * Configurations/WebCoreTestSupport.xcconfig: Ditto.
     14        * Configurations/WebCore.xcconfig: Use $(CONFIGURATION) so
     15        SECTORDER_FLAGS is only set on Production builds.
     16
    1172014-07-17  Zalan Bujtas  <zalan@apple.com>
    218

  • trunk/Source/WebCore/Configurations/Base.xcconfig

    r165677 r171212  
    1 // Copyright (C) 2009, 2010, 2013 Apple Inc. All rights reserved.
     1// Copyright (C) 2009, 2010, 2013, 2014 Apple Inc. All rights reserved.
    22//
    33// Redistribution and use in source and binary forms, with or without
    … …  
    109109DEAD_CODE_STRIPPING = $(DEAD_CODE_STRIPPING_$(CURRENT_VARIANT));
    110110
    111 SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(PLATFORM_NAME));
    112 SECTORDER_FLAGS_iphoneos = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebCore.order;
    113 SECTORDER_FLAGS_macosx = -Wl,-order_file,WebCore.order;
    114 
    115111WEBCORE_SQLITE3_HEADER_SEARCH_PATHS = $(NEXT_ROOT)/usr/local/include/WebCoreSQLite3;
    116112SQLITE3_HEADER_SEARCH_PATHS = $(SQLITE3_HEADER_SEARCH_PATHS_$(PLATFORM_NAME));

  • trunk/Source/WebCore/Configurations/DebugRelease.xcconfig

    r165549 r171212  
    1 // Copyright (C) 2009, 2010, 2013 Apple Inc. All rights reserved.
     1// Copyright (C) 2009, 2010, 2013, 2014 Apple Inc. All rights reserved.
    22//
    33// Redistribution and use in source and binary forms, with or without
    … …  
    3939DEBUG_INFORMATION_FORMAT = dwarf;
    4040
    41 SECTORDER_FLAGS = ;
    42 
    4341WEBCORE_SQLITE3_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/WebCoreSQLite3;
    4442

  • trunk/Source/WebCore/Configurations/WebCore.xcconfig

    r169409 r171212  
    1 // Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
     1// Copyright (C) 2009, 2010, 2014 Apple Inc. All rights reserved.
    22//
    33// Redistribution and use in source and binary forms, with or without
    … …  
    7676OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -umbrella WebKit -allowable_client WebCoreTestSupport -allowable_client WebKit2 -allowable_client WebKitLegacy -framework ApplicationServices -framework AudioUnit -framework Carbon -framework Cocoa -framework IOSurface -framework OpenGL;
    7777
     78SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION)_$(PLATFORM_NAME));
     79SECTORDER_FLAGS_Production_iphoneos = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebCore.order;
     80SECTORDER_FLAGS_Production_macosx = -Wl,-order_file,WebCore.order;
     81
    7882NORMAL_WEBCORE_FRAMEWORKS_DIR = $(NORMAL_WEBCORE_FRAMEWORKS_DIR_$(PLATFORM_NAME));
    7983NORMAL_WEBCORE_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);

  • trunk/Source/WebCore/Configurations/WebCoreTestShim.xcconfig

    r161809 r171212  
    1 // Copyright (C) 2013 Apple Inc. All rights reserved.
     1// Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
    22//
    33// Redistribution and use in source and binary forms, with or without
    … …  
    4040OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
    4141OTHER_LDFLAGS[sdk=macosx*] = $(ASAN_OTHER_LDFLAGS) -framework Carbon;
    42 SECTORDER_FLAGS = ;

  • trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig

    r161638 r171212  
    11// Copyright (C) 2011 Google Inc. All rights reserved.
     2// Copyright (C) 2014 Apple Inc. All rights reserved.
    23//
    34// Redistribution and use in source and binary forms, with or without
    … …  
    5253GCC_SYMBOLS_PRIVATE_EXTERN = YES;
    5354OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
    54 SECTORDER_FLAGS = ;

  • trunk/Source/WebKit/ChangeLog

    r170937 r171212  
     12014-07-17  David Kilzer  <ddkilzer@apple.com>
     2
     3        SECTORDER_FLAGS should be defined in target's xcconfig file, not Base.xcconfig
     4        <http://webkit.org/b/135006>
     5
     6        Reviewed by Darin Adler.
     7
     8        * WebKit.xcodeproj/project.pbxproj: Remove references to unused
     9        WebKit.xcconfig file.
     10
    1112014-07-09  Brent Fulgham  <bfulgham@apple.com>
    212

  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r170500 r171212  
    502502                1AB1DABF18BC0232004B6A9F /* WebViewGroup.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebViewGroup.mm; sourceTree = "<group>"; };
    503503                1AB1DAC018BC0232004B6A9F /* WebViewGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewGroup.h; sourceTree = "<group>"; };
    504                 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKit.xcconfig; sourceTree = "<group>"; };
    505504                1AEA66D20DC6B1FF003D12BF /* WebNetscapePluginEventHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNetscapePluginEventHandler.h; sourceTree = "<group>"; };
    506505                1AEA66D30DC6B1FF003D12BF /* WebNetscapePluginEventHandler.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebNetscapePluginEventHandler.mm; sourceTree = "<group>"; };
    … …  
    10581057                                1C904FD30BA9DD0F0081E9D0 /* Version.xcconfig */,
    10591058                                1C904FD20BA9DD0F0081E9D0 /* WebKitLegacy.xcconfig */,
    1060                                 1AD7453B18D0D2A6006F3A1E /* WebKit.xcconfig */,
    10611059                        );
    10621060                        name = Configurations;

  • trunk/Source/WebKit/mac/ChangeLog

    r171195 r171212  
     12014-07-17  David Kilzer  <ddkilzer@apple.com>
     2
     3        SECTORDER_FLAGS should be defined in target's xcconfig file, not Base.xcconfig
     4        <http://webkit.org/b/135006>
     5
     6        Reviewed by Darin Adler.
     7
     8        * Configurations/Base.xcconfig: Move SECTORDER_FLAGS to
     9        WebKitLegacy.xcconfig.
     10        * Configurations/DebugRelease.xcconfig: Remove empty
     11        SECTORDER_FLAGS definition.
     12        * Configurations/WebKit.xcconfig: Removed.  Unused.
     13        * Configurations/WebKitLegacy.xcconfig: Use $(CONFIGURATION) so
     14        SECTORDER_FLAGS is only set on Production builds.
     15
    1162014-07-17  Timothy Hatcher  <timothy@apple.com>
    217

  • trunk/Source/WebKit/mac/Configurations/Base.xcconfig

    r171164 r171212  
    1 // Copyright (C) 2009, 2010, 2013 Apple Inc. All rights reserved.
     1// Copyright (C) 2009, 2010, 2013, 2014 Apple Inc. All rights reserved.
    22//
    33// Redistribution and use in source and binary forms, with or without
    … …  
    102102DEAD_CODE_STRIPPING = YES;
    103103
    104 SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(PLATFORM_NAME));
    105 SECTORDER_FLAGS_iphoneos = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebKitLegacy.order;
    106 SECTORDER_FLAGS_macosx = -Wl,-order_file,mac/WebKit.order;
    107 
    108104SDKROOT = macosx.internal;
    109105

  • trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig

    r165754 r171212  
    1 // Copyright (C) 2009, 2010, 2013 Apple Inc. All rights reserved.
     1// Copyright (C) 2009, 2010, 2013, 2014 Apple Inc. All rights reserved.
    22//
    33// Redistribution and use in source and binary forms, with or without
    … …  
    3939DEBUG_INFORMATION_FORMAT = dwarf;
    4040
    41 SECTORDER_FLAGS = ;
    42 
    4341WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(PLATFORM_NAME));
    4442WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos = WebKitSystemInterface;

  • trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig

    r168500 r171212  
    1 // Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
     1// Copyright (C) 2009, 2010, 2014 Apple Inc. All rights reserved.
    22//
    33// Redistribution and use in source and binary forms, with or without
    … …  
    9090OTHER_LDFLAGS_macosx = -framework Carbon -framework Cocoa -framework DiskArbitration -framework IOKit -framework OpenGL;
    9191
     92SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION)_$(PLATFORM_NAME));
     93SECTORDER_FLAGS_Production_iphoneos = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebKitLegacy.order;
     94SECTORDER_FLAGS_Production_macosx = -Wl,-order_file,mac/WebKit.order;
     95
    9296NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_$(PLATFORM_NAME));
    9397NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);

  • trunk/Source/WebKit2/ChangeLog

    r171211 r171212  
     12014-07-17  David Kilzer  <ddkilzer@apple.com>
     2
     3        SECTORDER_FLAGS should be defined in target's xcconfig file, not Base.xcconfig
     4        <http://webkit.org/b/135006>
     5
     6        Reviewed by Darin Adler.
     7
     8        * Configurations/Base.xcconfig: Move SECTORDER_FLAGS to
     9        WebKit.xcconfig.
     10        * Configurations/DebugRelease.xcconfig: Remove empty
     11        SECTORDER_FLAGS definition.
     12        * Configurations/WebKit.xcconfig: Use $(CONFIGURATION) so
     13        SECTORDER_FLAGS is only set on Production builds.
     14
    1152014-07-17  Alexey Proskuryakov  <ap@apple.com>
    216

  • trunk/Source/WebKit2/Configurations/Base.xcconfig

    r171164 r171212  
    1 // Copyright (C) 2010, 2013 Apple Inc. All rights reserved.
     1// Copyright (C) 2010, 2013, 2014 Apple Inc. All rights reserved.
    22//
    33// Redistribution and use in source and binary forms, with or without
    … …  
    100100DEAD_CODE_STRIPPING = YES;
    101101
    102 SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(PLATFORM_NAME));
    103 SECTORDER_FLAGS_iphoneos = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebKit.order;
    104 SECTORDER_FLAGS_macosx = -Wl,-order_file,mac/WebKit2.order;
    105 
    106102INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
    107103

  • trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig

    r165549 r171212  
    1 // Copyright (C) 2009, 2013 Apple Inc. All rights reserved.
     1// Copyright (C) 2009, 2013, 2014 Apple Inc. All rights reserved.
    22//
    33// Redistribution and use in source and binary forms, with or without
    … …  
    3636DEBUG_INFORMATION_FORMAT = dwarf;
    3737
    38 SECTORDER_FLAGS = ;
    39 
    4038WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(PLATFORM_NAME));
    4139WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos = WebKitSystemInterface;

  • trunk/Source/WebKit2/Configurations/WebKit.xcconfig

    r169846 r171212  
    4343OTHER_LDFLAGS_macosx = $(ASAN_OTHER_LDFLAGS) $(FRAMEWORK_AND_LIBRARY_LDFLAGS) -sub_umbrella WebCore -framework WebKitLegacy -sub_umbrella WebKitLegacy;
    4444
     45SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION)_$(PLATFORM_NAME));
     46SECTORDER_FLAGS_Production_iphoneos = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebKit.order;
     47SECTORDER_FLAGS_Production_macosx = -Wl,-order_file,mac/WebKit2.order;
     48
    4549EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
    4650EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.pdf com.apple.WebKit.Databases.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb PlugInSandboxProfiles/*.sb;
Note: See TracChangeset for help on using the changeset viewer.