[hbelusca] 66730: [VERSION]: Update versioning for CLT 2015. [BOOTDATA]: Add user-friendliness to the boot menu; fix the autorun path. [CMAKE][BOOTDATA]: Flatten a bit the hybridcd tree otherwise s...
Author: hbelusca Date: Sun Mar 15 17:34:23 2015 New Revision: 66730
URL: http://svn.reactos.org/svn/reactos?rev=66730&view=rev Log: [VERSION]: Update versioning for CLT 2015. [BOOTDATA]: Add user-friendliness to the boot menu; fix 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.3.17-CLT2015/reactos/boot/CMakeLists.txt branches/ReactOS-0.3.17-CLT2015/reactos/boot/bootdata/autorun.inf branches/ReactOS-0.3.17-CLT2015/reactos/boot/bootdata/hybridcd.ini branches/ReactOS-0.3.17-CLT2015/reactos/cmake/CMakeMacros.cmake branches/ReactOS-0.3.17-CLT2015/reactos/include/reactos/version.cmake
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/b... ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/boot/CMakeLists.txt [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/boot/CMakeLists.txt [iso-8859-1] Sun Mar 15 17:34:23 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-CLT2015/reactos/boot/bootdata/autorun.inf URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/b... ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/boot/bootdata/autorun.inf [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/boot/bootdata/autorun.inf [iso-8859-1] Sun Mar 15 17:34:23 2015 @@ -1,3 +1,3 @@ [autorun] -open=reactos\welcome.exe +open=setup\reactos\welcome.exe icon=icon.ico
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/boot/bootdata/hybridcd.ini URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/b... ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/boot/bootdata/hybridcd.ini [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/boot/bootdata/hybridcd.ini [iso-8859-1] Sun Mar 15 17:34:23 2015 @@ -1,9 +1,9 @@ [FREELOADER] -DefaultOS=Setup -TimeOut=5 +DefaultOS=LiveCD_RamDisk +TimeOut=20
[Display] -TitleText=ReactOS Hybrid-CD +TitleText=ReactOS 0.3.17 Hybrid-CD - CLT 2015 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.3.17-CLT2015/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/c... ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sun Mar 15 17:34:23 2015 @@ -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)
Modified: branches/ReactOS-0.3.17-CLT2015/reactos/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.17-CLT2015/reactos/i... ============================================================================== --- branches/ReactOS-0.3.17-CLT2015/reactos/include/reactos/version.cmake [iso-8859-1] (original) +++ branches/ReactOS-0.3.17-CLT2015/reactos/include/reactos/version.cmake [iso-8859-1] Sun Mar 15 17:34:23 2015 @@ -17,11 +17,11 @@ string(TIMESTAMP KERNEL_VERSION_BUILD %Y%m%d UTC)
set(KERNEL_VERSION_MAJOR "0") -set(KERNEL_VERSION_MINOR "4") -set(KERNEL_VERSION_PATCH_LEVEL "0") +set(KERNEL_VERSION_MINOR "3") +set(KERNEL_VERSION_PATCH_LEVEL "17") set(COPYRIGHT_YEAR "2015") # KERNEL_VERSION_BUILD_TYPE is "SVN", "RC1", "RC2" or "" (for the release) -set(KERNEL_VERSION_BUILD_TYPE "SVN") +set(KERNEL_VERSION_BUILD_TYPE "CLT2015")
set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}")
-
hbelusca＠svn.reactos.org