Attachment #269778 for bug #153434

View Details Raw Unified Return to Bug 153434



2016-01-25  Alex Christensen  <achristensen@webkit.org>

        [Win] Copy forwarding headers before building a project
        https://bugs.webkit.org/show_bug.cgi?id=153434

        Reviewed by NOBODY (OOPS!).

        * CMakeLists.txt:
        * PlatformWin.cmake:

2016-01-25  Andreas Kling  <akling@apple.com>

        Reduce number of Structures created at startup.



set_target_properties(JavaScriptCore PROPERTIES COMPILE_DEFINITIONS "BUILDING_JavaScriptCore")
set_target_properties(JavaScriptCore PROPERTIES FOLDER "JavaScriptCore")

if (JavaScriptCore_PRE_BUILD_COMMAND)
    add_custom_command(TARGET JavaScriptCore PRE_BUILD COMMAND ${JavaScriptCore_PRE_BUILD_COMMAND} VERBATIM)
endif ()

if (JavaScriptCore_OUTPUT_NAME)




file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore)

set(JavaScriptCore_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore/preBuild.cmd")
file(WRITE "${JavaScriptCore_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_DIR}/JavaScriptCore/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore\" >nul 2>nul\n")
file(APPEND "${JavaScriptCore_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_DIR}/JavaScriptCore/inspector/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore\" >nul 2>nul\n")

foreach (_directory ${JavaScriptCore_FORWARDING_HEADERS_DIRECTORIES})
    file(APPEND "${JavaScriptCore_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${JAVASCRIPTCORE_DIR}/${_directory}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore\" >nul 2>nul\n")
endforeach ()

set(JavaScriptCore_OUTPUT_NAME JavaScriptCore${DEBUG_SUFFIX})



2016-01-25  Alex Christensen  <achristensen@webkit.org>

        [Win] Copy forwarding headers before building a project
        https://bugs.webkit.org/show_bug.cgi?id=153434

        Reviewed by NOBODY (OOPS!).

        * wtf/CMakeLists.txt:
        * wtf/PlatformWin.cmake:

2016-01-20  Ryosuke Niwa  <rniwa@webkit.org>

        HTMLElement::nodeName should not upper case non-ASCII characters



    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
endif ()

if (WTF_PRE_BUILD_COMMAND)
    add_custom_command(TARGET WTF PRE_BUILD COMMAND ${WTF_PRE_BUILD_COMMAND} VERBATIM)
endif ()

if (WTF_OUTPUT_NAME)



    "${DERIVED_SOURCES_WTF_DIR}/WTFHeaderDetection.h"
)

set(WTF_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WTF/preBuild.cmd")
file(WRITE "${WTF_PRE_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${WTF_DIR}/wtf/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF\" >nul 2>nul\n@xcopy /y /s /d /f \"${DERIVED_SOURCES_DIR}/WTF/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF\" >nul 2>nul\n")
file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF)

# FIXME: This should run testOSXLevel.cmd if it is available.



2016-01-25  Alex Christensen  <achristensen@webkit.org>

        [Win] Copy forwarding headers before building a project
        https://bugs.webkit.org/show_bug.cgi?id=153434

        Reviewed by NOBODY (OOPS!).

        * CMakeLists.txt:
        * PlatformWin.cmake:

2016-01-25  Brady Eidson  <beidson@apple.com>

        Modern IDB: Implement getIndexRecord in the SQLite backing store.



    add_dependencies(WebCore WebCorePreBuild)
endif ()

if (WebCore_PRE_BUILD_COMMAND)
    add_custom_command(TARGET WebCore PRE_BUILD COMMAND ${WebCore_PRE_BUILD_COMMAND} VERBATIM)
endif ()

if (WebCore_OUTPUT_NAME)



    file(APPEND "${WebCore_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${WEBCORE_DIR}/${_directory}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n")
endforeach ()

set(WebCore_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebCore/preBuild.cmd")
file(WRITE "${WebCore_PRE_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${DERIVED_SOURCES_WEBCORE_DIR}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n")

set(WebCore_OUTPUT_NAME
    WebCore${DEBUG_SUFFIX}



2016-01-25  Alex Christensen  <achristensen@webkit.org>

        [Win] Copy forwarding headers before building a project
        https://bugs.webkit.org/show_bug.cgi?id=153434

        Reviewed by NOBODY (OOPS!).

        * PlatformWin.cmake:

2016-01-22  Darin Adler  <darin@apple.com>

        Reduce use of equalIgnoringCase to just ignore ASCII case

Lines 463-469 endif () Source/WebKit/PlatformWin.cmake_sec1
- Source/WebKit/PlatformWin.cmake -3 / +3 lines
463	file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})	463	file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
464	file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces)	464	file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces)
465		465
466	set(WebKitGUID_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebKit/postBuild.cmd")	466	set(WebKitGUID_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebKit/preBuild.cmd")
467	file(WRITE "${WebKitGUID_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/WebKit.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul\n@xcopy /y /d /f \"${CMAKE_CURRENT_SOURCE_DIR}/win/WebKitCOMAPI.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul\n@xcopy /y /d /f \"${CMAKE_CURRENT_SOURCE_DIR}/win/CFDictionaryPropertyBag.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul\n")	467	file(WRITE "${WebKitGUID_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/WebKit.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul\n@xcopy /y /d /f \"${CMAKE_CURRENT_SOURCE_DIR}/win/WebKitCOMAPI.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul\n@xcopy /y /d /f \"${CMAKE_CURRENT_SOURCE_DIR}/win/CFDictionaryPropertyBag.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit\" >nul 2>nul\n")
468	file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit)	468	file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebKit)
469	add_custom_command(TARGET WebKitGUID POST_BUILD COMMAND ${WebKitGUID_POST_BUILD_COMMAND} VERBATIM)	469	add_custom_command(TARGET WebKitGUID PRE_BUILD COMMAND ${WebKitGUID_PRE_BUILD_COMMAND} VERBATIM)

Return to Bug 153434

Lines 1383-1390 target_link_libraries(JavaScriptCore ${J Source/JavaScriptCore/CMakeLists.txt_sec1
- Source/JavaScriptCore/CMakeLists.txt -2 / +2 lines
1383	set_target_properties(JavaScriptCore PROPERTIES COMPILE_DEFINITIONS "BUILDING_JavaScriptCore")	1383	set_target_properties(JavaScriptCore PROPERTIES COMPILE_DEFINITIONS "BUILDING_JavaScriptCore")
1384	set_target_properties(JavaScriptCore PROPERTIES FOLDER "JavaScriptCore")	1384	set_target_properties(JavaScriptCore PROPERTIES FOLDER "JavaScriptCore")
1385		1385
1386	if (JavaScriptCore_POST_BUILD_COMMAND)	1386	if (JavaScriptCore_PRE_BUILD_COMMAND)
1387	add_custom_command(TARGET JavaScriptCore POST_BUILD COMMAND ${JavaScriptCore_POST_BUILD_COMMAND} VERBATIM)	1387	add_custom_command(TARGET JavaScriptCore PRE_BUILD COMMAND ${JavaScriptCore_PRE_BUILD_COMMAND} VERBATIM)
1388	endif ()	1388	endif ()
1389		1389
1390	if (JavaScriptCore_OUTPUT_NAME)	1390	if (JavaScriptCore_OUTPUT_NAME)

Lines 31-42 file(COPY Source/JavaScriptCore/PlatformWin.cmake_sec1
- Source/JavaScriptCore/PlatformWin.cmake -4 / +4 lines
31		31
32	file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore)	32	file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore)
33		33
34	set(JavaScriptCore_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore/postBuild.cmd")	34	set(JavaScriptCore_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore/preBuild.cmd")
35	file(WRITE "${JavaScriptCore_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_DIR}/JavaScriptCore/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore\" >nul 2>nul\n")	35	file(WRITE "${JavaScriptCore_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_DIR}/JavaScriptCore/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore\" >nul 2>nul\n")
36	file(APPEND "${JavaScriptCore_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_DIR}/JavaScriptCore/inspector/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore\" >nul 2>nul\n")	36	file(APPEND "${JavaScriptCore_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${DERIVED_SOURCES_DIR}/JavaScriptCore/inspector/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore\" >nul 2>nul\n")
37		37
38	foreach (_directory ${JavaScriptCore_FORWARDING_HEADERS_DIRECTORIES})	38	foreach (_directory ${JavaScriptCore_FORWARDING_HEADERS_DIRECTORIES})
39	file(APPEND "${JavaScriptCore_POST_BUILD_COMMAND}" "@xcopy /y /d /f \"${JAVASCRIPTCORE_DIR}/${_directory}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore\" >nul 2>nul\n")	39	file(APPEND "${JavaScriptCore_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${JAVASCRIPTCORE_DIR}/${_directory}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore\" >nul 2>nul\n")
40	endforeach ()	40	endforeach ()
41		41
42	set(JavaScriptCore_OUTPUT_NAME JavaScriptCore${DEBUG_SUFFIX})	42	set(JavaScriptCore_OUTPUT_NAME JavaScriptCore${DEBUG_SUFFIX})

Lines 295-302 if (MSVC) Source/WTF/wtf/CMakeLists.txt_sec1
- Source/WTF/wtf/CMakeLists.txt -2 / +2 lines
295	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")	295	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
296	endif ()	296	endif ()
297		297
298	if (WTF_POST_BUILD_COMMAND)	298	if (WTF_PRE_BUILD_COMMAND)
299	add_custom_command(TARGET WTF POST_BUILD COMMAND ${WTF_POST_BUILD_COMMAND} VERBATIM)	299	add_custom_command(TARGET WTF PRE_BUILD COMMAND ${WTF_PRE_BUILD_COMMAND} VERBATIM)
300	endif ()	300	endif ()
301		301
302	if (WTF_OUTPUT_NAME)	302	if (WTF_OUTPUT_NAME)

Lines 29-36 list(APPEND WTF_HEADERS Source/WTF/wtf/PlatformWin.cmake_sec1
- Source/WTF/wtf/PlatformWin.cmake -2 / +2 lines
29	"${DERIVED_SOURCES_WTF_DIR}/WTFHeaderDetection.h"	29	"${DERIVED_SOURCES_WTF_DIR}/WTFHeaderDetection.h"
30	)	30	)
31		31
32	set(WTF_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WTF/postBuild.cmd")	32	set(WTF_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WTF/preBuild.cmd")
33	file(WRITE "${WTF_POST_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${WTF_DIR}/wtf/.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF\" >nul 2>nul\n@xcopy /y /s /d /f \"${DERIVED_SOURCES_DIR}/WTF/.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF\" >nul 2>nul\n")	33	file(WRITE "${WTF_PRE_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${WTF_DIR}/wtf/.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF\" >nul 2>nul\n@xcopy /y /s /d /f \"${DERIVED_SOURCES_DIR}/WTF/.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF\" >nul 2>nul\n")
34	file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF)	34	file(MAKE_DIRECTORY ${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF)
35		35
36	# FIXME: This should run testOSXLevel.cmd if it is available.	36	# FIXME: This should run testOSXLevel.cmd if it is available.

Lines 3775-3782 if (WebCore_PRE_BUILD_COMMAND) Source/WebCore/CMakeLists.txt_sec1
- Source/WebCore/CMakeLists.txt -2 / +2 lines
3775	add_dependencies(WebCore WebCorePreBuild)	3775	add_dependencies(WebCore WebCorePreBuild)
3776	endif ()	3776	endif ()
3777		3777
3778	if (WebCore_POST_BUILD_COMMAND)	3778	if (WebCore_PRE_BUILD_COMMAND)
3779	add_custom_command(TARGET WebCore POST_BUILD COMMAND ${WebCore_POST_BUILD_COMMAND} VERBATIM)	3779	add_custom_command(TARGET WebCore PRE_BUILD COMMAND ${WebCore_PRE_BUILD_COMMAND} VERBATIM)
3780	endif ()	3780	endif ()
3781		3781
3782	if (WebCore_OUTPUT_NAME)	3782	if (WebCore_OUTPUT_NAME)

Lines 1-3 Source/JavaScriptCore/ChangeLog_sec1
- Source/JavaScriptCore/ChangeLog +10 lines
		1	2016-01-25 Alex Christensen <achristensen@webkit.org>
		2
		3	[Win] Copy forwarding headers before building a project
		4	https://bugs.webkit.org/show_bug.cgi?id=153434
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* CMakeLists.txt:
		9	* PlatformWin.cmake:
		10
1	2016-01-25 Andreas Kling <akling@apple.com>	11	2016-01-25 Andreas Kling <akling@apple.com>
2		12
3	Reduce number of Structures created at startup.	13	Reduce number of Structures created at startup.

Lines 1-3 Source/WTF/ChangeLog_sec1
- Source/WTF/ChangeLog +10 lines
		1	2016-01-25 Alex Christensen <achristensen@webkit.org>
		2
		3	[Win] Copy forwarding headers before building a project
		4	https://bugs.webkit.org/show_bug.cgi?id=153434
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* wtf/CMakeLists.txt:
		9	* wtf/PlatformWin.cmake:
		10
1	2016-01-20 Ryosuke Niwa <rniwa@webkit.org>	11	2016-01-20 Ryosuke Niwa <rniwa@webkit.org>
2		12
3	HTMLElement::nodeName should not upper case non-ASCII characters	13	HTMLElement::nodeName should not upper case non-ASCII characters

Lines 1-3 Source/WebCore/ChangeLog_sec1
- Source/WebCore/ChangeLog +10 lines
		1	2016-01-25 Alex Christensen <achristensen@webkit.org>
		2
		3	[Win] Copy forwarding headers before building a project
		4	https://bugs.webkit.org/show_bug.cgi?id=153434
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* CMakeLists.txt:
		9	* PlatformWin.cmake:
		10
1	2016-01-25 Brady Eidson <beidson@apple.com>	11	2016-01-25 Brady Eidson <beidson@apple.com>
2		12
3	Modern IDB: Implement getIndexRecord in the SQLite backing store.	13	Modern IDB: Implement getIndexRecord in the SQLite backing store.

Lines 296-303 foreach (_directory ${WebCore_FORWARDING Source/WebCore/PlatformWin.cmake_sec1
- Source/WebCore/PlatformWin.cmake -2 / +2 lines
296	file(APPEND "${WebCore_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${WEBCORE_DIR}/${_directory}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n")	296	file(APPEND "${WebCore_PRE_BUILD_COMMAND}" "@xcopy /y /d /f \"${WEBCORE_DIR}/${_directory}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n")
297	endforeach ()	297	endforeach ()
298		298
299	set(WebCore_POST_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebCore/postBuild.cmd")	299	set(WebCore_PRE_BUILD_COMMAND "${CMAKE_BINARY_DIR}/DerivedSources/WebCore/preBuild.cmd")
300	file(WRITE "${WebCore_POST_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${DERIVED_SOURCES_WEBCORE_DIR}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n")	300	file(WRITE "${WebCore_PRE_BUILD_COMMAND}" "@xcopy /y /s /d /f \"${DERIVED_SOURCES_WEBCORE_DIR}/*.h\" \"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WebCore\" >nul 2>nul\n")
301		301
302	set(WebCore_OUTPUT_NAME	302	set(WebCore_OUTPUT_NAME
303	WebCore${DEBUG_SUFFIX}	303	WebCore${DEBUG_SUFFIX}

Lines 1-3 Source/WebKit/ChangeLog_sec1
- Source/WebKit/ChangeLog +9 lines
		1	2016-01-25 Alex Christensen <achristensen@webkit.org>
		2
		3	[Win] Copy forwarding headers before building a project
		4	https://bugs.webkit.org/show_bug.cgi?id=153434
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* PlatformWin.cmake:
		9
1	2016-01-22 Darin Adler <darin@apple.com>	10	2016-01-22 Darin Adler <darin@apple.com>
2		11
3	Reduce use of equalIgnoringCase to just ignore ASCII case	12	Reduce use of equalIgnoringCase to just ignore ASCII case