[tfaber] 62438: [CLT2014] - Update version - Add CLT wallpaper based on artwork by the_dj21 (CORE-7808) - Add hybrid CD tools
Author: tfaber Date: Fri Mar 7 16:56:58 2014 New Revision: 62438
URL: http://svn.reactos.org/svn/reactos?rev=62438&view=rev Log: [CLT2014] - Update version - Add CLT wallpaper based on artwork by the_dj21 (CORE-7808) - Add hybrid CD tools
Added: branches/ros-branch-0_3_16-clt2014/reactos/hybridcd_freeldr.ini (with props) branches/ros-branch-0_3_16-clt2014/reactos/make_hybridcd.cmd (with props) branches/ros-branch-0_3_16-clt2014/reactos/modules/wallpaper/ (with props) branches/ros-branch-0_3_16-clt2014/reactos/modules/wallpaper/5DJGG-clt2014.bmp (with props) branches/ros-branch-0_3_16-clt2014/reactos/modules/wallpaper/CMakeLists.txt (with props) Modified: branches/ros-branch-0_3_16-clt2014/reactos/base/shell/explorer-new/res/logov.bmp branches/ros-branch-0_3_16-clt2014/reactos/base/shell/explorer/res/logov.bmp branches/ros-branch-0_3_16-clt2014/reactos/boot/bootdata/hivedef.inf branches/ros-branch-0_3_16-clt2014/reactos/include/reactos/version.cmake
Modified: branches/ros-branch-0_3_16-clt2014/reactos/base/shell/explorer-new/res/logov.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_16-clt2014/reacto... ============================================================================== Binary files - no diff available.
Modified: branches/ros-branch-0_3_16-clt2014/reactos/base/shell/explorer/res/logov.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_16-clt2014/reacto... ============================================================================== Binary files - no diff available.
Modified: branches/ros-branch-0_3_16-clt2014/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_16-clt2014/reacto... ============================================================================== --- branches/ros-branch-0_3_16-clt2014/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ branches/ros-branch-0_3_16-clt2014/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Fri Mar 7 16:56:58 2014 @@ -63,7 +63,7 @@ HKCU,"Control Panel\Desktop","ScreenSaverIsSecure",2,"1" HKCU,"Control Panel\Desktop","ScreenSaveTimeOut",0,"600" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",2,"20000" -HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" +HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\5DJGG-clt2014.bmp" HKCU,"Control Panel\Desktop","FontSmoothing",0,"1" HKCU,"Control Panel\Desktop","FontSmoothingOrientation",0x00010003,0x00000001 HKCU,"Control Panel\Desktop","FontSmoothingType",0x00010003,0x00000001
Added: branches/ros-branch-0_3_16-clt2014/reactos/hybridcd_freeldr.ini URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_16-clt2014/reacto... ============================================================================== --- branches/ros-branch-0_3_16-clt2014/reactos/hybridcd_freeldr.ini (added) +++ branches/ros-branch-0_3_16-clt2014/reactos/hybridcd_freeldr.ini [iso-8859-1] Fri Mar 7 16:56:58 2014 @@ -0,0 +1,32 @@ +[FREELOADER] +DefaultOS=Install +Timeout=10 + +[Display] +TitleText=ReactOS 0.3.16 - CLT 2014 +StatusBarColor=Cyan +StatusBarTextColor=Black +BackdropTextColor=White +BackdropColor=Blue +BackdropFillStyle=Medium +TitleBoxTextColor=White +TitleBoxColor=Red +MessageBoxTextColor=White +MessageBoxColor=Blue +MenuTextColor=White +MenuColor=Blue +TextColor=Yellow +SelectedTextColor=Black +SelectedColor=Gray + +[Operating Systems] +Install="ReactOS-Installation starten" +Live="ReactOS Live-System starten" + +[Install] +BootType=ReactOSSetup + +[Live] +BootType=Windows2003 +SystemPath=LiveCD\live +Options=/DEBUGPORT=COM1 /SOS /MININT
Propchange: branches/ros-branch-0_3_16-clt2014/reactos/hybridcd_freeldr.ini ------------------------------------------------------------------------------ svn:eol-style = CRLF
Modified: branches/ros-branch-0_3_16-clt2014/reactos/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_16-clt2014/reacto... ============================================================================== --- branches/ros-branch-0_3_16-clt2014/reactos/include/reactos/version.cmake [iso-8859-1] (original) +++ branches/ros-branch-0_3_16-clt2014/reactos/include/reactos/version.cmake [iso-8859-1] Fri Mar 7 16:56:58 2014 @@ -32,11 +32,11 @@ today(KERNEL_VERSION_BUILD)
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 "16") set(COPYRIGHT_YEAR "2014") # KERNEL_VERSION_BUILD_TYPE is "SVN", "RC1", "RC2" or "" (for the release) -set(KERNEL_VERSION_BUILD_TYPE "SVN") +set(KERNEL_VERSION_BUILD_TYPE "CLT2014")
set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}")
Added: branches/ros-branch-0_3_16-clt2014/reactos/make_hybridcd.cmd URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_16-clt2014/reacto... ============================================================================== --- branches/ros-branch-0_3_16-clt2014/reactos/make_hybridcd.cmd (added) +++ branches/ros-branch-0_3_16-clt2014/reactos/make_hybridcd.cmd [iso-8859-1] Fri Mar 7 16:56:58 2014 @@ -0,0 +1,57 @@ +:: Script to create a Hybrid-CD (Boot-CD + Live-CD) for demo purposes. +:: Only run it from the root "reactos" dir (where you would also call "make"). +:: +:: Written by Colin Finck (2010-03-10) +:: + +@echo off + +:: Ensure that +:: - the user already built Boot-CDs and Live-CDs +:: - put his extra stuff into "hybridcd_extras" +:: - added a copy of mkisofs +if exist "boot\bootcd." ( + if exist "boot\livecd." ( + if exist "hybridcd_extras." ( + if exist "hybridcd_freeldr.ini" ( + if exist "mkisofs.exe" ( + goto NEXT + ) + ) + ) + ) +) + +echo Please make sure to copy this file (make_hybridcd.cmd) and +echo hybridcd_freeldr.ini to the "reactos" subfolder in your build directory. +echo You should run make_hybridcd from there. +echo. +echo Also build regular Boot-CDs and Live-CDs first, and create a directory +echo "hybridcd_extras" (inside the reactos folder). Put everything else +echo that should go in the CD root into that directory. +echo. +echo You also need to put a version of "mkisofs.exe" into the reactos +echo directory. Get one from e.g. "PE Builder" at http://nu2.nu/. +echo Our cdmake doesn't support creating an ISO9660:1999 filesystem, which is +echo important for a universally usable disc. +goto :EOF + +:: Create directories and copy the basic stuff there +:NEXT +rd /s /q "hybridcd" +mkdir "hybridcd" +mkdir "hybridcd\live" +mkdir "hybridcd\Profiles" + +xcopy /e "boot\bootcd" "hybridcd" +xcopy /e "boot\livecd\reactos" "hybridcd\live" +xcopy /e "boot\livecd\Profiles" "hybridcd\Profiles" + +:: Copy our modified "freeldr.ini" +copy /y "hybridcd_freeldr.ini" "hybridcd\freeldr.ini" + +:: Copy the extra stuff +xcopy /e "hybridcd_extras" "hybridcd" + +:: Create the ISO +mkisofs -iso-level 4 -volid "ReactOS-HybridCD" -b "loader/isoboot.bin" -no-emul-boot -boot-load-size 4 -hide "boot.catalog" -o "hybridcd.iso" "hybridcd"
Propchange: branches/ros-branch-0_3_16-clt2014/reactos/make_hybridcd.cmd ------------------------------------------------------------------------------ svn:eol-style = native
Propchange: branches/ros-branch-0_3_16-clt2014/reactos/modules/wallpaper/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Mar 7 16:56:58 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+)
Propchange: branches/ros-branch-0_3_16-clt2014/reactos/modules/wallpaper/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details.
Propchange: branches/ros-branch-0_3_16-clt2014/reactos/modules/wallpaper/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
Propchange: branches/ros-branch-0_3_16-clt2014/reactos/modules/wallpaper/ ------------------------------------------------------------------------------ tsvn:logminsize = 10
Added: branches/ros-branch-0_3_16-clt2014/reactos/modules/wallpaper/5DJGG-clt2014.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_16-clt2014/reacto... ============================================================================== Binary file - no diff available.
Propchange: branches/ros-branch-0_3_16-clt2014/reactos/modules/wallpaper/5DJGG-clt2014.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream
Added: branches/ros-branch-0_3_16-clt2014/reactos/modules/wallpaper/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_16-clt2014/reacto... ============================================================================== --- branches/ros-branch-0_3_16-clt2014/reactos/modules/wallpaper/CMakeLists.txt (added) +++ branches/ros-branch-0_3_16-clt2014/reactos/modules/wallpaper/CMakeLists.txt [iso-8859-1] Fri Mar 7 16:56:58 2014 @@ -0,0 +1 @@ +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/5DJGG-clt2014.bmp DESTINATION reactos FOR all)
Propchange: branches/ros-branch-0_3_16-clt2014/reactos/modules/wallpaper/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
-
tfaber＠svn.reactos.org