Changeset 175167 in webkit


Ignore:
Timestamp:
Oct 24, 2014 10:25:24 AM (9 years ago)
Author:
ap@apple.com
Message:

All plug-in tests fail on Yosemite WK1
https://bugs.webkit.org/show_bug.cgi?id=138040

Reviewed by Dan Bernstein.

Fix a symlink for WebKitPluginHost.app. There is also a broken symlink for WebKitPluginAgent,
which I don't know what to do about, but that seems harmless.

  • WebKit.xcodeproj/project.pbxproj:
Location:
trunk/Source/WebKit
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/ChangeLog

    r174876 r175167  
     12014-10-24  Alexey Proskuryakov  <ap@apple.com>
     2
     3        All plug-in tests fail on Yosemite WK1
     4        https://bugs.webkit.org/show_bug.cgi?id=138040
     5
     6        Reviewed by Dan Bernstein.
     7
     8        Fix a symlink for WebKitPluginHost.app. There is also a broken symlink for WebKitPluginAgent,
     9        which I don't know what to do about, but that seems harmless.
     10
     11        * WebKit.xcodeproj/project.pbxproj:
     12
    1132014-10-19  Chris Dumez  <cdumez@apple.com>
    214
  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r174791 r175167  
    20022002                        runOnlyForDeploymentPostprocessing = 0;
    20032003                        shellPath = /bin/sh;
    2004                         shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\n    exit 0\nfi\n\n# Prior to r172595, WebKitPluginHost.app and WebKitPluginAgent lived at the top level of the framework. Replace any stale copies with symlinks to the new location at Versions/Current.\nrm -rf \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\" \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginAgent\"\nln -s Versions/Current/WebKitPluginHost.app \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\"\nln -s Versions/Current/WebKitPluginAgent \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginAgent\"\n\nif [[ \"${CONFIGURATION}\" != \"Production\" && ${ACTION} == \"build\" ]]; then\n    # FIXME: This should be removed once faulty links have been removed on the bots.\n    if [[ -L \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\" ]]; then\n        rm \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\n    fi\n\n    if [[ -e \"/System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app\" ]]; then\n        ln -s /System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\n    else\n        ln -s /System/Library/Frameworks/WebKit.framework/Frameworks/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\n    fi\nfi\n";
     2004                        shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\n    exit 0\nfi\n\n# Prior to r172595, WebKitPluginHost.app and WebKitPluginAgent lived at the top level of the framework. Replace any stale copies with symlinks to the new location at Versions/Current.\nrm -rf \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\" \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginAgent\"\nln -s Versions/Current/WebKitPluginHost.app \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginHost.app\"\nln -s Versions/Current/WebKitPluginAgent \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/WebKitPluginAgent\"\n\nif [[ \"${CONFIGURATION}\" != \"Production\" && ${ACTION} == \"build\" ]]; then\n    # FIXME: This should be removed once faulty links have been removed on the bots.\n    if [[ -L \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\" ]]; then\n        rm \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\n    fi\n\n    if [[ -e \"/System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app\" ]]; then\n        ln -s /System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\n    else\n        ln -s /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks/WebKitLegacy.framework/WebKitPluginHost.app \"${TARGET_BUILD_DIR}/WebKitLegacy.framework/Versions/A/WebKitPluginHost.app\"\n    fi\nfi\n";
    20052005                };
    20062006                1C395DE20C6BE8E0000D1E52 /* Generate Export Files */ = {
Note: See TracChangeset for help on using the changeset viewer.