[LT2013]

- Update version
- Add themed wallpaper
- Add cmake-adjusted hybridcd tools

svn path=/branches/ros-branch-0_3_15-lt2013/; revision=59032

diff --git a/base/shell/explorer-new/res/logov.bmp b/base/shell/explorer-new/res/logov.bmp
index b4404ba..61c5e4f 100644 (file)
Binary files a/base/shell/explorer-new/res/logov.bmp and b/base/shell/explorer-new/res/logov.bmp differ

diff --git a/base/shell/explorer/res/logov.bmp b/base/shell/explorer/res/logov.bmp
index 109246c..61c5e4f 100644 (file)
Binary files a/base/shell/explorer/res/logov.bmp and b/base/shell/explorer/res/logov.bmp differ

diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf
index d397103..db25a3b 100644 (file)
--- a/boot/bootdata/hivedef.inf
+++ b/boot/bootdata/hivedef.inf
@@ -95,7 +95,7 @@ HKCU,"Control Panel\Desktop","ScreenSaveActive",2,"0"
 HKCU,"Control Panel\Desktop","ScreenSaverIsSecure",2,"1"\r
 HKCU,"Control Panel\Desktop","ScreenSaveTimeOut",0,"600"\r
 HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",2,"20000"\r
-HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\Angelus_02_ROSWP.bmp"\r
+HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\angelus-ros-lt.bmp"\r
 HKCU,"Control Panel\Desktop","FontSmoothing",0,"1"\r
 HKCU,"Control Panel\Desktop","FontSmoothingOrientation",0x00010003,0x00000001\r
 HKCU,"Control Panel\Desktop","FontSmoothingType",0x00010003,0x00000001\r

diff --git a/boot/bootdata/packages/reactos.dff.in b/boot/bootdata/packages/reactos.dff.in
index 37e7b12..3018dfc 100644 (file)
--- a/boot/bootdata/packages/reactos.dff.in
+++ b/boot/bootdata/packages/reactos.dff.in
@@ -59,5 +59,3 @@ modules\optional\vmx_svga.inf                       6  optional
 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

diff --git a/hybridcd_freeldr.ini b/hybridcd_freeldr.ini
new file mode 100644 (file)
index 0000000..c339408
--- /dev/null
+++ b/hybridcd_freeldr.ini
@@ -0,0 +1,32 @@
+[FREELOADER]\r
+DefaultOS=Install\r
+Timeout=10\r
+\r
+[Display]\r
+TitleText=ReactOS 0.3.14 - CLT 2012\r
+StatusBarColor=Cyan\r
+StatusBarTextColor=Black\r
+BackdropTextColor=White\r
+BackdropColor=Blue\r
+BackdropFillStyle=Medium\r
+TitleBoxTextColor=White\r
+TitleBoxColor=Red\r
+MessageBoxTextColor=White\r
+MessageBoxColor=Blue\r
+MenuTextColor=White\r
+MenuColor=Blue\r
+TextColor=Yellow\r
+SelectedTextColor=Black\r
+SelectedColor=Gray\r
+\r
+[Operating Systems]\r
+Install="ReactOS-Installation starten"\r
+Live="ReactOS Live-System starten"\r
+\r
+[Install]\r
+BootType=ReactOSSetup\r
+\r
+[Live]\r
+BootType=Windows2003\r
+SystemPath=LiveCD\live\r
+Options=/DEBUGPORT=COM1 /SOS /MININT\r

diff --git a/include/reactos/version.cmake b/include/reactos/version.cmake
index d49faf4..7c956c1 100644 (file)
--- a/include/reactos/version.cmake
+++ b/include/reactos/version.cmake
@@ -34,7 +34,7 @@ set(KERNEL_VERSION_MINOR "3")
 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}")

diff --git a/make_hybridcd.cmd b/make_hybridcd.cmd
new file mode 100644 (file)
index 0000000..6195d64
--- /dev/null
+++ b/make_hybridcd.cmd
@@ -0,0 +1,57 @@
+:: Script to create a Hybrid-CD (Boot-CD + Live-CD) for demo purposes.\r
+:: Only run it from the root "reactos" dir (where you would also call "make").\r
+::\r
+:: Written by Colin Finck (2010-03-10)\r
+::\r
+\r
+@echo off\r
+\r
+:: Ensure that\r
+::   - the user already built Boot-CDs and Live-CDs\r
+::   - put his extra stuff into "hybridcd_extras"\r
+::   - added a copy of mkisofs\r
+if exist "boot\bootcd\." (\r
+    if exist "boot\livecd\." (\r
+        if exist "hybridcd_extras\." (\r
+            if exist "hybridcd_freeldr.ini" (\r
+                if exist "mkisofs.exe" (\r
+                    goto NEXT\r
+                )\r
+            )\r
+        )\r
+    )\r
+)\r
+\r
+echo Please make sure to copy this file (make_hybridcd.cmd) and\r
+echo hybridcd_freeldr.ini to the "reactos" subfolder in your build directory.\r
+echo You should run make_hybridcd from there.\r
+echo.\r
+echo Also build regular Boot-CDs and Live-CDs first, and create a directory\r
+echo "hybridcd_extras" (inside the reactos folder). Put everything else\r
+echo that should go in the CD root into that directory.\r
+echo.\r
+echo You also need to put a version of "mkisofs.exe" into the reactos\r
+echo directory. Get one from e.g. "PE Builder" at http://nu2.nu/.\r
+echo Our cdmake doesn't support creating an ISO9660:1999 filesystem, which is\r
+echo important for a universally usable disc.\r
+goto :EOF\r
+\r
+:: Create directories and copy the basic stuff there\r
+:NEXT\r
+rd /s /q "hybridcd"\r
+mkdir "hybridcd"\r
+mkdir "hybridcd\live"\r
+mkdir "hybridcd\Profiles"\r
+\r
+xcopy /e "boot\bootcd" "hybridcd"\r
+xcopy /e "boot\livecd\reactos" "hybridcd\live"\r
+xcopy /e "boot\livecd\Profiles" "hybridcd\Profiles"\r
+\r
+:: Copy our modified "freeldr.ini"\r
+copy /y "hybridcd_freeldr.ini" "hybridcd\freeldr.ini"\r
+\r
+:: Copy the extra stuff\r
+xcopy /e "hybridcd_extras" "hybridcd"\r
+\r
+:: Create the ISO\r
+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"\r

diff --git a/modules/wallpaper/Angelus_ReactOS7_Dark_4-3.bmp b/modules/wallpaper/Angelus_ReactOS7_Dark_4-3.bmp
deleted file mode 100644 (file)
index c7e4ffc..0000000
Binary files a/modules/wallpaper/Angelus_ReactOS7_Dark_4-3.bmp and /dev/null differ

diff --git a/modules/wallpaper/Angelus_Sea04_FarBeyondTheSea_4x3.bmp b/modules/wallpaper/Angelus_Sea04_FarBeyondTheSea_4x3.bmp
deleted file mode 100644 (file)
index 1d2c997..0000000
Binary files a/modules/wallpaper/Angelus_Sea04_FarBeyondTheSea_4x3.bmp and /dev/null differ

diff --git a/modules/wallpaper/CMakeLists.txt b/modules/wallpaper/CMakeLists.txt
index f53db97..64d1a25 100644 (file)
--- a/modules/wallpaper/CMakeLists.txt
+++ b/modules/wallpaper/CMakeLists.txt
@@ -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)

diff --git a/modules/wallpaper/RainInTheScreen_4x3.bmp b/modules/wallpaper/RainInTheScreen_4x3.bmp
deleted file mode 100644 (file)
index cf67004..0000000
Binary files a/modules/wallpaper/RainInTheScreen_4x3.bmp and /dev/null differ

diff --git a/modules/wallpaper/Angelus_02_ROSWP.bmp b/modules/wallpaper/angelus-ros-lt.bmp
similarity index 76%
rename from modules/wallpaper/Angelus_02_ROSWP.bmp
rename to modules/wallpaper/angelus-ros-lt.bmp
index 5c67bfc..4bc8693 100644 (file)
Binary files a/modules/wallpaper/Angelus_02_ROSWP.bmp and b/modules/wallpaper/angelus-ros-lt.bmp differ