Author: hbelusca
Date: Fri Jan 29 01:17:32 2016
New Revision: 70654
URL: http://svn.reactos.org/svn/reactos?rev=70654&view=rev
Log:
[BOOTDATA]: Adjust the autorun path.
[CMAKE][BOOTDATA]: Flatten a bit the hybridcd tree otherwise some problems
appear for the livecd (see r66114 for more details).
Modified:
branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/CMakeLists.txt
branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/autorun.inf
branches/ReactOS-0.4.0-FOSDEM2016/reactos/cmake/CMakeMacros.cmake
Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/CMakeLists.txt?rev=70654&r1=70653&r2=70654&view=diff
==============================================================================
--- branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/CMakeLists.txt
[iso-8859-1] (original)
+++ branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/CMakeLists.txt
[iso-8859-1] Fri Jan 29 01:17:32 2016
@@ -57,9 +57,9 @@
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "")
#create the empty Desktop, Favorites, and Start Menu folders
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default
User/Desktop\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default
User/Desktop\n")
file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default
User/Favorites\n")
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default
User/Start Menu/Programs\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default
User/Start Menu/Programs\n")
add_custom_target(hybridcd
COMMAND native-cdmake -j -m
-bootdata:2\#p0,e,b${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isoboot.bin\#pEF,e,b${CMAKE_CURRENT_BINARY_DIR}/efisys.bin
@${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst REACTOS
${REACTOS_BINARY_DIR}/hybridcd.iso
Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/autorun.inf
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/autorun.inf?rev=70654&r1=70653&r2=70654&view=diff
==============================================================================
--- branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/autorun.inf
[iso-8859-1] (original)
+++ branches/ReactOS-0.4.0-FOSDEM2016/reactos/boot/bootdata/autorun.inf
[iso-8859-1] Fri Jan 29 01:17:32 2016
@@ -1,3 +1,3 @@
[autorun]
-open=reactos\welcome.exe
+open=setup\reactos\welcome.exe
icon=icon.ico
Modified: branches/ReactOS-0.4.0-FOSDEM2016/reactos/cmake/CMakeMacros.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-FOSDEM2016/reactos/cmake/CMakeMacros.cmake?rev=70654&r1=70653&r2=70654&view=diff
==============================================================================
--- branches/ReactOS-0.4.0-FOSDEM2016/reactos/cmake/CMakeMacros.cmake
[iso-8859-1] (original)
+++ branches/ReactOS-0.4.0-FOSDEM2016/reactos/cmake/CMakeMacros.cmake
[iso-8859-1] Fri Jan 29 01:17:32 2016
@@ -310,7 +310,7 @@
set_property(GLOBAL APPEND PROPERTY BOOTCD_FILE_LIST
"${_CD_DESTINATION}/${__file}=${item}")
#add it also into the hybridcd if not specified otherwise
if(NOT _CD_NOT_IN_HYBRIDCD)
- set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST
"bootcd/${_CD_DESTINATION}/${__file}=${item}")
+ set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST
"setup/${_CD_DESTINATION}/${__file}=${item}")
endif()
endforeach()
if(_CD_TARGET)
@@ -349,7 +349,7 @@
set_property(GLOBAL APPEND PROPERTY LIVECD_FILE_LIST
"${_CD_DESTINATION}/${__file}=${item}")
#add it also into the hybridcd if not specified otherwise
if(NOT _CD_NOT_IN_HYBRIDCD)
- set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST
"livecd/${_CD_DESTINATION}/${__file}=${item}")
+ set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST
"${_CD_DESTINATION}/${__file}=${item}")
endif()
endforeach()
endif() #end livecd
@@ -425,7 +425,7 @@
add_cd_file(
FILE ${CMAKE_CURRENT_BINARY_DIR}/livecd.iso
- DESTINATION livecd
+ DESTINATION root
FOR hybridcd)
get_property(_filelist GLOBAL PROPERTY BOOTCD_FILE_LIST)
