[CMAKE]

Add minicd target.
This partial bootcd target produces a minicd iso,
able to start the install process to the cabinet installation page.

svn path=/branches/cmake-bringup/; revision=49072

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dbb8c0d..c5b3046 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,12 +99,28 @@ add_subdirectory(include/dxsdk)
 add_subdirectory(include/reactos/idl)
 add_subdirectory(include/reactos/mc)
 
+#minicd target
+set(BOOTCD_DIR "${REACTOS_BINARY_DIR}/boot/bootcd")
+
+file(MAKE_DIRECTORY "${BOOTCD_DIR}")
+file(MAKE_DIRECTORY "${BOOTCD_DIR}/loader")
+file(MAKE_DIRECTORY "${BOOTCD_DIR}/reactos")
+file(MAKE_DIRECTORY "${BOOTCD_DIR}/reactos/system32")
+
+add_custom_command(
+    OUTPUT ${REACTOS_BINARY_DIR}/minicd.iso
+    COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/boot/freeldr/bootsect/isoboot.bin ${BOOTCD_DIR} REACTOS ${REACTOS_BINARY_DIR}/minicd.iso
+    DEPENDS native-cdmake)
+add_custom_target(minicd DEPENDS ${REACTOS_BINARY_DIR}/minicd.iso)
+add_minicd(${REACTOS_SOURCE_DIR}/boot/bootdata/bootcd.ini "" freeldr.ini)
+
 add_subdirectory(base)
 add_subdirectory(boot)
 add_subdirectory(dll)
 add_subdirectory(drivers)
 add_subdirectory(hal)
 add_subdirectory(lib)
+add_subdirectory(media)
 add_subdirectory(ntoskrnl)
 add_subdirectory(subsystems)
 

diff --git a/CMakeMacros.cmake b/CMakeMacros.cmake
index bc73fee..5c0ce53 100644 (file)
--- a/CMakeMacros.cmake
+++ b/CMakeMacros.cmake
@@ -75,7 +75,7 @@ MACRO(CreateBootSectorTarget _target_name _asm_file _object_file)
         DEPENDS native-winebuild)\r
     set_source_files_properties(${_object_file} PROPERTIES GENERATED TRUE)\r
     add_custom_target(${_target_name} ALL DEPENDS ${_object_file})\r
-\r
+    add_minicd(${_object_file} loader ${OBJECT_NAME})\r
 ENDMACRO(CreateBootSectorTarget _target_name _asm_file _object_file)\r
 else()\r
 MACRO(CreateBootSectorTarget _target_name _asm_file _object_file)\r

diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt
index d7d203d..5221811 100644 (file)
--- a/base/setup/usetup/CMakeLists.txt
+++ b/base/setup/usetup/CMakeLists.txt
@@ -39,3 +39,4 @@ target_link_libraries(usetup
 
 set_module_type(usetup nativecui)
 add_importlibs(usetup kernel32 ntdll)
+add_minicd_target(usetup reactos/system32 smss.exe)

diff --git a/boot/CMakeLists.txt b/boot/CMakeLists.txt
index 6f1fc90..5d5cf35 100644 (file)
--- a/boot/CMakeLists.txt
+++ b/boot/CMakeLists.txt
@@ -193,7 +193,7 @@ list(APPEND SETUPLDR_SOURCE
 
 add_library(setupldr SHARED ${SETUPLDR_SOURCE})
 
-set_target_properties(setupldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,-entry,_mainCRTStartup -Wl,--image-base,0x8000 -Wl,--exclude-all-symbols -Wl,--subsystem,native -Wl,--file-alignment,0x1000" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP")
+set_target_properties(setupldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,-entry,_mainCRTStartup -Wl,--image-base,0x8000 -Wl,--exclude-all-symbols -Wl,--subsystem,native -Wl,--file-alignment,0x1000 -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP")
 
 if(ARCH MATCHES i386)
 target_link_libraries(setupldr mini_hal)
@@ -205,3 +205,7 @@ target_link_libraries(setupldr
     cmlib
     rtl
     libcntpr)
+
+add_minicd_target(setupldr loader setupldr.sys)
+add_minicd_target(freeldr loader freeldr.sys)
+add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/txtsetup.sif reactos txtsetup.sif)
\ No newline at end of file

diff --git a/dll/ntdll/CMakeLists.txt b/dll/ntdll/CMakeLists.txt
index 93ba22c..50fb984 100644 (file)
--- a/dll/ntdll/CMakeLists.txt
+++ b/dll/ntdll/CMakeLists.txt
@@ -44,3 +44,5 @@ target_link_libraries(ntdll ${CMAKE_CURRENT_SOURCE_DIR}/def/ntdll.def
                       
 add_pch(ntdll ${CMAKE_CURRENT_SOURCE_DIR}/include/ntdll.h ${SOURCE})
 add_dependencies(ntdll ntstatus version)
+
+add_minicd_target(ntdll reactos/system32 ntdll.dll)
\ No newline at end of file

diff --git a/drivers/base/bootvid/CMakeLists.txt b/drivers/base/bootvid/CMakeLists.txt
index cce397f..1660df8 100644 (file)
--- a/drivers/base/bootvid/CMakeLists.txt
+++ b/drivers/base/bootvid/CMakeLists.txt
@@ -27,3 +27,4 @@ target_link_libraries(bootvid
 
 add_pch(bootvid ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_dependencies(bootvid bootvid_def psdk buildno_header bugcodes)
+add_minicd_target(bootvid reactos bootvid.dll)
\ No newline at end of file

diff --git a/drivers/base/kdcom/CMakeLists.txt b/drivers/base/kdcom/CMakeLists.txt
index b133ccb..d29f2cb 100644 (file)
--- a/drivers/base/kdcom/CMakeLists.txt
+++ b/drivers/base/kdcom/CMakeLists.txt
@@ -21,3 +21,4 @@ target_link_libraries(kdcom
     -lhal)
 
 add_dependencies(kdcom kdcom_def psdk buildno_header bugcodes)
+add_minicd_target(kdcom reactos kdcom.dll)
\ No newline at end of file

diff --git a/drivers/bus/acpi/CMakeLists.txt b/drivers/bus/acpi/CMakeLists.txt
index 588b8aa..3152764 100644 (file)
--- a/drivers/bus/acpi/CMakeLists.txt
+++ b/drivers/bus/acpi/CMakeLists.txt
@@ -146,5 +146,7 @@ target_link_libraries(acpi
 add_importlibs(acpi ntoskrnl hal)
 add_dependencies(acpi psdk bugcodes)
 
+add_minicd_target(acpi reactos acpi.sys)
+
 add_subdirectory(cmbatt)
-add_subdirectory(compbatt)
\ No newline at end of file
+add_subdirectory(compbatt)

diff --git a/drivers/bus/isapnp/CMakeLists.txt b/drivers/bus/isapnp/CMakeLists.txt
index b563165..e870c92 100644 (file)
--- a/drivers/bus/isapnp/CMakeLists.txt
+++ b/drivers/bus/isapnp/CMakeLists.txt
@@ -10,3 +10,4 @@ set_target_properties(isapnp PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -W
 
 add_importlibs(isapnp ntoskrnl hal)
 add_dependencies(isapnp psdk bugcodes buildno_header)
+add_minicd_target(isapnp reactos isapnp.sys)

diff --git a/drivers/bus/pci/CMakeLists.txt b/drivers/bus/pci/CMakeLists.txt
index c9b0444..4347832 100644 (file)
--- a/drivers/bus/pci/CMakeLists.txt
+++ b/drivers/bus/pci/CMakeLists.txt
@@ -9,3 +9,4 @@ set_target_properties(pci PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,-
 
 add_importlibs(pci ntoskrnl hal)
 add_dependencies(pci psdk bugcodes buildno_header)
+add_minicd_target(pci reactos pci.sys)
\ No newline at end of file

diff --git a/drivers/bus/pcmcia/CMakeLists.txt b/drivers/bus/pcmcia/CMakeLists.txt
index b3c52c0..033438d 100644 (file)
--- a/drivers/bus/pcmcia/CMakeLists.txt
+++ b/drivers/bus/pcmcia/CMakeLists.txt
@@ -9,3 +9,4 @@ set_target_properties(pcmcia PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -W
 
 add_importlibs(pcmcia ntoskrnl hal)
 add_dependencies(pcmcia psdk bugcodes buildno_header)
+add_minicd_target(pcmcia reactos pcmcia.sys)
\ No newline at end of file

diff --git a/drivers/filesystems/cdfs/CMakeLists.txt b/drivers/filesystems/cdfs/CMakeLists.txt
index f5dd7eb..bcaa45f 100644 (file)
--- a/drivers/filesystems/cdfs/CMakeLists.txt
+++ b/drivers/filesystems/cdfs/CMakeLists.txt
@@ -29,3 +29,4 @@ target_link_libraries(cdfs
 
 add_pch(cdfs ${CMAKE_CURRENT_SOURCE_DIR}/cdfs.h ${SOURCE})
 add_dependencies(cdfs psdk bugcodes)
+add_minicd_target(cdfs reactos cdfs.sys)
\ No newline at end of file

diff --git a/drivers/filesystems/ext2/CMakeLists.txt b/drivers/filesystems/ext2/CMakeLists.txt
index 8dc54b3..ddc6e29 100644 (file)
--- a/drivers/filesystems/ext2/CMakeLists.txt
+++ b/drivers/filesystems/ext2/CMakeLists.txt
@@ -30,3 +30,4 @@ target_link_libraries(ext2fs
     -lhal)
 
 add_dependencies(ext2fs psdk bugcodes)
+add_minicd_target(ext2fs reactos ext2.sys)
\ No newline at end of file

diff --git a/drivers/filesystems/fastfat/CMakeLists.txt b/drivers/filesystems/fastfat/CMakeLists.txt
index 681069b..e938fbb 100644 (file)
--- a/drivers/filesystems/fastfat/CMakeLists.txt
+++ b/drivers/filesystems/fastfat/CMakeLists.txt
@@ -35,3 +35,4 @@ target_link_libraries(fastfat
 
 add_pch(fastfat ${CMAKE_CURRENT_SOURCE_DIR}/vfat.h ${SOURCE})
 add_dependencies(fastfat psdk bugcodes)
+add_minicd_target(fastfat reactos fastfat.sys)
\ No newline at end of file

diff --git a/drivers/input/i8042prt/CMakeLists.txt b/drivers/input/i8042prt/CMakeLists.txt
index 24b6eb3..8ce4db4 100644 (file)
--- a/drivers/input/i8042prt/CMakeLists.txt
+++ b/drivers/input/i8042prt/CMakeLists.txt
@@ -21,3 +21,4 @@ target_link_libraries(i8042prt
     -lhal)
 
 add_dependencies(i8042prt psdk bugcodes)
+add_minicd_target(i8042prt reactos i8042prt.sys)
\ No newline at end of file

diff --git a/drivers/input/kbdclass/CMakeLists.txt b/drivers/input/kbdclass/CMakeLists.txt
index 39784b7..b8e0bc8 100644 (file)
--- a/drivers/input/kbdclass/CMakeLists.txt
+++ b/drivers/input/kbdclass/CMakeLists.txt
@@ -15,3 +15,4 @@ target_link_libraries(kbdclass
     -lhal)
 
 add_dependencies(kbdclass psdk bugcodes)
+add_minicd_target(kbdclass reactos kbdclass.sys)
\ No newline at end of file

diff --git a/drivers/setup/blue/CMakeLists.txt b/drivers/setup/blue/CMakeLists.txt
index 7c87c6d..11f971e 100644 (file)
--- a/drivers/setup/blue/CMakeLists.txt
+++ b/drivers/setup/blue/CMakeLists.txt
@@ -12,3 +12,4 @@ target_link_libraries(blue
     -lhal)
 
 add_dependencies(blue psdk bugcodes)
+add_minicd_target(blue reactos blue.sys)
\ No newline at end of file

diff --git a/drivers/storage/class/cdrom/CMakeLists.txt b/drivers/storage/class/cdrom/CMakeLists.txt
index cfc645a..ad65873 100644 (file)
--- a/drivers/storage/class/cdrom/CMakeLists.txt
+++ b/drivers/storage/class/cdrom/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(cdrom
     -lhal)
 
 add_dependencies(cdrom psdk bugcodes)
+add_minicd_target(cdrom reactos cdrom.sys)
\ No newline at end of file

diff --git a/drivers/storage/class/class2/CMakeLists.txt b/drivers/storage/class/class2/CMakeLists.txt
index 85ed6c8..3e4ed5b 100644 (file)
--- a/drivers/storage/class/class2/CMakeLists.txt
+++ b/drivers/storage/class/class2/CMakeLists.txt
@@ -16,3 +16,4 @@ target_link_libraries(class2
     -lhal)
 
 add_dependencies(class2 class2_def psdk bugcodes)
+add_minicd_target(class2 reactos class2.sys)
\ No newline at end of file

diff --git a/drivers/storage/class/disk/CMakeLists.txt b/drivers/storage/class/disk/CMakeLists.txt
index 5c588c9..b1785fc 100644 (file)
--- a/drivers/storage/class/disk/CMakeLists.txt
+++ b/drivers/storage/class/disk/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(disk
     -lhal)
 
 add_dependencies(disk psdk bugcodes)
+add_minicd_target(disk reactos disk.sys)
\ No newline at end of file

diff --git a/drivers/storage/class/ramdisk/CMakeLists.txt b/drivers/storage/class/ramdisk/CMakeLists.txt
index ea5bc47..cbe10dd 100644 (file)
--- a/drivers/storage/class/ramdisk/CMakeLists.txt
+++ b/drivers/storage/class/ramdisk/CMakeLists.txt
@@ -12,3 +12,4 @@ target_link_libraries(ramdisk
     -lhal)
 
 add_dependencies(ramdisk psdk bugcodes)
+add_minicd_target(ramdisk reactos ramdisk.sys)
\ No newline at end of file

diff --git a/drivers/storage/floppy/CMakeLists.txt b/drivers/storage/floppy/CMakeLists.txt
index df6b951..ec615d7 100644 (file)
--- a/drivers/storage/floppy/CMakeLists.txt
+++ b/drivers/storage/floppy/CMakeLists.txt
@@ -17,3 +17,4 @@ target_link_libraries(floppy
     -lhal)
 
 add_dependencies(floppy psdk bugcodes buildno_header)
+add_minicd_target(floppy reactos floppy.sys)
\ No newline at end of file

diff --git a/drivers/storage/ide/atapi/CMakeLists.txt b/drivers/storage/ide/atapi/CMakeLists.txt
index de8dec7..1d1eb84 100644 (file)
--- a/drivers/storage/ide/atapi/CMakeLists.txt
+++ b/drivers/storage/ide/atapi/CMakeLists.txt
@@ -10,3 +10,4 @@ target_link_libraries(atapi
     libcntpr)
 
 add_dependencies(atapi psdk bugcodes)
+add_minicd_target(atapi reactos atapi.sys)
\ No newline at end of file

diff --git a/drivers/storage/ide/uniata/CMakeLists.txt b/drivers/storage/ide/uniata/CMakeLists.txt
index 8478af4..c02f423 100644 (file)
--- a/drivers/storage/ide/uniata/CMakeLists.txt
+++ b/drivers/storage/ide/uniata/CMakeLists.txt
@@ -23,3 +23,4 @@ target_link_libraries(uniata
     -lgcc)
 
 add_dependencies(uniata psdk bugcodes buildno_header)
+add_minicd_target(uniata reactos uniata.sys)
\ No newline at end of file

diff --git a/drivers/storage/port/buslogic/CMakeLists.txt b/drivers/storage/port/buslogic/CMakeLists.txt
index 8203570..b043bdf 100644 (file)
--- a/drivers/storage/port/buslogic/CMakeLists.txt
+++ b/drivers/storage/port/buslogic/CMakeLists.txt
@@ -10,3 +10,4 @@ target_link_libraries(buslogic
     libcntpr)
 
 add_dependencies(buslogic psdk bugcodes)
+add_minicd_target(buslogic reactos buslogic.sys)
\ No newline at end of file

diff --git a/drivers/storage/scsiport/CMakeLists.txt b/drivers/storage/scsiport/CMakeLists.txt
index 270b583..4f58e9b 100644 (file)
--- a/drivers/storage/scsiport/CMakeLists.txt
+++ b/drivers/storage/scsiport/CMakeLists.txt
@@ -11,3 +11,4 @@ target_link_libraries(scsiport
     -lhal)
 
 add_dependencies(scsiport psdk bugcodes)
+add_minicd_target(scsiport reactos scsiport.sys)
\ No newline at end of file

diff --git a/hal/CMakeLists.txt b/hal/CMakeLists.txt
index 85a1695..4f8bac4 100644 (file)
--- a/hal/CMakeLists.txt
+++ b/hal/CMakeLists.txt
@@ -98,7 +98,7 @@ endif(ARCH MATCHES i386)
 add_library(mini_hal ${MINI_HAL_SOURCE})
 set_property(TARGET mini_hal PROPERTY COMPILE_DEFINITIONS "_BLDR_;_MINIHAL_")
 add_dependencies(mini_hal psdk bugcodes)
-
+add_minicd_target(hal reactos hal.dll)
 else()
 #TBD
 endif(ARCH MATCHES i386)
\ No newline at end of file

diff --git a/media/CMakeLists.txt b/media/CMakeLists.txt
new file mode 100644 (file)
index 0000000..54c546e
--- /dev/null
+++ b/media/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/nls/l_intl.nls reactos l_intl.nls)
+add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/nls/c_437.nls reactos c_437.nls)
+add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/nls/c_1252.nls reactos c_1252.nls)
\ No newline at end of file

diff --git a/ntoskrnl/CMakeLists.txt b/ntoskrnl/CMakeLists.txt
index 1dcc281..9b66c72 100644 (file)
--- a/ntoskrnl/CMakeLists.txt
+++ b/ntoskrnl/CMakeLists.txt
@@ -424,3 +424,5 @@ target_link_libraries(ntoskrnl
 add_pch(ntoskrnl ${CMAKE_CURRENT_SOURCE_DIR}/include/ntoskrnl.h ${SOURCE})
 set_source_files_properties(${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S PROPERTIES GENERATED TRUE)
 add_dependencies(ntoskrnl psdk bugcodes kernel_zw kernel_napi)
+
+add_minicd_target(ntoskrnl reactos ntoskrnl.exe)
\ No newline at end of file