[BRANCHES/TRANSITION_PTE]

 - Sync to trunk head 70646

svn path=/branches/TransitionPte/; revision=70648

Author: zefklop

.hgeol

@@ -1,11 +1,21 @@
 
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 
 if(POLICY CMP0017)
     # Shadow cmake provided modules
     cmake_policy(SET CMP0017 OLD)
 endif()
 
+if(POLICY CMP0026)
+    # Allow use of the LOCATION property
+    cmake_policy(SET CMP0026 OLD)
+endif()
+
+if(POLICY CMP0051)
+    # List TARGET_OBJECTS in SOURCES target property
+    cmake_policy(SET CMP0051 NEW)
+endif()
+
 project(REACTOS)
 
 # Versioning
@@ -27,8 +37,8 @@ set(CMAKE_COLOR_MAKEFILE OFF)
 #set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
 set(CMAKE_SKIP_INSTALL_RULES ON)
 
-if(NOT CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS")
-    set(CMAKE_DISABLE_NINJA_DEPSLOG TRUE)
+if(NOT DEFINED NEW_STYLE_BUILD)
+    set(NEW_STYLE_BUILD TRUE)
 endif()
 
 if(NOT ARCH)
@@ -55,8 +65,25 @@ include(cmake/compilerflags.cmake)
 
 add_definitions(-D__REACTOS__)
 
+if(MSVC_IDE)
+    add_compile_flags("/MP")
+endif()
+
+# We don't need CMake importlib handling.
+# FIXME: Remove the MSVC_IDE condition when the upcoming RosBE lands.
+if(NOT MSVC_IDE)
+    unset(CMAKE_IMPORT_LIBRARY_SUFFIX)
+endif()
+
+# Bison and Flex support
+# include(cmake/bison-flex.cmake)
+
 if(NOT CMAKE_CROSSCOMPILING)
 
+    if(NEW_STYLE_BUILD)
+        set(TOOLS_FOLDER ${CMAKE_CURRENT_BINARY_DIR})
+    endif()
+
     add_definitions(-DTARGET_${ARCH})
 
     if(MSVC)
@@ -79,14 +106,23 @@ if(NOT CMAKE_CROSSCOMPILING)
     add_subdirectory(tools)
     add_subdirectory(lib)
 
-    if(NOT MSVC)
-        export(TARGETS bin2c widl gendib cabman cdmake mkhive obj2bin spec2def geninc rsym mkshelllink utf16le FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
-    else()
-        export(TARGETS bin2c widl gendib cabman cdmake mkhive obj2bin spec2def geninc mkshelllink utf16le FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+    if(NOT NEW_STYLE_BUILD)
+        if(NOT MSVC)
+            export(TARGETS bin2c widl gendib cabman cdmake fatten hpp mkhive obj2bin spec2def geninc rsym mkshelllink utf16le FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+        else()
+            export(TARGETS bin2c widl gendib cabman cdmake fatten hpp mkhive obj2bin spec2def geninc mkshelllink utf16le FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+        endif()
     endif()
 
 else()
 
+    if(NEW_STYLE_BUILD)
+        include(cmake/host-tools.cmake)
+    endif()
+
+    # Print build type
+    message("-- Build Type: ${CMAKE_BUILD_TYPE}")
+
     # adjust the default behaviour of the FIND_XXX() commands:
     # search headers and libraries in the target environment, search
     # programs in the host environment
@@ -97,15 +133,6 @@ else()
     #useful stuff!
     include(CMakeParseArguments)
 
-    if(ENABLE_CCACHE)
-        set(CMAKE_C_USE_RESPONSE_FILE_FOR_INCLUDES OFF)
-        set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES OFF)
-    endif()
-
-    # Default to Debug for the build type
-    set(CMAKE_BUILD_TYPE "Debug" CACHE STRING
-"Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE)
-
     # Do some cleanup
     file(REMOVE
         ${REACTOS_BINARY_DIR}/dependencies.graphml
@@ -116,13 +143,14 @@ else()
         ${REACTOS_BINARY_DIR}/boot/ros_cab.txt
         ${REACTOS_BINARY_DIR}/boot/ros_cab_target.txt)
 
-    if(NOT DEFINED REACTOS_BUILD_TOOLS_DIR)
-        set(REACTOS_BUILD_TOOLS_DIR ${REACTOS_SOURCE_DIR}/build)
+    if(NOT NEW_STYLE_BUILD)
+        if(NOT DEFINED REACTOS_BUILD_TOOLS_DIR)
+            set(REACTOS_BUILD_TOOLS_DIR ${REACTOS_SOURCE_DIR}/build)
+        endif()
+        set(IMPORT_EXECUTABLES "${REACTOS_BUILD_TOOLS_DIR}/ImportExecutables.cmake" CACHE FILEPATH "Host executables")
+        include(${IMPORT_EXECUTABLES})
     endif()
 
-    set(IMPORT_EXECUTABLES "${REACTOS_BUILD_TOOLS_DIR}/ImportExecutables.cmake" CACHE FILEPATH "Host executables")
-    include(${IMPORT_EXECUTABLES})
-
     if(DBG)
         add_definitions(-DDBG=1 -D_SEH_ENABLE_TRACE)
     else()
@@ -137,7 +165,7 @@ else()
         add_definitions(-D_WINKD_=1)
     endif()
 
-    if(CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS")
+    if(CMAKE_VERSION MATCHES "ReactOS")
         set(PCH 1 CACHE BOOL "Whether to use precompiled headers")
     else()
         set(PCH 0 CACHE BOOL "Whether to use precompiled headers")
@@ -157,7 +185,10 @@ else()
         add_definitions(-D_M_AMD64 -D_AMD64_ -D__x86_64__ -D_WIN64)
     elseif(ARCH STREQUAL "arm")
         # _M_ARM is already defined by toolchain
-        add_definitions(-D_ARM_ -D__arm__)
+        add_definitions(-D_ARM_ -D__arm__ -DWIN32)
+        if(SARCH STREQUAL "omap-zoom2")
+            add_definitions(-D_ZOOM2_)
+        endif()
     endif()
 
     # Other
@@ -166,7 +197,7 @@ else()
     elseif(ARCH STREQUAL "amd64")
         add_definitions(-DUSE_COMPILER_EXCEPTIONS -DNO_UNDERSCORE_PREFIX)
     elseif(ARCH STREQUAL "arm")
-        add_definitions(-DUSE_COMPILER_EXCEPTIONS)
+        add_definitions(-DUSE_COMPILER_EXCEPTIONS -DNO_UNDERSCORE_PREFIX)
     endif()
 
     # Activate support for assembly source files
@@ -202,6 +233,7 @@ else()
         ${REACTOS_BINARY_DIR}/include
         ${REACTOS_BINARY_DIR}/include/psdk
         ${REACTOS_BINARY_DIR}/include/dxsdk
+        ${REACTOS_BINARY_DIR}/include/ddk
         ${REACTOS_BINARY_DIR}/include/reactos
         include/crt
         include/ddk
@@ -215,13 +247,20 @@ else()
 
     add_dependency_header()
 
+    add_subdirectory(include/xdk)
     add_subdirectory(include/psdk)
     add_subdirectory(include/dxsdk)
     add_subdirectory(include/reactos/wine)
     add_subdirectory(include/reactos/mc)
     add_subdirectory(include/asm)
 
-    include(cmake/baseaddress.cmake)
+    if(NO_ROSSYM)
+        include(cmake/baseaddress_dwarf.cmake)
+    elseif(MSVC)
+        include(cmake/baseaddress_msvc.cmake)
+    else()
+        include(cmake/baseaddress.cmake)
+    endif()
 
     # For MSVC builds, this puts all debug symbols file in the same directory.
     set(CMAKE_PDB_OUTPUT_DIRECTORY "${REACTOS_BINARY_DIR}/msvc_pdb")
@@ -240,6 +279,9 @@ else()
     add_subdirectory(tools/wpp)
     add_subdirectory(win32ss)
 
+    # Create the registry hives
+    create_registry_hives()
+
     # Create {bootcd, livecd, bootcdregtest}.lst
     create_iso_lists()
 

CMakeLists.txt

@@ -13,6 +13,7 @@ Brian Palmer <[email protected]>
 Cameron M. Gutman <[email protected]>
 Casper S. Hornstrup <[email protected]>
 Christoph von Wittich <[email protected]>
+Colin Finck <[email protected]>
 Daniel Reimer <[email protected]>
 David Welch <[email protected]>
 Dmitry Chapyshev <[email protected]>
@@ -67,7 +68,7 @@ Robert Dickenson <[email protected]>
 Royce Mitchell III <[email protected]>
 Samuel Serapi�n <[email protected]>
 Saveliy Tretiakov <[email protected]>
-Stefan Ginsberg <[email protected]>
+Stefan Ginsberg <[email protected]>
 Steven Edwards <[email protected]>
 Thomas Weidenmueller <[email protected]>
 Timo Kreuzer <[email protected]>

CREDITS

@@ -1,28 +1,41 @@
 1. Build environment
+--------------------
 
-To build the system you need either mingw32 installed on Windows or a mingw32
-cross compiler running on unix. You may obtain MinGW binaries that build
-ReactOS from http://www.reactos.org/. 
+To build the system it is strongly advised to use the ReactOS Build Environment
+(RosBE). Up-to-date versions for Windows and for Unix/GNU-Linux are available
+from our download page at: http://www.reactos.org/wiki/Build_Environment/
+
+Alternatively one can use Microsoft Visual C++ (MSVC) version 2010+, together
+with separate installations of CMake and the Ninja build utility.
 
 
 2. Building ReactOS
+-------------------
+
+A throughout guide for how to build ReactOS can be found at:
+  http://www.reactos.org/wiki/Building_ReactOS
+
+In the following we only make a quick overview.
+
 
 2.1 Building the binaries
 
-To build ReactOS run 'make' (without the quotes) if you are building on Linux
-or 'mingw32-make' if you are building on Windows (or ReactOS) from the top
-directory. If you are using RosBE, follow on-screen instructions.
+To build ReactOS run 'ninja' (without the quotes), or alternatively run
+'make' if you are using the Make utility, from the top directory.
+NOTE: In the other examples listed in the following, similar modification
+holds if you are using the Make utility instead of Ninja.
+If you are using RosBE, follow on-screen instructions.
 
 
 2.2 Building a bootable CD image
 
-To build a bootable CD image run 'make bootcd' (without the quotes) if you are
-building on Linux or 'mingw32-make bootcd' if you are building on Windows (or
-ReactOS) from the top directory. This will create a CD image with a filename,
-ReactOS.iso, in the top directory.
+To build a bootable CD image run 'ninja bootcd' (without the quotes) from the
+top directory. This will create a CD image with a filename, ReactOS.iso, in
+the top directory.
 
 
 3. Installation
+---------------
 
 ReactOS can only be installed on a machine that has a FAT16 or FAT32 partition
 as the active (bootable) partition. The partition on which ReactOS is to be
@@ -41,13 +54,13 @@ build a bootable CD as described above. Burn the CD image, boot from it, and
 follow the instructions to install ReactOS.
 
 If you have an existing ReactOS installation you want to upgrade, then to
-install ReactOS after building it, type 'make install' or
-'mingw32-make install'. This will create the directory 'reactos' in the top
-directory. Copy the contents of this directory over the existing installation.
+install ReactOS after building it, type 'ninja install'. This will create
+the directory 'reactos' in the top directory. Copy the contents of this
+directory over the existing installation.
 
 If you don't want to copy the files manually every time you run a
-'make install' or 'mingw32-make install', then you can specify the directory
-where the files are to be copied to during installation.
+'ninja install', then you can specify the directory where the files are
+to be copied to during installation.
 
 Set the ROS_INSTALL environment variable. If you are on Windows this could be
 done by:
@@ -58,8 +71,7 @@ If you are on Linux this could be done by:
 
   export ROS_INSTALL=/mnt/windows/reactos
 
-Now run 'make install' or 'mingw32-make install' to install the files to the
-new location.
+Now run 'ninja install' to install the files to the new location.
 
 
 3.2 Installation from bootable CD distribution
@@ -68,12 +80,13 @@ To install ReactOS from the bootable CD distribution, extract the archive
 contents. Then burn the CD image, boot from it, and follow instructions.
 
 
-5. Help
+4. Help
+-------
 
 If you run into problems or have suggestions for making ReactOS better, please
 visit the address below. Mailing lists are available for a variety of topics, 
 bugs should be submitted to JIRA and general chat takes place in the forums, 
-or #reactos on freenode
+or #reactos on freenode.
 
 http://www.reactos.org/
 

INSTALL

@@ -1,29 +1,32 @@
 ========================
-ReactOS Version 0.3.x
-Updated Dec 16, 2006
+ReactOS� Version 0.4.x
+Updated January 5, 2016
 ========================
 
 1. What is ReactOS?
+-------------------
 
-   ReactOS is an Open Source effort to develop a quality operating system
-that is compatible with Windows NT applications and drivers.
+ReactOS� is an Open Source effort to develop a quality operating system that is
+compatible with applications and drivers written for the Microsoft� Windows� NT
+family of operating systems (NT4, 2000, XP, 2003, Vista, Seven).
 
-   The ReactOS project, although currently focused on Windows XP/2003
-drivers compatibility, is always keeping an eye toward compatibility with
-older version of Windows NT family ( NT 4.0, 2000 (NT 5.0)) and new
-Windows NT releases (Vista, etc). Applications (Win32 API) compatibility
-focus is Windows XP.
+The ReactOS project, although currently focused on Windows Server 2003
+compatibility, is always keeping an eye toward compatibility with
+Windows Vista and future Windows NT releases.
 
-More information is available at http://www.reactos.org/.
+More information is available at: http://www.reactos.org
 
 2. Building ReactOS
+-------------------
 
 See the INSTALL file for more details.
 
 3. More information
+-------------------
 
 See the media\doc subdirectory for some sparse notes.
 
 4. Who is responsible
+---------------------
 
 See the CREDITS file.