08/08: [BOOTDATA][CMAKE] Enumerate the four first installation directories in 'canonical' order, to keep compatibility with Windows' txtsetup.sif/layout.inf.

[Hermès Bélusca-Maïto]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=287d35b84d9d35ec5c5767...

commit 287d35b84d9d35ec5c5767fd3c9498223c09e5ab
Author:     Hermès Bélusca-Maïto [e-mail]
AuthorDate: Sun Jan 7 01:46:31 2018 +0100
Commit:     Hermès Bélusca-Maïto [e-mail]
CommitDate: Mon Oct 8 21:16:58 2018 +0200

[BOOTDATA][CMAKE] Enumerate the four first installation directories in 'canonical' order, to keep compatibility with Windows' txtsetup.sif/layout.inf.
---
 boot/bootdata/packages/reactos.dff.in |  8 ++++----
 sdk/cmake/CMakeMacros.cmake           | 13 +++++++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/boot/bootdata/packages/reactos.dff.in b/boot/bootdata/packages/reactos.dff.in
index cd3c0de558..b0561522b6 100644
--- a/boot/bootdata/packages/reactos.dff.in
+++ b/boot/bootdata/packages/reactos.dff.in
@@ -17,10 +17,10 @@ Signature = "$ReactOS$"
 ; For specifying absolute directories, use the SystemPartitionFiles section,
 ; or use names starting with .
 [Directories]
-1 = system32
-2 = system32\drivers
-3 = Fonts
-4 = ""
+1 = ""
+2 = system32
+3 = system32\drivers
+4 = Fonts
 5 = system32\drivers\etc
 6 = inf
 7 = bin
diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake
index 8258247290..d3214158a9 100644
--- a/sdk/cmake/CMakeMacros.cmake
+++ b/sdk/cmake/CMakeMacros.cmake
@@ -162,14 +162,19 @@ function(add_link)
     set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_LINK_NAME}.lnk PROPERTIES GENERATED TRUE)
 endfunction()

+#
+# WARNING!
+# Please keep the numbering in this list in sync with
+# boot/bootdata/packages/reactos.dff.in
+#
 macro(dir_to_num dir var)
-    if(${dir} STREQUAL reactos/system32)
+    if(${dir} STREQUAL reactos)
         set(${var} 1)
-    elseif(${dir} STREQUAL reactos/system32/drivers)
+    elseif(${dir} STREQUAL reactos/system32)
         set(${var} 2)
-    elseif(${dir} STREQUAL reactos/Fonts)
+    elseif(${dir} STREQUAL reactos/system32/drivers)
         set(${var} 3)
-    elseif(${dir} STREQUAL reactos)
+    elseif(${dir} STREQUAL reactos/Fonts)
         set(${var} 4)
     elseif(${dir} STREQUAL reactos/system32/drivers/etc)
         set(${var} 5)