Title: [216528] trunk/Tools
- Revision
- 216528
- Author
- [email protected]
- Date
- 2017-05-09 11:07:19 -0700 (Tue, 09 May 2017)
Log Message
build ImageDiff with host SDK from Make
https://bugs.webkit.org/show_bug.cgi?id=171835
Reviewed by Alexey Proskuryakov.
ImageDiff should be built for the default SDK and default architecture when
the SDKROOT is set to either iOS device or iOS simulator. Check the
DO_NOT_BUILD_IMAGE_DIFF flag to skip the ImageDiff build.
* ImageDiff/Makefile: Use Mac SDK when building for iOS Simulator or iOS device.
* Makefile: Do not build ImageDiff if the DO_NOT_BUILD_IMAGE_DIFF flag is set.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (216527 => 216528)
--- trunk/Tools/ChangeLog 2017-05-09 18:05:30 UTC (rev 216527)
+++ trunk/Tools/ChangeLog 2017-05-09 18:07:19 UTC (rev 216528)
@@ -1,3 +1,17 @@
+2017-05-09 Jonathan Bedard <[email protected]>
+
+ build ImageDiff with host SDK from Make
+ https://bugs.webkit.org/show_bug.cgi?id=171835
+
+ Reviewed by Alexey Proskuryakov.
+
+ ImageDiff should be built for the default SDK and default architecture when
+ the SDKROOT is set to either iOS device or iOS simulator. Check the
+ DO_NOT_BUILD_IMAGE_DIFF flag to skip the ImageDiff build.
+
+ * ImageDiff/Makefile: Use Mac SDK when building for iOS Simulator or iOS device.
+ * Makefile: Do not build ImageDiff if the DO_NOT_BUILD_IMAGE_DIFF flag is set.
+
2017-05-09 Matt Lewis <[email protected]>
Unreviewed, adding myself to contributors.json
Modified: trunk/Tools/ImageDiff/Makefile (216527 => 216528)
--- trunk/Tools/ImageDiff/Makefile 2017-05-09 18:05:30 UTC (rev 216527)
+++ trunk/Tools/ImageDiff/Makefile 2017-05-09 18:07:19 UTC (rev 216528)
@@ -1,3 +1,8 @@
SCRIPTS_PATH = ../Scripts
+ifneq (,$(findstring iphone,$(SDKROOT)))
+ OVERRIDE_SDKROOT = default
+ OVERRIDE_ARCHS = default
+endif
+
include ../../Makefile.shared
Modified: trunk/Tools/Makefile (216527 => 216528)
--- trunk/Tools/Makefile 2017-05-09 18:05:30 UTC (rev 216527)
+++ trunk/Tools/Makefile 2017-05-09 18:07:19 UTC (rev 216528)
@@ -1,13 +1,16 @@
-MODULES = DumpRenderTree WebKitTestRunner MiniBrowser ../Source/ThirdParty/gtest/xcode TestWebKitAPI ImageDiff
+MODULES = DumpRenderTree WebKitTestRunner MiniBrowser ../Source/ThirdParty/gtest/xcode TestWebKitAPI
ifneq (,$(SDKROOT))
ifeq (,$(findstring macosx,$(SDKROOT)))
- MODULES = DumpRenderTree WebKitTestRunner ../Source/ThirdParty/gtest/xcode TestWebKitAPI ImageDiff
+ MODULES = DumpRenderTree WebKitTestRunner ../Source/ThirdParty/gtest/xcode TestWebKitAPI
endif
ifneq (,$(findstring iphone,$(SDKROOT)))
MODULES += MobileMiniBrowser
endif
endif
+ifeq (,$(DO_NOT_BUILD_IMAGE_DIFF))
+ MODULES += ImageDiff
+endif
all:
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
