[ros-diffs] [hbelusca] 66114: [FOSDEM2015]: Flatten a bit the hybridcd tree otherwise some problems appear for the livecd (in other words, some parts of the OS do not really support having ROS installed eg. in...

Author: hbelusca
Date: Thu Jan 29 21:36:54 2015
New Revision: 66114

URL: http://svn.reactos.org/svn/reactos?rev=66114&view=rev
Log:
[FOSDEM2015]: Flatten a bit the hybridcd tree otherwise some problems appear for the
livecd (in other words, some parts of the OS do not really support having ROS installed
eg. in C:\some_custom_dir\reactos instead of C:\reactos).

Modified:
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/CMakeLists.txt
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/autorun.inf
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/hybridcd.ini
    branches/ReactOS-0.3.17-FOSDEM2015/reactos/cmake/CMakeMacros.cmake

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/react…
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/CMakeLists.txt	[iso-8859-1]
(original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/CMakeLists.txt	[iso-8859-1] Thu Jan 29
21:36:54 2015
@@ -34,8 +34,8 @@
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "")
 
 #create the empty Desktop 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 "livecd/Profiles/Default
User/Start Menu/Programs\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/Start
Menu/Programs\n")
 
 add_custom_target(hybridcd
     COMMAND native-cdmake -j -m -b
${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isoboot.bin
@${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst REACTOS ${REACTOS_BINARY_DIR}/hybridcd.iso

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/autorun.inf
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/react…
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/autorun.inf	[iso-8859-1]
(original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/autorun.inf	[iso-8859-1] Thu
Jan 29 21:36:54 2015
@@ -1,3 +1,3 @@
 [autorun]
-open=livecd\reactos\welcome.exe
+open=setup\reactos\welcome.exe
 icon=icon.ico

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/hybridcd.ini
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/react…
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/hybridcd.ini	[iso-8859-1]
(original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/boot/bootdata/hybridcd.ini	[iso-8859-1] Thu
Jan 29 21:36:54 2015
@@ -32,37 +32,37 @@
 
 [Setup]
 BootType=ReactOSSetup
-SystemPath=\bootcd
+SystemPath=\setup
 
 [LiveCD]
 BootType=Windows2003
-SystemPath=\livecd\reactos
+SystemPath=\reactos
 Options=/MININT
 
 [LiveCD_Debug]
 BootType=Windows2003
-SystemPath=\livecd\reactos
+SystemPath=\reactos
 Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT
 
 [LiveCD_Screen]
 BootType=Windows2003
-SystemPath=\livecd\reactos
+SystemPath=\reactos
 Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT
 
 [LiveCD_RamDisk]
 BootType=Windows2003
 SystemPath=ramdisk(0)\reactos
-Options=/MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD
+Options=/MININT /RDPATH=livecd.iso /RDEXPORTASCD
 
 [LiveCD_RamDisk_Debug]
 BootType=Windows2003
 SystemPath=ramdisk(0)\reactos
-Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT /RDPATH=livecd\livecd.iso
/RDEXPORTASCD
+Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT /RDPATH=livecd.iso
/RDEXPORTASCD
 
 [LiveCD_RamDisk_Screen]
 BootType=Windows2003
 SystemPath=ramdisk(0)\reactos
-Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD
+Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT /RDPATH=livecd.iso /RDEXPORTASCD
 
 [HddBoot]
 BootType=Drive

Modified: branches/ReactOS-0.3.17-FOSDEM2015/reactos/cmake/CMakeMacros.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-FOSDEM2015/react…
==============================================================================
--- branches/ReactOS-0.3.17-FOSDEM2015/reactos/cmake/CMakeMacros.cmake	[iso-8859-1]
(original)
+++ branches/ReactOS-0.3.17-FOSDEM2015/reactos/cmake/CMakeMacros.cmake	[iso-8859-1] Thu
Jan 29 21:36:54 2015
@@ -308,7 +308,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)
@@ -347,7 +347,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
@@ -423,7 +423,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)