Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 17:42:58 +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")
file(MAKE_DIRECTORY "${BOOTCD_DIR}/reactos/system32") file(MAKE_DIRECTORY "${BOOTCD_DIR}/reactos/system32")
add_custom_command( add_custom_target(minicd
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 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) 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_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 #livecd target
set(LIVECD_DIR "${REACTOS_BINARY_DIR}/boot/livecd") 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")
file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/system32/config") file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/system32/config")
add_custom_command( add_custom_target(livecd
OUTPUT ${REACTOS_BINARY_DIR}/livecd.iso
COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/boot/freeldr/bootsect/isoboot.bin ${LIVECD_DIR} REACTOS ${REACTOS_BINARY_DIR}/livecd.iso 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) DEPENDS native-cdmake)
add_custom_target(livecd DEPENDS ${REACTOS_BINARY_DIR}/livecd.iso)
add_livecd(${REACTOS_SOURCE_DIR}/boot/bootdata/livecd.ini "" freeldr.ini) 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) include(baseaddress.cmake)

222
CMakeMacros.cmake
View file

@ -125,23 +125,19 @@ MACRO(add_minicd_target _targetname _dir) # optional parameter: _nameoncd
set(_nameoncd ${ARGN}) set(_nameoncd ${ARGN})
endif() endif()
add_custom_command( add_custom_target(${_targetname}_minicd
OUTPUT ${BOOTCD_DIR}/${_dir}/${_nameoncd} COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${BOOTCD_DIR}/${_dir}/${_nameoncd}
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) add_dependencies(minicd ${_targetname}_minicd)
ENDMACRO(add_minicd_target _targetname _dir _nameoncd) ENDMACRO(add_minicd_target)
MACRO(add_minicd FILENAME _dir _nameoncd) MACRO(add_minicd FILENAME _dir _nameoncd)
add_custom_command( add_custom_target(${_nameoncd}_minicd
OUTPUT ${BOOTCD_DIR}/${_dir}/${_nameoncd} COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${BOOTCD_DIR}/${_dir}/${_nameoncd}
DEPENDS ${FILENAME} DEPENDS ${FILENAME})
COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${BOOTCD_DIR}/${_dir}/${_nameoncd}) set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${BOOTCD_DIR}/${_dir}/${_nameoncd})
add_custom_target(${_nameoncd}_minicd DEPENDS ${BOOTCD_DIR}/${_dir}/${_nameoncd})
add_dependencies(minicd ${_nameoncd}_minicd) add_dependencies(minicd ${_nameoncd}_minicd)
ENDMACRO(add_minicd) ENDMACRO(add_minicd)
@ -150,112 +146,108 @@ macro(set_cpp)
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/lib/3rdparty/stlport/stlport) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/lib/3rdparty/stlport/stlport)
set(IS_CPP 1) set(IS_CPP 1)
endmacro() endmacro()
MACRO(add_livecd_target _targetname _dir )# optional parameter : _nameoncd MACRO(add_livecd_target _targetname _dir )# optional parameter : _nameoncd
get_target_property(FILENAME ${_targetname} LOCATION) get_target_property(FILENAME ${_targetname} LOCATION)
if("${ARGN}" STREQUAL "") if("${ARGN}" STREQUAL "")
get_filename_component(_nameoncd ${FILENAME} NAME) get_filename_component(_nameoncd ${FILENAME} NAME)
else() else()
set(_nameoncd ${ARGN}) set(_nameoncd ${ARGN})
endif() endif()
add_custom_command( add_custom_target(${_targetname}_livecd
OUTPUT ${LIVECD_DIR}/${_dir}/${_nameoncd} COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${LIVECD_DIR}/${_dir}/${_nameoncd}
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(livecd ${_targetname}_livecd)
add_dependencies(${_targetname}_livecd ${_targetname}) ENDMACRO(add_livecd_target)
add_dependencies(livecd ${_targetname}_livecd)
ENDMACRO(add_livecd_target _targetname _dir _nameoncd) MACRO(add_livecd FILENAME _dir _nameoncd)
add_custom_target(${_nameoncd}_livecd
MACRO(add_livecd FILENAME _dir _nameoncd) COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${LIVECD_DIR}/${_dir}/${_nameoncd}
add_custom_command( DEPENDS ${FILENAME})
OUTPUT ${LIVECD_DIR}/${_dir}/${_nameoncd} set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${LIVECD_DIR}/${_dir}/${_nameoncd})
DEPENDS ${FILENAME}
COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${LIVECD_DIR}/${_dir}/${_nameoncd}) add_dependencies(livecd ${_nameoncd}_livecd)
ENDMACRO(add_livecd)
add_custom_target(${_nameoncd}_livecd DEPENDS ${LIVECD_DIR}/${_dir}/${_nameoncd})
macro(custom_incdefs)
add_dependencies(livecd ${_nameoncd}_livecd) if(NOT DEFINED result_incs) #rpc_defines
ENDMACRO(add_livecd) get_directory_property(rpc_defines COMPILE_DEFINITIONS)
get_directory_property(rpc_includes INCLUDE_DIRECTORIES)
macro(custom_incdefs)
if(NOT DEFINED result_incs) #rpc_defines foreach(arg ${rpc_defines})
get_directory_property(rpc_defines COMPILE_DEFINITIONS) set(result_defs ${result_defs} -D${arg})
get_directory_property(rpc_includes INCLUDE_DIRECTORIES) endforeach(arg ${defines})
foreach(arg ${rpc_defines}) foreach(arg ${rpc_includes})
set(result_defs ${result_defs} -D${arg}) set(result_incs -I${arg} ${result_incs})
endforeach(arg ${defines}) endforeach(arg ${includes})
endif()
foreach(arg ${rpc_includes}) endmacro(custom_incdefs)
set(result_incs -I${arg} ${result_incs})
endforeach(arg ${includes}) macro(rpcproxy TARGET)
endif() custom_incdefs()
endmacro(custom_incdefs) list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c)
macro(rpcproxy TARGET) foreach(_in_FILE ${ARGN})
custom_incdefs() get_filename_component(FILE ${_in_FILE} NAME_WE)
list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c) add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c
foreach(_in_FILE ${ARGN}) COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 -h -H ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.h -p -P ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl
get_filename_component(FILE ${_in_FILE} NAME_WE) DEPENDS native-widl)
add_custom_command( set_source_files_properties(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c
COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 -h -H ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.h -p -P ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl PROPERTIES GENERATED TRUE)
DEPENDS native-widl) list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c)
set_source_files_properties( list(APPEND IDLS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl)
${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c list(APPEND PROXY_DEPENDS ${TARGET}_${FILE}_p)
PROPERTIES GENERATED TRUE) add_custom_target(${TARGET}_${FILE}_p
list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c) DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c)
list(APPEND IDLS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl) #add_dependencies(${TARGET}_proxy ${TARGET}_${FILE}_p)
list(APPEND PROXY_DEPENDS ${TARGET}_${FILE}_p) endforeach(_in_FILE ${ARGN})
add_custom_target(${TARGET}_${FILE}_p
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c) add_custom_command(
#add_dependencies(${TARGET}_proxy ${TARGET}_${FILE}_p) OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c
endforeach(_in_FILE ${ARGN}) COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 --dlldata-only --dlldata=${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c ${IDLS}
DEPENDS native-widl)
add_custom_command( set_source_files_properties(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c
COMMAND native-widl ${result_incs} ${result_defs} -m32 --win32 --dlldata-only --dlldata=${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c ${IDLS} PROPERTIES GENERATED TRUE)
DEPENDS native-widl)
set_source_files_properties( add_library(${TARGET}_proxy ${SOURCE})
${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c add_dependencies(${TARGET}_proxy psdk ${PROXY_DEPENDS})
PROPERTIES GENERATED TRUE) endmacro(rpcproxy)
add_library(${TARGET}_proxy ${SOURCE}) macro (MACRO_IDL_FILES)
add_dependencies(${TARGET}_proxy psdk ${PROXY_DEPENDS}) custom_incdefs()
endmacro(rpcproxy) foreach(_in_FILE ${ARGN})
get_filename_component(FILE ${_in_FILE} NAME_WE)
macro (MACRO_IDL_FILES) add_custom_command(
custom_incdefs() OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c
foreach(_in_FILE ${ARGN})
get_filename_component(FILE ${_in_FILE} NAME_WE)
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c
COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} ${IDL_FLAGS} ${IDL_HEADER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${IDL_SERVER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} ${IDL_FLAGS} ${IDL_HEADER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${IDL_SERVER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl
DEPENDS ${_in_file}) DEPENDS ${_in_file})
set_source_files_properties( set_source_files_properties(
${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c
PROPERTIES GENERATED TRUE) PROPERTIES GENERATED TRUE)
add_library(${FILE}_server ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c) add_library(${FILE}_server ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_s.c)
add_dependencies(${FILE}_server psdk) add_dependencies(${FILE}_server psdk)
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c
COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} ${IDL_FLAGS} ${IDL_HEADER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${IDL_CLIENT_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} ${IDL_FLAGS} ${IDL_HEADER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${IDL_CLIENT_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.idl
DEPENDS ${_in_file}) DEPENDS ${_in_file})
set_source_files_properties( set_source_files_properties(
${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.h ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c
PROPERTIES GENERATED TRUE) PROPERTIES GENERATED TRUE)
add_library(${FILE}_client ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c) add_library(${FILE}_client ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c)
add_dependencies(${FILE}_client psdk) add_dependencies(${FILE}_client psdk)
endforeach(_in_FILE ${ARGN}) endforeach(_in_FILE ${ARGN})
endmacro (MACRO_IDL_FILES) endmacro (MACRO_IDL_FILES)
macro(ADD_TYPELIB TARGET) macro(ADD_TYPELIB TARGET)
custom_incdefs() custom_incdefs()