Skip to content
  • mrowe@apple.com's avatar
    Build in to an alternate location when USE_STAGING_INSTALL_PATH is set. · e2036bb0
    mrowe@apple.com authored
    <rdar://problem/10609417> Adopt USE_STAGING_INSTALL_PATH
    
    Reviewed by David Kilzer.
    
    Source/JavaScriptCore:
    
    * Configurations/Base.xcconfig: Define NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR, which contains
    the path where JavaScriptCore is normally installed. Update JAVASCRIPTCORE_FRAMEWORKS_DIR
    to point to the staged frameworks directory when USE_STAGING_INSTALL_PATH is set.
    * Configurations/JavaScriptCore.xcconfig: Always set the framework's install name based on
    the normal framework location. This prevents an incorrect install name from being used when
    installing in to the staged frameworks directory.
    
    Source/ThirdParty:
    
    * gtest/xcode/Config/ProductionProject.xcconfig: Ensure that the staged frameworks path
    is in the framework search path when USE_STAGING_INSTALL_PATH is set. Look for the WebCore
    framework in the staged frameworks directory when USE_STAGING_INSTALL_PATH is set.
    
    Source/WebCore:
    
    * Configurations/WebCore.xcconfig: Define NORMAL_WEBCORE_FRAMEWORKS_DIR, which contains
    the path where WebCore is normally installed. Update WEBCORE_FRAMEWORKS_DIR to point to
    the staged frameworks directory when USE_STAGING_INSTALL_PATH is set. Define
    NORMAL_PRODUCTION_FRAMEWORKS_DIR, which contains the path where our public frameworks
    are normally installed. Update PRODUCTION_FRAMEWORKS_DIR to point to the staged frameworks
    directory when USE_STAGING_INSTALL_PATH is set. Always set the framework's install name
    based on the normal framework location. This prevents an incorrect install name from being
    used when installing in to the staged frameworks directory. Look for our other frameworks
    in the staged frameworks directory when USE_STAGING_INSTALL_PATH is set.
    
    Source/WebKit/mac:
    
    * Configurations/WebKit.xcconfig: Define NORMAL_WEBKIT_FRAMEWORKS_DIR, which contains
    the path where WebKit is normally installed. Update WEBKIT_FRAMEWORKS_DIR to point to
    the staged frameworks directory when USE_STAGING_INSTALL_PATH is set. Define
    NORMAL_PRODUCTION_FRAMEWORKS_DIR, which contains the path where our public frameworks
    are normally installed. Update PRODUCTION_FRAMEWORKS_DIR to point to the staged frameworks
    directory when USE_STAGING_INSTALL_PATH is set. Always set the framework's install name
    based on the normal framework location. This prevents an incorrect install name from being
    used when installing in to the staged frameworks directory. Look for our other frameworks
    in the staged frameworks directory when USE_STAGING_INSTALL_PATH is set. Update
    WEBCORE_PRIVATE_HEADERS_DIR to find WebCore at the top level of the staged frameworks
    directory when USE_STAGING_INSTALL_PATH is set, rather than finding it embedded inside of
    WebKit.framework.
    
    Source/WebKit2:
    
    * Configurations/BaseTarget.xcconfig: Define NORMAL_WEBKIT2_FRAMEWORKS_DIR, which contains
    the path where WebKit is normally installed. Update WEBKIT2_FRAMEWORKS_DIR to point to
    the staged frameworks directory when USE_STAGING_INSTALL_PATH is set. Update
    UMBRELLA_FRAMEWORKS_DIR so we can find WebCore at the top level of the staged frameworks
    directory when USE_STAGING_INSTALL_PATH is set, rather than finding it embedded inside of
    WebKit.framework.
    * Configurations/PluginProcess.xcconfig: Set our install path based on WEBKIT2_FRAMEWORKS_DIR.
    * Configurations/WebKit2.xcconfig: Set our install path based on WEBKIT2_FRAMEWORKS_DIR.
    Always set the framework's install name based on the normal framework location. This prevents
    an incorrect install name from being used when installing in to the staged frameworks directory.
    * Configurations/WebProcess.xcconfig: Set our install path based on WEBKIT2_FRAMEWORKS_DIR.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@105942 268f45cc-cd09-0410-ab3c-d52691b4dbfc
    e2036bb0