[ros-diffs] 01/01: [BOOTDATA] Do not include caroots.inf in registry.inf. CORE-12020

[Thomas Faber]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6158207c318bccaf1767d…

commit 6158207c318bccaf1767d1a5c1545de45beb113d
Author:     Thomas Faber <thomas.faber(a)reactos.org>
AuthorDate: Sat Feb 24 18:01:58 2018 +0100
Commit:     Thomas Faber <thomas.faber(a)reactos.org>
CommitDate: Sun Feb 25 10:07:28 2018 +0100

    [BOOTDATA] Do not include caroots.inf in registry.inf. CORE-12020
    
    This splits registry.inf roughly in half, which massively reduces heap usage
    in 1st stage. DPH and low-memory scenarios benefit from this.
---
 boot/bootdata/CMakeLists.txt | 7 ++++++-
 boot/bootdata/txtsetup.sif   | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/boot/bootdata/CMakeLists.txt b/boot/bootdata/CMakeLists.txt
index 42dbfff18b..fd5696b46f 100644
--- a/boot/bootdata/CMakeLists.txt
+++ b/boot/bootdata/CMakeLists.txt
@@ -5,8 +5,13 @@ add_subdirectory(packages)
 
 add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/txtsetup.sif DESTINATION reactos NO_CAB FOR
bootcd regtest)
 
+add_custom_target(converted_caroots_inf DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/caroots.inf)
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/caroots.inf
+                   COMMAND native-utf16le
"${CMAKE_CURRENT_SOURCE_DIR}/caroots.inf"
"${CMAKE_CURRENT_BINARY_DIR}/caroots.inf"
+                   DEPENDS native-utf16le ${CMAKE_CURRENT_SOURCE_DIR}/caroots.inf)
+add_cd_file(TARGET converted_caroots_inf FILE ${CMAKE_CURRENT_BINARY_DIR}/caroots.inf
DESTINATION reactos NO_CAB FOR all)
+
 add_registry_inf(
-    caroots.inf
     hivecls.inf
     hivedef.inf
     hivesft.inf
diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif
index 7a86befd28..fc2aa63284 100644
--- a/boot/bootdata/txtsetup.sif
+++ b/boot/bootdata/txtsetup.sif
@@ -523,6 +523,7 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)"
 0000048F = kbdeo.dll
 
 [HiveInfs.Install]
+AddReg=caroots.inf,AddReg
 AddReg=registry.inf,AddReg
 
 ; EOF