Author: akhaldi
Date: Mon Feb 10 18:35:12 2014
New Revision: 62109
URL: http://svn.reactos.org/svn/reactos?rev=62109&view=rev
Log:
[HAL]
* Prepare the CMake scripts for PCH.
CORE-7716
Added:
trunk/reactos/hal/halx86/minihal/ (with props)
trunk/reactos/hal/halx86/minihal/CMakeLists.txt
- copied, changed from r62101, trunk/reactos/hal/halx86/minihal.cmake
Removed:
trunk/reactos/hal/halx86/minihal.cmake
Modified:
trunk/reactos/hal/halx86/CMakeLists.txt
trunk/reactos/hal/halx86/generic.cmake
Modified: trunk/reactos/hal/halx86/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?rev=62109&r1=62108&r2=62109&view=diff
==============================================================================
--- trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] Mon Feb 10
18:35:12 2014
@@ -56,7 +56,7 @@
include(legacy.cmake)
include(up.cmake)
include(pic.cmake)
- include(minihal.cmake)
+ add_subdirectory(minihal)
# hal
add_hal(hal SOURCES up/halup.rc COMPONENTS generic legacy up pic)
Modified: trunk/reactos/hal/halx86/generic.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic.cmake?rev=62109&r1=62108&r2=62109&view=diff
==============================================================================
--- trunk/reactos/hal/halx86/generic.cmake [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic.cmake [iso-8859-1] Mon Feb 10
18:35:12 2014
@@ -24,4 +24,3 @@
add_asm_files(lib_hal_generic_asm ${HAL_GENERIC_ASM_SOURCE})
add_object_library(lib_hal_generic ${HAL_GENERIC_SOURCE}
${lib_hal_generic_asm})
add_dependencies(lib_hal_generic asm)
-add_pch(lib_hal_generic include/hal.h)
Propchange: trunk/reactos/hal/halx86/minihal/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Mon Feb 10 18:35:12 2014
@@ -0,0 +1,2 @@
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)
Propchange: trunk/reactos/hal/halx86/minihal/
------------------------------------------------------------------------------
bugtraq:message = See issue #%BUGID% for more details.
Propchange: trunk/reactos/hal/halx86/minihal/
------------------------------------------------------------------------------
bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
Propchange: trunk/reactos/hal/halx86/minihal/
------------------------------------------------------------------------------
tsvn:logminsize = 10
Removed: trunk/reactos/hal/halx86/minihal.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/minihal.cmake?rev=62108
==============================================================================
--- trunk/reactos/hal/halx86/minihal.cmake [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/minihal.cmake (removed)
@@ -1,31 +0,0 @@
-
-list(APPEND MINI_HAL_SOURCE
- generic/portio.c
- legacy/bus/bushndlr.c
- legacy/bus/cmosbus.c
- legacy/bus/isabus.c
- legacy/bus/pcibus.c
- legacy/bus/sysbus.c
- legacy/bussupp.c
- generic/beep.c
- generic/bios.c
- generic/cmos.c
- generic/dma.c
- generic/display.c
- generic/drive.c
- generic/misc.c
- generic/profil.c
- generic/reboot.c
- generic/spinlock.c
- generic/sysinfo.c
- generic/timer.c
- generic/usage.c
- up/halinit_mini.c
- up/pic.c
- up/processor.c)
-
-# mini_hal
-add_asm_files(mini_hal_asm generic/systimer.S)
-add_library(mini_hal ${MINI_HAL_SOURCE} ${mini_hal_asm})
-add_target_compile_definitions(mini_hal _BLDR_ _MINIHAL_)
-add_dependencies(mini_hal psdk bugcodes asm)
Copied: trunk/reactos/hal/halx86/minihal/CMakeLists.txt (from r62101,
trunk/reactos/hal/halx86/minihal.cmake)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/minihal/CMakeLists.txt?p2=trunk/reactos/hal/halx86/minihal/CMakeLists.txt&p1=trunk/reactos/hal/halx86/minihal.cmake&r1=62101&r2=62109&rev=62109&view=diff
==============================================================================
--- trunk/reactos/hal/halx86/minihal.cmake [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/minihal/CMakeLists.txt [iso-8859-1] Mon Feb 10
18:35:12 2014
@@ -1,31 +1,32 @@
list(APPEND MINI_HAL_SOURCE
- generic/portio.c
- legacy/bus/bushndlr.c
- legacy/bus/cmosbus.c
- legacy/bus/isabus.c
- legacy/bus/pcibus.c
- legacy/bus/sysbus.c
- legacy/bussupp.c
- generic/beep.c
- generic/bios.c
- generic/cmos.c
- generic/dma.c
- generic/display.c
- generic/drive.c
- generic/misc.c
- generic/profil.c
- generic/reboot.c
- generic/spinlock.c
- generic/sysinfo.c
- generic/timer.c
- generic/usage.c
- up/halinit_mini.c
- up/pic.c
- up/processor.c)
+ ../generic/portio.c
+ ../legacy/bus/bushndlr.c
+ ../legacy/bus/cmosbus.c
+ ../legacy/bus/isabus.c
+ ../legacy/bus/pcibus.c
+ ../legacy/bus/sysbus.c
+ ../legacy/bussupp.c
+ ../generic/beep.c
+ ../generic/bios.c
+ ../generic/cmos.c
+ ../generic/dma.c
+ ../generic/display.c
+ ../generic/drive.c
+ ../generic/misc.c
+ ../generic/profil.c
+ ../generic/reboot.c
+ ../generic/spinlock.c
+ ../generic/sysinfo.c
+ ../generic/timer.c
+ ../generic/usage.c
+ ../up/halinit_mini.c
+ ../up/pic.c
+ ../up/processor.c
+ ../include/hal.h)
-# mini_hal
-add_asm_files(mini_hal_asm generic/systimer.S)
+add_asm_files(mini_hal_asm ../generic/systimer.S)
add_library(mini_hal ${MINI_HAL_SOURCE} ${mini_hal_asm})
add_target_compile_definitions(mini_hal _BLDR_ _MINIHAL_)
add_dependencies(mini_hal psdk bugcodes asm)
+add_pch(mini_hal ../include/hal.h MINI_HAL_SOURCE)
