Title: [151334] trunk/Source/WebCore
- Revision
- 151334
- Author
- aes...@apple.com
- Date
- 2013-06-07 13:33:06 -0700 (Fri, 07 Jun 2013)
Log Message
Compile WebCoreTestShimLibrary.cpp on iOS, but exclude the Carbon bits
https://bugs.webkit.org/show_bug.cgi?id=117360
Reviewed by Mark Rowe.
In r150114 we tried to make the WebCoreTestShim target build on iOS by
excluding its only source file from the build. While this allowed the
target to build, it prevented the target's product (WebCoreTestShim.dylib)
from being created. This causes xcodebuild to fail if you ask it to
install the target.
Fix this by building the target's product on iOS. Just use the
preprocessor to exclude the bits that won't build on iOS.
* Configurations/WebCoreTestShim.xcconfig:
* testing/WebCoreTestShimLibrary.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (151333 => 151334)
--- trunk/Source/WebCore/ChangeLog 2013-06-07 20:25:37 UTC (rev 151333)
+++ trunk/Source/WebCore/ChangeLog 2013-06-07 20:33:06 UTC (rev 151334)
@@ -1,3 +1,22 @@
+2013-06-07 Andy Estes <aes...@apple.com>
+
+ Compile WebCoreTestShimLibrary.cpp on iOS, but exclude the Carbon bits
+ https://bugs.webkit.org/show_bug.cgi?id=117360
+
+ Reviewed by Mark Rowe.
+
+ In r150114 we tried to make the WebCoreTestShim target build on iOS by
+ excluding its only source file from the build. While this allowed the
+ target to build, it prevented the target's product (WebCoreTestShim.dylib)
+ from being created. This causes xcodebuild to fail if you ask it to
+ install the target.
+
+ Fix this by building the target's product on iOS. Just use the
+ preprocessor to exclude the bits that won't build on iOS.
+
+ * Configurations/WebCoreTestShim.xcconfig:
+ * testing/WebCoreTestShimLibrary.cpp:
+
2013-06-07 Ryosuke Niwa <rn...@webkit.org>
REGRESSION: Lines jump up and down while typing Chinese or Japanese
Modified: trunk/Source/WebCore/Configurations/WebCoreTestShim.xcconfig (151333 => 151334)
--- trunk/Source/WebCore/Configurations/WebCoreTestShim.xcconfig 2013-06-07 20:25:37 UTC (rev 151333)
+++ trunk/Source/WebCore/Configurations/WebCoreTestShim.xcconfig 2013-06-07 20:33:06 UTC (rev 151334)
@@ -39,7 +39,3 @@
EXPORTED_SYMBOLS_FILE = ;
OTHER_LDFLAGS = ;
SECTORDER_FLAGS = ;
-
-EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME)) $(EXCLUDED_SOURCE_FILE_NAMES_$(CONFIGURATION)_$(PLATFORM_NAME));
-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = WebCoreTestShimLibrary.cpp;
-EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
Modified: trunk/Source/WebCore/testing/WebCoreTestShimLibrary.cpp (151333 => 151334)
--- trunk/Source/WebCore/testing/WebCoreTestShimLibrary.cpp 2013-06-07 20:25:37 UTC (rev 151333)
+++ trunk/Source/WebCore/testing/WebCoreTestShimLibrary.cpp 2013-06-07 20:33:06 UTC (rev 151334)
@@ -23,6 +23,10 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <TargetConditionals.h>
+
+#if !defined(TARGET_OS_IPHONE) || !TARGET_OS_IPHONE
+
#include "DynamicLinkerInterposing.h"
#include <Carbon/Carbon.h>
@@ -50,3 +54,5 @@
DYLD_INTERPOSE(shimEnableSecureEventInput, EnableSecureEventInput)
DYLD_INTERPOSE(shimDisableSecureEventInput, DisableSecureEventInput)
DYLD_INTERPOSE(shimIsSecureEventInputEnabled, IsSecureEventInputEnabled)
+
+#endif // !defined(TARGET_OS_IPHONE) || !TARGET_OS_IPHONE
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
