Diff
Modified: trunk/ChangeLog (191748 => 191749)
--- trunk/ChangeLog 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/ChangeLog 2015-10-29 20:01:20 UTC (rev 191749)
@@ -1,3 +1,12 @@
+2015-10-29 Alex Christensen <[email protected]>
+
+ Fix Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=150686
+
+ Reviewed by Filip Pizlo.
+
+ * Source/cmake/WebKitMacros.cmake:
+
2015-10-28 Alex Christensen <[email protected]>
Compile and link with CMake on Mac
Modified: trunk/Source/_javascript_Core/API/ObjCCallbackFunction.mm (191748 => 191749)
--- trunk/Source/_javascript_Core/API/ObjCCallbackFunction.mm 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/_javascript_Core/API/ObjCCallbackFunction.mm 2015-10-29 20:01:20 UTC (rev 191749)
@@ -39,6 +39,7 @@
#import "JSValueInternal.h"
#import "ObjCCallbackFunction.h"
#import "ObjcRuntimeExtras.h"
+#import "StructureInlines.h"
#import <objc/runtime.h>
#import <wtf/RetainPtr.h>
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (191748 => 191749)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2015-10-29 20:01:20 UTC (rev 191749)
@@ -8,6 +8,8 @@
"${_javascript_CORE_DIR}/API"
"${_javascript_CORE_DIR}/ForwardingHeaders"
"${_javascript_CORE_DIR}/assembler"
+ "${_javascript_CORE_DIR}/b3"
+ "${_javascript_CORE_DIR}/b3/air"
"${_javascript_CORE_DIR}/bindings"
"${_javascript_CORE_DIR}/builtins"
"${_javascript_CORE_DIR}/bytecode"
@@ -1219,14 +1221,44 @@
)
add_custom_command(
- OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.cpp
- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.h
- MAIN_DEPENDENCY ${_javascript_Core_SCRIPTS_DIR}/generate-js-builtins.py
- DEPENDS ${_javascript_Core_BUILTINS_SOURCES} ${BUILTINS_GENERATOR_SCRIPTS}
- COMMAND ${PYTHON_EXECUTABLE} ${_javascript_Core_SCRIPTS_DIR}/generate-js-builtins.py --framework _javascript_Core --output-directory ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR} --combined ${_javascript_Core_BUILTINS_SOURCES}
- VERBATIM)
+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/B3AddressMatcher.h
+ MAIN_DEPENDENCY ${_javascript_CORE_DIR}/b3/B3AddressMatcher.patterns
+ DEPENDS ${_javascript_CORE_DIR}/b3/generate_pattern_matcher.rb
+ COMMAND ${RUBY_EXECUTABLE} ${_javascript_CORE_DIR}/b3/generate_pattern_matcher.rb ${_javascript_CORE_DIR}/b3/B3AddressMatcher.patterns VERBATIM
+ WORKING_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
+)
+add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/B3LoweringMatcher.h
+ MAIN_DEPENDENCY ${_javascript_CORE_DIR}/b3/B3LoweringMatcher.patterns
+ DEPENDS ${_javascript_CORE_DIR}/b3/generate_pattern_matcher.rb
+ COMMAND ${RUBY_EXECUTABLE} ${_javascript_CORE_DIR}/b3/generate_pattern_matcher.rb ${_javascript_CORE_DIR}/b3/B3LoweringMatcher.patterns VERBATIM
+ WORKING_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
+)
+
+add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/AirOpcode.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/AirOpcodeGenerated.h
+ MAIN_DEPENDENCY ${_javascript_CORE_DIR}/b3/air/AirOpcode.opcodes
+ DEPENDS ${_javascript_CORE_DIR}/b3/air/opcode_generator.rb
+ COMMAND ${RUBY_EXECUTABLE} ${_javascript_CORE_DIR}/b3/air/opcode_generator.rb ${_javascript_CORE_DIR}/b3/air/AirOpcode.opcodes VERBATIM
+ WORKING_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
+)
+
list(APPEND _javascript_Core_SOURCES
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/AirOpcode.h
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/AirOpcodeGenerated.h
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/B3AddressMatcher.h
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/B3LoweringMatcher.h
+)
+
+add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.h
+ MAIN_DEPENDENCY ${_javascript_Core_SCRIPTS_DIR}/generate-js-builtins.py
+ DEPENDS ${_javascript_Core_BUILTINS_SOURCES} ${BUILTINS_GENERATOR_SCRIPTS}
+ COMMAND ${PYTHON_EXECUTABLE} ${_javascript_Core_SCRIPTS_DIR}/generate-js-builtins.py --framework _javascript_Core --output-directory ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR} --combined ${_javascript_Core_BUILTINS_SOURCES}
+ VERBATIM)
+
+list(APPEND _javascript_Core_SOURCES
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendDispatchers.cpp
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorFrontendDispatchers.cpp
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorProtocolObjects.cpp
@@ -1331,3 +1363,5 @@
add_custom_target(stageSharedScripts DEPENDS ${_javascript_Core_SCRIPTS})
add_dependencies(_javascript_Core stageSharedScripts)
+
+WEBKIT_FRAMEWORK(_javascript_Core)
Modified: trunk/Source/_javascript_Core/ChangeLog (191748 => 191749)
--- trunk/Source/_javascript_Core/ChangeLog 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-10-29 20:01:20 UTC (rev 191749)
@@ -1,3 +1,14 @@
+2015-10-29 Alex Christensen <[email protected]>
+
+ Fix Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=150686
+
+ Reviewed by Filip Pizlo.
+
+ * API/ObjCCallbackFunction.mm:
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+
2015-10-29 Filip Pizlo <[email protected]>
Air needs syntax for escaping StackSlots
Modified: trunk/Source/_javascript_Core/PlatformMac.cmake (191748 => 191749)
--- trunk/Source/_javascript_Core/PlatformMac.cmake 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/_javascript_Core/PlatformMac.cmake 2015-10-29 20:01:20 UTC (rev 191749)
@@ -1,13 +1,3 @@
-find_library(COCOA_LIBRARY Cocoa)
-find_library(COREFOUNDATION_LIBRARY CoreFoundation)
-find_library(READLINE_LIBRARY Readline)
-list(APPEND _javascript_Core_LIBRARIES
- ${COREFOUNDATION_LIBRARY}
- ${COCOA_LIBRARY}
- ${READLINE_LIBRARY}
- libicucore.dylib
-)
-
list(APPEND _javascript_Core_SOURCES
API/JSAPIWrapperObject.mm
API/JSContext.mm
Modified: trunk/Source/WTF/ChangeLog (191748 => 191749)
--- trunk/Source/WTF/ChangeLog 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/WTF/ChangeLog 2015-10-29 20:01:20 UTC (rev 191749)
@@ -1,3 +1,14 @@
+2015-10-29 Alex Christensen <[email protected]>
+
+ Fix Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=150686
+
+ Reviewed by Filip Pizlo.
+
+ * wtf/CMakeLists.txt:
+ * wtf/Platform.h:
+ * wtf/PlatformMac.cmake:
+
2015-10-29 Commit Queue <[email protected]>
Unreviewed, rolling out r191728.
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (191748 => 191749)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2015-10-29 20:01:20 UTC (rev 191749)
@@ -290,3 +290,5 @@
if (WTF_OUTPUT_NAME)
set_target_properties(WTF PROPERTIES OUTPUT_NAME ${WTF_OUTPUT_NAME})
endif ()
+
+WEBKIT_FRAMEWORK(WTF)
Modified: trunk/Source/WTF/wtf/Platform.h (191748 => 191749)
--- trunk/Source/WTF/wtf/Platform.h 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/WTF/wtf/Platform.h 2015-10-29 20:01:20 UTC (rev 191749)
@@ -778,7 +778,7 @@
/* The B3 compiler is an experimental backend that is still in development. We will keep it building
on Mac/x86-64 for now, though it is unused except for tests. */
-#if PLATFORM(MAC) && CPU(X86_64)
+#if PLATFORM(MAC) && CPU(X86_64) && ENABLE(FTL_JIT)
#define ENABLE_B3_JIT 1
#endif
Modified: trunk/Source/WTF/wtf/PlatformMac.cmake (191748 => 191749)
--- trunk/Source/WTF/wtf/PlatformMac.cmake 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/WTF/wtf/PlatformMac.cmake 2015-10-29 20:01:20 UTC (rev 191749)
@@ -1,3 +1,15 @@
+set(WTF_LIBRARY_TYPE SHARED)
+
+find_library(COCOA_LIBRARY Cocoa)
+find_library(COREFOUNDATION_LIBRARY CoreFoundation)
+find_library(READLINE_LIBRARY Readline)
+list(APPEND WTF_LIBRARIES
+ ${COREFOUNDATION_LIBRARY}
+ ${COCOA_LIBRARY}
+ ${READLINE_LIBRARY}
+ libicucore.dylib
+)
+
list(APPEND WTF_SOURCES
AutodrainedPoolMac.mm
RunLoopTimerCF.cpp
Modified: trunk/Source/WebCore/ChangeLog (191748 => 191749)
--- trunk/Source/WebCore/ChangeLog 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/WebCore/ChangeLog 2015-10-29 20:01:20 UTC (rev 191749)
@@ -1,3 +1,12 @@
+2015-10-29 Alex Christensen <[email protected]>
+
+ Fix Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=150686
+
+ Reviewed by Filip Pizlo.
+
+ * PlatformMac.cmake:
+
2015-10-29 Csaba Osztrogonác <[email protected]>
One more URTBF after r191731.
Modified: trunk/Source/WebCore/PlatformMac.cmake (191748 => 191749)
--- trunk/Source/WebCore/PlatformMac.cmake 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/WebCore/PlatformMac.cmake 2015-10-29 20:01:20 UTC (rev 191749)
@@ -224,7 +224,7 @@
page/mac/ChromeMac.mm
page/mac/DragControllerMac.mm
page/mac/EventHandlerMac.mm
- page/mac/PageMac.cpp
+ page/mac/PageMac.mm
page/mac/ServicesOverlayController.mm
page/mac/SettingsMac.mm
page/mac/TextIndicatorWindow.mm
Modified: trunk/Source/WebKit/CMakeLists.txt (191748 => 191749)
--- trunk/Source/WebKit/CMakeLists.txt 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/WebKit/CMakeLists.txt 2015-10-29 20:01:20 UTC (rev 191749)
@@ -44,6 +44,4 @@
set_target_properties(WebKit PROPERTIES OUTPUT_NAME ${WebKit_OUTPUT_NAME})
endif ()
-POPULATE_LIBRARY_VERSION(WEBKIT)
-set_target_properties(WebKit PROPERTIES VERSION ${WEBKIT_VERSION} SOVERSION ${WEBKIT_VERSION_MAJOR})
-install(TARGETS WebKit DESTINATION "${LIB_INSTALL_DIR}")
+WEBKIT_FRAMEWORK(WebKit)
Modified: trunk/Source/WebKit/ChangeLog (191748 => 191749)
--- trunk/Source/WebKit/ChangeLog 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/WebKit/ChangeLog 2015-10-29 20:01:20 UTC (rev 191749)
@@ -1,3 +1,13 @@
+2015-10-29 Alex Christensen <[email protected]>
+
+ Fix Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=150686
+
+ Reviewed by Filip Pizlo.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+
2015-10-28 Alex Christensen <[email protected]>
Compile and link with CMake on Mac
Modified: trunk/Source/WebKit/PlatformMac.cmake (191748 => 191749)
--- trunk/Source/WebKit/PlatformMac.cmake 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/WebKit/PlatformMac.cmake 2015-10-29 20:01:20 UTC (rev 191749)
@@ -408,7 +408,10 @@
)
WEBKIT_CREATE_FORWARDING_HEADERS(WebKitLegacy DIRECTORIES ${WebKitLegacy_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebKitLegacy_FORWARDING_HEADERS_FILES})
+WEBKIT_CREATE_FORWARDING_HEADERS(WebKit DIRECTORIES ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKitLegacy)
+set(WebKit_OUTPUT_NAME WebKitLegacy)
+
set(WebKitLegacy_WebCore_FORWARDING_HEADERS
DOMElement.h
DOMHTMLFormElement.h
Modified: trunk/Source/WebKit2/CMakeLists.txt (191748 => 191749)
--- trunk/Source/WebKit2/CMakeLists.txt 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-10-29 20:01:20 UTC (rev 191749)
@@ -28,6 +28,7 @@
"${WEBKIT2_DIR}/UIProcess"
"${WEBKIT2_DIR}/UIProcess/API"
"${WEBKIT2_DIR}/UIProcess/API/C"
+ "${WEBKIT2_DIR}/UIProcess/API/Cocoa"
"${WEBKIT2_DIR}/UIProcess/API/cpp"
"${WEBKIT2_DIR}/UIProcess/Authentication"
"${WEBKIT2_DIR}/UIProcess/Databases"
@@ -455,6 +456,51 @@
UIProcess/API/C/WKViewportAttributes.cpp
UIProcess/API/C/WKWindowFeaturesRef.cpp
+ UIProcess/API/Cocoa/APISerializedScriptValueCocoa.mm
+ UIProcess/API/Cocoa/APIUserContentExtensionStoreCocoa.mm
+ UIProcess/API/Cocoa/APIWebsiteDataStoreCocoa.mm
+ UIProcess/API/Cocoa/LegacyBundleForClass.mm
+ UIProcess/API/Cocoa/WKBackForwardList.mm
+ UIProcess/API/Cocoa/WKBackForwardListItem.mm
+ UIProcess/API/Cocoa/WKBrowsingContextController.mm
+ UIProcess/API/Cocoa/WKBrowsingContextGroup.mm
+ UIProcess/API/Cocoa/WKConnection.mm
+ UIProcess/API/Cocoa/WKError.mm
+ UIProcess/API/Cocoa/WKFrameInfo.mm
+ UIProcess/API/Cocoa/WKNSURLAuthenticationChallenge.mm
+ UIProcess/API/Cocoa/WKNavigation.mm
+ UIProcess/API/Cocoa/WKNavigationAction.mm
+ UIProcess/API/Cocoa/WKNavigationData.mm
+ UIProcess/API/Cocoa/WKNavigationResponse.mm
+ UIProcess/API/Cocoa/WKPreferences.mm
+ UIProcess/API/Cocoa/WKProcessGroup.mm
+ UIProcess/API/Cocoa/WKProcessPool.mm
+ UIProcess/API/Cocoa/WKScriptMessage.mm
+ UIProcess/API/Cocoa/WKSecurityOrigin.mm
+ UIProcess/API/Cocoa/WKTypeRefWrapper.mm
+ UIProcess/API/Cocoa/WKUserContentController.mm
+ UIProcess/API/Cocoa/WKUserScript.mm
+ UIProcess/API/Cocoa/WKWebView.mm
+ UIProcess/API/Cocoa/WKWebViewConfiguration.mm
+ UIProcess/API/Cocoa/WKWebsiteDataRecord.mm
+ UIProcess/API/Cocoa/WKWebsiteDataStore.mm
+ UIProcess/API/Cocoa/WKWindowFeatures.mm
+ UIProcess/API/Cocoa/_WKActivatedElementInfo.mm
+ UIProcess/API/Cocoa/_WKContextMenuElementInfo.mm
+ UIProcess/API/Cocoa/_WKDownload.mm
+ UIProcess/API/Cocoa/_WKElementAction.mm
+ UIProcess/API/Cocoa/_WKElementInfo.mm
+ UIProcess/API/Cocoa/_WKErrorRecoveryAttempting.mm
+ UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
+ UIProcess/API/Cocoa/_WKSessionState.mm
+ UIProcess/API/Cocoa/_WKThumbnailView.mm
+ UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm
+ UIProcess/API/Cocoa/_WKUserContentFilter.mm
+ UIProcess/API/Cocoa/_WKUserStyleSheet.mm
+ UIProcess/API/Cocoa/_WKVisitedLinkProvider.mm
+ UIProcess/API/Cocoa/_WKVisitedLinkStore.mm
+ UIProcess/API/Cocoa/_WKWebsiteDataStore.mm
+
UIProcess/Authentication/AuthenticationChallengeProxy.cpp
UIProcess/Authentication/AuthenticationDecisionListener.cpp
UIProcess/Authentication/WebCredential.cpp
@@ -839,7 +885,11 @@
POPULATE_LIBRARY_VERSION(WEBKIT2)
set_target_properties(WebKit2 PROPERTIES VERSION ${WEBKIT2_VERSION} SOVERSION ${WEBKIT2_VERSION_MAJOR})
-install(TARGETS WebKit2 WebProcess
+if (APPLE)
+ WEBKIT_FRAMEWORK(WebKit2)
+else ()
+ install(TARGETS WebKit2 WebProcess
LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
RUNTIME DESTINATION "${LIBEXEC_INSTALL_DIR}"
-)
+ )
+endif ()
Modified: trunk/Source/WebKit2/ChangeLog (191748 => 191749)
--- trunk/Source/WebKit2/ChangeLog 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-29 20:01:20 UTC (rev 191749)
@@ -1,3 +1,13 @@
+2015-10-29 Alex Christensen <[email protected]>
+
+ Fix Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=150686
+
+ Reviewed by Filip Pizlo.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+
2015-10-29 Commit Queue <[email protected]>
Unreviewed, rolling out r191728.
Modified: trunk/Source/WebKit2/PlatformMac.cmake (191748 => 191749)
--- trunk/Source/WebKit2/PlatformMac.cmake 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2015-10-29 20:01:20 UTC (rev 191749)
@@ -473,12 +473,16 @@
)
set(WebKit2_FORWARDING_HEADERS_DIRECTORIES
+ Platform
Shared
+
+ Shared/API
+ Shared/Cocoa
+
Shared/API/Cocoa
Shared/API/c
Shared/API/c/cf
-
Shared/API/c/mac
UIProcess/Cocoa
Modified: trunk/Source/cmake/WebKitMacros.cmake (191748 => 191749)
--- trunk/Source/cmake/WebKitMacros.cmake 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Source/cmake/WebKitMacros.cmake 2015-10-29 20:01:20 UTC (rev 191749)
@@ -242,6 +242,12 @@
source_group("DerivedSources" REGULAR_EXPRESSION "${DERIVED_SOURCES_WEBCORE_DIR}")
endmacro()
+macro(WEBKIT_FRAMEWORK _target)
+ if (APPLE)
+ set_target_properties(${_target} PROPERTIES FRAMEWORK TRUE)
+ install(TARGETS ${_target} FRAMEWORK DESTINATION ${LIB_INSTALL_DIR})
+ endif ()
+endmacro()
macro(WEBKIT_CREATE_FORWARDING_HEADER _target_directory _file)
get_filename_component(_source_path "${CMAKE_SOURCE_DIR}/Source/" ABSOLUTE)
Modified: trunk/Tools/ChangeLog (191748 => 191749)
--- trunk/Tools/ChangeLog 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Tools/ChangeLog 2015-10-29 20:01:20 UTC (rev 191749)
@@ -1,3 +1,22 @@
+2015-10-29 Alex Christensen <[email protected]>
+
+ Fix Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=150686
+
+ Reviewed by Filip Pizlo.
+
+ * Scripts/build-webkit:
+ * Scripts/webkitdirs.pm:
+ (isCachedArgumentfileOutOfDate):
+ (wrapperPrefixIfNeeded):
+ (generateBuildSystemFromCMakeProject):
+ (buildCMakeGeneratedProject):
+ (cmakeBasedPortName):
+ (determineIsCMakeBuild):
+ (isCMakeBuild):
+ (promptUser):
+ (jhbuildWrapperPrefixIfNeeded): Deleted.
+
2015-10-29 Lucas Forschler <[email protected]>
Teach JSC bots to build 32bit instead of x86_64
Modified: trunk/Tools/Scripts/build-webkit (191748 => 191749)
--- trunk/Tools/Scripts/build-webkit 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Tools/Scripts/build-webkit 2015-10-29 20:01:20 UTC (rev 191749)
@@ -271,7 +271,7 @@
}
exit exitStatus($result);
}
-} elsif (isAppleMacWebKit()) {
+} elsif (isAppleMacWebKit() && !isCMakeBuild()) {
# Build, and abort if the build fails.
for my $dir (@projects) {
chdir $dir or die;
Modified: trunk/Tools/Scripts/webkitdirs.pm (191748 => 191749)
--- trunk/Tools/Scripts/webkitdirs.pm 2015-10-29 19:40:27 UTC (rev 191748)
+++ trunk/Tools/Scripts/webkitdirs.pm 2015-10-29 20:01:20 UTC (rev 191749)
@@ -118,6 +118,7 @@
my $osXVersion;
my $iosVersion;
my $generateDsym;
+my $isCMakeBuild;
my $isGtk;
my $isWinCairo;
my $isWin64;
@@ -1792,11 +1793,14 @@
return 0;
}
-sub jhbuildWrapperPrefixIfNeeded()
+sub wrapperPrefixIfNeeded()
{
if (isWindows() || isCygwin()) {
return ();
}
+ if (isAppleMacWebKit()) {
+ return ("xcrun");
+ }
if (-e getJhbuildPath()) {
my @prefix = (File::Spec->catfile(sourceDir(), "Tools", "jhbuild", "jhbuild-wrapper"));
if (isEfl()) {
@@ -1954,7 +1958,7 @@
# We call system("cmake @args") instead of system("cmake", @args) so that @args is
# parsed for shell metacharacters.
- my $wrapper = join(" ", jhbuildWrapperPrefixIfNeeded()) . " ";
+ my $wrapper = join(" ", wrapperPrefixIfNeeded()) . " ";
my $returnCode = system($wrapper . "cmake @args");
chdir($originalWorkingDirectory);
@@ -1988,7 +1992,7 @@
# We call system("cmake @args") instead of system("cmake", @args) so that @args is
# parsed for shell metacharacters. In particular, $makeArgs may contain such metacharacters.
- my $wrapper = join(" ", jhbuildWrapperPrefixIfNeeded()) . " ";
+ my $wrapper = join(" ", wrapperPrefixIfNeeded()) . " ";
return system($wrapper . "$command @args");
}
@@ -2035,12 +2039,23 @@
{
return "Efl" if isEfl();
return "GTK" if isGtk();
+ return "Mac" if isAppleMacWebKit();
return "";
}
+sub determineIsCMakeBuild()
+{
+ return if defined($isCMakeBuild);
+ $isCMakeBuild = checkForArgumentAndRemoveFromARGV("--cmake");
+}
+
sub isCMakeBuild()
{
- return isEfl() || isGtk();
+ if (isEfl() || isGtk()) {
+ return 1;
+ }
+ determineIsCMakeBuild();
+ return $isCMakeBuild;
}
sub promptUser
