[ros-diffs] [hbelusca] 73588: [BOOTDATA] - Flatten out the ISO layout for hybridcd (otherwise some problems appear for the livecd: see r66114 for more details). - Add user-friendly boot menu. [README]: Update ...

Author: hbelusca
Date: Mon Jan 23 12:45:51 2017
New Revision: 73588

URL: http://svn.reactos.org/svn/reactos?rev=73588&view=rev
Log:
[BOOTDATA]
- Flatten out the ISO layout for hybridcd (otherwise some problems appear for the livecd:
see r66114 for more details).
- Add user-friendly boot menu.

[README]: Update the ReadMe.txt for FOSDEM 2017.

[VERSION]: Adjust version to 0.4.4-RC FOSDEM 2017.

Modified:
    branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/CMakeLists.txt
    branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/autorun-hybridcd.inf
    branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/hybridcd.ini
    branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/readme.txt
    branches/ReactOS-0.4.4-FOSDEM2017/reactos/sdk/cmake/CMakeMacros.cmake
    branches/ReactOS-0.4.4-FOSDEM2017/reactos/sdk/include/reactos/version.cmake

Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto…
==============================================================================
--- branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/CMakeLists.txt	[iso-8859-1] (original)
+++ branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/CMakeLists.txt	[iso-8859-1] Mon Jan 23
12:45:51 2017
@@ -131,32 +131,32 @@
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst
"${CMAKE_CURRENT_BINARY_DIR}/empty\n")
 
 # Create the empty Desktop, Favorites, and Start Menu folders. And many more.
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All
Users/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All
Users/Documents/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All
Users/Documents/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All
Users/Documents/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All
Users/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/My
Documents=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All
Users/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All
Users/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default
User/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default
User/Cookies=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default
User/Desktop=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default
User/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default
User/Local Settings/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default
User/Local Settings/History=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default
User/Local Settings/Temporary Internet Files=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default
User/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default
User/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default
User/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default
User/NetHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default
User/PrintHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default
User/Recent=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default
User/SendTo=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default
User/Start Menu/Programs=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default
User/Start Menu/Programs/Administrative Tools=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default
User/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default
User/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/All Users/Application
Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/All
Users/Documents/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/All
Users/Documents/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/All
Users/Documents/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/All
Users/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/All Users/My
Documents=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/All Users/Start
Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/All
Users/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default
User/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default
User/Cookies=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default
User/Desktop=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default
User/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Local
Settings/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Local
Settings/History=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Local
Settings/Temporary Internet Files=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/My
Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/My
Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/My
Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default
User/NetHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default
User/PrintHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default
User/Recent=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default
User/SendTo=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Start
Menu/Programs=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Start
Menu/Programs/Administrative Tools=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Start
Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default
User/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
 
 add_custom_target(hybridcd
     COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/hybridcd.iso -iso-level 4

Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/autorun-hybridcd.inf
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto…
==============================================================================
---
branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/autorun-hybridcd.inf	[iso-8859-1]
(original)
+++
branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/autorun-hybridcd.inf	[iso-8859-1]
Mon Jan 23 12:45:51 2017
@@ -1,3 +1,3 @@
 [autorun]
-open=bootcd\reactos\welcome.exe
+open=setup\reactos\welcome.exe
 icon=icon.ico

Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/hybridcd.ini
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto…
==============================================================================
--- branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/hybridcd.ini	[iso-8859-1]
(original)
+++ branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/hybridcd.ini	[iso-8859-1] Mon
Jan 23 12:45:51 2017
@@ -1,9 +1,9 @@
 [FREELOADER]
-DefaultOS=Setup
-TimeOut=5
+DefaultOS=LiveCD_RamDisk
+TimeOut=20
 
 [Display]
-TitleText=ReactOS Hybrid-CD
+TitleText=ReactOS 0.4.4-RC for FOSDEM 2017
 StatusBarColor=Cyan
 StatusBarTextColor=Black
 BackdropTextColor=White
@@ -13,62 +13,33 @@
 TitleBoxColor=Red
 MessageBoxTextColor=White
 MessageBoxColor=Blue
-MenuTextColor=Gray
-MenuColor=Black
-TextColor=Gray
+MenuTextColor=White
+MenuColor=Blue
+TextColor=Yellow
 SelectedTextColor=Black
 SelectedColor=Gray
-ShowTime=No
-MenuBox=No
-CenterMenu=No
-MinimalUI=Yes
-TimeText=Seconds until highlighted choice will be started automatically:   
+SpecialEffects=Yes
 
 [Operating Systems]
-Setup="Setup"
-LiveCD="LiveCD"
-LiveCD_Debug="LiveCD (Debug)"
-LiveCD_Screen="LiveCD (Screen)"
-LiveCD_LogFile="LiveCD (Log file)"
-LiveCD_RamDisk="LiveCD in RAM"
-LiveCD_RamDisk_Debug="LiveCD in RAM (Debug)"
-LiveCD_RamDisk_Screen="LiveCD in RAM (Screen)"
+Setup="ReactOS Setup"
+LiveCD="ReactOS Live"
+LiveCD_RamDisk="ReactOS Live in RAM"
+HddBoot="Boot from first hard disk"
 
 [Setup]
 BootType=ReactOSSetup
-SystemPath=\bootcd
+SystemPath=\setup
 
 [LiveCD]
 BootType=Windows2003
-SystemPath=\livecd\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
-Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT
-
-[LiveCD_LogFile]
-BootType=Windows2003
-SystemPath=\livecd\reactos
-Options=/DEBUG /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log /SOS /MININT
 
 [LiveCD_RamDisk]
 BootType=Windows2003
 SystemPath=ramdisk(0)\reactos
-Options=/MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD
+Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /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
-
-[LiveCD_RamDisk_Screen]
-BootType=Windows2003
-SystemPath=ramdisk(0)\reactos
-Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD
+[HddBoot]
+BootType=Drive
+BootDrive=hd0

Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/readme.txt
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto…
==============================================================================
--- branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/readme.txt	[iso-8859-1]
(original)
+++ branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/readme.txt	[iso-8859-1] Mon
Jan 23 12:45:51 2017
@@ -1,7 +1,23 @@
-========================
-ReactOS™ Version 0.4.x
-Updated August 31, 2016
-========================
+================================================================================
+ReactOS™ Version 0.4.4-RC Preview
+for FOSDEM 2017
+================================================================================
+
+0. CD-ROM Contents
+------------------
+
+* ReactOS LiveCD and Installation
+* ReactOS on QEMU virtual machine
+* ReactOS Build Environment (RosBE) for Windows and Unix-like OSes
+* ReactOS source code
+
+This CD-ROM starts an AutoRun program under Windows. Alternatively you can
+browse the contents of this CD-ROM with any file browser. The folder names
+should be self-explanatory.
+
+The source code of ReactOS can be compiled using the ReactOS Build Environment
+under Windows or Unix-like operating systems such as Linux.
+
 
 1. What is ReactOS?
 -------------------

Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/sdk/cmake/CMakeMacros.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto…
==============================================================================
--- branches/ReactOS-0.4.4-FOSDEM2017/reactos/sdk/cmake/CMakeMacros.cmake	[iso-8859-1]
(original)
+++ branches/ReactOS-0.4.4-FOSDEM2017/reactos/sdk/cmake/CMakeMacros.cmake	[iso-8859-1] Mon
Jan 23 12:45:51 2017
@@ -318,7 +318,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)
@@ -357,7 +357,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
@@ -433,7 +433,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)

Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/sdk/include/reactos/version.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto…
==============================================================================
---
branches/ReactOS-0.4.4-FOSDEM2017/reactos/sdk/include/reactos/version.cmake	[iso-8859-1]
(original)
+++
branches/ReactOS-0.4.4-FOSDEM2017/reactos/sdk/include/reactos/version.cmake	[iso-8859-1]
Mon Jan 23 12:45:51 2017
@@ -22,10 +22,10 @@
 set(COPYRIGHT_YEAR "2017")
 
 # KERNEL_VERSION_BUILD_TYPE is "SVN" or "" (for the release)
-set(KERNEL_VERSION_BUILD_TYPE "SVN")
+set(KERNEL_VERSION_BUILD_TYPE "")
 
 # KERNEL_VERSION_RELEASE_TYPE is "RC1", "RC2" or "" (for
the final one)
-set(KERNEL_VERSION_RELEASE_TYPE "")
+set(KERNEL_VERSION_RELEASE_TYPE "FOSDEM2017RC")
 
 set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}")
 if(KERNEL_VERSION_PATCH_LEVEL)