Author: spetreolle
Date: Thu May 19 21:55:57 2011
New Revision: 51824
URL: http://svn.reactos.org/svn/reactos?rev=51824&view=rev
Log:
Add bootcdregtest target to cmake build.
Added:
trunk/reactos/boot/bootdata/bootcd/unattend.inf
- copied unchanged from r51800, trunk/reactos/boot/bootdata/unattend.inf
Modified:
trunk/reactos/CMakeMacros.cmake
trunk/reactos/base/setup/usetup/CMakeLists.txt
trunk/reactos/boot/CMakeLists.txt
trunk/reactos/boot/bootdata/CMakeLists.txt
trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild
trunk/reactos/boot/bootdata/packages/CMakeLists.txt
Modified: trunk/reactos/CMakeMacros.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeMacros.cmake?rev=51824&r1=51823&r2=51824&view=diff
==============================================================================
--- trunk/reactos/CMakeMacros.cmake [iso-8859-1] (original)
+++ trunk/reactos/CMakeMacros.cmake [iso-8859-1] Thu May 19 21:55:57 2011
@@ -175,4 +175,32 @@
endif()
endif() #end livecd
+ #do we add it to regtest?
+ list(FIND _CD_FOR regtest __cd)
+ if(NOT __cd EQUAL -1)
+ #whether or not we should put it in reactos.cab or directly on cd
+ if(_CD_NO_CAB)
+ #directly on cd
+ foreach(item ${_CD_FILE})
+ file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcdregtest.cmake
"file(COPY \"${item}\" DESTINATION \"\${CD_DIR}/${_CD_DESTINATION}\")\n")
+ endforeach()
+ if(_CD_NAME_ON_CD)
+ get_filename_component(__file ${_CD_FILE} NAME)
+ #rename it in the cd tree
+ file(APPEND ${REACTOS_BINARY_DIR}/boot/bootcdregtest.cmake
"file(RENAME \${CD_DIR}/${_CD_DESTINATION}/${__file}
\${CD_DIR}/${_CD_DESTINATION}/${_CD_NAME_ON_CD})\n")
+ endif()
+ if(_CD_TARGET)
+ #manage dependency
+ add_dependencies(bootcdregtest ${_CD_TARGET})
+ endif()
+ else()
+ #add it in reactos.cab
+ #dir_to_num(${_CD_DESTINATION} _num)
+ #file(APPEND
${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn "${_CD_FILE}
${_num}\n")
+ #if(_CD_TARGET)
+ # #manage dependency
+ # add_dependencies(reactos_cab ${_CD_TARGET})
+ #endif()
+ endif()
+ endif() #end bootcd
endfunction()
Modified: trunk/reactos/base/setup/usetup/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/CMakeLists.txt?rev=51824&r1=51823&r2=51824&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/CMakeLists.txt [iso-8859-1] Thu May 19
21:55:57 2011
@@ -44,4 +44,4 @@
set_module_type(usetup nativecui)
add_importlibs(usetup kernel32 ntdll)
-add_cd_file(TARGET usetup DESTINATION reactos/system32 NO_CAB NAME_ON_CD
smss.exe FOR bootcd)
+add_cd_file(TARGET usetup DESTINATION reactos/system32 NO_CAB NAME_ON_CD
smss.exe FOR bootcd regtest)
Modified: trunk/reactos/boot/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/CMakeLists.txt?rev=51824&r1=51823&r2=51824&view=diff
==============================================================================
--- trunk/reactos/boot/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/boot/CMakeLists.txt [iso-8859-1] Thu May 19 21:55:57 2011
@@ -9,6 +9,18 @@
COMMAND native-cdmake -v -j -m -b
${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isoboot.bin
${CMAKE_CURRENT_BINARY_DIR}/bootcd REACTOS ${REACTOS_BINARY_DIR}/bootcd.iso
VERBATIM)
+##bootcdregtest
+#clear it out
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.cmake
+ "file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest)\n")
+
+add_custom_target(bootcdregtest
+ ${CMAKE_COMMAND} -D CD_DIR=${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest
+ -P ${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest.cmake
+ COMMAND native-cdmake -v -j -m -b
${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isobtrt.bin
${CMAKE_CURRENT_BINARY_DIR}/bootcdregtest REACTOS
${REACTOS_BINARY_DIR}/bootcdregtest.iso
+ VERBATIM)
+
+
##livecd
#clear it out
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake
Modified: trunk/reactos/boot/bootdata/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/CMakeLists.txt?rev=51824&r1=51823&r2=51824&view=diff
==============================================================================
--- trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] Thu May 19 21:55:57
2011
@@ -1,11 +1,11 @@
add_subdirectory(packages)
-add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/txtsetup.sif DESTINATION reactos
NO_CAB FOR bootcd)
-add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivecls_${ARCH}.inf DESTINATION
reactos NO_CAB NAME_ON_CD hivecls.inf FOR bootcd)
-add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivedef_${ARCH}.inf DESTINATION
reactos NO_CAB NAME_ON_CD hivedef.inf FOR bootcd)
-add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivesft_${ARCH}.inf DESTINATION
reactos NO_CAB NAME_ON_CD hivesft.inf FOR bootcd)
-add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivesys_${ARCH}.inf DESTINATION
reactos NO_CAB NAME_ON_CD hivesys.inf FOR bootcd)
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/txtsetup.sif DESTINATION reactos
NO_CAB FOR bootcd regtest)
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivecls_${ARCH}.inf DESTINATION
reactos NO_CAB NAME_ON_CD hivecls.inf FOR bootcd regtest)
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivedef_${ARCH}.inf DESTINATION
reactos NO_CAB NAME_ON_CD hivedef.inf FOR bootcd regtest)
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivesft_${ARCH}.inf DESTINATION
reactos NO_CAB NAME_ON_CD hivesft.inf FOR bootcd regtest)
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivesys_${ARCH}.inf DESTINATION
reactos NO_CAB NAME_ON_CD hivesys.inf FOR bootcd regtest)
# livecd hives
list(APPEND CD_HIVES
@@ -42,6 +42,10 @@
add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcdregtest/regtest.cmd
DESTINATION reactos/bin FOR all)
#freeldr.ini
-add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd.ini DESTINATION root
NO_CAB NAME_ON_CD freeldr.ini FOR bootcd)
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd.ini DESTINATION root
NO_CAB NAME_ON_CD freeldr.ini FOR bootcd regtest)
add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/livecd.ini DESTINATION root
NAME_ON_CD freeldr.ini FOR livecd)
+#unattend
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcdregtest/unattend.inf
DESTINATION reactos NO_CAB FOR regtest)
+#uncomment this for unattend bootcd
+#add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd/unattend.inf DESTINATION
reactos NO_CAB FOR bootcd)
Modified: trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild?rev=51824&r1=51823&r2=51824&view=diff
==============================================================================
--- trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild [iso-8859-1] Thu May 19
21:55:57 2011
@@ -4,6 +4,7 @@
<if property="ARCH" value="i386">
<module name="bootcd" type="iso" output="ReactOS.iso">
<bootsector>isoboot</bootsector>
+ <!--cdfile installbase="$(CDOUTPUT)">unattend.inf</cdfile-->
</module>
</if>
<ifnot property="ARCH" value="i386">
Modified: trunk/reactos/boot/bootdata/packages/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/CMakeLists.txt?rev=51824&r1=51823&r2=51824&view=diff
==============================================================================
--- trunk/reactos/boot/bootdata/packages/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/packages/CMakeLists.txt [iso-8859-1] Thu May 19
21:55:57 2011
@@ -42,4 +42,4 @@
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf
VERBATIM)
-add_cd_file(TARGET reactos_cab FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab
${CMAKE_CURRENT_BINARY_DIR}/reactos.inf DESTINATION reactos NO_CAB FOR bootcd)
+add_cd_file(TARGET reactos_cab FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab
${CMAKE_CURRENT_BINARY_DIR}/reactos.inf DESTINATION reactos NO_CAB FOR bootcd
regtest)
