Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-31 08:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CMAKE]

Browse source 
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
This commit is contained in:
Sylvain Petreolle 2010-10-09 13:54:36 +00:00
parent 303e51c09c
commit da55a789c3
29 changed files with 54 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
CMakeLists.txt
View file

@ -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)

2
CMakeMacros.cmake
View file

@ -75,7 +75,7 @@ MACRO(CreateBootSectorTarget _target_name _asm_file _object_file)
DEPENDS native-winebuild)
set_source_files_properties(${_object_file} PROPERTIES GENERATED TRUE)
add_custom_target(${_target_name} ALL DEPENDS ${_object_file})
add_minicd(${_object_file} loader ${OBJECT_NAME})
ENDMACRO(CreateBootSectorTarget _target_name _asm_file _object_file)
else()
MACRO(CreateBootSectorTarget _target_name _asm_file _object_file)

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

@ -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)

6
boot/CMakeLists.txt
View file

@ -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)

2
dll/ntdll/CMakeLists.txt
View file

@ -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)

1
drivers/base/bootvid/CMakeLists.txt
View file

@ -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)

1
drivers/base/kdcom/CMakeLists.txt
View file

@ -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)

4
drivers/bus/acpi/CMakeLists.txt
View file

@ -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)
add_subdirectory(compbatt)

1
drivers/bus/isapnp/CMakeLists.txt
View file

@ -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)

1
drivers/bus/pci/CMakeLists.txt
View file

@ -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)

1
drivers/bus/pcmcia/CMakeLists.txt
View file

@ -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)

1
drivers/filesystems/cdfs/CMakeLists.txt
View file

@ -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)

1
drivers/filesystems/ext2/CMakeLists.txt
View file

@ -30,3 +30,4 @@ target_link_libraries(ext2fs
-lhal)
add_dependencies(ext2fs psdk bugcodes)
add_minicd_target(ext2fs reactos ext2.sys)

1
drivers/filesystems/fastfat/CMakeLists.txt
View file

@ -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)

1
drivers/input/i8042prt/CMakeLists.txt
View file

@ -21,3 +21,4 @@ target_link_libraries(i8042prt
-lhal)
add_dependencies(i8042prt psdk bugcodes)
add_minicd_target(i8042prt reactos i8042prt.sys)

1
drivers/input/kbdclass/CMakeLists.txt
View file

@ -15,3 +15,4 @@ target_link_libraries(kbdclass
-lhal)
add_dependencies(kbdclass psdk bugcodes)
add_minicd_target(kbdclass reactos kbdclass.sys)

1
drivers/setup/blue/CMakeLists.txt
View file

@ -12,3 +12,4 @@ target_link_libraries(blue
-lhal)
add_dependencies(blue psdk bugcodes)
add_minicd_target(blue reactos blue.sys)

1
drivers/storage/class/cdrom/CMakeLists.txt
View file

@ -14,3 +14,4 @@ target_link_libraries(cdrom
-lhal)
add_dependencies(cdrom psdk bugcodes)
add_minicd_target(cdrom reactos cdrom.sys)

1
drivers/storage/class/class2/CMakeLists.txt
View file

@ -16,3 +16,4 @@ target_link_libraries(class2
-lhal)
add_dependencies(class2 class2_def psdk bugcodes)
add_minicd_target(class2 reactos class2.sys)

1
drivers/storage/class/disk/CMakeLists.txt
View file

@ -14,3 +14,4 @@ target_link_libraries(disk
-lhal)
add_dependencies(disk psdk bugcodes)
add_minicd_target(disk reactos disk.sys)

1
drivers/storage/class/ramdisk/CMakeLists.txt
View file

@ -12,3 +12,4 @@ target_link_libraries(ramdisk
-lhal)
add_dependencies(ramdisk psdk bugcodes)
add_minicd_target(ramdisk reactos ramdisk.sys)

1
drivers/storage/floppy/CMakeLists.txt
View file

@ -17,3 +17,4 @@ target_link_libraries(floppy
-lhal)
add_dependencies(floppy psdk bugcodes buildno_header)
add_minicd_target(floppy reactos floppy.sys)

1
drivers/storage/ide/atapi/CMakeLists.txt
View file

@ -10,3 +10,4 @@ target_link_libraries(atapi
libcntpr)
add_dependencies(atapi psdk bugcodes)
add_minicd_target(atapi reactos atapi.sys)

1
drivers/storage/ide/uniata/CMakeLists.txt
View file

@ -23,3 +23,4 @@ target_link_libraries(uniata
-lgcc)
add_dependencies(uniata psdk bugcodes buildno_header)
add_minicd_target(uniata reactos uniata.sys)

1
drivers/storage/port/buslogic/CMakeLists.txt
View file

@ -10,3 +10,4 @@ target_link_libraries(buslogic
libcntpr)
add_dependencies(buslogic psdk bugcodes)
add_minicd_target(buslogic reactos buslogic.sys)

1
drivers/storage/scsiport/CMakeLists.txt
View file

@ -11,3 +11,4 @@ target_link_libraries(scsiport
-lhal)
add_dependencies(scsiport psdk bugcodes)
add_minicd_target(scsiport reactos scsiport.sys)

2
hal/CMakeLists.txt
View file

@ -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)

3
media/CMakeLists.txt Normal file
View file

@ -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)

2
ntoskrnl/CMakeLists.txt
View file

@ -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)