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

[MODULES] Add a convenient option to transfer files into a new installation (#877)

Browse source 
Purpose:
When doing a PXE BootCD installation, you may be left without networking, usb and a cd drive.
This adds an easy way to include a few or more files to the installation which are then present on the disk after the installation and which does not require any change to ReactOS source code/build script files (and no manual editing of boot/bootdata/packages/reactos.dff.in).

Proposed changes:
Adds a new modules/3rdparty folder which lets the files end up in C:\ReactOS\3rdParty ready for use.
This commit is contained in:
Bernhard Feichtinger 2018-11-16 23:26:58 +01:00 committed by Hermès BÉLUSCA - MAÏTO
parent c00bafaad9
commit 76daaf9faf
4 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -3,6 +3,7 @@ modules/optional
modules/bootcd_extras modules/bootcd_extras
modules/livecd_extras modules/livecd_extras
modules/hybridcd_extras modules/hybridcd_extras
modules/3rdparty
.cproject .cproject
.project .project
.settings .settings

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

@ -81,6 +81,7 @@ Signature = "$Windows NT$"
60 = winsxs\x86_reactos.newapi_6595b64144ccf1df_1.0.0.0_none_deadbeef 60 = winsxs\x86_reactos.newapi_6595b64144ccf1df_1.0.0.0_none_deadbeef
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
.InfEnd .InfEnd

10
modules/CMakeLists.txt
View file

@ -17,6 +17,8 @@ endif()
## Extra files for Boot/Live/Hybrid CD. You need to put them under [boot|live|hybrid]cd_extras ## Extra files for Boot/Live/Hybrid CD. You need to put them under [boot|live|hybrid]cd_extras
## in the same layout as you want them to be in the CD. ## in the same layout as you want them to be in the CD.
## If you change the content of any of the following folders later on,
## run "cmake ." before compiling.
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/bootcd_extras/) if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/bootcd_extras/)
file(GLOB_RECURSE EXTRA_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd_extras/ ${CMAKE_CURRENT_SOURCE_DIR}/bootcd_extras/*) file(GLOB_RECURSE EXTRA_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd_extras/ ${CMAKE_CURRENT_SOURCE_DIR}/bootcd_extras/*)
foreach(item ${EXTRA_FILES}) foreach(item ${EXTRA_FILES})
@ -35,3 +37,11 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/hybridcd_extras/)
add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hybridcd_extras/${item} DESTINATION extras NO_CAB NAME_ON_CD ${item} FOR hybridcd) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hybridcd_extras/${item} DESTINATION extras NO_CAB NAME_ON_CD ${item} FOR hybridcd)
endforeach(item) endforeach(item)
endif() endif()
## Extra files which you need existing on the hard drive after the installation.
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/)
file(GLOB_RECURSE EXTRA_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/ ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/*)
foreach(item ${EXTRA_FILES})
add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/${item} DESTINATION reactos/3rdParty NAME_ON_CD ${item} FOR bootcd)
endforeach(item)
endif()

2
sdk/cmake/CMakeMacros.cmake
View file

@ -294,6 +294,8 @@ macro(dir_to_num dir var)
set(${var} 61) set(${var} 61)
elseif(${dir} STREQUAL reactos/Resources/Themes/Modern) elseif(${dir} STREQUAL reactos/Resources/Themes/Modern)
set(${var} 62) set(${var} 62)
elseif(${dir} STREQUAL reactos/3rdParty)
set(${var} 63)
else() else()
message(FATAL_ERROR "Wrong destination: ${dir}") message(FATAL_ERROR "Wrong destination: ${dir}")
endif() endif()