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

[CMAKE]

Browse source 
Completely refactor bootcd generation
  - one macro (à la cmake's install) to rule them all, to make your life simpler and have build files cleaner
  - Completely rehaul the bootcd tree : now you have in it some minimal reactos system
  - reflect those changes in setupldr
No livecd yet!

svn path=/branches/cmake-bringup/; revision=51731
This commit is contained in:
Jérôme Gardou 2011-05-14 13:49:39 +00:00
parent ee7e7b3462
commit 53fbd8e185
556 changed files with 772 additions and 722 deletions
Download patch file Download diff file Expand all files Collapse all files

2
base/setup/reactos/CMakeLists.txt
View file

@ -8,4 +8,4 @@ target_link_libraries(reactos uuid)
set_module_type(reactos win32gui)
add_importlibs(reactos gdi32 user32 comctl32 setupapi msvcrt kernel32 ntdll)
add_minicd_target(reactos reactos)
add_cd_file(TARGET reactos DESTINATION reactos NO_CAB NO_LIVECD)

2
base/setup/setup/CMakeLists.txt
View file

@ -5,4 +5,4 @@ add_executable(setup setup.c setup.rc)
set_module_type(setup win32gui)
add_importlibs(setup userenv msvcrt kernel32 ntdll)
add_cab_target(setup 1)
add_cd_file(TARGET setup DESTINATION reactos/system32)

2
base/setup/usetup/CMakeLists.txt
View file

@ -44,4 +44,4 @@ endif()
set_module_type(usetup nativecui)
add_importlibs(usetup kernel32 ntdll)
add_minicd_target(usetup reactos/system32 smss.exe)
add_cd_file(TARGET usetup DESTINATION reactos/system32 NO_CAB NO_LIVECD NAME_ON_CD smss.exe)

2
base/setup/usetup/filesup.c
View file

@ -126,7 +126,7 @@ SetupCopyFile(PWCHAR SourceFileName,
FILE_SEQUENTIAL_ONLY);
if(!NT_SUCCESS(Status))
{
DPRINT1("NtOpenFile failed: %x\n", Status);
DPRINT1("NtOpenFile failed: %x, %wZ\n", Status, &FileName);
goto done;
}
#else

7
base/setup/usetup/interface/usetup.c
View file

@ -2843,6 +2843,7 @@ AddSectionToCopyQueue(HINF InfFile,
PWCHAR FileKeyValue;
PWCHAR DirKeyValue;
PWCHAR TargetFileName;
WCHAR CompleteOrigFileName[512];
if (SourceCabinet)
return AddSectionToCopyQueueCab(InfFile, L"SourceFiles", SourceCabinet, DestinationPath, Ir);
@ -2901,10 +2902,14 @@ AddSectionToCopyQueue(HINF InfFile,
break;
}
wcscpy(CompleteOrigFileName, SourceRootDir.Buffer);
wcscat(CompleteOrigFileName, L"\\");
wcscat(CompleteOrigFileName, DirKeyValue);
if (!SetupQueueCopy(SetupFileQueue,
SourceCabinet,
SourceRootPath.Buffer,
SourceRootDir.Buffer,
CompleteOrigFileName,
FileKeyName,
DirKeyValue,
TargetFileName))

2
base/setup/vmwinst/CMakeLists.txt
View file

@ -18,4 +18,4 @@ add_importlibs(vmwinst
kernel32
ntdll)
add_cab_target(vmwinst 1)
add_cd_file(TARGET vmwinst DESTINATION reactos/system32)

2
base/setup/welcome/CMakeLists.txt
View file

@ -5,4 +5,4 @@ add_executable(welcome welcome.c welcome.rc)
set_module_type(welcome win32gui)
add_importlibs(welcome gdi32 user32 msvcrt kernel32 ntdll)
add_minicd_target(welcome reactos)
add_cd_file(TARGET welcome DESTINATION reactos NO_CAB NO_LIVECD)