Author: spetreolle Date: Fri Nov 5 14:33:14 2010 New Revision: 49484
URL: http://svn.reactos.org/svn/reactos?rev=49484&view=rev Log: [CMAKE] Bootcd: Added : syssetup.inf, vgafonts.cab, c_28593.nls, ntvdm. Remove blue from reactos.cab.
Added: branches/cmake-bringup/media/inf/syssetup.inf - copied unchanged from r49479, branches/cmake-bringup/media/inf/syssetup.inf.trunk Removed: branches/cmake-bringup/media/inf/syssetup.inf.trunk Modified: branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt branches/cmake-bringup/media/inf/CMakeLists.txt branches/cmake-bringup/media/nls/CMakeLists.txt branches/cmake-bringup/media/vgafonts/CMakeLists.txt branches/cmake-bringup/subsystems/CMakeLists.txt branches/cmake-bringup/subsystems/ntvdm/CMakeLists.txt
Modified: branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/setup/blue... ============================================================================== --- branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt [iso-8859-1] Fri Nov 5 14:33:14 2010 @@ -7,4 +7,4 @@ add_importlibs(blue ntoskrnl hal)
add_minicd_target(blue reactos blue.sys) -add_cab_target(blue 2) +add_livecd_target(blue reactos/system32/drivers)
Modified: branches/cmake-bringup/media/inf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/media/inf/CMakeLis... ============================================================================== --- branches/cmake-bringup/media/inf/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/media/inf/CMakeLists.txt [iso-8859-1] Fri Nov 5 14:33:14 2010 @@ -3,4 +3,4 @@ add_cab("${CMAKE_CURRENT_SOURCE_DIR}/${item}" 6) endforeach(item)
-add_livecd(${CMAKE_CURRENT_SOURCE_DIR}/syssetup.inf.trunk reactos/inf syssetup.inf) +add_livecd(${CMAKE_CURRENT_SOURCE_DIR}/syssetup.inf reactos/inf)
Removed: branches/cmake-bringup/media/inf/syssetup.inf.trunk URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/media/inf/syssetup... ============================================================================== --- branches/cmake-bringup/media/inf/syssetup.inf.trunk [iso-8859-1] (original) +++ branches/cmake-bringup/media/inf/syssetup.inf.trunk (removed) @@ -1,83 +1,0 @@ -[Version] -Signature = $Windows NT$ -ClassGUID = {00000000-0000-0000-0000-000000000000} - -[DeviceInfsToInstall] -battery.inf -cdrom.inf -display.inf -fdc.inf -hdc.inf -keyboard.inf -machine.inf -msmouse.inf -NET_NIC.inf -ports.inf -scsi.inf -usbport.inf -audio.inf -ks.inf - -[RegistrationPhase2] -RegisterDlls = OleControlDlls - -[OleControlDlls] -11,,actxprxy.dll,1 -11,,amstream.dll,1 -11,,atl.dll,1 -11,,avifil32.dll,1 -11,,browseui.dll,1 -11,,comcat.dll,1 -11,,comctl32.dll,2 -11,,cryptdlg.dll,1 -11,,cryptnet.dll,1 -11,,ddraw.dll,1 -11,,devenum.dll,1 -11,,dinput.dll,1 -11,,dinput8.dll,1 -11,,dmusic.dll,1 -11,,dplayx.dll,1 -11,,dsound.dll,1 -11,,dxdiagn.dll,1 -11,,hhctrl.ocx,1 -11,,hlink.dll,1 -11,,hnetcfg.dll,1 -11,,inetcomm.dll,1 -11,,inseng.dll,1 -11,,itss.dll,1 -11,,jscript.dll,1 -11,,ksproxy.ax,1 -11,,mlang.dll,1 -11,,mscat32.dll,1 -11,,msctf.dll,1 -11,,mshtml.dll,3 -11,,msi.dll,1 -11,,msimtf.dll,1 -11,,msisip.dll,1 -11,,mstask.dll,1 -11,,msxml3.dll,1 -11,,netcfgx.dll,1 -11,,netshell.dll,1 -11,,objsel.dll,1 -11,,ole32.dll,1 -11,,oleacc.dll,1 -11,,oleaut32.dll,1 -11,,olepro32.dll,1 -11,,pstorec.dll,1 -11,,qedit.dll,1 -11,,qmgr.dll,1 -11,,qmgrprxy.dll,1 -11,,quartz.dll,1 -11,,rpcrt4.dll,1 -11,,rsabase.dll,1 -11,,rsaenh.dll,1 -11,,shdocvw.dll,3 -11,,shell32.dll,3 -11,,softpub.dll,1 -11,,sti.dll,1 -11,,urlmon.dll,3 -11,,windowscodecs.dll,1 -11,,winhttp.dll,1 -11,,wininet.dll,2 -11,,wintrust.dll,1 -11,,wuapi.dll,1
Modified: branches/cmake-bringup/media/nls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/media/nls/CMakeLis... ============================================================================== --- branches/cmake-bringup/media/nls/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/media/nls/CMakeLists.txt [iso-8859-1] Fri Nov 5 14:33:14 2010 @@ -51,6 +51,7 @@ c_21866.nls c_28591.nls c_28592.nls + c_28593.nls c_28594.nls c_28595.nls c_28596.nls @@ -67,4 +68,4 @@
foreach(item ${NLS_FILES}) add_cab("${CMAKE_CURRENT_SOURCE_DIR}/${item}" 1 ${item}) -endforeach(item) +endforeach(item)
Modified: branches/cmake-bringup/media/vgafonts/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/media/vgafonts/CMa... ============================================================================== --- branches/cmake-bringup/media/vgafonts/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/media/vgafonts/CMakeLists.txt [iso-8859-1] Fri Nov 5 14:33:14 2010 @@ -16,4 +16,5 @@
add_custom_target(vgafonts DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab)
-add_minicd(${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab reactos vgafonts.cab) +add_minicd(${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab reactos vgafonts.cab) +add_cab(${CMAKE_CURRENT_BINARY_DIR}/vgafonts.cab 4)
Modified: branches/cmake-bringup/subsystems/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/CMakeLi... ============================================================================== --- branches/cmake-bringup/subsystems/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/CMakeLists.txt [iso-8859-1] Fri Nov 5 14:33:14 2010 @@ -1,3 +1,4 @@ - -add_subdirectory(ntvdm) +if(ARCH MATCHES i386) + add_subdirectory(ntvdm) +endif() add_subdirectory(win32)
Modified: branches/cmake-bringup/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/ntvdm/C... ============================================================================== --- branches/cmake-bringup/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Fri Nov 5 14:33:14 2010 @@ -15,3 +15,5 @@
add_importlibs(ntvdm ntdll user32 gdi32 advapi32 kernel32 msvcrt) add_dependencies(ntvdm ndk bugcodes) + +add_cab_target(ntvdm 1)