Changeset 244245 in webkit
- Timestamp:
- Apr 14, 2019 6:50:01 AM (5 years ago)
- Location:
- trunk
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r244138 r244245 1 2019-04-14 Don Olmstead <don.olmstead@sony.com> 2 3 [CMake] JavaScriptCore derived sources should only be referenced inside JavaScriptCore 4 https://bugs.webkit.org/show_bug.cgi?id=196742 5 6 Reviewed by Konstantin Tokarev. 7 8 Migrate to using JavaScriptCore_DERIVED_SOURCES_DIR instead of DERIVED_SOURCES_JAVASCRIPTCORE_DIR 9 to support moving the JavaScriptCore derived sources outside of a shared directory. 10 This is in support of the target oriented design refactoring. 11 12 WinCairo is explicitly overriding the value as a canary for this setup. 13 14 Also move JavaScriptCore_SCRIPTS_DIR to WebKitFS to remove logic setting it in other projects. 15 16 * Source/PlatformWin.cmake: 17 * Source/cmake/OptionsAppleWin.cmake: 18 * Source/cmake/OptionsWinCairo.cmake: 19 * Source/cmake/WebKitFS.cmake: 20 1 21 2019-04-10 Michael Catanzaro <mcatanzaro@igalia.com> 2 22 -
trunk/Source/JavaScriptCore/CMakeLists.txt
r244143 r244245 45 45 "${JAVASCRIPTCORE_DIR}/wasm/js" 46 46 "${JAVASCRIPTCORE_DIR}/yarr" 47 "${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"48 "${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"49 "${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/runtime"50 "${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/yarr"47 "${JavaScriptCore_DERIVED_SOURCES_DIR}" 48 "${JavaScriptCore_DERIVED_SOURCES_DIR}/inspector" 49 "${JavaScriptCore_DERIVED_SOURCES_DIR}/runtime" 50 "${JavaScriptCore_DERIVED_SOURCES_DIR}/yarr" 51 51 ) 52 52 … … 145 145 ) 146 146 147 # Force JavaScriptCore to run scripts from the same staging path as WebCore.148 set(JavaScriptCore_SCRIPTS_DIR "${FORWARDING_HEADERS_DIR}/JavaScriptCore/Scripts")149 150 file(MAKE_DIRECTORY ${JavaScriptCore_SCRIPTS_DIR})151 152 147 # The directory flattening performed below mirrors what the Mac port does with private headers. 153 148 … … 159 154 OUTPUT ${JavaScriptCore_SCRIPTS_DIR}/${_script} 160 155 MAIN_DEPENDENCY ${_file} 161 WORKING_DIRECTORY ${ DERIVED_SOURCES_DIR}156 WORKING_DIRECTORY ${JavaScriptCore_DERIVED_SOURCES_DIR} 162 157 COMMAND ${CMAKE_COMMAND} -E copy_if_different ${_file} ${JavaScriptCore_SCRIPTS_DIR}/${_script} 163 158 VERBATIM) … … 172 167 173 168 add_custom_command( 174 OUTPUT ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/udis86_itab.c ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/udis86_itab.h169 OUTPUT ${JavaScriptCore_DERIVED_SOURCES_DIR}/udis86_itab.c ${JavaScriptCore_DERIVED_SOURCES_DIR}/udis86_itab.h 175 170 DEPENDS ${UDIS_GEN_DEP} 176 WORKING_DIRECTORY ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}177 COMMAND ${PYTHON_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/disassembler/udis86/ud_itab.py ${JAVASCRIPTCORE_DIR}/disassembler/udis86/optable.xml ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}171 WORKING_DIRECTORY ${JavaScriptCore_DERIVED_SOURCES_DIR} 172 COMMAND ${PYTHON_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/disassembler/udis86/ud_itab.py ${JAVASCRIPTCORE_DIR}/disassembler/udis86/optable.xml ${JavaScriptCore_DERIVED_SOURCES_DIR} 178 173 VERBATIM) 179 174 180 175 list(APPEND JavaScriptCore_HEADERS 181 ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/udis86_itab.h176 ${JavaScriptCore_DERIVED_SOURCES_DIR}/udis86_itab.h 182 177 ) 183 178 … … 225 220 226 221 add_custom_command( 227 OUTPUT ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Bytecodes.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InitBytecodes.asm ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/BytecodeStructs.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/BytecodeIndices.h222 OUTPUT ${JavaScriptCore_DERIVED_SOURCES_DIR}/Bytecodes.h ${JavaScriptCore_DERIVED_SOURCES_DIR}/InitBytecodes.asm ${JavaScriptCore_DERIVED_SOURCES_DIR}/BytecodeStructs.h ${JavaScriptCore_DERIVED_SOURCES_DIR}/BytecodeIndices.h 228 223 MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/generator/main.rb 229 224 DEPENDS ${GENERATOR} bytecode/BytecodeList.rb 230 COMMAND ${RUBY_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/generator/main.rb --bytecodes_h ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Bytecodes.h --init_bytecodes_asm ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InitBytecodes.asm --bytecode_structs_h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/BytecodeStructs.h --bytecode_indices_h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/BytecodeIndices.h ${JAVASCRIPTCORE_DIR}/bytecode/BytecodeList.rb225 COMMAND ${RUBY_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/generator/main.rb --bytecodes_h ${JavaScriptCore_DERIVED_SOURCES_DIR}/Bytecodes.h --init_bytecodes_asm ${JavaScriptCore_DERIVED_SOURCES_DIR}/InitBytecodes.asm --bytecode_structs_h ${JavaScriptCore_DERIVED_SOURCES_DIR}/BytecodeStructs.h --bytecode_indices_h ${JavaScriptCore_DERIVED_SOURCES_DIR}/BytecodeIndices.h ${JAVASCRIPTCORE_DIR}/bytecode/BytecodeList.rb 231 226 VERBATIM) 232 227 … … 238 233 endif () 239 234 240 file(WRITE ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/BytecodeCacheVersion.h "#define JSC_BYTECODE_CACHE_VERSION ${BUILD_TIME}\n")235 file(WRITE ${JavaScriptCore_DERIVED_SOURCES_DIR}/BytecodeCacheVersion.h "#define JSC_BYTECODE_CACHE_VERSION ${BUILD_TIME}\n") 241 236 242 237 list(APPEND JavaScriptCore_HEADERS 243 ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/BytecodeCacheVersion.h244 ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/BytecodeStructs.h245 ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Bytecodes.h238 ${JavaScriptCore_DERIVED_SOURCES_DIR}/BytecodeCacheVersion.h 239 ${JavaScriptCore_DERIVED_SOURCES_DIR}/BytecodeStructs.h 240 ${JavaScriptCore_DERIVED_SOURCES_DIR}/Bytecodes.h 246 241 ) 247 242 … … 269 264 270 265 add_custom_command( 271 OUTPUT ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntDesiredSettings.h266 OUTPUT ${JavaScriptCore_DERIVED_SOURCES_DIR}/LLIntDesiredSettings.h 272 267 MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/offlineasm/generate_settings_extractor.rb 273 DEPENDS ${LLINT_ASM} ${OFFLINE_ASM} ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InitBytecodes.asm274 COMMAND ${RUBY_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/offlineasm/generate_settings_extractor.rb -I${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/ ${JAVASCRIPTCORE_DIR}/llint/LowLevelInterpreter.asm ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntDesiredSettings.h ${OFFLINE_ASM_BACKEND}268 DEPENDS ${LLINT_ASM} ${OFFLINE_ASM} ${JavaScriptCore_DERIVED_SOURCES_DIR}/InitBytecodes.asm 269 COMMAND ${RUBY_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/offlineasm/generate_settings_extractor.rb -I${JavaScriptCore_DERIVED_SOURCES_DIR}/ ${JAVASCRIPTCORE_DIR}/llint/LowLevelInterpreter.asm ${JavaScriptCore_DERIVED_SOURCES_DIR}/LLIntDesiredSettings.h ${OFFLINE_ASM_BACKEND} 275 270 VERBATIM) 276 271 277 272 add_custom_command( 278 OUTPUT ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntDesiredOffsets.h273 OUTPUT ${JavaScriptCore_DERIVED_SOURCES_DIR}/LLIntDesiredOffsets.h 279 274 MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/offlineasm/generate_offset_extractor.rb 280 DEPENDS LLIntSettingsExtractor ${LLINT_ASM} ${OFFLINE_ASM} ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InitBytecodes.asm281 COMMAND ${RUBY_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/offlineasm/generate_offset_extractor.rb -I${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/ ${JAVASCRIPTCORE_DIR}/llint/LowLevelInterpreter.asm $<TARGET_FILE:LLIntSettingsExtractor> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntDesiredOffsets.h ${OFFLINE_ASM_BACKEND}275 DEPENDS LLIntSettingsExtractor ${LLINT_ASM} ${OFFLINE_ASM} ${JavaScriptCore_DERIVED_SOURCES_DIR}/InitBytecodes.asm 276 COMMAND ${RUBY_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/offlineasm/generate_offset_extractor.rb -I${JavaScriptCore_DERIVED_SOURCES_DIR}/ ${JAVASCRIPTCORE_DIR}/llint/LowLevelInterpreter.asm $<TARGET_FILE:LLIntSettingsExtractor> ${JavaScriptCore_DERIVED_SOURCES_DIR}/LLIntDesiredOffsets.h ${OFFLINE_ASM_BACKEND} 282 277 VERBATIM) 283 278 … … 293 288 add_executable(LLIntSettingsExtractor 294 289 ${JAVASCRIPTCORE_DIR}/llint/LLIntSettingsExtractor.cpp 295 ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntDesiredSettings.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Bytecodes.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/BytecodeStructs.h290 ${JavaScriptCore_DERIVED_SOURCES_DIR}/LLIntDesiredSettings.h ${JavaScriptCore_DERIVED_SOURCES_DIR}/Bytecodes.h ${JavaScriptCore_DERIVED_SOURCES_DIR}/BytecodeStructs.h 296 291 ) 297 292 298 293 add_executable(LLIntOffsetsExtractor 299 294 ${JAVASCRIPTCORE_DIR}/llint/LLIntOffsetsExtractor.cpp 300 ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntDesiredOffsets.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Bytecodes.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/BytecodeStructs.h295 ${JavaScriptCore_DERIVED_SOURCES_DIR}/LLIntDesiredOffsets.h ${JavaScriptCore_DERIVED_SOURCES_DIR}/Bytecodes.h ${JavaScriptCore_DERIVED_SOURCES_DIR}/BytecodeStructs.h 301 296 ) 302 297 … … 320 315 321 316 add_custom_command( 322 OUTPUT ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/${LLIntOutput}317 OUTPUT ${JavaScriptCore_DERIVED_SOURCES_DIR}/${LLIntOutput} 323 318 MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/offlineasm/asm.rb 324 DEPENDS LLIntOffsetsExtractor ${LLINT_ASM} ${OFFLINE_ASM} ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InitBytecodes.asm325 COMMAND ${RUBY_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/offlineasm/asm.rb -I${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/ ${JAVASCRIPTCORE_DIR}/llint/LowLevelInterpreter.asm $<TARGET_FILE:LLIntOffsetsExtractor> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/${LLIntOutput} ${OFFLINE_ASM_ARGS}326 COMMAND ${CMAKE_COMMAND} -E touch_nocreate ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/${LLIntOutput}327 WORKING_DIRECTORY ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}319 DEPENDS LLIntOffsetsExtractor ${LLINT_ASM} ${OFFLINE_ASM} ${JavaScriptCore_DERIVED_SOURCES_DIR}/InitBytecodes.asm 320 COMMAND ${RUBY_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/offlineasm/asm.rb -I${JavaScriptCore_DERIVED_SOURCES_DIR}/ ${JAVASCRIPTCORE_DIR}/llint/LowLevelInterpreter.asm $<TARGET_FILE:LLIntOffsetsExtractor> ${JavaScriptCore_DERIVED_SOURCES_DIR}/${LLIntOutput} ${OFFLINE_ASM_ARGS} 321 COMMAND ${CMAKE_COMMAND} -E touch_nocreate ${JavaScriptCore_DERIVED_SOURCES_DIR}/${LLIntOutput} 322 WORKING_DIRECTORY ${JavaScriptCore_DERIVED_SOURCES_DIR} 328 323 VERBATIM) 329 324 … … 343 338 endif () 344 339 add_custom_command( 345 OUTPUT ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LowLevelInterpreterWin.obj346 DEPENDS ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LowLevelInterpreterWin.asm347 COMMAND ${MASM_EXECUTABLE} ${LLINT_MASM_FLAGS} ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LowLevelInterpreterWin.obj ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LowLevelInterpreterWin.asm340 OUTPUT ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.obj 341 DEPENDS ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.asm 342 COMMAND ${MASM_EXECUTABLE} ${LLINT_MASM_FLAGS} ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.obj ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.asm 348 343 VERBATIM) 349 list(APPEND JavaScriptCore_SOURCES ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LowLevelInterpreterWin.obj)344 list(APPEND JavaScriptCore_SOURCES ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.obj) 350 345 else () 351 346 list(APPEND JavaScriptCore_HEADERS 352 ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntAssembly.h347 ${JavaScriptCore_DERIVED_SOURCES_DIR}/LLIntAssembly.h 353 348 ) 354 349 endif () … … 366 361 WEBKIT_ADD_SOURCE_DEPENDENCIES(${_input} ${_output}) 367 362 endmacro() 368 GENERATE_PYTHON(${CMAKE_CURRENT_SOURCE_DIR}/wasm/generateWasmOpsHeader.py ${CMAKE_CURRENT_SOURCE_DIR}/wasm/generateWasm.py ${CMAKE_CURRENT_SOURCE_DIR}/wasm/wasm.json ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/WasmOps.h)369 GENERATE_PYTHON(${CMAKE_CURRENT_SOURCE_DIR}/wasm/generateWasmValidateInlinesHeader.py ${CMAKE_CURRENT_SOURCE_DIR}/wasm/generateWasm.py ${CMAKE_CURRENT_SOURCE_DIR}/wasm/wasm.json ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/WasmValidateInlines.h)370 GENERATE_PYTHON(${CMAKE_CURRENT_SOURCE_DIR}/wasm/generateWasmB3IRGeneratorInlinesHeader.py ${CMAKE_CURRENT_SOURCE_DIR}/wasm/generateWasm.py ${CMAKE_CURRENT_SOURCE_DIR}/wasm/wasm.json ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/WasmB3IRGeneratorInlines.h)363 GENERATE_PYTHON(${CMAKE_CURRENT_SOURCE_DIR}/wasm/generateWasmOpsHeader.py ${CMAKE_CURRENT_SOURCE_DIR}/wasm/generateWasm.py ${CMAKE_CURRENT_SOURCE_DIR}/wasm/wasm.json ${JavaScriptCore_DERIVED_SOURCES_DIR}/WasmOps.h) 364 GENERATE_PYTHON(${CMAKE_CURRENT_SOURCE_DIR}/wasm/generateWasmValidateInlinesHeader.py ${CMAKE_CURRENT_SOURCE_DIR}/wasm/generateWasm.py ${CMAKE_CURRENT_SOURCE_DIR}/wasm/wasm.json ${JavaScriptCore_DERIVED_SOURCES_DIR}/WasmValidateInlines.h) 365 GENERATE_PYTHON(${CMAKE_CURRENT_SOURCE_DIR}/wasm/generateWasmB3IRGeneratorInlinesHeader.py ${CMAKE_CURRENT_SOURCE_DIR}/wasm/generateWasm.py ${CMAKE_CURRENT_SOURCE_DIR}/wasm/wasm.json ${JavaScriptCore_DERIVED_SOURCES_DIR}/WasmB3IRGeneratorInlines.h) 371 366 372 367 # LUT generator … … 388 383 foreach (_file ${JavaScriptCore_OBJECT_LUT_SOURCES}) 389 384 get_filename_component(_name ${_file} NAME_WE) 390 GENERATE_HASH_LUT(${CMAKE_CURRENT_SOURCE_DIR}/${_file} ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/${_name}.lut.h)385 GENERATE_HASH_LUT(${CMAKE_CURRENT_SOURCE_DIR}/${_file} ${JavaScriptCore_DERIVED_SOURCES_DIR}/${_name}.lut.h) 391 386 endforeach () 392 387 … … 403 398 404 399 set(JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS 405 ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Bytecodes.h406 ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.h407 408 ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendDispatchers.h409 ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorFrontendDispatchers.h410 ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorProtocolObjects.h400 ${JavaScriptCore_DERIVED_SOURCES_DIR}/Bytecodes.h 401 ${JavaScriptCore_DERIVED_SOURCES_DIR}/JSCBuiltins.h 402 403 ${JavaScriptCore_DERIVED_SOURCES_DIR}/inspector/InspectorBackendDispatchers.h 404 ${JavaScriptCore_DERIVED_SOURCES_DIR}/inspector/InspectorFrontendDispatchers.h 405 ${JavaScriptCore_DERIVED_SOURCES_DIR}/inspector/InspectorProtocolObjects.h 411 406 412 407 API/APICallbackFunction.h … … 1026 1021 1027 1022 # GENERATOR 1-B: particular LUT creator (for 1 file only) 1028 GENERATE_HASH_LUT(${CMAKE_CURRENT_SOURCE_DIR}/parser/Keywords.table ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Lexer.lut.h)1029 1030 file(MAKE_DIRECTORY ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/yarr)1023 GENERATE_HASH_LUT(${CMAKE_CURRENT_SOURCE_DIR}/parser/Keywords.table ${JavaScriptCore_DERIVED_SOURCES_DIR}/Lexer.lut.h) 1024 1025 file(MAKE_DIRECTORY ${JavaScriptCore_DERIVED_SOURCES_DIR}/yarr) 1031 1026 1032 1027 #GENERATOR: "RegExpJitTables.h": tables used by Yarr 1033 1028 add_custom_command( 1034 OUTPUT ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/yarr/RegExpJitTables.h1029 OUTPUT ${JavaScriptCore_DERIVED_SOURCES_DIR}/yarr/RegExpJitTables.h 1035 1030 MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/yarr/create_regex_tables 1036 COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/yarr/create_regex_tables ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/yarr/RegExpJitTables.h1031 COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/yarr/create_regex_tables ${JavaScriptCore_DERIVED_SOURCES_DIR}/yarr/RegExpJitTables.h 1037 1032 VERBATIM) 1038 list(APPEND JavaScriptCore_HEADERS ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/yarr/RegExpJitTables.h)1039 WEBKIT_ADD_SOURCE_DEPENDENCIES(${CMAKE_CURRENT_SOURCE_DIR}/yarr/YarrPattern.cpp ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/yarr/RegExpJitTables.h)1040 1041 add_custom_command( 1042 OUTPUT ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/yarr/UnicodePatternTables.h1033 list(APPEND JavaScriptCore_HEADERS ${JavaScriptCore_DERIVED_SOURCES_DIR}/yarr/RegExpJitTables.h) 1034 WEBKIT_ADD_SOURCE_DEPENDENCIES(${CMAKE_CURRENT_SOURCE_DIR}/yarr/YarrPattern.cpp ${JavaScriptCore_DERIVED_SOURCES_DIR}/yarr/RegExpJitTables.h) 1035 1036 add_custom_command( 1037 OUTPUT ${JavaScriptCore_DERIVED_SOURCES_DIR}/yarr/UnicodePatternTables.h 1043 1038 MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/yarr/generateYarrUnicodePropertyTables.py 1044 1039 DEPENDS ${JAVASCRIPTCORE_DIR}/yarr/hasher.py ${JAVASCRIPTCORE_DIR}/ucd/DerivedBinaryProperties.txt ${JAVASCRIPTCORE_DIR}/ucd/DerivedCoreProperties.txt ${JAVASCRIPTCORE_DIR}/ucd/DerivedNormalizationProps.txt ${JAVASCRIPTCORE_DIR}/ucd/PropList.txt ${JAVASCRIPTCORE_DIR}/ucd/PropertyAliases.txt ${JAVASCRIPTCORE_DIR}/ucd/PropertyValueAliases.txt ${JAVASCRIPTCORE_DIR}/ucd/ScriptExtensions.txt ${JAVASCRIPTCORE_DIR}/ucd/Scripts.txt ${JAVASCRIPTCORE_DIR}/ucd/UnicodeData.txt ${JAVASCRIPTCORE_DIR}/ucd/emoji-data.txt 1045 COMMAND ${PYTHON_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/yarr/generateYarrUnicodePropertyTables.py ${JAVASCRIPTCORE_DIR}/ucd ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/yarr/UnicodePatternTables.h1040 COMMAND ${PYTHON_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/yarr/generateYarrUnicodePropertyTables.py ${JAVASCRIPTCORE_DIR}/ucd ${JavaScriptCore_DERIVED_SOURCES_DIR}/yarr/UnicodePatternTables.h 1046 1041 VERBATIM) 1047 list(APPEND JavaScriptCore_HEADERS ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/yarr/UnicodePatternTables.h)1048 WEBKIT_ADD_SOURCE_DEPENDENCIES(${CMAKE_CURRENT_SOURCE_DIR}/yarr/UnicodePatternTables.cpp ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/yarr/UnicodePatternTables.h)1049 1050 add_custom_command( 1051 OUTPUT ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/yarr/YarrCanonicalizeUnicode.cpp1042 list(APPEND JavaScriptCore_HEADERS ${JavaScriptCore_DERIVED_SOURCES_DIR}/yarr/UnicodePatternTables.h) 1043 WEBKIT_ADD_SOURCE_DEPENDENCIES(${CMAKE_CURRENT_SOURCE_DIR}/yarr/UnicodePatternTables.cpp ${JavaScriptCore_DERIVED_SOURCES_DIR}/yarr/UnicodePatternTables.h) 1044 1045 add_custom_command( 1046 OUTPUT ${JavaScriptCore_DERIVED_SOURCES_DIR}/yarr/YarrCanonicalizeUnicode.cpp 1052 1047 MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/yarr/generateYarrCanonicalizeUnicode 1053 1048 DEPENDS ${JAVASCRIPTCORE_DIR}/ucd/CaseFolding.txt 1054 COMMAND ${PYTHON_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/yarr/generateYarrCanonicalizeUnicode ${JAVASCRIPTCORE_DIR}/ucd/CaseFolding.txt ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/yarr/YarrCanonicalizeUnicode.cpp1049 COMMAND ${PYTHON_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/yarr/generateYarrCanonicalizeUnicode ${JAVASCRIPTCORE_DIR}/ucd/CaseFolding.txt ${JavaScriptCore_DERIVED_SOURCES_DIR}/yarr/YarrCanonicalizeUnicode.cpp 1055 1050 VERBATIM) 1056 1051 1057 1052 #GENERATOR: "IntlCanonicalizeLanguage.h": tables used by Intl 1058 1053 add_custom_command( 1059 OUTPUT ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/IntlCanonicalizeLanguage.h1054 OUTPUT ${JavaScriptCore_DERIVED_SOURCES_DIR}/IntlCanonicalizeLanguage.h 1060 1055 MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/Scripts/generateIntlCanonicalizeLanguage.py 1061 1056 DEPENDS ${JAVASCRIPTCORE_DIR}/ucd/language-subtag-registry.txt 1062 COMMAND ${PYTHON_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/Scripts/generateIntlCanonicalizeLanguage.py ${JAVASCRIPTCORE_DIR}/ucd/language-subtag-registry.txt ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/IntlCanonicalizeLanguage.h1057 COMMAND ${PYTHON_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/Scripts/generateIntlCanonicalizeLanguage.py ${JAVASCRIPTCORE_DIR}/ucd/language-subtag-registry.txt ${JavaScriptCore_DERIVED_SOURCES_DIR}/IntlCanonicalizeLanguage.h 1063 1058 VERBATIM) 1064 list(APPEND JavaScriptCore_HEADERS ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/IntlCanonicalizeLanguage.h)1065 WEBKIT_ADD_SOURCE_DEPENDENCIES(${CMAKE_CURRENT_SOURCE_DIR}/runtime/IntlObject.cpp ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/IntlCanonicalizeLanguage.h)1059 list(APPEND JavaScriptCore_HEADERS ${JavaScriptCore_DERIVED_SOURCES_DIR}/IntlCanonicalizeLanguage.h) 1060 WEBKIT_ADD_SOURCE_DEPENDENCIES(${CMAKE_CURRENT_SOURCE_DIR}/runtime/IntlObject.cpp ${JavaScriptCore_DERIVED_SOURCES_DIR}/IntlCanonicalizeLanguage.h) 1066 1061 1067 1062 #GENERATOR: "KeywordLookup.h": keyword decision tree used by the lexer 1068 1063 add_custom_command( 1069 OUTPUT ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/KeywordLookup.h1064 OUTPUT ${JavaScriptCore_DERIVED_SOURCES_DIR}/KeywordLookup.h 1070 1065 MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/KeywordLookupGenerator.py 1071 1066 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/parser/Keywords.table 1072 COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/KeywordLookupGenerator.py ${CMAKE_CURRENT_SOURCE_DIR}/parser/Keywords.table > ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/KeywordLookup.h1067 COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/KeywordLookupGenerator.py ${CMAKE_CURRENT_SOURCE_DIR}/parser/Keywords.table > ${JavaScriptCore_DERIVED_SOURCES_DIR}/KeywordLookup.h 1073 1068 VERBATIM) 1074 list(APPEND JavaScriptCore_HEADERS ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/KeywordLookup.h)1075 WEBKIT_ADD_SOURCE_DEPENDENCIES(${CMAKE_CURRENT_SOURCE_DIR}/parser/Lexer.cpp ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/KeywordLookup.h)1069 list(APPEND JavaScriptCore_HEADERS ${JavaScriptCore_DERIVED_SOURCES_DIR}/KeywordLookup.h) 1070 WEBKIT_ADD_SOURCE_DEPENDENCIES(${CMAKE_CURRENT_SOURCE_DIR}/parser/Lexer.cpp ${JavaScriptCore_DERIVED_SOURCES_DIR}/KeywordLookup.h) 1076 1071 1077 1072 … … 1143 1138 1144 1139 add_custom_command( 1145 OUTPUT ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/CombinedDomains.json1140 OUTPUT ${JavaScriptCore_DERIVED_SOURCES_DIR}/CombinedDomains.json 1146 1141 MAIN_DEPENDENCY ${JavaScriptCore_SCRIPTS_DIR}/generate-combined-inspector-json.py 1147 1142 DEPENDS ${JavaScriptCore_INSPECTOR_DOMAINS} 1148 COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/generate-combined-inspector-json.py ${JavaScriptCore_INSPECTOR_DOMAINS} > ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/CombinedDomains.json1143 COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/generate-combined-inspector-json.py ${JavaScriptCore_INSPECTOR_DOMAINS} > ${JavaScriptCore_DERIVED_SOURCES_DIR}/CombinedDomains.json 1149 1144 VERBATIM) 1150 1145 1151 1146 # Inspector Backend Dispatchers, Frontend Dispatchers, Type Builders 1152 1147 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol) 1153 file(MAKE_DIRECTORY ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector)1154 add_custom_command( 1155 OUTPUT ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendDispatchers.cpp1156 ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendDispatchers.h1157 ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorFrontendDispatchers.cpp1158 ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorFrontendDispatchers.h1159 ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorProtocolObjects.cpp1160 ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorProtocolObjects.h1161 ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js1162 MAIN_DEPENDENCY ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/CombinedDomains.json1148 file(MAKE_DIRECTORY ${JavaScriptCore_DERIVED_SOURCES_DIR}/inspector) 1149 add_custom_command( 1150 OUTPUT ${JavaScriptCore_DERIVED_SOURCES_DIR}/inspector/InspectorBackendDispatchers.cpp 1151 ${JavaScriptCore_DERIVED_SOURCES_DIR}/inspector/InspectorBackendDispatchers.h 1152 ${JavaScriptCore_DERIVED_SOURCES_DIR}/inspector/InspectorFrontendDispatchers.cpp 1153 ${JavaScriptCore_DERIVED_SOURCES_DIR}/inspector/InspectorFrontendDispatchers.h 1154 ${JavaScriptCore_DERIVED_SOURCES_DIR}/inspector/InspectorProtocolObjects.cpp 1155 ${JavaScriptCore_DERIVED_SOURCES_DIR}/inspector/InspectorProtocolObjects.h 1156 ${JavaScriptCore_DERIVED_SOURCES_DIR}/inspector/InspectorBackendCommands.js 1157 MAIN_DEPENDENCY ${JavaScriptCore_DERIVED_SOURCES_DIR}/CombinedDomains.json 1163 1158 DEPENDS ${JavaScriptCore_INSPECTOR_PROTOCOL_SCRIPTS} 1164 COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/generate-inspector-protocol-bindings.py --outputDir "${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector" --framework JavaScriptCore ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/CombinedDomains.json1159 COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/generate-inspector-protocol-bindings.py --outputDir "${JavaScriptCore_DERIVED_SOURCES_DIR}/inspector" --framework JavaScriptCore ${JavaScriptCore_DERIVED_SOURCES_DIR}/CombinedDomains.json 1165 1160 VERBATIM) 1166 1161 … … 1222 1217 1223 1218 add_custom_command( 1224 OUTPUT ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.h1219 OUTPUT ${JavaScriptCore_DERIVED_SOURCES_DIR}/JSCBuiltins.cpp ${JavaScriptCore_DERIVED_SOURCES_DIR}/JSCBuiltins.h 1225 1220 MAIN_DEPENDENCY ${JavaScriptCore_SCRIPTS_DIR}/generate-js-builtins.py 1226 1221 DEPENDS ${JavaScriptCore_BUILTINS_SOURCES} ${BUILTINS_GENERATOR_SCRIPTS} 1227 COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/generate-js-builtins.py --framework JavaScriptCore --output-directory ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR} --combined ${JavaScriptCore_BUILTINS_SOURCES}1222 COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/generate-js-builtins.py --framework JavaScriptCore --output-directory ${JavaScriptCore_DERIVED_SOURCES_DIR} --combined ${JavaScriptCore_BUILTINS_SOURCES} 1228 1223 VERBATIM) 1229 1224 1230 1225 list(APPEND JavaScriptCore_HEADERS 1231 ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendDispatchers.h1232 ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorFrontendDispatchers.h1233 ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorProtocolObjects.h1234 ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.h1235 ) 1236 1237 add_custom_command( 1238 OUTPUT ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/AirOpcode.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/AirOpcodeGenerated.h1226 ${JavaScriptCore_DERIVED_SOURCES_DIR}/inspector/InspectorBackendDispatchers.h 1227 ${JavaScriptCore_DERIVED_SOURCES_DIR}/inspector/InspectorFrontendDispatchers.h 1228 ${JavaScriptCore_DERIVED_SOURCES_DIR}/inspector/InspectorProtocolObjects.h 1229 ${JavaScriptCore_DERIVED_SOURCES_DIR}/JSCBuiltins.h 1230 ) 1231 1232 add_custom_command( 1233 OUTPUT ${JavaScriptCore_DERIVED_SOURCES_DIR}/AirOpcode.h ${JavaScriptCore_DERIVED_SOURCES_DIR}/AirOpcodeGenerated.h 1239 1234 MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/b3/air/AirOpcode.opcodes 1240 1235 DEPENDS ${JAVASCRIPTCORE_DIR}/b3/air/opcode_generator.rb 1241 1236 COMMAND ${RUBY_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/b3/air/opcode_generator.rb ${JAVASCRIPTCORE_DIR}/b3/air/AirOpcode.opcodes VERBATIM 1242 WORKING_DIRECTORY ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}1237 WORKING_DIRECTORY ${JavaScriptCore_DERIVED_SOURCES_DIR} 1243 1238 ) 1244 1239 1245 1240 list(APPEND JavaScriptCore_HEADERS 1246 ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/AirOpcode.h1247 ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/AirOpcodeGenerated.h1248 ) 1249 1250 add_custom_command( 1251 OUTPUT ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InjectedScriptSource.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InjectedScriptSource.min.js1241 ${JavaScriptCore_DERIVED_SOURCES_DIR}/AirOpcode.h 1242 ${JavaScriptCore_DERIVED_SOURCES_DIR}/AirOpcodeGenerated.h 1243 ) 1244 1245 add_custom_command( 1246 OUTPUT ${JavaScriptCore_DERIVED_SOURCES_DIR}/InjectedScriptSource.h ${JavaScriptCore_DERIVED_SOURCES_DIR}/InjectedScriptSource.min.js 1252 1247 MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/inspector/InjectedScriptSource.js 1253 1248 DEPENDS ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py 1254 COMMAND ${CMAKE_COMMAND} -E echo "//# sourceURL=__InjectedScript_InjectedScriptSource.js" > ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InjectedScriptSource.min.js1255 COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py < ${JAVASCRIPTCORE_DIR}/inspector/InjectedScriptSource.js >> ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InjectedScriptSource.min.js1256 COMMAND ${PERL_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl InjectedScriptSource_js ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InjectedScriptSource.min.js ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InjectedScriptSource.h1249 COMMAND ${CMAKE_COMMAND} -E echo "//# sourceURL=__InjectedScript_InjectedScriptSource.js" > ${JavaScriptCore_DERIVED_SOURCES_DIR}/InjectedScriptSource.min.js 1250 COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/jsmin.py < ${JAVASCRIPTCORE_DIR}/inspector/InjectedScriptSource.js >> ${JavaScriptCore_DERIVED_SOURCES_DIR}/InjectedScriptSource.min.js 1251 COMMAND ${PERL_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/xxd.pl InjectedScriptSource_js ${JavaScriptCore_DERIVED_SOURCES_DIR}/InjectedScriptSource.min.js ${JavaScriptCore_DERIVED_SOURCES_DIR}/InjectedScriptSource.h 1257 1252 VERBATIM) 1258 1253 1259 list(APPEND JavaScriptCore_HEADERS ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InjectedScriptSource.h)1254 list(APPEND JavaScriptCore_HEADERS ${JavaScriptCore_DERIVED_SOURCES_DIR}/InjectedScriptSource.h) 1260 1255 1261 1256 if (WTF_CPU_X86_64) 1262 1257 if (MSVC AND NOT ENABLE_C_LOOP) 1263 1258 add_custom_command( 1264 OUTPUT ${ DERIVED_SOURCES_DIR}/JITStubsMSVC64.obj1259 OUTPUT ${JavaScriptCore_DERIVED_SOURCES_DIR}/JITStubsMSVC64.obj 1265 1260 MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/jit/JITStubsMSVC64.asm 1266 COMMAND ml64 -nologo -c -Fo ${ DERIVED_SOURCES_DIR}/JITStubsMSVC64.obj ${JAVASCRIPTCORE_DIR}/jit/JITStubsMSVC64.asm1261 COMMAND ml64 -nologo -c -Fo ${JavaScriptCore_DERIVED_SOURCES_DIR}/JITStubsMSVC64.obj ${JAVASCRIPTCORE_DIR}/jit/JITStubsMSVC64.asm 1267 1262 VERBATIM) 1268 1263 1269 list(APPEND JavaScriptCore_SOURCES ${ DERIVED_SOURCES_DIR}/JITStubsMSVC64.obj)1264 list(APPEND JavaScriptCore_SOURCES ${JavaScriptCore_DERIVED_SOURCES_DIR}/JITStubsMSVC64.obj) 1270 1265 endif () 1271 1266 endif () … … 1329 1324 TARGET JavaScriptCore 1330 1325 PRE_BUILD 1331 COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/auto-version.pl ${ DERIVED_SOURCES_DIR}1326 COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/auto-version.pl ${JavaScriptCore_DERIVED_SOURCES_DIR} 1332 1327 VERBATIM) 1333 1328 … … 1335 1330 TARGET JavaScriptCore 1336 1331 POST_BUILD 1337 COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/version-stamp.pl ${ DERIVED_SOURCES_DIR} $<TARGET_FILE:JavaScriptCore>1332 COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/version-stamp.pl ${JavaScriptCore_DERIVED_SOURCES_DIR} $<TARGET_FILE:JavaScriptCore> 1338 1333 VERBATIM) 1339 1334 endif () -
trunk/Source/JavaScriptCore/ChangeLog
r244241 r244245 1 2019-04-14 Don Olmstead <don.olmstead@sony.com> 2 3 [CMake] JavaScriptCore derived sources should only be referenced inside JavaScriptCore 4 https://bugs.webkit.org/show_bug.cgi?id=196742 5 6 Reviewed by Konstantin Tokarev. 7 8 Migrate to using JavaScriptCore_DERIVED_SOURCES_DIR instead of DERIVED_SOURCES_JAVASCRIPTCORE_DIR 9 to support moving the JavaScriptCore derived sources outside of a shared directory. 10 11 Also use JavaScriptCore_DERIVED_SOURCES_DIR instead of DERIVED_SOUCES_DIR. 12 13 * CMakeLists.txt: 14 1 15 2019-04-13 Tadeu Zagallo <tzagallo@apple.com> 2 16 -
trunk/Source/PlatformWin.cmake
r230188 r244245 5 5 web-inspector-resources ALL 6 6 COMMAND ${CMAKE_COMMAND} -E copy_directory ${WEBINSPECTORUI_DIR}/UserInterface ${WEB_INSPECTOR_DIR} 7 COMMAND ${CMAKE_COMMAND} -E copy ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js ${WEB_INSPECTOR_DIR}/Protocol7 COMMAND ${CMAKE_COMMAND} -E copy ${JavaScriptCore_DERIVED_SOURCES_DIR}/inspector/InspectorBackendCommands.js ${WEB_INSPECTOR_DIR}/Protocol 8 8 COMMAND ${CMAKE_COMMAND} -E copy ${WEBINSPECTORUI_DIR}/Localizations/en.lproj/localizedStrings.js ${WEB_INSPECTOR_DIR} 9 9 DEPENDS JavaScriptCore WebCore -
trunk/Source/WebCore/CMakeLists.txt
r244078 r244245 1134 1134 1135 1135 if (WIN32 AND INTERNAL_BUILD) 1136 set(JavaScriptCore_SCRIPTS_DIR "${CMAKE_BINARY_DIR}/../include/private/JavaScriptCore/Scripts")1137 1136 set(ANGLE_FORWARDING_HEADERS_DIR "${CMAKE_BINARY_DIR}/../include/private/ANGLE") 1138 1137 else () 1139 set(JavaScriptCore_SCRIPTS_DIR "${FORWARDING_HEADERS_DIR}/JavaScriptCore/Scripts")1140 1138 set(ANGLE_FORWARDING_HEADERS_DIR "${FORWARDING_HEADERS_DIR}/ANGLE") 1141 1139 endif () -
trunk/Source/WebCore/ChangeLog
r244240 r244245 1 2019-04-14 Don Olmstead <don.olmstead@sony.com> 2 3 [CMake] JavaScriptCore derived sources should only be referenced inside JavaScriptCore 4 https://bugs.webkit.org/show_bug.cgi?id=196742 5 6 Reviewed by Konstantin Tokarev. 7 8 Don't set JavaScriptCore_SCRIPTS_DIR now that it is set within WebKitFS. 9 10 * CMakeLists.txt: 11 1 12 2019-04-12 Antoine Quint <graouts@apple.com> 2 13 -
trunk/Source/WebDriver/CMakeLists.txt
r243934 r244245 30 30 ) 31 31 32 set(JavaScriptCore_SCRIPTS_DIR "${FORWARDING_HEADERS_DIR}/JavaScriptCore/Scripts")33 32 MAKE_JS_FILE_ARRAYS( 34 33 ${DERIVED_SOURCES_WEBDRIVER_DIR}/WebDriverAtoms.cpp -
trunk/Source/WebDriver/ChangeLog
r243934 r244245 1 2019-04-14 Don Olmstead <don.olmstead@sony.com> 2 3 [CMake] JavaScriptCore derived sources should only be referenced inside JavaScriptCore 4 https://bugs.webkit.org/show_bug.cgi?id=196742 5 6 Reviewed by Konstantin Tokarev. 7 8 Don't set JavaScriptCore_SCRIPTS_DIR now that it is set within WebKitFS. 9 10 * CMakeLists.txt: 11 1 12 2019-04-05 Commit Queue <commit-queue@webkit.org> 2 13 -
trunk/Source/WebKit/CMakeLists.txt
r244065 r244245 276 276 endif () 277 277 278 if (WIN32 AND INTERNAL_BUILD)279 set(JavaScriptCore_SCRIPTS_DIR "${CMAKE_BINARY_DIR}/../include/private/JavaScriptCore/Scripts")280 else ()281 set(JavaScriptCore_SCRIPTS_DIR "${FORWARDING_HEADERS_DIR}/JavaScriptCore/Scripts")282 endif ()283 284 278 if (ATOMIC_INT64_REQUIRES_LIBATOMIC) 285 279 list(APPEND WebKit_LIBRARIES PRIVATE atomic) -
trunk/Source/WebKit/ChangeLog
r244243 r244245 1 2019-04-14 Don Olmstead <don.olmstead@sony.com> 2 3 [CMake] JavaScriptCore derived sources should only be referenced inside JavaScriptCore 4 https://bugs.webkit.org/show_bug.cgi?id=196742 5 6 Reviewed by Konstantin Tokarev. 7 8 Don't set JavaScriptCore_SCRIPTS_DIR now that it is set within WebKitFS. 9 10 * CMakeLists.txt: 11 * PlatformWin.cmake: 12 13 Remove use of DERIVED_SOURCES_JAVASCRIPTCORE_DIR. 14 1 15 2019-04-13 Chris Dumez <cdumez@apple.com> 2 16 -
trunk/Source/WebKit/PlatformWin.cmake
r244065 r244245 96 96 add_custom_command( 97 97 OUTPUT ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js 98 DEPENDS ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js99 COMMAND cp ${ DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js98 DEPENDS ${JavaScriptCore_DERIVED_SOURCES_DIR}/inspector/InspectorBackendCommands.js 99 COMMAND cp ${JavaScriptCore_DERIVED_SOURCES_DIR}/inspector/InspectorBackendCommands.js ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js 100 100 ) 101 101 -
trunk/Source/cmake/OptionsAppleWin.cmake
r240118 r244245 72 72 # Warnings as errors (ignore narrowing conversions) 73 73 add_compile_options(/WX /Wv:18) 74 75 if (INTERNAL_BUILD) 76 set(JavaScriptCore_SCRIPTS_DIR "${CMAKE_BINARY_DIR}/../include/private/JavaScriptCore/Scripts") 77 endif () -
trunk/Source/cmake/OptionsWinCairo.cmake
r244090 r244245 51 51 # Override derived sources directories 52 52 set(WTF_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/WTF/DerivedSources) 53 set(JavaScriptCore_DERIVED_SOURCES_DIR ${CMAKE_BINARY_DIR}/JavaScriptCore/DerivedSources) 54 55 # Override scripts directories 56 set(JavaScriptCore_SCRIPTS_DIR ${CMAKE_BINARY_DIR}/JavaScriptCore/Scripts) -
trunk/Source/cmake/WebKitFS.cmake
r244103 r244245 60 60 set(WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR ${FORWARDING_HEADERS_DIR}) 61 61 62 file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}) 63 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/runtime) 62 set(JavaScriptCore_SCRIPTS_DIR "${FORWARDING_HEADERS_DIR}/JavaScriptCore/Scripts") 64 63 65 64 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBINSPECTORUI_DIR})
Note: See TracChangeset
for help on using the changeset viewer.