set(${var} 17)
elseif(${dir} STREQUAL reactos/Resources/Themes/Lautus)
set(${var} 18)
+ elseif(${dir} STREQUAL reactos/Help)
+ set(${var} 19)
+ elseif(${dir} STREQUAL reactos/Config)
+ set(${var} 20)
+ elseif(${dir} STREQUAL reactos/Cursors)
+ set(${var} 21)
+ elseif(${dir} STREQUAL reactos/system32/ShellExt)
+ set(${var} 22)
+ elseif(${dir} STREQUAL reactos/Temp)
+ set(${var} 23)
+ elseif(${dir} STREQUAL reactos/system32/spool)
+ set(${var} 24)
+ elseif(${dir} STREQUAL reactos/system32/spool/drivers)
+ set(${var} 25)
+ elseif(${dir} STREQUAL reactos/system32/spool/drivers/color)
+ set(${var} 26)
+ elseif(${dir} STREQUAL reactos/system32/spool/drivers/w32x86)
+ set(${var} 27)
+ elseif(${dir} STREQUAL reactos/system32/spool/drivers/w32x86/3)
+ set(${var} 28)
+ elseif(${dir} STREQUAL reactos/system32/spool/prtprocs)
+ set(${var} 29)
+ elseif(${dir} STREQUAL reactos/system32/spool/prtprocs/w32x86)
+ set(${var} 30)
+ elseif(${dir} STREQUAL reactos/system32/spool/PRINTERS)
+ set(${var} 31)
+ elseif(${dir} STREQUAL reactos/system32/wbem/Repository)
+ set(${var} 32)
+ elseif(${dir} STREQUAL reactos/system32/wbem/Repository/FS)
+ set(${var} 33)
+ elseif(${dir} STREQUAL reactos/system32/wbem/mof/good)
+ set(${var} 34)
+ elseif(${dir} STREQUAL reactos/system32/wbem/mof/bad)
+ set(${var} 35)
+ elseif(${dir} STREQUAL reactos/system32/wbem/AdStatus)
+ set(${var} 36)
+ elseif(${dir} STREQUAL reactos/system32/wbem/xml)
+ set(${var} 37)
+ elseif(${dir} STREQUAL reactos/system32/wbem/Logs)
+ set(${var} 38)
+ elseif(${dir} STREQUAL reactos/system32/wbem/AutoRecover)
+ set(${var} 39)
+ elseif(${dir} STREQUAL reactos/system32/wbem/snmp)
+ set(${var} 40)
+ elseif(${dir} STREQUAL reactos/system32/wbem/Performance)
+ set(${var} 41)
+ elseif(${dir} STREQUAL reactos/twain_32)
+ set(${var} 42)
+ elseif(${dir} STREQUAL reactos/repair)
+ set(${var} 43)
+ elseif(${dir} STREQUAL reactos/Web)
+ set(${var} 44)
+ elseif(${dir} STREQUAL reactos/Web/Wallpaper)
+ set(${var} 45)
+ elseif(${dir} STREQUAL reactos/Prefetch)
+ set(${var} 46)
+ elseif(${dir} STREQUAL reactos/security)
+ set(${var} 47)
+ elseif(${dir} STREQUAL reactos/security/Database)
+ set(${var} 48)
+ elseif(${dir} STREQUAL reactos/security/logs)
+ set(${var} 49)
+ elseif(${dir} STREQUAL reactos/security/templates)
+ set(${var} 50)
+ elseif(${dir} STREQUAL reactos/system32/CatRoot)
+ set(${var} 51)
+ elseif(${dir} STREQUAL reactos/system32/CatRoot2)
+ set(${var} 52)
else()
message(FATAL_ERROR "Wrong destination: ${dir}")
endif()
endforeach()
if(_CD_TARGET)
#manage dependency
- add_dependencies(bootcd ${_CD_TARGET})
+ add_dependencies(bootcd ${_CD_TARGET} converted_hives)
endif()
else()
#add it in reactos.cab
file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn "\"${__relative_file}\" ${_num}\n")
unset(__relative_file)
if(_CD_TARGET)
- #manage dependency
- add_dependencies(reactos_cab ${_CD_TARGET})
+ #manage dependency - target level
+ add_dependencies(reactos_cab_inf ${_CD_TARGET})
endif()
+ # manage dependency - file level
+ set_property(GLOBAL APPEND PROPERTY REACTOS_CAB_DEPENDS ${_CD_FILE})
endif()
endif() #end bootcd
if(NOT __cd EQUAL -1)
#manage dependency
if(_CD_TARGET)
- add_dependencies(livecd ${_CD_TARGET})
+ add_dependencies(livecd ${_CD_TARGET} converted_hives)
endif()
foreach(item ${_CD_FILE})
if(_CD_NAME_ON_CD)
endforeach()
if(_CD_TARGET)
#manage dependency
- add_dependencies(bootcdregtest ${_CD_TARGET})
+ add_dependencies(bootcdregtest ${_CD_TARGET} converted_hives)
endif()
else()
#add it in reactos.cab
endfunction()
function(create_iso_lists)
+ # generate reactos.cab before anything else
+ get_property(_filelist GLOBAL PROPERTY REACTOS_CAB_DEPENDS)
+
+ # begin with reactos.inf. We want this command to be always executed, so we pretend it generates another file although it will never do.
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf ${CMAKE_CURRENT_BINARY_DIR}/__some_non_existent_file
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.inf ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf
+ DEPENDS ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.inf reactos_cab_inf)
+
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab
+ COMMAND native-cabman -C ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff -RC ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf -N -P ${REACTOS_SOURCE_DIR}
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf native-cabman ${_filelist})
+
+ add_custom_target(reactos_cab DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab)
+ add_dependencies(reactos_cab reactos_cab_inf)
+
+ add_cd_file(
+ TARGET reactos_cab
+ FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab
+ DESTINATION reactos
+ NO_CAB FOR bootcd regtest)
+
get_property(_filelist GLOBAL PROPERTY BOOTCD_FILE_LIST)
string(REPLACE ";" "\n" _filelist "${_filelist}")
file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcd.lst "${_filelist}")
endfunction()
function(set_module_type MODULE TYPE)
- cmake_parse_arguments(__module "UNICODE" "IMAGEBASE" "ENTRYPOINT" ${ARGN})
+ cmake_parse_arguments(__module "UNICODE;HOTPATCHABLE" "IMAGEBASE" "ENTRYPOINT" ${ARGN})
if(__module_UNPARSED_ARGUMENTS)
message(STATUS "set_module_type : unparsed arguments ${__module_UNPARSED_ARGUMENTS}, module : ${MODULE}")
# Set subsystem. Also take this as an occasion
# to error out if someone gave a non existing type
- if((${TYPE} STREQUAL nativecui) OR (${TYPE} STREQUAL nativedll) OR (${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver))
+ if((${TYPE} STREQUAL nativecui) OR (${TYPE} STREQUAL nativedll)
+ OR (${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver) OR (${TYPE} STREQUAL kerneldll))
set(__subsystem native)
elseif(${TYPE} STREQUAL win32cui)
set(__subsystem console)
elseif(${TYPE} STREQUAL win32gui)
set(__subsystem windows)
- elseif(${TYPE} STREQUAL kbdlayout)
- set_entrypoint(${MODULE} 0)
- set_image_base(${MODULE} 0x5FFF0000)
- set_subsystem(${MODULE} native)
- if (MSVC)
- # Merge the .text and .rdata section into the .data section
- add_target_link_flags(${MODULE} "/ignore:4254 /SECTION:.data,ER /MERGE:.text=.data /MERGE:.rdata=.data /MERGE:.bss=.data /MERGE:.edata=.data")
- else()
- # Use a custom linker script
- add_target_link_flags(${MODULE} "-Wl,-T,${CMAKE_SOURCE_DIR}/kbdlayout.lds")
- add_dependencies(${MODULE} "${CMAKE_SOURCE_DIR}/kbdlayout.lds")
- endif()
elseif(NOT ((${TYPE} STREQUAL win32dll) OR (${TYPE} STREQUAL win32ocx)
OR (${TYPE} STREQUAL cpl) OR (${TYPE} STREQUAL module)))
message(FATAL_ERROR "Unknown type ${TYPE} for module ${MODULE}")
add_target_compile_definitions(${MODULE} UNICODE _UNICODE)
endif()
+ # Handle hotpatchable images.
+ # GCC has this as a function attribute so we're handling it using DECLSPEC_HOTPATCH
+ if(__module_HOTPATCHABLE AND MSVC AND (NOT ARCH STREQUAL "arm"))
+ set_property(TARGET ${MODULE} APPEND_STRING PROPERTY COMPILE_FLAGS " /hotpatch")
+ if(ARCH STREQUAL "i386")
+ set_property(TARGET ${MODULE} APPEND_STRING PROPERTY LINK_FLAGS " /FUNCTIONPADMIN:5")
+ elseif(ARCH STREQUAL "amd64")
+ set_property(TARGET ${MODULE} APPEND_STRING PROPERTY LINK_FLAGS " /FUNCTIONPADMIN:6")
+ endif()
+ endif()
+
# set entry point
if(__module_ENTRYPOINT OR (__module_ENTRYPOINT STREQUAL "0"))
list(GET __module_ENTRYPOINT 0 __entrypoint)
#set base address
if(__module_IMAGEBASE)
- set_image_base(${MODULE} __module_IMAGEBASE)
+ set_image_base(${MODULE} ${__module_IMAGEBASE})
elseif(${TYPE} STREQUAL win32dll)
if(DEFINED baseaddress_${MODULE})
set_image_base(${MODULE} ${baseaddress_${MODULE}})
else()
message(STATUS "${MODULE} has no base address")
endif()
- elseif((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver))
+ elseif((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver) OR (${TYPE} STREQUAL kerneldll))
set_image_base(${MODULE} 0x00010000)
endif()
# Now do some stuff which is specific to each type
- if((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver))
+ if((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver) OR (${TYPE} STREQUAL kerneldll))
add_dependencies(${MODULE} bugcodes)
- set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys")
+ if((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver))
+ set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys")
+ endif()
endif()
if(${TYPE} STREQUAL win32ocx)
projects / reactos.git / blobdiff