From e35e42758a68dc3657cf4178799bc11196dfc238 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sun, 18 May 2003 15:21:30 +0000 Subject: [PATCH] Remove the INSTALL directory of the Boot-CD. svn path=/trunk/; revision=4711 --- freeldr/bootsect/isoboot.asm | 4 +- reactos/bootcd.bat | 180 +++++++++++------------- reactos/install.bat | 5 +- reactos/subsys/system/usetup/registry.c | 2 +- reactos/subsys/system/usetup/usetup.c | 4 +- 5 files changed, 92 insertions(+), 103 deletions(-) diff --git a/freeldr/bootsect/isoboot.asm b/freeldr/bootsect/isoboot.asm index ee466703ee7..89f9752fa4b 100644 --- a/freeldr/bootsect/isoboot.asm +++ b/freeldr/bootsect/isoboot.asm @@ -938,8 +938,8 @@ crlf_msg db CR, LF, 0 diskerr_msg: db 'Disk error ', 0 ondrive_str: db ', drive ', 0 err_bootfailed db CR, LF, 'Boot failed: press a key to retry...' -isolinux_dir db '\REACTOS', 0 -no_dir_msg db 'Could not find the REACTOS directory.', CR, LF, 0 +isolinux_dir db '\LOADER', 0 +no_dir_msg db 'Could not find the LOADER directory.', CR, LF, 0 isolinux_bin db 'SETUPLDR.SYS', 0 no_isolinux_msg db 'Could not find SETUPLDR.SYS.', CR, LF, 0 diff --git a/reactos/bootcd.bat b/reactos/bootcd.bat index 4efcc68c03e..3f083872772 100755 --- a/reactos/bootcd.bat +++ b/reactos/bootcd.bat @@ -6,14 +6,13 @@ set ROSAPPS_DIR=..\rosapps md %BOOTCD_DIR% md %BOOTCD_DIR%\disk md %BOOTCD_DIR%\disk\bootdisk -md %BOOTCD_DIR%\disk\install +md %BOOTCD_DIR%\disk\loader md %BOOTCD_DIR%\disk\reactos md %BOOTCD_DIR%\disk\reactos\system32 -md %BOOTCD_DIR%\disk\loader rem copy FreeLoader files copy /Y %FREELDR_DIR%\bootsect\isoboot.bin %BOOTCD_DIR% -copy /Y %FREELDR_DIR%\freeldr\obj\i386\setupldr.sys %BOOTCD_DIR%\disk\reactos +copy /Y %FREELDR_DIR%\freeldr\obj\i386\setupldr.sys %BOOTCD_DIR%\disk\loader copy /Y %FREELDR_DIR%\bootsect\dosmbr.bin %BOOTCD_DIR%\disk\loader copy /Y %FREELDR_DIR%\bootsect\ext2.bin %BOOTCD_DIR%\disk\loader @@ -22,20 +21,7 @@ copy /Y %FREELDR_DIR%\bootsect\fat32.bin %BOOTCD_DIR%\disk\loader copy /Y %FREELDR_DIR%\bootsect\isoboot.bin %BOOTCD_DIR%\disk\loader copy /Y %FREELDR_DIR%\freeldr\obj\i386\freeldr.sys %BOOTCD_DIR%\disk\loader -rem copy boot files -copy /Y ntoskrnl\ntoskrnl.exe %BOOTCD_DIR%\disk\reactos -copy /Y hal\halx86\hal.dll %BOOTCD_DIR%\disk\reactos -copy /Y drivers\fs\vfat\vfatfs.sys %BOOTCD_DIR%\disk\reactos -copy /Y drivers\fs\cdfs\cdfs.sys %BOOTCD_DIR%\disk\reactos -copy /Y drivers\fs\ntfs\ntfs.sys %BOOTCD_DIR%\disk\reactos -copy /Y drivers\dd\floppy\floppy.sys %BOOTCD_DIR%\disk\reactos -copy /Y drivers\dd\blue\blue.sys %BOOTCD_DIR%\disk\reactos -copy /Y drivers\input\keyboard\keyboard.sys %BOOTCD_DIR%\disk\reactos -copy /Y drivers\storage\atapi\atapi.sys %BOOTCD_DIR%\disk\reactos -copy /Y drivers\storage\scsiport\scsiport.sys %BOOTCD_DIR%\disk\reactos -copy /Y drivers\storage\cdrom\cdrom.sys %BOOTCD_DIR%\disk\reactos -copy /Y drivers\storage\disk\disk.sys %BOOTCD_DIR%\disk\reactos -copy /Y drivers\storage\class2\class2.sys %BOOTCD_DIR%\disk\reactos +rem copy setup files copy /Y lib\ntdll\ntdll.dll %BOOTCD_DIR%\disk\reactos\system32 copy /Y subsys\system\usetup\usetup.exe %BOOTCD_DIR%\disk\reactos\system32\smss.exe @@ -43,103 +29,105 @@ rem copy data files copy /Y bootdata\autorun.inf %BOOTCD_DIR%\disk copy /Y bootdata\readme.txt %BOOTCD_DIR%\disk -copy /Y bootdata\hivecls.inf %BOOTCD_DIR%\disk\install -copy /Y bootdata\hivedef.inf %BOOTCD_DIR%\disk\install -copy /Y bootdata\hivesft.inf %BOOTCD_DIR%\disk\install -copy /Y bootdata\hivesys.inf %BOOTCD_DIR%\disk\install +copy /Y bootdata\hivecls.inf %BOOTCD_DIR%\disk\reactos +copy /Y bootdata\hivedef.inf %BOOTCD_DIR%\disk\reactos +copy /Y bootdata\hivesft.inf %BOOTCD_DIR%\disk\reactos +copy /Y bootdata\hivesys.inf %BOOTCD_DIR%\disk\reactos -copy /Y bootdata\txtsetup.sif %BOOTCD_DIR%\disk\install +copy /Y bootdata\txtsetup.sif %BOOTCD_DIR%\disk\reactos rem copy install files -copy /Y ntoskrnl\ntoskrnl.exe %BOOTCD_DIR%\disk\install -copy /Y hal\halx86\hal.dll %BOOTCD_DIR%\disk\install +copy /Y ntoskrnl\ntoskrnl.exe %BOOTCD_DIR%\disk\reactos +copy /Y hal\halx86\hal.dll %BOOTCD_DIR%\disk\reactos -copy /Y drivers\bus\acpi\acpi.sys %BOOTCD_DIR%\disk\install -copy /Y drivers\bus\isapnp\isapnp.sys %BOOTCD_DIR%\disk\install +copy /Y drivers\bus\acpi\acpi.sys %BOOTCD_DIR%\disk\reactos +copy /Y drivers\bus\isapnp\isapnp.sys %BOOTCD_DIR%\disk\reactos -copy /Y drivers\dd\beep\beep.sys %BOOTCD_DIR%\disk\install -copy /Y drivers\dd\blue\blue.sys %BOOTCD_DIR%\disk\install -copy /Y drivers\dd\floppy\floppy.sys %BOOTCD_DIR%\disk\install -copy /Y drivers\dd\null\null.sys %BOOTCD_DIR%\disk\install -copy /Y drivers\dd\serial\serial.sys %BOOTCD_DIR%\disk\install -copy /Y drivers\dd\vga\display\vgaddi.dll %BOOTCD_DIR%\disk\install -copy /Y drivers\dd\vga\miniport\vgamp.sys %BOOTCD_DIR%\disk\install -copy /Y drivers\dd\videoprt\videoprt.sys %BOOTCD_DIR%\disk\install +copy /Y drivers\dd\beep\beep.sys %BOOTCD_DIR%\disk\reactos +copy /Y drivers\dd\blue\blue.sys %BOOTCD_DIR%\disk\reactos +copy /Y drivers\dd\floppy\floppy.sys %BOOTCD_DIR%\disk\reactos +copy /Y drivers\dd\null\null.sys %BOOTCD_DIR%\disk\reactos +copy /Y drivers\dd\serial\serial.sys %BOOTCD_DIR%\disk\reactos +copy /Y drivers\dd\vga\display\vgaddi.dll %BOOTCD_DIR%\disk\reactos +copy /Y drivers\dd\vga\miniport\vgamp.sys %BOOTCD_DIR%\disk\reactos +copy /Y drivers\dd\videoprt\videoprt.sys %BOOTCD_DIR%\disk\reactos -copy /Y drivers\fs\cdfs\cdfs.sys %BOOTCD_DIR%\disk\install -copy /Y drivers\fs\fs_rec\fs_rec.sys %BOOTCD_DIR%\disk\install -copy /Y drivers\fs\ms\msfs.sys %BOOTCD_DIR%\disk\install -copy /Y drivers\fs\mup\mup.sys %BOOTCD_DIR%\disk\install -copy /Y drivers\fs\np\npfs.sys %BOOTCD_DIR%\disk\install -copy /Y drivers\fs\ntfs\ntfs.sys %BOOTCD_DIR%\disk\install -copy /Y drivers\fs\vfat\vfatfs.sys %BOOTCD_DIR%\disk\install +copy /Y drivers\fs\cdfs\cdfs.sys %BOOTCD_DIR%\disk\reactos +copy /Y drivers\fs\fs_rec\fs_rec.sys %BOOTCD_DIR%\disk\reactos +copy /Y drivers\fs\ms\msfs.sys %BOOTCD_DIR%\disk\reactos +copy /Y drivers\fs\mup\mup.sys %BOOTCD_DIR%\disk\reactos +copy /Y drivers\fs\np\npfs.sys %BOOTCD_DIR%\disk\reactos +copy /Y drivers\fs\ntfs\ntfs.sys %BOOTCD_DIR%\disk\reactos +copy /Y drivers\fs\vfat\vfatfs.sys %BOOTCD_DIR%\disk\reactos -copy /Y drivers\input\keyboard\keyboard.sys %BOOTCD_DIR%\disk\install -copy /Y drivers\input\mouclass\mouclass.sys %BOOTCD_DIR%\disk\install -copy /Y drivers\input\psaux\psaux.sys %BOOTCD_DIR%\disk\install +copy /Y drivers\input\keyboard\keyboard.sys %BOOTCD_DIR%\disk\reactos +copy /Y drivers\input\mouclass\mouclass.sys %BOOTCD_DIR%\disk\reactos +copy /Y drivers\input\psaux\psaux.sys %BOOTCD_DIR%\disk\reactos -copy /Y drivers\lib\bzip2\unbzip2.sys %BOOTCD_DIR%\disk\install +copy /Y drivers\lib\bzip2\unbzip2.sys %BOOTCD_DIR%\disk\reactos -copy /Y drivers\net\afd\afd.sys %BOOTCD_DIR%\disk\install -copy /Y drivers\net\dd\ne2000\ne2000.sys %BOOTCD_DIR%\disk\install -copy /Y drivers\net\ndis\ndis.sys %BOOTCD_DIR%\disk\install -copy /Y drivers\net\npf\npf.sys %BOOTCD_DIR%\disk\install -copy /Y drivers\net\packet\packet.sys %BOOTCD_DIR%\disk\install -copy /Y drivers\net\tcpip\tcpip.sys %BOOTCD_DIR%\disk\install -copy /Y drivers\net\tdi\tdi.sys %BOOTCD_DIR%\disk\install +copy /Y drivers\net\afd\afd.sys %BOOTCD_DIR%\disk\reactos +copy /Y drivers\net\dd\ne2000\ne2000.sys %BOOTCD_DIR%\disk\reactos +copy /Y drivers\net\ndis\ndis.sys %BOOTCD_DIR%\disk\reactos +copy /Y drivers\net\npf\npf.sys %BOOTCD_DIR%\disk\reactos +copy /Y drivers\net\packet\packet.sys %BOOTCD_DIR%\disk\reactos +copy /Y drivers\net\tcpip\tcpip.sys %BOOTCD_DIR%\disk\reactos +copy /Y drivers\net\tdi\tdi.sys %BOOTCD_DIR%\disk\reactos -copy /Y drivers\storage\atapi\atapi.sys %BOOTCD_DIR%\disk\install -copy /Y drivers\storage\cdrom\cdrom.sys %BOOTCD_DIR%\disk\install -copy /Y drivers\storage\class2\class2.sys %BOOTCD_DIR%\disk\install -copy /Y drivers\storage\disk\disk.sys %BOOTCD_DIR%\disk\install -copy /Y drivers\storage\scsiport\scsiport.sys %BOOTCD_DIR%\disk\install +copy /Y drivers\storage\atapi\atapi.sys %BOOTCD_DIR%\disk\reactos +copy /Y drivers\storage\cdrom\cdrom.sys %BOOTCD_DIR%\disk\reactos +copy /Y drivers\storage\class2\class2.sys %BOOTCD_DIR%\disk\reactos +copy /Y drivers\storage\disk\disk.sys %BOOTCD_DIR%\disk\reactos +copy /Y drivers\storage\scsiport\scsiport.sys %BOOTCD_DIR%\disk\reactos -copy /Y lib\advapi32\advapi32.dll %BOOTCD_DIR%\disk\install -copy /Y lib\crtdll\crtdll.dll %BOOTCD_DIR%\disk\install -copy /Y lib\fmifs\fmifs.dll %BOOTCD_DIR%\disk\install -copy /Y lib\freetype\freetype.dll %BOOTCD_DIR%\disk\install -copy /Y lib\gdi32\gdi32.dll %BOOTCD_DIR%\disk\install -copy /Y lib\kernel32\kernel32.dll %BOOTCD_DIR%\disk\install -copy /Y lib\msafd\msafd.dll %BOOTCD_DIR%\disk\install -copy /Y lib\msvcrt\msvcrt.dll %BOOTCD_DIR%\disk\install -copy /Y lib\ntdll\ntdll.dll %BOOTCD_DIR%\disk\install -copy /Y lib\ole32\ole32.dll %BOOTCD_DIR%\disk\install -copy /Y lib\oleaut32\oleaut32.dll %BOOTCD_DIR%\disk\install -copy /Y lib\packet\packet.dll %BOOTCD_DIR%\disk\install -copy /Y lib\secur32\secur32.dll %BOOTCD_DIR%\disk\install -copy /Y lib\shell32\shell32.dll %BOOTCD_DIR%\disk\install -copy /Y lib\syssetup\syssetup.dll %BOOTCD_DIR%\disk\install -copy /Y lib\user32\user32.dll %BOOTCD_DIR%\disk\install -copy /Y lib\version\version.dll %BOOTCD_DIR%\disk\install -copy /Y lib\winedbgc\winedbgc.dll %BOOTCD_DIR%\disk\install -copy /Y lib\winmm\winmm.dll %BOOTCD_DIR%\disk\install -copy /Y lib\ws2_32\ws2_32.dll %BOOTCD_DIR%\disk\install -copy /Y lib\ws2help\ws2help.dll %BOOTCD_DIR%\disk\install -copy /Y lib\wshirda\wshirda.dll %BOOTCD_DIR%\disk\install +copy /Y lib\advapi32\advapi32.dll %BOOTCD_DIR%\disk\reactos +copy /Y lib\crtdll\crtdll.dll %BOOTCD_DIR%\disk\reactos +copy /Y lib\fmifs\fmifs.dll %BOOTCD_DIR%\disk\reactos +copy /Y lib\freetype\freetype.dll %BOOTCD_DIR%\disk\reactos +copy /Y lib\gdi32\gdi32.dll %BOOTCD_DIR%\disk\reactos +copy /Y lib\kernel32\kernel32.dll %BOOTCD_DIR%\disk\reactos +copy /Y lib\msafd\msafd.dll %BOOTCD_DIR%\disk\reactos +copy /Y lib\msvcrt\msvcrt.dll %BOOTCD_DIR%\disk\reactos +copy /Y lib\ntdll\ntdll.dll %BOOTCD_DIR%\disk\reactos +copy /Y lib\ole32\ole32.dll %BOOTCD_DIR%\disk\reactos +copy /Y lib\oleaut32\oleaut32.dll %BOOTCD_DIR%\disk\reactos +copy /Y lib\packet\packet.dll %BOOTCD_DIR%\disk\reactos +copy /Y lib\secur32\secur32.dll %BOOTCD_DIR%\disk\reactos +copy /Y lib\shell32\shell32.dll %BOOTCD_DIR%\disk\reactos +copy /Y lib\syssetup\syssetup.dll %BOOTCD_DIR%\disk\reactos +copy /Y lib\user32\user32.dll %BOOTCD_DIR%\disk\reactos +copy /Y lib\version\version.dll %BOOTCD_DIR%\disk\reactos +copy /Y lib\winedbgc\winedbgc.dll %BOOTCD_DIR%\disk\reactos +copy /Y lib\winmm\winmm.dll %BOOTCD_DIR%\disk\reactos +copy /Y lib\ws2_32\ws2_32.dll %BOOTCD_DIR%\disk\reactos +copy /Y lib\ws2help\ws2help.dll %BOOTCD_DIR%\disk\reactos +copy /Y lib\wshirda\wshirda.dll %BOOTCD_DIR%\disk\reactos -copy /Y services\eventlog\eventlog.exe %BOOTCD_DIR%\disk\install -copy /Y services\rpcss\rpcss.exe %BOOTCD_DIR%\disk\install +copy /Y services\eventlog\eventlog.exe %BOOTCD_DIR%\disk\reactos +copy /Y services\rpcss\rpcss.exe %BOOTCD_DIR%\disk\reactos -copy /Y subsys\csrss\csrss.exe %BOOTCD_DIR%\disk\install -copy /Y subsys\ntvdm\ntvdm.exe %BOOTCD_DIR%\disk\install -copy /Y subsys\smss\smss.exe %BOOTCD_DIR%\disk\install -copy /Y subsys\system\autochk\autochk.exe %BOOTCD_DIR%\disk\install -copy /Y subsys\system\cmd\cmd.exe %BOOTCD_DIR%\disk\install -copy /Y subsys\system\lsass\lsass.exe %BOOTCD_DIR%\disk\install -copy /Y subsys\system\services\services.exe %BOOTCD_DIR%\disk\install -copy /Y subsys\system\setup\setup.exe %BOOTCD_DIR%\disk\install -copy /Y subsys\system\winlogon\winlogon.exe %BOOTCD_DIR%\disk\install -copy /Y subsys\win32k\win32k.sys %BOOTCD_DIR%\disk\install +copy /Y subsys\csrss\csrss.exe %BOOTCD_DIR%\disk\reactos +copy /Y subsys\ntvdm\ntvdm.exe %BOOTCD_DIR%\disk\reactos +copy /Y subsys\smss\smss.exe %BOOTCD_DIR%\disk\reactos +copy /Y subsys\system\autochk\autochk.exe %BOOTCD_DIR%\disk\reactos +copy /Y subsys\system\cmd\cmd.exe %BOOTCD_DIR%\disk\reactos +copy /Y subsys\system\lsass\lsass.exe %BOOTCD_DIR%\disk\reactos +copy /Y subsys\system\services\services.exe %BOOTCD_DIR%\disk\reactos +copy /Y subsys\system\setup\setup.exe %BOOTCD_DIR%\disk\reactos +copy /Y subsys\system\winlogon\winlogon.exe %BOOTCD_DIR%\disk\reactos +copy /Y subsys\win32k\win32k.sys %BOOTCD_DIR%\disk\reactos -copy /Y media\fonts\*.ttf %BOOTCD_DIR%\disk\install +rem copy media files +copy /Y media\fonts\*.ttf %BOOTCD_DIR%\disk\reactos +copy /Y media\nls\*.nls %BOOTCD_DIR%\disk\reactos rem copy test apps -copy /Y apps\tests\winhello\winhello.exe %BOOTCD_DIR%\disk\install +copy /Y apps\tests\winhello\winhello.exe %BOOTCD_DIR%\disk\reactos rem copy rosapps files -copy /Y %ROSAPPS_DIR%\games\winemine\winemine.exe %BOOTCD_DIR%\disk\install -copy /Y %ROSAPPS_DIR%\hcalc\hcalc.exe %BOOTCD_DIR%\disk\install -copy /Y %ROSAPPS_DIR%\mc\mc.exe %BOOTCD_DIR%\disk\install +copy /Y %ROSAPPS_DIR%\games\winemine\winemine.exe %BOOTCD_DIR%\disk\reactos +copy /Y %ROSAPPS_DIR%\hcalc\hcalc.exe %BOOTCD_DIR%\disk\reactos +copy /Y %ROSAPPS_DIR%\mc\mc.exe %BOOTCD_DIR%\disk\reactos rem create the reactos.iso image file tools\cdmake\cdmake -m -b %BOOTCD_DIR%\isoboot.bin %BOOTCD_DIR%\disk REACTOS %BOOTCD_DIR%\reactos.iso diff --git a/reactos/install.bat b/reactos/install.bat index 8be6e89c50b..9e77d954d4c 100644 --- a/reactos/install.bat +++ b/reactos/install.bat @@ -23,7 +23,6 @@ md %ROS_INSTALL%\media\fonts copy boot.bat %ROS_INSTALL% copy bootc.lst %ROS_INSTALL% copy aboot.bat %ROS_INSTALL% -copy system.hiv %ROS_INSTALL%\system32\config copy loaders\dos\loadros.com %ROS_INSTALL% copy ntoskrnl\ntoskrnl.exe %ROS_INSTALL%\system32 copy ntoskrnl\ntoskrnl.sym %ROS_INSTALL%\symbols @@ -145,7 +144,9 @@ copy apps\testsets\msvcrt\mbtowc\mbtowc.exe %ROS_INSTALL_TESTS% copy apps\testsets\test\test.exe %ROS_INSTALL_TESTS% copy apps\testsets\testperl\testperl.exe %ROS_INSTALL_TESTS% copy media\fonts\*.ttf %ROS_INSTALL%\media\fonts -rem copy media\nls\*.nls %ROS_INSTALL%\system32 +copy media\nls\c_1252.nls %ROS_INSTALL%\system32\ansi.nls +copy media\nls\c_437.nls %ROS_INSTALL%\system32\oem.nls +copy media\nls\l_intl.nls %ROS_INSTALL%\system32\casemap.nls copy ntoskrnl\ntoskrnl.map %ROS_INSTALL%\symbols tools\mkhive\mkhive bootdata %ROS_INSTALL%\system32\config diff --git a/reactos/subsys/system/usetup/registry.c b/reactos/subsys/system/usetup/registry.c index 7041cc7ae12..4579fea0ec2 100644 --- a/reactos/subsys/system/usetup/registry.c +++ b/reactos/subsys/system/usetup/registry.c @@ -579,7 +579,7 @@ ImportRegistryFile(PWSTR Filename, /* Load inf file from install media. */ wcscpy(FileNameBuffer, SourceRootPath.Buffer); - wcscat(FileNameBuffer, L"\\install\\"); + wcscat(FileNameBuffer, L"\\reactos\\"); wcscat(FileNameBuffer, Filename); RtlInitUnicodeString(&FileName, diff --git a/reactos/subsys/system/usetup/usetup.c b/reactos/subsys/system/usetup/usetup.c index cefc00fc4b0..5d6127f7047 100644 --- a/reactos/subsys/system/usetup/usetup.c +++ b/reactos/subsys/system/usetup/usetup.c @@ -426,7 +426,7 @@ StartPage(PINPUT_RECORD Ir) /* Load txtsetup.sif from install media. */ wcscpy(FileNameBuffer, SourceRootPath.Buffer); - wcscat(FileNameBuffer, L"\\install\\txtsetup.sif"); + wcscat(FileNameBuffer, L"\\reactos\\txtsetup.sif"); RtlInitUnicodeString(&FileName, FileNameBuffer); @@ -1709,7 +1709,7 @@ PrepareCopyPage(PINPUT_RECORD Ir) if (!SetupQueueCopy(SetupFileQueue, SourceRootPath.Buffer, - L"\\install", + L"\\reactos", FileKeyName, DirKeyValue, NULL))