[CMAKE]

- add macros add_cab and add_cab_target to add files to reactos.dff
  - add bootcd target
  - make use of these macros to create bootcd and livecd
Bootcd works and install things, but 2nd stage fails booting. We need debug symbols!!!

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

CMakeLists.txt

@@ -47,6 +47,18 @@ endif()
 
 else()
 
+#Some cleanup
+file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_livecd.txt)
+file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_livecd_target.txt)
+file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt)
+file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt)
+file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_cab.txt)
+file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_cab_target.txt)
+
+#Some useful variables
+set(LIVECD_DIR "${REACTOS_BINARY_DIR}/boot/livecd")
+set(BOOTCD_DIR "${REACTOS_BINARY_DIR}/boot/bootcd")
+
 # Activate support for assembly source files
 enable_language(ASM)
 
@@ -100,44 +112,6 @@ add_subdirectory(include/reactos/idl)
 add_subdirectory(include/reactos/wine)
 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_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_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")
-
-file(MAKE_DIRECTORY "${LIVECD_DIR}")
-file(MAKE_DIRECTORY "${LIVECD_DIR}/loader")
-file(MAKE_DIRECTORY "${LIVECD_DIR}/Profiles")
-file(MAKE_DIRECTORY "${LIVECD_DIR}/Profiles/All Users")
-file(MAKE_DIRECTORY "${LIVECD_DIR}/Profiles/All Users/Desktop")
-file(MAKE_DIRECTORY "${LIVECD_DIR}/Profiles/Default User")
-file(MAKE_DIRECTORY "${LIVECD_DIR}/Profiles/Default User/Desktop")
-file(MAKE_DIRECTORY "${LIVECD_DIR}/Profiles/Default User/My Documents")
-file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos")
-file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/inf")
-file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/fonts")
-file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/system32")
-file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/system32/config")
-
-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_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)
 
 add_subdirectory(base)
@@ -207,5 +181,8 @@ add_custom_command(
 
 add_custom_target(gendib_generated ALL DEPENDS ${OUTPUT_FILES})
 
+#bootcd and livecd
+include(ros_cd.cmake)
+
 endif()
 

CMakeMacros.cmake

@@ -117,62 +117,86 @@ MACRO(ADD_INTERFACE_DEFINITIONS TARGET)
 ENDMACRO()
 
 MACRO(add_minicd_target _targetname _dir) # optional parameter: _nameoncd
-    get_target_property(FILENAME ${_targetname} LOCATION)
+    if("${ARGN}" STREQUAL "")
-
+        get_target_property(FILENAME ${_targetname} LOCATION)
-    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()
+    
-
+    file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt "${_targetname}\t${_dir}\t${_nameoncd}\n")
-    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_dependencies(minicd ${_targetname}_minicd)
 ENDMACRO(add_minicd_target)
 
 MACRO(add_minicd FILENAME _dir _nameoncd)
-    add_custom_target(${_nameoncd}_minicd
+    file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt "${FILENAME}\t${_dir}\t${_nameoncd}\n")
-        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)
 
 macro(set_cpp)
   include_directories(BEFORE ${REACTOS_SOURCE_DIR}/lib/3rdparty/stlport/stlport)
   set(IS_CPP 1)
 endmacro()
-
+
 MACRO(add_livecd_target _targetname _dir )# optional parameter : _nameoncd
-    
+    if("${ARGN}" STREQUAL "")
-    get_target_property(FILENAME ${_targetname} LOCATION)
+        get_target_property(FILENAME ${_targetname} LOCATION)
-
-    if("${ARGN}" STREQUAL "")
     	get_filename_component(_nameoncd ${FILENAME} NAME)
     else()
     	set(_nameoncd ${ARGN})
-    endif()
+    endif()
-
+    
-    add_custom_target(${_targetname}_livecd 
+    file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_livecd_target.txt "${_targetname}\t${_dir}\t${_nameoncd}\n")
-        COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${LIVECD_DIR}/${_dir}/${_nameoncd}
+ENDMACRO(add_livecd_target)
-        DEPENDS ${_targetname})
+
-    set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${LIVECD_DIR}/${_dir}/${_nameoncd})
+MACRO(add_livecd FILENAME _dir)# optional parameter : _nameoncd
-
+    if("${ARGN}" STREQUAL "")
-    add_dependencies(livecd ${_targetname}_livecd)
+    	get_filename_component(_nameoncd ${FILENAME} NAME)
-ENDMACRO(add_livecd_target)
+    else()
-
+    	set(_nameoncd ${ARGN})
-MACRO(add_livecd FILENAME _dir _nameoncd)
+    endif()
-    add_custom_target(${_nameoncd}_livecd
+    file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_livecd.txt "${FILENAME}\t${_dir}\t${_nameoncd}\n")
-        COMMAND ${CMAKE_COMMAND} -E copy ${FILENAME} ${LIVECD_DIR}/${_dir}/${_nameoncd}
+ENDMACRO(add_livecd)
-        DEPENDS ${FILENAME})
+
-    set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${LIVECD_DIR}/${_dir}/${_nameoncd})
+macro(cab_to_dir _dir_num _var_name)
-
+#   1 = system32
-    add_dependencies(livecd ${_nameoncd}_livecd)
+#   2 = system32\drivers
-ENDMACRO(add_livecd)
+#   3 = Fonts
+#   4 =
+#   5 = system32\drivers\etc
+#   6 = inf
+#   7 = bin
+#   8 = media
+    if(${_dir_num} STREQUAL "1")
+        set(${_var_name} "reactos/system32")
+    elseif(${_dir_num} STREQUAL "2")
+        set(${_var_name} "reactos/system32/drivers")
+    elseif(${_dir_num} STREQUAL "3")
+        set(${_var_name} "reactos/fonts")
+    elseif(${_dir_num} STREQUAL "4")
+        set(${_var_name} "reactos")
+    elseif(${_dir_num} STREQUAL "5")
+        set(${_var_name} "reactos/system32/drivers/etc")
+    elseif(${_dir_num} STREQUAL "6")
+        set(${_var_name} "reactos/inf")
+    elseif(${_dir_num} STREQUAL "7")
+        set(${_var_name} "reactos/bin")
+    elseif(${_dir_num} STREQUAL "8")
+        set(${_var_name} "reactos/system32/drivers")
+    else()
+        message(FATAL_ERROR "Wrong directory ${_dir_num}")
+    endif()
+endmacro()
+
+MACRO(add_cab_target _targetname _num )
+    file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_cab_target.txt "${_targetname}\t${_num}\n")
+    cab_to_dir(${_num} _dir)
+    add_livecd_target(${_targetname} ${_dir})
+ENDMACRO(add_cab_target)
+
+MACRO(add_cab FILENAME _num)
+    file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_cab.txt "${FILENAME}\t${_num}\n")
+    cab_to_dir(${_num} _dir)
+    add_livecd(${FILENAME} ${_dir})
+ENDMACRO(add_cab)    
 
 macro(custom_incdefs)
     if(NOT DEFINED result_incs) #rpc_defines

base/applications/kbswitch/kbsdll/CMakeLists.txt

@@ -11,4 +11,4 @@ set_module_type(kbsdll win32dll)
 add_importlibs(kbsdll user32 comctl32 kernel32)
 
 add_dependencies(kbsdll kbsdll_def)
-add_livecd_target(kbsdll reactos/system32)
+add_cab_target(kbsdll 1)

base/applications/network/arp/CMakeLists.txt

@@ -5,4 +5,4 @@ set_module_type(arp win32cui)
 
 add_importlibs(arp iphlpapi ws2_32 shlwapi msvcrt kernel32)
 
-add_livecd_target(arp reactos/system32)
+add_cab_target(arp 1)

base/applications/network/dwnl/CMakeLists.txt

@@ -9,4 +9,4 @@ target_link_libraries(dwnl uuid)
 
 add_importlibs(dwnl urlmon wininet msvcrt kernel32)
 
-add_livecd_target(dwnl reactos/system32)
+add_cab_target(dwnl 1)

base/applications/network/finger/CMakeLists.txt

@@ -11,4 +11,4 @@ set_module_type(finger win32cui)
 
 add_importlibs(finger ws2_32 msvcrt kernel32)
 
-add_livecd_target(finger reactos/system32)
+add_cab_target(finger 1)

base/applications/network/ftp/CMakeLists.txt

@@ -12,4 +12,4 @@ set_module_type(ftp win32cui)
 
 add_importlibs(ftp ws2_32 iphlpapi msvcrt kernel32)
 
-add_livecd_target(ftp reactos/system32)
+add_cab_target(ftp 1)

base/applications/network/ipconfig/CMakeLists.txt

@@ -5,4 +5,4 @@ set_module_type(ipconfig win32cui)
 
 add_importlibs(ipconfig user32 iphlpapi advapi32 msvcrt kernel32)
 
-add_livecd_target(ipconfig reactos/system32)
+add_cab_target(ipconfig 1)

base/applications/network/net/CMakeLists.txt

@@ -14,4 +14,4 @@ set_module_type(net win32cui)
 
 add_importlibs(net ws2_32 msvcrt kernel32)
 
-add_livecd_target(net reactos/system32)
+add_cab_target(net 1)

base/applications/network/netstat/CMakeLists.txt

@@ -5,4 +5,4 @@ set_module_type(netstat win32cui)
 
 add_importlibs(netstat user32 ws2_32 snmpapi iphlpapi msvcrt kernel32)
 
-add_livecd_target(netstat reactos/system32)
+add_cab_target(netstat 1)

base/applications/network/nslookup/CMakeLists.txt

@@ -8,4 +8,4 @@ set_module_type(nslookup win32cui)
 
 add_importlibs(nslookup user32 ws2_32 snmpapi iphlpapi msvcrt kernel32)
 
-add_livecd_target(nslookup reactos/system32)
+add_cab_target(nslookup 1)

base/applications/network/ping/CMakeLists.txt

@@ -6,4 +6,4 @@ set_module_type(ping win32cui)
 
 add_importlibs(ping ws2_32 msvcrt kernel32)
 
-add_livecd_target(ping reactos/system32)
+add_cab_target(ping 1)

base/applications/network/route/CMakeLists.txt

@@ -6,4 +6,4 @@ add_executable(route route.c route.rc)
 set_module_type(route win32cui)
 add_importlibs(route ws2_32 iphlpapi msvcrt kernel32)
 
-add_livecd_target(route reactos/system32)
+add_cab_target(route 1)

base/applications/network/telnet/CMakeLists.txt

@@ -28,4 +28,4 @@ set_module_type(telnet win32cui)
 
 add_importlibs(telnet ws2_32 user32 kernel32 msvcrt)
 
-add_livecd_target(telnet reactos/system32)
+add_cab_target(telnet 1)

base/applications/network/tracert/CMakeLists.txt

@@ -6,4 +6,4 @@ set_module_type(tracert win32cui)
 
 add_importlibs(tracert ws2_32 msvcrt kernel32)
 
-add_livecd_target(tracert reactos/system32)
+add_cab_target(tracert 1)

base/applications/network/whois/CMakeLists.txt

@@ -5,4 +5,4 @@ set_module_type(whois win32cui)
 
 add_importlibs(whois ws2_32 msvcrt kernel32)
 
-add_livecd_target(whois reactos/system32)
+add_cab_target(whois 1)

base/applications/shutdown/CMakeLists.txt

@@ -11,4 +11,4 @@ add_pch(shutdown ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 set_module_type(shutdown win32cui)
 
 add_importlibs(shutdown advapi32 user32 msvcrt kernel32)
-add_livecd_target(shutdown reactos/system32)
+add_cab_target(shutdown 1)

base/applications/winhlp32/CMakeLists.txt

@@ -20,4 +20,4 @@ set_module_type(winhlp32 win32gui)
 
 target_link_libraries(winhlp32 wine)
 add_importlibs(winhlp32 user32 gdi32 shell32 comctl32 comdlg32 msvcrt kernel32 ntdll)
-add_livecd_target(winhlp32 reactos)
+add_cab_target(winhlp32 4)

base/services/audiosrv/CMakeLists.txt

@@ -12,4 +12,4 @@ add_executable(audiosrv
 
 set_module_type(audiosrv win32cui)
 add_importlibs(audiosrv advapi32 user32 setupapi msvcrt kernel32)
-add_livecd_target(audiosrv reactos/system32)
+add_cab_target(audiosrv 1)

base/services/eventlog/CMakeLists.txt

@@ -19,4 +19,4 @@ add_pch(eventlog ${CMAKE_CURRENT_SOURCE_DIR}/eventlog.h ${SOURCE})
 set_module_type(eventlog win32cui)
 
 add_importlibs(eventlog advapi32 rpcrt4 msvcrt kernel32 ntdll)
-add_livecd_target(eventlog reactos/system32)
+add_cab_target(eventlog 1)

base/services/rpcss/CMakeLists.txt

@@ -19,5 +19,5 @@ target_link_libraries(rpcss epm_server irot_server pseh wine)
 set_module_type(rpcss win32cui)
 
 add_importlibs(rpcss advapi32 rpcrt4 msvcrt kernel32 ntdll)
-add_livecd_target(rpcss reactos/system32)
+add_cab_target(rpcss 1)
 add_dependencies(rpcss winesdk)

base/services/spoolsv/CMakeLists.txt

@@ -7,4 +7,4 @@ target_link_libraries(spoolsv wine)
 
 set_module_type(spoolsv win32cui)
 add_importlibs(spoolsv advapi32 msvcrt kernel32 ntdll)
-add_livecd_target(spoolsv reactos/system32)
+add_cab_target(spoolsv 1)

base/services/svchost/CMakeLists.txt

@@ -3,4 +3,4 @@ add_executable(svchost svchost.c svchost.rc)
 
 set_module_type(svchost win32cui)
 add_importlibs(svchost advapi32 msvcrt kernel32 ntdll)
-add_livecd_target(svchost reactos/system32)
+add_cab_target(svchost 1)

base/services/umpnpmgr/CMakeLists.txt

@@ -17,4 +17,4 @@ add_importlibs(umpnpmgr
     kernel32
     ntdll)
 
-add_livecd_target(umpnpmgr reactos/system32)
+add_cab_target(umpnpmgr 1)

base/setup/setup/CMakeLists.txt

@@ -5,4 +5,4 @@ add_executable(setup setup.c setup.rc)
 
 set_module_type(setup win32gui)
 add_importlibs(setup userenv msvcrt kernel32 ntdll)
-add_livecd_target(setup reactos/system32)
+add_cab_target(setup 1)

base/shell/explorer/CMakeLists.txt

@@ -82,4 +82,4 @@ target_link_libraries(explorer
 set_image_base(explorer 0x00400000)
 
 add_dependencies(explorer psdk buildno_header)
-add_livecd_target(explorer reactos)
+add_cab_target(explorer 4)

base/shell/explorer/notifyhook/CMakeLists.txt

@@ -9,4 +9,4 @@ target_link_libraries(notifyhook
     -lkernel32
     -luser32)
 
-add_livecd_target(notifyhook reactos/system32)
+add_cab_target(notifyhook 1)

base/system/autochk/CMakeLists.txt

@@ -5,4 +5,4 @@ set_module_type(autochk nativecui)
 
 target_link_libraries(autochk mingw_common nt)
 add_importlibs(autochk kernel32 ntdll)
-add_livecd_target(autochk reactos/system32)
+add_cab_target(autochk 1)

base/system/lsass/CMakeLists.txt

@@ -8,4 +8,4 @@ add_executable(lsass lsass.c lsass.rc)
 set_module_type(lsass win32gui)
 
 add_importlibs(lsass advapi32 lsasrv msvcrt kernel32 ntdll)
-add_livecd_target(lsass reactos/system32)
+add_cab_target(lsass 1)

base/system/rundll32/CMakeLists.txt

@@ -8,4 +8,4 @@ add_executable(rundll32 rundll32.c rundll32.rc)
 set_module_type(rundll32 win32gui)
 
 add_importlibs(rundll32 user32 msvcrt kernel32 ntdll)
-add_livecd_target(rundll32 reactos/system32)
+add_cab_target(rundll32 1)

base/system/services/CMakeLists.txt

@@ -23,4 +23,4 @@ add_pch(services ${CMAKE_CURRENT_SOURCE_DIR}/services.h ${SOURCE})
 set_module_type(services win32cui)
 
 add_importlibs(services user32 advapi32 rpcrt4 msvcrt kernel32 ntdll)
-add_livecd_target(services reactos/system32)
+add_cab_target(services 1)

base/system/smss/CMakeLists.txt

@@ -30,4 +30,4 @@ add_pch(smss ${CMAKE_CURRENT_SOURCE_DIR}/smss.h ${SOURCE})
 
 set_module_type(smss nativecui)
 add_importlibs(smss ntdll)
-add_livecd_target(smss reactos/system32)
+add_cab_target(smss 1)

base/system/userinit/CMakeLists.txt

@@ -9,4 +9,4 @@ target_link_libraries(userinit wine)
 
 set_module_type(userinit win32gui)
 add_importlibs(userinit user32 gdi32 advapi32 shell32 shlwapi msvcrt kernel32 ntdll)
-add_livecd_target(userinit reactos/system32)
+add_cab_target(userinit 1)

base/system/winlogon/CMakeLists.txt

@@ -17,4 +17,4 @@ add_pch(winlogon ${CMAKE_CURRENT_SOURCE_DIR}/winlogon.h ${SOURCE})
 set_module_type(winlogon win32gui)
 
 add_importlibs(winlogon user32 advapi32 userenv secur32 msvcrt kernel32 ntdll)
-add_livecd_target(winlogon reactos/system32)
+add_cab_target(winlogon 1)

boot/CMakeLists.txt

@@ -205,24 +205,28 @@ target_link_libraries(setupldr
     cmlib
     rtl
     libcntpr)
-
+    
-list(APPEND LIVECD_HIVES
-    ${CMAKE_CURRENT_SOURCE_DIR}/bootdata/livecd.inf
-    ${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hiveinst_i386.inf)
-
-add_custom_command(
-    OUTPUT ${LIVECD_DIR}/reactos/system32/config/sam
-
-    COMMAND native-mkhive ${CMAKE_CURRENT_SOURCE_DIR}/bootdata ${LIVECD_DIR}/reactos/system32/config/ ${ARCH} ${LIVECD_HIVES}
-    DEPENDS native-mkhive)
-
-add_custom_target(livecd_hives DEPENDS ${LIVECD_DIR}/reactos/system32/config/sam)
-
 # Bootcd files
 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)
+add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/bootcd.ini "" freeldr.ini)
+add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hivecls_${ARCH}.inf reactos hivecls.inf)
+add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hivedef_${ARCH}.inf reactos hivedef.inf)
+add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hivesft_${ARCH}.inf reactos hivesft.inf)
+add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hivesys_${ARCH}.inf reactos hivesys.inf)
 
 # Livecd files
+list(APPEND LIVECD_HIVES
+    ${CMAKE_CURRENT_SOURCE_DIR}/bootdata/livecd.inf
+    ${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hiveinst_${ARCH}.inf)
+
+add_custom_command(
+    OUTPUT ${LIVECD_DIR}/reactos/system32/config/sam
+    COMMAND native-mkhive ${CMAKE_CURRENT_SOURCE_DIR}/bootdata ${LIVECD_DIR}/reactos/system32/config ${ARCH} ${LIVECD_HIVES}
+    DEPENDS native-mkhive)
+
+add_custom_target(livecd_hives DEPENDS ${LIVECD_DIR}/reactos/system32/config/sam)
+
 add_livecd_target(setupldr loader)
-add_dependencies(livecd livecd_hives isoboot)
+add_livecd(${REACTOS_SOURCE_DIR}/boot/bootdata/livecd.ini "" freeldr.ini)

dll/cpl/access/CMakeLists.txt

@@ -25,4 +25,4 @@ add_importlibs(access
     kernel32)
 
 add_dependencies(access access_def)
-add_livecd_target(access reactos/system32)
+add_cab_target(access 1)

dll/cpl/appwiz/CMakeLists.txt

@@ -22,4 +22,4 @@ add_importlibs(appwiz
     kernel32)
 
 add_dependencies(appwiz appwiz_def)
-add_livecd_target(appwiz reactos/system32)
+add_cab_target(appwiz 1)

dll/cpl/console/CMakeLists.txt

@@ -26,4 +26,4 @@ add_importlibs(console
 
 add_pch(console ${CMAKE_CURRENT_SOURCE_DIR}/console.h ${SOURCE})
 add_dependencies(console console_def)
-add_livecd_target(console reactos/system32)
+add_cab_target(console 1)

dll/cpl/desk/CMakeLists.txt

@@ -45,4 +45,4 @@ add_importlibs(desk
     ntdll)
 
 add_dependencies(desk desk_def)
-add_livecd_target(desk reactos/system32)
+add_cab_target(desk 1)

dll/cpl/hdwwiz/CMakeLists.txt

@@ -22,4 +22,4 @@ add_importlibs(hdwwiz
     ntdll)
 
 add_dependencies(hdwwiz hdwwiz_def)
-add_livecd_target(hdwwiz reactos/system32)
+add_cab_target(hdwwiz 1)

dll/cpl/input/CMakeLists.txt

@@ -24,4 +24,4 @@ add_importlibs(input
     kernel32)
 
 add_dependencies(input input_def)
-add_livecd_target(input reactos/system32)
+add_cab_target(input 1)

dll/cpl/intl/CMakeLists.txt

@@ -34,4 +34,4 @@ add_importlibs(intl
     kernel32)
 
 add_dependencies(intl intl_def)
-add_livecd_target(intl reactos/system32)
+add_cab_target(intl 1)

dll/cpl/joy/CMakeLists.txt

@@ -16,4 +16,4 @@ add_importlibs(joy
     shell32)
 
 add_dependencies(joy joy_def)
-add_livecd_target(joy reactos/system32)
+add_cab_target(joy 1)

dll/cpl/main/CMakeLists.txt

@@ -27,4 +27,4 @@ add_importlibs(main
     kernel32)
 
 add_dependencies(main main_def)
-add_livecd_target(main reactos/system32)
+add_cab_target(main 1)

dll/cpl/mmsys/CMakeLists.txt

@@ -32,4 +32,4 @@ add_importlibs(mmsys
     kernel32)
 
 add_dependencies(mmsys mmsys_def)
-add_livecd_target(mmsys reactos/system32)
+add_cab_target(mmsys 1)

dll/cpl/ncpa/CMakeLists.txt

@@ -15,4 +15,4 @@ add_importlibs(ncpa
     shell32)
 
 add_dependencies(ncpa ncpa_def)
-add_livecd_target(ncpa reactos/system32)
+add_cab_target(ncpa 1)

dll/cpl/odbccp32/CMakeLists.txt

@@ -11,4 +11,4 @@ target_link_libraries(odbccp32i ${CMAKE_CURRENT_BINARY_DIR}/odbccp32.def)
 
 add_importlibs(odbccp32i user32 comctl32 kernel32)
 add_dependencies(odbccp32i odbccp32i_def)
-add_livecd_target(odbccp32i reactos/system32)
+add_cab_target(odbccp32i 1)

dll/cpl/powercfg/CMakeLists.txt

@@ -26,4 +26,4 @@ add_importlibs(powercfg
     kernel32)
 
 add_dependencies(powercfg powercfg_def)
-add_livecd_target(powercfg reactos/system32)
+add_cab_target(powercfg 1)

dll/cpl/sysdm/CMakeLists.txt

@@ -38,4 +38,4 @@ add_importlibs(sysdm
 
 add_pch(sysdm ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_dependencies(sysdm sysdm_def)
-add_livecd_target(sysdm reactos/system32)
+add_cab_target(sysdm 1)

dll/cpl/telephon/CMakeLists.txt

@@ -18,4 +18,4 @@ add_importlibs(telephon
     kernel32)
 
 add_dependencies(telephon telephon_def)
-add_livecd_target(telephon reactos/system32)
+add_cab_target(telephon 1)

dll/cpl/timedate/CMakeLists.txt

@@ -28,4 +28,4 @@ add_importlibs(timedate
     kernel32)
 
 add_dependencies(timedate timedate_def)
-add_livecd_target(timedate reactos/system32)
+add_cab_target(timedate 1)

dll/cpl/usrmgr/CMakeLists.txt

@@ -30,4 +30,4 @@ add_importlibs(usrmgr
     ntdll)
 
 add_dependencies(usrmgr usrmgr_def)
-add_livecd_target(usrmgr reactos/system32)
+add_cab_target(usrmgr 1)

dll/directx/amstream/CMakeLists.txt

@@ -30,4 +30,4 @@ add_importlibs(amstream
     ntdll)
 
 add_dependencies(amstream amstream_def dxsdk)
-add_livecd_target(amstream reactos/system32)
+add_cab_target(amstream 1)

dll/directx/devenum/CMakeLists.txt

@@ -34,4 +34,4 @@ add_importlibs(devenum
     ntdll)
 
 add_dependencies(devenum devenum_def)
-add_livecd_target(devenum reactos/system32)
+add_cab_target(devenum 1)

dll/directx/dinput/CMakeLists.txt

@@ -36,4 +36,4 @@ add_importlibs(dinput
     ntdll)
 
 add_dependencies(dinput dinput_def)
-add_livecd_target(dinput reactos/system32)
+add_cab_target(dinput 1)

dll/directx/dsound/CMakeLists.txt

@@ -37,4 +37,4 @@ add_importlibs(dsound
     ntdll)
 
 add_dependencies(dsound dsound_def)
-add_livecd_target(dsound reactos/system32)
+add_cab_target(dsound 1)

dll/directx/dxdiagn/CMakeLists.txt

@@ -27,4 +27,4 @@ add_importlibs(dxdiagn
     ntdll)
 
 add_dependencies(dxdiagn dxdiagn_def)
-add_livecd_target(dxdiagn reactos/system32)
+add_cab_target(dxdiagn 1)

dll/directx/ksuser/CMakeLists.txt

@@ -9,4 +9,4 @@ target_link_libraries(ksuser ${CMAKE_CURRENT_BINARY_DIR}/ksuser.def)
 
 add_importlibs(ksuser advapi32 kernel32 ntdll)
 add_dependencies(ksuser ksuser_def psdk bugcodes)
-add_livecd_target(ksuser reactos/system32)
+add_cab_target(ksuser 1)

dll/directx/qedit/CMakeLists.txt

@@ -32,4 +32,4 @@ add_importlibs(qedit
     ntdll)
 
 add_dependencies(qedit qedit_def dxsdk)
-add_livecd_target(qedit reactos/system32)
+add_cab_target(qedit 1)

dll/directx/quartz/CMakeLists.txt

@@ -69,4 +69,4 @@ add_importlibs(quartz
 
 add_dependencies(quartz quartz_def)
 rpcproxy(quartz quartz_strmif.idl)
-add_livecd_target(quartz reactos/system32)
+add_cab_target(quartz 1)

dll/directx/wine/d3d8/CMakeLists.txt

@@ -38,4 +38,4 @@ add_importlibs(d3d8
     wined3d)
 
 add_dependencies(d3d8 d3d8_def wineheaders)
-add_livecd_target(d3d8 reactos/system32)
+add_cab_target(d3d8 1)

dll/directx/wine/d3d9/CMakeLists.txt

@@ -40,4 +40,4 @@ add_importlibs(d3d9
     wined3d)
 
 add_dependencies(d3d9 d3d9_def wineheaders)
-add_livecd_target(d3d9 reactos/system32)
+add_cab_target(d3d9 1)

dll/keyboard/kbdus/CMakeLists.txt

@@ -9,4 +9,4 @@ set_entrypoint(kbdus 0)
 target_link_libraries(kbdus ${CMAKE_CURRENT_BINARY_DIR}/kbdus.def)
 
 add_dependencies(kbdus kbdus_def psdk buildno_header)
-add_livecd_target(kbdus reactos/system32)
+add_cab_target(kbdus 1)

dll/shellext/deskadp/CMakeLists.txt

@@ -24,4 +24,4 @@ add_importlibs(deskadp
 
 add_pch(deskadp ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_dependencies(deskadp deskadp_def)
-add_livecd_target(deskadp reactos/system32)
+add_cab_target(deskadp 1)

dll/shellext/deskmon/CMakeLists.txt

@@ -24,4 +24,4 @@ add_importlibs(deskmon
 
 add_pch(deskmon ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_dependencies(deskmon deskmon_def)
-add_livecd_target(deskmon reactos/system32)
+add_cab_target(deskmon 1)

dll/shellext/devcpux/CMakeLists.txt

@@ -17,4 +17,4 @@ add_importlibs(devcpux
     ntdll)
 
 add_dependencies(devcpux devcpux_def)
-add_livecd_target(devcpux reactos/system32)
+add_cab_target(devcpux 1)

dll/shellext/fontext/CMakeLists.txt

@@ -24,4 +24,4 @@ add_importlibs(fontext
     ntdll)
 
 add_dependencies(fontext fontext_def)
-add_livecd_target(fontext reactos/system32)
+add_cab_target(fontext 1)

dll/shellext/slayer/CMakeLists.txt

@@ -22,4 +22,4 @@ add_importlibs(slayer
 
 add_pch(slayer ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_dependencies(slayer slayer_def)
-add_livecd_target(slayer reactos/system32)
+add_cab_target(slayer 1)

dll/win32/acledit/CMakeLists.txt

@@ -16,4 +16,4 @@ target_link_libraries(acledit ${CMAKE_CURRENT_BINARY_DIR}/acledit.def)
 add_importlibs(acledit ntdll)
 
 add_dependencies(acledit acledit_def)
-add_livecd_target(acledit reactos/system32)
+add_cab_target(acledit 1)

dll/win32/aclui/CMakeLists.txt

@@ -24,4 +24,4 @@ add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme kerne
 
 add_pch(aclui ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_dependencies(aclui aclui_def)
-add_livecd_target(aclui reactos/system32)
+add_cab_target(aclui 1)

dll/win32/activeds/CMakeLists.txt

@@ -16,4 +16,4 @@ target_link_libraries(activeds
 add_importlibs(activeds kernel32 ntdll)
 
 add_dependencies(activeds activeds_def)
-add_livecd_target(activeds reactos/system32)
+add_cab_target(activeds 1)

dll/win32/actxprxy/CMakeLists.txt

@@ -39,4 +39,4 @@ rpcproxy(actxprxy
     actxprxy_shobjidl.idl
     actxprxy_urlhist.idl)
 
-add_livecd_target(actxprxy reactos/system32)
+add_cab_target(actxprxy 1)

dll/win32/advapi32/CMakeLists.txt

@@ -59,4 +59,4 @@ target_link_libraries(advapi32
 add_importlibs(advapi32 rpcrt4 kernel32 ntdll)
 
 add_pch(advapi32 ${CMAKE_CURRENT_SOURCE_DIR}/advapi32.h ${SOURCE})
-add_livecd_target(advapi32 reactos/system32)
+add_cab_target(advapi32 1)

dll/win32/advpack/CMakeLists.txt

@@ -21,4 +21,4 @@ target_link_libraries(advpack
 
 add_importlibs(advpack ole32 setupapi version advapi32 kernel32 ntdll)
 add_dependencies(advpack advpack_def)
-add_livecd_target(advpack reactos/system32)
+add_cab_target(advpack 1)

dll/win32/atl/CMakeLists.txt

@@ -34,4 +34,4 @@ add_importlibs(atl
     ntdll)
 
 add_dependencies(atl atl_atliface_header atl_def)
-add_livecd_target(atl reactos/system32)
+add_cab_target(atl 1)

dll/win32/authz/CMakeLists.txt

@@ -20,4 +20,4 @@ target_link_libraries(authz ${CMAKE_CURRENT_BINARY_DIR}/authz.def)
 add_pch(authz ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_importlibs(authz advapi32 kernel32 ntdll)
 add_dependencies(authz authz_def)
-add_livecd_target(authz reactos/system32)
+add_cab_target(authz 1)

dll/win32/avicap32/CMakeLists.txt

@@ -13,4 +13,4 @@ target_link_libraries(avicap32
 
 add_importlibs(avicap32 advapi32 user32 version kernel32 ntdll)
 add_dependencies(avicap32 avicap32_def)
-add_livecd_target(avicap32 reactos/system32)
+add_cab_target(avicap32 1)

dll/win32/avifil32/CMakeLists.txt

@@ -40,4 +40,4 @@ add_importlibs(avifil32
     ntdll)
 
 add_dependencies(avifil32 avifil32_def)
-add_livecd_target(avifil32 reactos/system32)
+add_cab_target(avifil32 1)

dll/win32/batt/CMakeLists.txt

@@ -11,4 +11,4 @@ target_link_libraries(batt ${CMAKE_CURRENT_BINARY_DIR}/batt.def)
 
 add_importlibs(batt kernel32)
 add_dependencies(batt batt_def)
-add_livecd_target(batt reactos/system32)
+add_cab_target(batt 1)

dll/win32/bcrypt/CMakeLists.txt

@@ -17,4 +17,4 @@ target_link_libraries(bcrypt
 add_importlibs(bcrypt kernel32 ntdll)
 
 add_dependencies(bcrypt bcrypt_def)
-add_livecd_target(bcrypt reactos/system32)
+add_cab_target(bcrypt 1)

dll/win32/beepmidi/CMakeLists.txt

@@ -11,4 +11,4 @@ target_link_libraries(beepmidi ${CMAKE_CURRENT_BINARY_DIR}/beepmidi.def)
 
 add_importlibs(beepmidi winmm kernel32 ntdll)
 add_dependencies(beepmidi beepmidi_def psdk)
-add_livecd_target(beepmidi reactos/system32)
+add_cab_target(beepmidi 1)

dll/win32/browseui/CMakeLists.txt

@@ -52,4 +52,4 @@ add_importlibs(browseui
     ntdll)
 
 add_dependencies(browseui browseui_def)
-add_livecd_target(browseui reactos/system32)
+add_cab_target(browseui 1)

dll/win32/cabinet/CMakeLists.txt

@@ -21,4 +21,4 @@ target_link_libraries(cabinet
 
 add_importlibs(cabinet kernel32 ntdll)
 add_dependencies(cabinet cabinet_def psdk buildno_header)
-add_livecd_target(cabinet reactos/system32)
+add_cab_target(cabinet 1)

dll/win32/cards/CMakeLists.txt

@@ -14,4 +14,4 @@ target_link_libraries(cards ${CMAKE_CURRENT_BINARY_DIR}/cards.def)
 
 add_importlibs(cards user32 gdi32)
 add_dependencies(cards cards_def)
-add_livecd_target(cards reactos/system32)
+add_cab_target(cards 1)

dll/win32/cfgmgr32/CMakeLists.txt

@@ -8,4 +8,4 @@ set_entrypoint(cfgmgr32 0)
 target_link_libraries(cfgmgr32 ${CMAKE_CURRENT_BINARY_DIR}/cfgmgr32.def)
 
 add_dependencies(cfgmgr32 cfgmgr32_def psdk buildno_header)
-add_livecd_target(cfgmgr32 reactos/system32)
+add_cab_target(cfgmgr32 1)

dll/win32/clusapi/CMakeLists.txt

@@ -15,4 +15,4 @@ target_link_libraries(clusapi
 
 add_importlibs(clusapi kernel32 ntdll)
 add_dependencies(clusapi clusapi_def)
-add_livecd_target(clusapi reactos/system32)
+add_cab_target(clusapi 1)

dll/win32/comcat/CMakeLists.txt

@@ -22,4 +22,4 @@ add_importlibs(comcat
     ntdll)
 
 add_dependencies(comcat comcat_def psdk buildno_header)
-add_livecd_target(comcat reactos/system32)
+add_cab_target(comcat 1)

dll/win32/comctl32/CMakeLists.txt

@@ -67,4 +67,4 @@ add_importlibs(comctl32
     ntdll)
 
 add_dependencies(comctl32 comctl32_def)
-add_livecd_target(comctl32 reactos/system32)
+add_cab_target(comctl32 1)

dll/win32/comdlg32/CMakeLists.txt

@@ -38,4 +38,4 @@ add_importlibs(comdlg32
     ntdll)
 
 add_dependencies(comdlg32 comdlg32_def)
-add_livecd_target(comdlg32 reactos/system32)
+add_cab_target(comdlg32 1)

dll/win32/compstui/CMakeLists.txt

@@ -15,4 +15,4 @@ target_link_libraries(compstui
 
 add_importlibs(compstui kernel32 ntdll)
 add_dependencies(compstui compstui_def)
-add_livecd_target(compstui reactos/system32)
+add_cab_target(compstui 1)

dll/win32/credui/CMakeLists.txt

@@ -15,4 +15,4 @@ target_link_libraries(credui
 
 add_importlibs(credui advapi32 user32 comctl32 kernel32 ntdll)
 add_dependencies(credui credui_def)
-add_livecd_target(credui reactos/system32)
+add_cab_target(credui 1)

dll/win32/crtdll/CMakeLists.txt

@@ -28,4 +28,4 @@ target_link_libraries(crtdll
 add_importlibs(crtdll kernel32 ntdll)
 add_pch(crtdll ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_dependencies(crtdll crtdll_def)
-add_livecd_target(crtdll reactos/system32)
+add_cab_target(crtdll 1)

dll/win32/crypt32/CMakeLists.txt

@@ -50,4 +50,4 @@ target_link_libraries(crypt32
 
 add_importlibs(crypt32 user32 advapi32 msvcrt kernel32 ntdll)
 add_dependencies(crypt32 crypt32_def)
-add_livecd_target(crypt32 reactos/system32)
+add_cab_target(crypt32 1)

dll/win32/cryptdlg/CMakeLists.txt

@@ -22,4 +22,4 @@ add_importlibs(cryptdlg
     ntdll)
 
 add_dependencies(cryptdlg cryptdlg_def)
-add_livecd_target(cryptdlg reactos/system32)
+add_cab_target(cryptdlg 1)

dll/win32/cryptdll/CMakeLists.txt

@@ -15,4 +15,4 @@ target_link_libraries(cryptdll
 
 add_importlibs(cryptdll kernel32 ntdll)
 add_dependencies(cryptdll cryptdll_def)
-add_livecd_target(cryptdll reactos/system32)
+add_cab_target(cryptdll 1)

dll/win32/cryptnet/CMakeLists.txt

@@ -19,4 +19,4 @@ add_importlibs(cryptnet
     ntdll)
 
 add_dependencies(cryptnet cryptnet_def)
-add_livecd_target(cryptnet reactos/system32)
+add_cab_target(cryptnet 1)

dll/win32/cryptui/CMakeLists.txt

@@ -28,4 +28,4 @@ add_importlibs(cryptui
     ntdll)
 
 add_dependencies(cryptui cryptui_def)
-add_livecd_target(cryptui reactos/system32)
+add_cab_target(cryptui 1)

dll/win32/dbghelp/CMakeLists.txt

@@ -51,4 +51,4 @@ target_link_libraries(dbghelp
 
 add_importlibs(dbghelp psapi version msvcrt kernel32 ntdll)
 add_dependencies(dbghelp dbghelp_def)
-add_livecd_target(dbghelp reactos/system32)
+add_cab_target(dbghelp 1)

dll/win32/dciman32/CMakeLists.txt

@@ -15,4 +15,4 @@ target_link_libraries(dciman32
 
 add_importlibs(dciman32 kernel32 ntdll)
 add_dependencies(dciman32 dciman32_def)
-add_livecd_target(dciman32 reactos/system32)
+add_cab_target(dciman32 1)

dll/win32/devmgr/CMakeLists.txt

@@ -30,4 +30,4 @@ add_importlibs(devmgr
 
 add_pch(devmgr ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
 add_dependencies(devmgr devmgr_def)
-add_livecd_target(devmgr reactos/system32)
+add_cab_target(devmgr 1)