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

[BOOTDATA][CMAKE] Sort 2 directories out

Browse source 
winsxs\x86_reactos.newapi_6595b64144ccf1df_1.0.0.0_none_deadbeef:
removed: silently added on 8d30456 and never used.

bin\suppl:
moved: to 60 from 80.
This commit is contained in:
Serge Gautherie 2020-11-12 01:22:46 +01:00 committed by Mark Jansen
parent e044df8736
commit 8ddbfdeb57
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
boot/bootdata/packages/reactos.dff.in
View file

@ -17,6 +17,10 @@ Signature = "$Windows NT$"
; Directories relative to the installation directory. ; Directories relative to the installation directory.
; For specifying absolute directories, use the SystemPartitionFiles section, ; For specifying absolute directories, use the SystemPartitionFiles section,
; or use names starting with \. ; or use names starting with \.
;
; WARNING!
; Please keep the numbering in this list in sync with
; sdk/cmake/CMakeMacros.cmake
[Directories] [Directories]
1 = "\" 1 = "\"
2 = system32 2 = system32
@ -26,7 +30,6 @@ Signature = "$Windows NT$"
6 = inf 6 = inf
7 = bin 7 = bin
8 = bin\testdata 8 = bin\testdata
80 = bin\suppl
9 = media 9 = media
10 = Microsoft.NET 10 = Microsoft.NET
11 = Microsoft.NET\Framework 11 = Microsoft.NET\Framework
@ -78,7 +81,7 @@ Signature = "$Windows NT$"
57 = winsxs\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef 57 = winsxs\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef
58 = winsxs\x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef 58 = winsxs\x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef
59 = winsxs\x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef 59 = winsxs\x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef
60 = winsxs\x86_reactos.newapi_6595b64144ccf1df_1.0.0.0_none_deadbeef 60 = bin\suppl
61 = winsxs\x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef 61 = winsxs\x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef
62 = Resources\Themes\Modern 62 = Resources\Themes\Modern
63 = 3rdParty 63 = 3rdParty

4
sdk/cmake/CMakeMacros.cmake
View file

@ -107,8 +107,6 @@ macro(dir_to_num dir var)
set(${var} 7) set(${var} 7)
elseif(${dir} STREQUAL reactos/bin/testdata) elseif(${dir} STREQUAL reactos/bin/testdata)
set(${var} 8) set(${var} 8)
elseif(${dir} STREQUAL reactos/bin/suppl)
set(${var} 80)
elseif(${dir} STREQUAL reactos/media) elseif(${dir} STREQUAL reactos/media)
set(${var} 9) set(${var} 9)
elseif(${dir} STREQUAL reactos/Microsoft.NET) elseif(${dir} STREQUAL reactos/Microsoft.NET)
@ -211,7 +209,7 @@ macro(dir_to_num dir var)
set(${var} 58) set(${var} 58)
elseif(${dir} STREQUAL reactos/winsxs/x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef) elseif(${dir} STREQUAL reactos/winsxs/x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef)
set(${var} 59) set(${var} 59)
elseif(${dir} STREQUAL reactos/winsxs/x86_reactos.newapi_6595b64144ccf1df_1.0.0.0_none_deadbeef) elseif(${dir} STREQUAL reactos/bin/suppl)
set(${var} 60) set(${var} 60)
elseif(${dir} STREQUAL reactos/winsxs/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef) elseif(${dir} STREQUAL reactos/winsxs/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef)
set(${var} 61) set(${var} 61)