Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 08:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
* Convert the hives from UTF-8 to UTF16 as part of the build process.
CORE-7703
CORE-8221

svn path=/trunk/; revision=63480
This commit is contained in:
Amine Khaldi 2014-05-27 19:42:15 +00:00
parent 86b416b410
commit a3b5088597
6 changed files with 2550 additions and 2538 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
reactos/boot/bootdata/CMakeLists.txt
View file

@ -2,18 +2,30 @@
add_subdirectory(packages)
#common hives
add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/txtsetup.sif DESTINATION reactos NO_CAB FOR bootcd regtest)
add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivecls.inf DESTINATION reactos NO_CAB FOR bootcd regtest)
add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivedef.inf DESTINATION reactos NO_CAB FOR bootcd regtest)
add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivesft.inf DESTINATION reactos NO_CAB FOR bootcd regtest)
add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivesys.inf DESTINATION reactos NO_CAB FOR bootcd regtest)
# livecd hives
list(APPEND CD_HIVES
add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/txtsetup.sif DESTINATION reactos NO_CAB FOR bootcd regtest)
list(APPEND _common_hives
${CMAKE_CURRENT_SOURCE_DIR}/hivecls.inf
${CMAKE_CURRENT_SOURCE_DIR}/hivedef.inf
${CMAKE_CURRENT_SOURCE_DIR}/hivesft.inf
${CMAKE_CURRENT_SOURCE_DIR}/hivesys.inf
${CMAKE_CURRENT_SOURCE_DIR}/hivesys.inf)
foreach(_hive ${_common_hives})
get_filename_component(_hive_name ${_hive} NAME)
set(_converted_hive ${CMAKE_CURRENT_BINARY_DIR}/${_hive_name})
add_custom_command(OUTPUT ${_converted_hive}
COMMAND native-utf16le ${_hive} ${_converted_hive}
DEPENDS native-utf16le ${_hive})
list(APPEND _converted_common_hives ${_converted_hive})
add_cd_file(FILE ${_converted_hive} DESTINATION reactos NO_CAB FOR bootcd regtest)
endforeach()
add_custom_target(converted_hives DEPENDS ${_converted_common_hives})
# livecd hives
list(APPEND _livecd_hives
${_converted_common_hives}
${CMAKE_CURRENT_SOURCE_DIR}/livecd.inf
${CMAKE_CURRENT_SOURCE_DIR}/hiveinst.inf)
@ -23,8 +35,8 @@ add_custom_command(
${CMAKE_CURRENT_BINARY_DIR}/security
${CMAKE_CURRENT_BINARY_DIR}/software
${CMAKE_CURRENT_BINARY_DIR}/system
COMMAND native-mkhive ${CMAKE_CURRENT_BINARY_DIR} ${CD_HIVES}
DEPENDS native-mkhive ${CD_HIVES})
COMMAND native-mkhive ${CMAKE_CURRENT_BINARY_DIR} ${_livecd_hives}
DEPENDS native-mkhive ${_livecd_hives} ${_converted_common_hives})
add_custom_target(livecd_hives
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/sam

BIN
reactos/boot/bootdata/hivecls.inf
View file

Binary file not shown.

BIN
reactos/boot/bootdata/hivedef.inf
View file

Binary file not shown.

5048
reactos/boot/bootdata/hivesft.inf
View file

File diff suppressed because it is too large Load diff

2
reactos/boot/bootdata/hivesys.inf
View file

@ -1,4 +1,4 @@
[Version]
[Version]
Signature = "$ReactOS$"
[AddReg]

6
reactos/cmake/CMakeMacros.cmake
View file

@ -239,7 +239,7 @@ function(add_cd_file)
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
@ -259,7 +259,7 @@ function(add_cd_file)
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)
@ -289,7 +289,7 @@ function(add_cd_file)
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