From b975ab079c8d0c3f259394a426c01bc16eee757d Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 23 Oct 2010 10:38:48 +0000 Subject: [PATCH] [CMAKE] - Create profiles related folders into the livecd iso. - Add some missing modules to livecd. svn path=/branches/cmake-bringup/; revision=49234 --- CMakeLists.txt | 6 ++++++ dll/win32/cabinet/CMakeLists.txt | 1 + dll/win32/cfgmgr32/CMakeLists.txt | 1 + dll/win32/comcat/CMakeLists.txt | 1 + dll/win32/glu32/CMakeLists.txt | 1 + dll/win32/imaadp32.acm/CMakeLists.txt | 1 + dll/win32/mcicda/CMakeLists.txt | 1 + dll/win32/mciseq/CMakeLists.txt | 1 + dll/win32/mciwave/CMakeLists.txt | 1 + dll/win32/mmdrv/CMakeLists.txt | 1 + dll/win32/msadp32.acm/CMakeLists.txt | 1 + dll/win32/msg711.acm/CMakeLists.txt | 1 + dll/win32/msgsm32.acm/CMakeLists.txt | 1 + dll/win32/msvcrt20/CMakeLists.txt | 1 + dll/win32/nddeapi/CMakeLists.txt | 1 + dll/win32/ntdsapi/CMakeLists.txt | 1 + dll/win32/odbccp32/CMakeLists.txt | 1 + dll/win32/oleacc/CMakeLists.txt | 1 + dll/win32/olepro32/CMakeLists.txt | 1 + dll/win32/pdh/CMakeLists.txt | 1 + dll/win32/printui/CMakeLists.txt | 1 + dll/win32/rasapi32/CMakeLists.txt | 1 + dll/win32/rsabase/CMakeLists.txt | 1 + 23 files changed, 28 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e4d69cd0e2..05989403579 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -120,6 +120,12 @@ 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/fonts") file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/system32") diff --git a/dll/win32/cabinet/CMakeLists.txt b/dll/win32/cabinet/CMakeLists.txt index a57785f6a63..430650506dd 100644 --- a/dll/win32/cabinet/CMakeLists.txt +++ b/dll/win32/cabinet/CMakeLists.txt @@ -21,3 +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) \ No newline at end of file diff --git a/dll/win32/cfgmgr32/CMakeLists.txt b/dll/win32/cfgmgr32/CMakeLists.txt index f179dabd145..63321880fe7 100644 --- a/dll/win32/cfgmgr32/CMakeLists.txt +++ b/dll/win32/cfgmgr32/CMakeLists.txt @@ -8,3 +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) diff --git a/dll/win32/comcat/CMakeLists.txt b/dll/win32/comcat/CMakeLists.txt index 9e008227066..3cd4f8974e6 100644 --- a/dll/win32/comcat/CMakeLists.txt +++ b/dll/win32/comcat/CMakeLists.txt @@ -22,3 +22,4 @@ add_importlibs(comcat ntdll) add_dependencies(comcat comcat_def psdk buildno_header) +add_livecd_target(comcat reactos/system32) diff --git a/dll/win32/glu32/CMakeLists.txt b/dll/win32/glu32/CMakeLists.txt index 3fc6ac53c3b..e32f49bf0f0 100644 --- a/dll/win32/glu32/CMakeLists.txt +++ b/dll/win32/glu32/CMakeLists.txt @@ -117,3 +117,4 @@ add_importlibs(glu32 ntdll) add_dependencies(glu32 glu32_def psdk buildno_header) +add_livecd_target(glu32 reactos/system32) \ No newline at end of file diff --git a/dll/win32/imaadp32.acm/CMakeLists.txt b/dll/win32/imaadp32.acm/CMakeLists.txt index 258b3632037..3c0b40872ae 100644 --- a/dll/win32/imaadp32.acm/CMakeLists.txt +++ b/dll/win32/imaadp32.acm/CMakeLists.txt @@ -22,3 +22,4 @@ target_link_libraries(imaadp32.acm add_importlibs(imaadp32.acm winmm user32 msvcrt kernel32 ntdll) add_dependencies(imaadp32.acm imaadp32.acm_def psdk buildno_header) +add_livecd_target(imaadp32.acm reactos/system32) diff --git a/dll/win32/mcicda/CMakeLists.txt b/dll/win32/mcicda/CMakeLists.txt index bfb28b46c02..1ede7b516c7 100644 --- a/dll/win32/mcicda/CMakeLists.txt +++ b/dll/win32/mcicda/CMakeLists.txt @@ -14,3 +14,4 @@ target_link_libraries(mcicda add_importlibs(mcicda winmm user32 kernel32 ntdll) add_dependencies(mcicda mcicda_def psdk buildno_header) +add_livecd_target(mcicda reactos/system32) \ No newline at end of file diff --git a/dll/win32/mciseq/CMakeLists.txt b/dll/win32/mciseq/CMakeLists.txt index 87a7986d24f..d9d86cd8308 100644 --- a/dll/win32/mciseq/CMakeLists.txt +++ b/dll/win32/mciseq/CMakeLists.txt @@ -14,3 +14,4 @@ target_link_libraries(mciseq add_importlibs(mciseq winmm user32 kernel32 ntdll) add_dependencies(mciseq mciseq_def psdk buildno_header) +add_livecd_target(mciseq reactos/system32) \ No newline at end of file diff --git a/dll/win32/mciwave/CMakeLists.txt b/dll/win32/mciwave/CMakeLists.txt index cefe1332a5c..302698a5f57 100644 --- a/dll/win32/mciwave/CMakeLists.txt +++ b/dll/win32/mciwave/CMakeLists.txt @@ -17,3 +17,4 @@ target_link_libraries(mciwave add_importlibs(mciwave winmm user32 msvcrt kernel32 ntdll) add_dependencies(mciwave mciwave_def psdk buildno_header) +add_livecd_target(mciwave reactos/system32) diff --git a/dll/win32/mmdrv/CMakeLists.txt b/dll/win32/mmdrv/CMakeLists.txt index ba3db14b2f2..aaa077e05fd 100644 --- a/dll/win32/mmdrv/CMakeLists.txt +++ b/dll/win32/mmdrv/CMakeLists.txt @@ -20,3 +20,4 @@ target_link_libraries(mmdrv ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def) add_importlibs(mmdrv winmm user32 kernel32 ntdll) add_dependencies(mmdrv mmdrv_def psdk buildno_header) +add_livecd_target(mmdrv reactos/system32) \ No newline at end of file diff --git a/dll/win32/msadp32.acm/CMakeLists.txt b/dll/win32/msadp32.acm/CMakeLists.txt index cacd867c5d9..91593c059a4 100644 --- a/dll/win32/msadp32.acm/CMakeLists.txt +++ b/dll/win32/msadp32.acm/CMakeLists.txt @@ -22,3 +22,4 @@ target_link_libraries(msadp32.acm add_importlibs(msadp32.acm winmm user32 msvcrt kernel32 ntdll) add_dependencies(msadp32.acm msadp32.acm_def psdk buildno_header) +add_livecd_target(msadp32.acm reactos/system32) diff --git a/dll/win32/msg711.acm/CMakeLists.txt b/dll/win32/msg711.acm/CMakeLists.txt index e909b4c9c12..25f8b27c4b0 100644 --- a/dll/win32/msg711.acm/CMakeLists.txt +++ b/dll/win32/msg711.acm/CMakeLists.txt @@ -22,3 +22,4 @@ target_link_libraries(msg711.acm add_importlibs(msg711.acm winmm user32 msvcrt kernel32 ntdll) add_dependencies(msg711.acm msg711.acm_def psdk buildno_header) +add_livecd_target(msg711.acm reactos/system32) diff --git a/dll/win32/msgsm32.acm/CMakeLists.txt b/dll/win32/msgsm32.acm/CMakeLists.txt index 49e220ec9fb..a8addf06c7d 100644 --- a/dll/win32/msgsm32.acm/CMakeLists.txt +++ b/dll/win32/msgsm32.acm/CMakeLists.txt @@ -22,3 +22,4 @@ target_link_libraries(msgsm32.acm add_importlibs(msgsm32.acm winmm user32 msvcrt kernel32 ntdll) add_dependencies(msgsm32.acm msgsm32.acm_def psdk buildno_header) +add_livecd_target(msgsm32.acm reactos/system32) diff --git a/dll/win32/msvcrt20/CMakeLists.txt b/dll/win32/msvcrt20/CMakeLists.txt index 0d6e31a9acb..b39b1c3b18b 100644 --- a/dll/win32/msvcrt20/CMakeLists.txt +++ b/dll/win32/msvcrt20/CMakeLists.txt @@ -16,3 +16,4 @@ target_link_libraries(msvcrt20 add_importlibs(msvcrt20 msvcrt kernel32 ntdll) add_dependencies(msvcrt20 msvcrt20_def psdk buildno_header) +add_livecd_target(msvcrt20 reactos/system32) diff --git a/dll/win32/nddeapi/CMakeLists.txt b/dll/win32/nddeapi/CMakeLists.txt index 6bb177e041f..8d9940ba540 100644 --- a/dll/win32/nddeapi/CMakeLists.txt +++ b/dll/win32/nddeapi/CMakeLists.txt @@ -14,3 +14,4 @@ target_link_libraries(nddeapi add_importlibs(nddeapi kernel32 ntdll) add_dependencies(nddeapi nddeapi_def psdk buildno_header) +add_livecd_target(nddeapi reactos/system32) \ No newline at end of file diff --git a/dll/win32/ntdsapi/CMakeLists.txt b/dll/win32/ntdsapi/CMakeLists.txt index 54069e0dea4..63be7bb4b39 100644 --- a/dll/win32/ntdsapi/CMakeLists.txt +++ b/dll/win32/ntdsapi/CMakeLists.txt @@ -14,3 +14,4 @@ target_link_libraries(ntdsapi add_importlibs(ntdsapi user32 kernel32 ntdll) add_dependencies(ntdsapi ntdsapi_def psdk buildno_header) +add_livecd_target(ntdsapi reactos/system32) diff --git a/dll/win32/odbccp32/CMakeLists.txt b/dll/win32/odbccp32/CMakeLists.txt index ed7f754f41d..2d6b23339b1 100644 --- a/dll/win32/odbccp32/CMakeLists.txt +++ b/dll/win32/odbccp32/CMakeLists.txt @@ -22,3 +22,4 @@ add_importlibs(odbccp32 ntdll) add_dependencies(odbccp32 odbccp32_def) +add_livecd_target(odbccp32 reactos/system32) diff --git a/dll/win32/oleacc/CMakeLists.txt b/dll/win32/oleacc/CMakeLists.txt index d1f275d5043..9fef83f6243 100644 --- a/dll/win32/oleacc/CMakeLists.txt +++ b/dll/win32/oleacc/CMakeLists.txt @@ -19,3 +19,4 @@ add_importlibs(oleacc ntdll) add_dependencies(oleacc oleacc_def) +add_livecd_target(oleacc reactos/system32) \ No newline at end of file diff --git a/dll/win32/olepro32/CMakeLists.txt b/dll/win32/olepro32/CMakeLists.txt index ec6ac3eb6c4..a790aa469d1 100644 --- a/dll/win32/olepro32/CMakeLists.txt +++ b/dll/win32/olepro32/CMakeLists.txt @@ -18,3 +18,4 @@ add_importlibs(olepro32 ntdll) add_dependencies(olepro32 olepro32_def) +add_livecd_target(olepro32 reactos/system32) \ No newline at end of file diff --git a/dll/win32/pdh/CMakeLists.txt b/dll/win32/pdh/CMakeLists.txt index fbd725d100a..d9897d6efbd 100644 --- a/dll/win32/pdh/CMakeLists.txt +++ b/dll/win32/pdh/CMakeLists.txt @@ -18,3 +18,4 @@ target_link_libraries(pdh add_importlibs(pdh kernel32 ntdll) add_dependencies(pdh pdh_def) +add_livecd_target(pdh reactos/system32) \ No newline at end of file diff --git a/dll/win32/printui/CMakeLists.txt b/dll/win32/printui/CMakeLists.txt index 3cbbab7d1c1..5ebdf99a519 100644 --- a/dll/win32/printui/CMakeLists.txt +++ b/dll/win32/printui/CMakeLists.txt @@ -14,3 +14,4 @@ target_link_libraries(printui add_importlibs(printui shell32 kernel32 ntdll) add_dependencies(printui printui_def psdk buildno_header) +add_livecd_target(printui reactos/system32) \ No newline at end of file diff --git a/dll/win32/rasapi32/CMakeLists.txt b/dll/win32/rasapi32/CMakeLists.txt index 4187f3b09cf..00cc962b317 100644 --- a/dll/win32/rasapi32/CMakeLists.txt +++ b/dll/win32/rasapi32/CMakeLists.txt @@ -14,3 +14,4 @@ target_link_libraries(rasapi32 add_importlibs(rasapi32 kernel32 ntdll) add_dependencies(rasapi32 rasapi32_def psdk buildno_header) +add_livecd_target(rasapi32 reactos/system32) \ No newline at end of file diff --git a/dll/win32/rsabase/CMakeLists.txt b/dll/win32/rsabase/CMakeLists.txt index d22fe9d07e3..89eb260222e 100644 --- a/dll/win32/rsabase/CMakeLists.txt +++ b/dll/win32/rsabase/CMakeLists.txt @@ -14,3 +14,4 @@ target_link_libraries(rsabase add_importlibs(rsabase rsaenh ntdll) add_dependencies(rsabase rsabase_def) +add_livecd_target(rsabase reactos/system32) \ No newline at end of file