Title: [230836] trunk/Source/WebCore
- Revision
- 230836
- Author
- a...@apple.com
- Date
- 2018-04-19 23:41:03 -0700 (Thu, 19 Apr 2018)
Log Message
More WK_ALTERNATE_FRAMEWORKS_DIR adoption in WebCore
https://bugs.webkit.org/show_bug.cgi?id=184805
Reviewed by Dan Bernstein.
* Configurations/WebCoreTestShim.xcconfig:
* Configurations/WebCoreTestSupport.xcconfig:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (230835 => 230836)
--- trunk/Source/WebCore/ChangeLog 2018-04-20 06:17:19 UTC (rev 230835)
+++ trunk/Source/WebCore/ChangeLog 2018-04-20 06:41:03 UTC (rev 230836)
@@ -1,3 +1,13 @@
+2018-04-19 Alexey Proskuryakov <a...@apple.com>
+
+ More WK_ALTERNATE_FRAMEWORKS_DIR adoption in WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=184805
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/WebCoreTestShim.xcconfig:
+ * Configurations/WebCoreTestSupport.xcconfig:
+
2018-04-19 Brady Eidson <beid...@apple.com>
Make back forward cache work with process swapping.
Modified: trunk/Source/WebCore/Configurations/WebCoreTestShim.xcconfig (230835 => 230836)
--- trunk/Source/WebCore/Configurations/WebCoreTestShim.xcconfig 2018-04-20 06:17:19 UTC (rev 230835)
+++ trunk/Source/WebCore/Configurations/WebCoreTestShim.xcconfig 2018-04-20 06:41:03 UTC (rev 230836)
@@ -21,8 +21,12 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#include "WebCore.xcconfig"
+
INSTALL_PATH = $(INSTALL_PATH_$(CONFIGURATION));
-INSTALL_PATH_Production = /usr/local/lib;
+INSTALL_PATH_Production = $(INSTALL_PATH_Production_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR))
+INSTALL_PATH_Production_NO = /usr/local/lib;
+INSTALL_PATH_Production_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/usr/local/lib;
SKIP_INSTALL = $(SKIP_INSTALL_$(FORCE_TOOL_INSTALL));
SKIP_INSTALL_ = YES;
Modified: trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig (230835 => 230836)
--- trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig 2018-04-20 06:17:19 UTC (rev 230835)
+++ trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig 2018-04-20 06:41:03 UTC (rev 230836)
@@ -34,7 +34,9 @@
INSTALL_PATH = $(INSTALL_PATH_WebCoreTestSupport_$(CONFIGURATION));
// Using [sdk=macosx*] to override the setting in WebCore.xcconfig.
INSTALL_PATH[sdk=macosx*] = $(INSTALL_PATH_WebCoreTestSupport_$(CONFIGURATION));
-INSTALL_PATH_WebCoreTestSupport_Production = /usr/local/lib;
+INSTALL_PATH_WebCoreTestSupport_Production = $(INSTALL_PATH_WebCoreTestSupport_Production_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+INSTALL_PATH_WebCoreTestSupport_Production_NO = /usr/local/lib;
+INSTALL_PATH_WebCoreTestSupport_Production_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/usr/local/lib;
SKIP_INSTALL = $(SKIP_INSTALL_$(FORCE_TOOL_INSTALL));
SKIP_INSTALL_ = YES;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
