Changeset 184906 in webkit


Ignore:
Timestamp:
May 27, 2015, 9:52:51 AM (10 years ago)
Author:
mitz@apple.com
Message:

Remove JSC_OBJC_API_AVAILABLE_MAC_OS_X_1080
​https://bugs.webkit.org/show_bug.cgi?id=145403

Reviewed by Anders Carlsson.

JSC_OBJC_API_AVAILABLE_MAC_OS_X_1080 was used to enable the JavaScriptCore Objective-C API
for WebKit and Safari projects building with JavaScriptCore targeting OS X 10.8. We don’t
need it anymore.

  • API/JSBase.h:
  • API/JSContext.h:
  • API/JSManagedValue.h:
  • API/JSValue.h:
  • API/JSVirtualMachine.h:
  • Configurations/Base.xcconfig:
  • postprocess-headers.sh:
Location:
trunk/Source/JavaScriptCore
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/API/JSBase.h

    r174110 r184906  
    142142/* Enable the Objective-C API for platforms with a modern runtime. */
    143143#if !defined(JSC_OBJC_API_ENABLED)
    144 #ifndef JSC_OBJC_API_AVAILABLE_MAC_OS_X_1080
    145144#define JSC_OBJC_API_ENABLED (defined(__clang__) && defined(__APPLE__) && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 && !defined(__i386__)) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)))
    146 #else
    147 #define JSC_OBJC_API_ENABLED (defined(__clang__) && defined(__APPLE__) && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 && !defined(__i386__)) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)))
    148 #endif
    149145#endif
    150146

  • trunk/Source/JavaScriptCore/API/JSContext.h

    r165424 r184906  
    4545 will be deallocated unless it has been previously retained.
    4646*/
    47 #ifndef JSC_OBJC_API_AVAILABLE_MAC_OS_X_1080
    4847NS_CLASS_AVAILABLE(10_9, 7_0)
    49 #else
    50 OBJC_VISIBLE
    51 #endif
    5248@interface JSContext : NSObject
    5349

  • trunk/Source/JavaScriptCore/API/JSManagedValue.h

    r163707 r184906  
    5151 keeping the entire JSContext alive.
    5252*/
    53 #ifndef JSC_OBJC_API_AVAILABLE_MAC_OS_X_1080
    5453NS_CLASS_AVAILABLE(10_9, 7_0)
    55 #else
    56 OBJC_VISIBLE
    57 #endif
    5854@interface JSManagedValue : NSObject
    5955

  • trunk/Source/JavaScriptCore/API/JSValue.h

    r182336 r184906  
    5151 being raised.
    5252*/
    53 #ifndef JSC_OBJC_API_AVAILABLE_MAC_OS_X_1080
    5453NS_CLASS_AVAILABLE(10_9, 7_0)
    55 #else
    56 OBJC_VISIBLE
    57 #endif
    5854@interface JSValue : NSObject
    5955

  • trunk/Source/JavaScriptCore/API/JSVirtualMachine.h

    r160454 r184906  
    3535 separate instances of JSVirtualMachine.
    3636*/
    37 #ifndef JSC_OBJC_API_AVAILABLE_MAC_OS_X_1080
    3837NS_CLASS_AVAILABLE(10_9, 7_0)
    39 #else
    40 OBJC_VISIBLE
    41 #endif
    4238@interface JSVirtualMachine : NSObject
    4339

  • trunk/Source/JavaScriptCore/ChangeLog

    r184884 r184906  
     12015-05-27  Dan Bernstein  <mitz@apple.com>
     2
     3        Remove JSC_OBJC_API_AVAILABLE_MAC_OS_X_1080
     4        https://bugs.webkit.org/show_bug.cgi?id=145403
     5
     6        Reviewed by Anders Carlsson.
     7
     8        JSC_OBJC_API_AVAILABLE_MAC_OS_X_1080 was used to enable the JavaScriptCore Objective-C API
     9        for WebKit and Safari projects building with JavaScriptCore targeting OS X 10.8. We don’t
     10        need it anymore.
     11
     12        * API/JSBase.h:
     13        * API/JSContext.h:
     14        * API/JSManagedValue.h:
     15        * API/JSValue.h:
     16        * API/JSVirtualMachine.h:
     17        * Configurations/Base.xcconfig:
     18        * postprocess-headers.sh:
     19
    1202015-05-26  Geoffrey Garen  <ggaren@apple.com>
    221

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

    r184845 r184906  
    5757GCC_OBJC_CALL_CXX_CDTORS = YES;
    5858GCC_PRECOMPILE_PREFIX_HEADER = YES;
    59 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) HAVE_HEADER_DETECTION_H JSC_OBJC_API_AVAILABLE_MAC_OS_X_1080 $(FEATURE_DEFINES) $(inherited);
     59GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) HAVE_HEADER_DETECTION_H $(FEATURE_DEFINES) $(inherited);
    6060GCC_STRICT_ALIASING = YES;
    6161GCC_THREADSAFE_STATICS = NO;

  • trunk/Source/JavaScriptCore/postprocess-headers.sh

    r163710 r184906  
    11cd "${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}"
    22
    3 if [[ ${TARGET_MAC_OS_X_VERSION_MAJOR} == "1080" ]]; then
    4     UNIFDEF_OPTIONS="-DJSC_OBJC_API_AVAILABLE_MAC_OS_X_1080";
    5 else
    6     UNIFDEF_OPTIONS="-UJSC_OBJC_API_AVAILABLE_MAC_OS_X_1080";
    7 fi
    8 
    9 UNIFDEF_OPTIONS+=" -D__MAC_OS_X_VERSION_MIN_REQUIRED=${TARGET_MAC_OS_X_VERSION_MAJOR}"
     3UNIFDEF_OPTIONS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=${TARGET_MAC_OS_X_VERSION_MAJOR}"
    104
    115for ((i = 0; i < ${SCRIPT_INPUT_FILE_COUNT}; ++i)); do
    … …  
    2317    esac
    2418done
    25 
Note: See TracChangeset for help on using the changeset viewer.