[tfaber] 70325: [0.4.0] - Update version to 0.4.0 - Properly determine SVN revision - Update CD root readme

Author: tfaber
Date: Sat Dec 12 08:32:56 2015
New Revision: 70325

URL: http://svn.reactos.org/svn/reactos?rev=70325&view=rev
Log:
[0.4.0]
- Update version to 0.4.0
- Properly determine SVN revision
- Update CD root readme

Modified:
    branches/ros-branch-0_4_0/   (props changed)
    branches/ros-branch-0_4_0/reactos/   (props changed)
    branches/ros-branch-0_4_0/reactos/base/shell/explorer/res/bmp/158.bmp
    branches/ros-branch-0_4_0/reactos/boot/bootdata/readme.txt
    branches/ros-branch-0_4_0/reactos/include/reactos/version.cmake

Propchange: branches/ros-branch-0_4_0/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sat Dec 12 08:32:56 2015
@@ -1 +1 @@
-/trunk:70000-70321
+/trunk:70000-70321,70324

Propchange: branches/ros-branch-0_4_0/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sat Dec 12 08:32:56 2015
@@ -20,4 +20,4 @@
 /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup:54809-54998
-/trunk/reactos:70000-70321
+/trunk/reactos:70000-70321,70324

Modified: branches/ros-branch-0_4_0/reactos/base/shell/explorer/res/bmp/158.bmp
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/sh...
==============================================================================
Binary files - no diff available.

Modified: branches/ros-branch-0_4_0/reactos/boot/bootdata/readme.txt
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/boot/bo...
==============================================================================
--- branches/ros-branch-0_4_0/reactos/boot/bootdata/readme.txt	[iso-8859-1] (original)
+++ branches/ros-branch-0_4_0/reactos/boot/bootdata/readme.txt	[iso-8859-1] Sat Dec 12 08:32:56 2015
@@ -1,6 +1,6 @@
 ========================
-ReactOS™ Version 0.3.x
-Updated March 3, 2013
+ReactOS™ Version 0.4.x
+Updated December 12, 2015
 ========================

1. What is ReactOS?

Modified: branches/ros-branch-0_4_0/reactos/include/reactos/version.cmake
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/include...
==============================================================================
--- branches/ros-branch-0_4_0/reactos/include/reactos/version.cmake	[iso-8859-1] (original)
+++ branches/ros-branch-0_4_0/reactos/include/reactos/version.cmake	[iso-8859-1] Sat Dec 12 08:32:56 2015
@@ -21,7 +21,7 @@
 set(KERNEL_VERSION_PATCH_LEVEL "0")
 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 "")

set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}")
@@ -37,10 +37,10 @@
 # get svn revision number
 set(REVISION "rUNKNOWN")
 set(KERNEL_VERSION_BUILD_HEX "0")
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn")
+if(EXISTS "${REACTOS_SOURCE_DIR}/.svn" OR EXISTS "${REACTOS_SOURCE_DIR}/../.svn")
     find_package(Subversion)
     if(Subversion_FOUND)
-        subversion_wc_info(${CMAKE_CURRENT_SOURCE_DIR} SVNINFO)
+        subversion_wc_info(${REACTOS_SOURCE_DIR} SVNINFO)
         if(SVNINFO_WC_REVISION)
             set(REVISION "r${SVNINFO_WC_REVISION}")
             converttohex(${SVNINFO_WC_REVISION} KERNEL_VERSION_BUILD_HEX)