[tfaber] 59032: [LT2013] - Update version - Add themed wallpaper - Add cmake-adjusted hybridcd tools
Author: tfaber Date: Sat May 18 11:41:34 2013 New Revision: 59032
URL: http://svn.reactos.org/svn/reactos?rev=59032&view=rev Log: [LT2013] - Update version - Add themed wallpaper - Add cmake-adjusted hybridcd tools
Added: branches/ros-branch-0_3_15-lt2013/hybridcd_freeldr.ini - copied unchanged from r59031, tags/ReactOS-0.3.14-CLT2012/hybridcd_freeldr.ini branches/ros-branch-0_3_15-lt2013/make_hybridcd.cmd - copied, changed from r59031, tags/ReactOS-0.3.14-CLT2012/make_hybridcd.cmd branches/ros-branch-0_3_15-lt2013/modules/wallpaper/angelus-ros-lt.bmp - copied, changed from r59031, branches/ros-branch-0_3_15-lt2013/modules/wallpaper/Angelus_02_ROSWP.bmp Removed: branches/ros-branch-0_3_15-lt2013/modules/wallpaper/Angelus_02_ROSWP.bmp branches/ros-branch-0_3_15-lt2013/modules/wallpaper/Angelus_ReactOS7_Dark_4-3.bmp branches/ros-branch-0_3_15-lt2013/modules/wallpaper/Angelus_Sea04_FarBeyondTheSea_4x3.bmp branches/ros-branch-0_3_15-lt2013/modules/wallpaper/RainInTheScreen_4x3.bmp Modified: branches/ros-branch-0_3_15-lt2013/base/shell/explorer-new/res/logov.bmp branches/ros-branch-0_3_15-lt2013/base/shell/explorer/res/logov.bmp branches/ros-branch-0_3_15-lt2013/boot/bootdata/hivedef.inf branches/ros-branch-0_3_15-lt2013/boot/bootdata/packages/reactos.dff.in branches/ros-branch-0_3_15-lt2013/include/reactos/version.cmake branches/ros-branch-0_3_15-lt2013/modules/wallpaper/CMakeLists.txt
Modified: branches/ros-branch-0_3_15-lt2013/base/shell/explorer-new/res/logov.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/sh... ============================================================================== Binary files - no diff available.
Modified: branches/ros-branch-0_3_15-lt2013/base/shell/explorer/res/logov.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/base/sh... ============================================================================== Binary files - no diff available.
Modified: branches/ros-branch-0_3_15-lt2013/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/boot/bo... ============================================================================== --- branches/ros-branch-0_3_15-lt2013/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ branches/ros-branch-0_3_15-lt2013/boot/bootdata/hivedef.inf [iso-8859-1] Sat May 18 11:41:34 2013 @@ -95,7 +95,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,"%SystemRoot%\Angelus_02_ROSWP.bmp" +HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\angelus-ros-lt.bmp" HKCU,"Control Panel\Desktop","FontSmoothing",0,"1" HKCU,"Control Panel\Desktop","FontSmoothingOrientation",0x00010003,0x00000001 HKCU,"Control Panel\Desktop","FontSmoothingType",0x00010003,0x00000001
Modified: branches/ros-branch-0_3_15-lt2013/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/boot/bo... ============================================================================== --- branches/ros-branch-0_3_15-lt2013/boot/bootdata/packages/reactos.dff.in [iso-8859-1] (original) +++ branches/ros-branch-0_3_15-lt2013/boot/bootdata/packages/reactos.dff.in [iso-8859-1] Sat May 18 11:41:34 2013 @@ -59,5 +59,3 @@ modules\optional\vmx_svga.sys 2 optional modules\optional\wine_gecko-1.0.0-x86.cab 4 optional boot\bootdata\bootcdregtest\AHKAppTests.cmd 7 optional - -modules\wallpaper\Angelus_02_ROSWP.bmp 4 optional
Modified: branches/ros-branch-0_3_15-lt2013/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/include... ============================================================================== --- branches/ros-branch-0_3_15-lt2013/include/reactos/version.cmake [iso-8859-1] (original) +++ branches/ros-branch-0_3_15-lt2013/include/reactos/version.cmake [iso-8859-1] Sat May 18 11:41:34 2013 @@ -34,7 +34,7 @@ set(KERNEL_VERSION_PATCH_LEVEL "15") set(COPYRIGHT_YEAR "2013") # KERNEL_VERSION_BUILD_TYPE is "SVN", "RC1", "RC2" or "" (for the release) -set(KERNEL_VERSION_BUILD_TYPE "") +set(KERNEL_VERSION_BUILD_TYPE "LT2013")
set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}")
Copied: branches/ros-branch-0_3_15-lt2013/make_hybridcd.cmd (from r59031, tags/ReactOS-0.3.14-CLT2012/make_hybridcd.cmd) URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/make_hy... ============================================================================== --- tags/ReactOS-0.3.14-CLT2012/make_hybridcd.cmd [iso-8859-1] (original) +++ branches/ros-branch-0_3_15-lt2013/make_hybridcd.cmd [iso-8859-1] Sat May 18 11:41:34 2013 @@ -10,21 +10,27 @@ :: - the user already built Boot-CDs and Live-CDs :: - put his extra stuff into "hybridcd_extras" :: - added a copy of mkisofs -if exist "output-i386\bootcd." ( - if exist "output-i386\livecd." ( +if exist "boot\bootcd." ( + if exist "boot\livecd." ( if exist "hybridcd_extras." ( - if exist "mkisofs.exe" ( - goto NEXT + if exist "hybridcd_freeldr.ini" ( + if exist "mkisofs.exe" ( + goto NEXT + ) ) ) ) )
-echo Please build regular Boot-CDs and Live-CDs first! -echo Also create a directory "hybridcd_extras" and put everything else -echo for the CD root into this directory. +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 You also need to put a version of "mkisofs.exe" into this +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. @@ -37,9 +43,9 @@ mkdir "hybridcd\live" mkdir "hybridcd\Profiles"
-xcopy /e "output-i386\bootcd" "hybridcd" -xcopy /e "output-i386\livecd\reactos" "hybridcd\live" -xcopy /e "output-i386\livecd\Profiles" "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" @@ -48,4 +54,4 @@ 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" +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"
Removed: branches/ros-branch-0_3_15-lt2013/modules/wallpaper/Angelus_02_ROSWP.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/modules... ============================================================================== Binary file - no diff available.
Removed: branches/ros-branch-0_3_15-lt2013/modules/wallpaper/Angelus_ReactOS7_Dark_4-3.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/modules... ============================================================================== Binary file - no diff available.
Removed: branches/ros-branch-0_3_15-lt2013/modules/wallpaper/Angelus_Sea04_FarBeyondTheSea_4x3.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/modules... ============================================================================== Binary file - no diff available.
Modified: branches/ros-branch-0_3_15-lt2013/modules/wallpaper/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/modules... ============================================================================== --- branches/ros-branch-0_3_15-lt2013/modules/wallpaper/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-branch-0_3_15-lt2013/modules/wallpaper/CMakeLists.txt [iso-8859-1] Sat May 18 11:41:34 2013 @@ -1,4 +1 @@ -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus_ReactOS7_Dark_4-3.bmp DESTINATION reactos FOR all) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus_02_ROSWP.bmp DESTINATION reactos FOR all) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus_Sea04_FarBeyondTheSea_4x3.bmp DESTINATION reactos FOR all) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/RainInTheScreen_4x3.bmp DESTINATION reactos FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/angelus-ros-lt.bmp DESTINATION reactos FOR all)
Removed: branches/ros-branch-0_3_15-lt2013/modules/wallpaper/RainInTheScreen_4x3.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/modules... ============================================================================== Binary file - no diff available.
Copied: branches/ros-branch-0_3_15-lt2013/modules/wallpaper/angelus-ros-lt.bmp (from r59031, branches/ros-branch-0_3_15-lt2013/modules/wallpaper/Angelus_02_ROSWP.bmp) URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_15-lt2013/modules... ============================================================================== Binary files - no diff available.
-
tfaber＠svn.reactos.org