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

[CMAKE]

Browse source 
Improve minicd and livecd macros.
Files and iso images are updated/cleaned without any manual steps.

svn path=/branches/cmake-bringup/; revision=49306
This commit is contained in:
Sylvain Petreolle 2010-10-27 14:06:40 +00:00
parent ef1e9cefa1
commit 5644ab604d
2 changed files with 112 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

11
CMakeLists.txt
View file

@ -108,12 +108,12 @@ 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
add_custom_target(minicd
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)
set_directory_properties(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${REACTOS_BINARY_DIR}/minicd.iso)
#livecd target
set(LIVECD_DIR "${REACTOS_BINARY_DIR}/boot/livecd")
@ -132,12 +132,11 @@ file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/fonts")
file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/system32")
file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/system32/config")
add_custom_command(
OUTPUT ${REACTOS_BINARY_DIR}/livecd.iso
add_custom_target(livecd
COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/boot/freeldr/bootsect/isoboot.bin ${LIVECD_DIR} REACTOS ${REACTOS_BINARY_DIR}/livecd.iso
DEPENDS native-cdmake)
add_custom_target(livecd DEPENDS ${REACTOS_BINARY_DIR}/livecd.iso)
add_livecd(${REACTOS_SOURCE_DIR}/boot/bootdata/livecd.ini "" freeldr.ini)
set_directory_properties(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${REACTOS_BINARY_DIR}/livecd.iso)
include(baseaddress.cmake)

44
CMakeMacros.cmake
View file

@ -125,23 +125,19 @@ MACRO(add_minicd_target _targetname _dir) # optional parameter: _nameoncd
set(_nameoncd ${ARGN})
endif()
add_custom_command(
OUTPUT ${BOOTCD_DIR}/${_dir}/${_nameoncd}
COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${BOOTCD_DIR}/${_dir}/${_nameoncd})
add_custom_target(${_targetname}_minicd
COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${BOOTCD_DIR}/${_dir}/${_nameoncd}
DEPENDS ${_targetname})
set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${BOOTCD_DIR}/${_dir}/${_nameoncd})
add_custom_target(${_targetname}_minicd DEPENDS ${BOOTCD_DIR}/${_dir}/${_nameoncd})
add_dependencies(${_targetname}_minicd ${_targetname})
add_dependencies(minicd ${_targetname}_minicd)
ENDMACRO(add_minicd_target _targetname _dir _nameoncd)
ENDMACRO(add_minicd_target)
MACRO(add_minicd FILENAME _dir _nameoncd)
add_custom_command(
OUTPUT ${BOOTCD_DIR}/${_dir}/${_nameoncd}
DEPENDS ${FILENAME}
COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${BOOTCD_DIR}/${_dir}/${_nameoncd})
add_custom_target(${_nameoncd}_minicd DEPENDS ${BOOTCD_DIR}/${_dir}/${_nameoncd})
add_custom_target(${_nameoncd}_minicd
COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${BOOTCD_DIR}/${_dir}/${_nameoncd}
DEPENDS ${FILENAME})
set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${BOOTCD_DIR}/${_dir}/${_nameoncd})
add_dependencies(minicd ${_nameoncd}_minicd)
ENDMACRO(add_minicd)
@ -161,23 +157,19 @@ MACRO(add_livecd_target _targetname _dir )# optional parameter : _nameoncd
set(_nameoncd ${ARGN})
endif()
add_custom_command(
OUTPUT ${LIVECD_DIR}/${_dir}/${_nameoncd}
COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${LIVECD_DIR}/${_dir}/${_nameoncd})
add_custom_target(${_targetname}_livecd
COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${LIVECD_DIR}/${_dir}/${_nameoncd}
DEPENDS ${_targetname})
set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${LIVECD_DIR}/${_dir}/${_nameoncd})
add_custom_target(${_targetname}_livecd DEPENDS ${LIVECD_DIR}/${_dir}/${_nameoncd})
add_dependencies(${_targetname}_livecd ${_targetname})
add_dependencies(livecd ${_targetname}_livecd)
ENDMACRO(add_livecd_target _targetname _dir _nameoncd)
ENDMACRO(add_livecd_target)
MACRO(add_livecd FILENAME _dir _nameoncd)
add_custom_command(
OUTPUT ${LIVECD_DIR}/${_dir}/${_nameoncd}
DEPENDS ${FILENAME}
COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${LIVECD_DIR}/${_dir}/${_nameoncd})
add_custom_target(${_nameoncd}_livecd DEPENDS ${LIVECD_DIR}/${_dir}/${_nameoncd})
add_custom_target(${_nameoncd}_livecd
COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${LIVECD_DIR}/${_dir}/${_nameoncd}
DEPENDS ${FILENAME})
set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${LIVECD_DIR}/${_dir}/${_nameoncd})
add_dependencies(livecd ${_nameoncd}_livecd)
ENDMACRO(add_livecd)