[ros-diffs] [tkreuzer] 53002: update a bunch of files from trunk
tkreuzer at svn.reactos.org
tkreuzer at svn.reactos.org
Sat Jul 30 09:04:35 UTC 2011
Author: tkreuzer
Date: Sat Jul 30 09:04:33 2011
New Revision: 53002
URL: http://svn.reactos.org/svn/reactos?rev=53002&view=rev
Log:
update a bunch of files from trunk
Modified:
branches/GSoC_2011/GdiFontDriver/cmake/Platform/Windows-cl.cmake
branches/GSoC_2011/GdiFontDriver/configure.cmd
branches/GSoC_2011/GdiFontDriver/configure.sh
branches/GSoC_2011/GdiFontDriver/toolchain-msvc.cmake
Modified: branches/GSoC_2011/GdiFontDriver/cmake/Platform/Windows-cl.cmake
URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/cmake/Platform/Windows-cl.cmake?rev=53002&r1=53001&r2=53002&view=diff
==============================================================================
--- branches/GSoC_2011/GdiFontDriver/cmake/Platform/Windows-cl.cmake [iso-8859-1] (original)
+++ branches/GSoC_2011/GdiFontDriver/cmake/Platform/Windows-cl.cmake [iso-8859-1] Sat Jul 30 09:04:33 2011
@@ -208,13 +208,13 @@
#SET(CMAKE_C_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_C_LINK_EXECUTABLE}")
SET(CMAKE_BUILD_TYPE_INIT Debug)
-SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /Zi /Ob0 /Od")
-SET(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /Zi /Ob0 /Od")
-SET(CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /EHsc")
+SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/Zi /Ob0 /Od")
+SET(CMAKE_C_FLAGS_DEBUG_INIT "/Zi /Ob0 /Od")
+SET(CMAKE_CXX_FLAGS_INIT "")
SET(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG")
SET(CMAKE_CXX_FLAGS_RELEASE_INIT "/O2 /Ob2 /D NDEBUG")
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/Zi /O2 /Ob1")
-SET(CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000")
+SET(CMAKE_C_FLAGS_INIT "")
SET(CMAKE_C_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG")
SET(CMAKE_C_FLAGS_RELEASE_INIT "/O2 /Ob2 /D NDEBUG")
SET(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/Zi /O2 /Ob1")
Modified: branches/GSoC_2011/GdiFontDriver/configure.cmd
URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/configure.cmd?rev=53002&r1=53001&r2=53002&view=diff
==============================================================================
--- branches/GSoC_2011/GdiFontDriver/configure.cmd [iso-8859-1] (original)
+++ branches/GSoC_2011/GdiFontDriver/configure.cmd [iso-8859-1] Sat Jul 30 09:04:33 2011
@@ -2,25 +2,37 @@
:: Get the source root directory
set REACTOS_SOURCE_DIR=%~dp0
-set USE_NMAKE=
+set USE_NMAKE=0
+
+:: Detect presence of cmake
+cmd /c cmake --version 2>&1 | find "cmake version" > NUL || goto cmake_notfound
:: Detect build environment (MinGW, VS, WDK, ...)
if defined ROS_ARCH (
+ echo Detected RosBE for %ROS_ARCH%
set BUILD_ENVIRONMENT=MinGW
set ARCH=%ROS_ARCH%
- echo Detected RosBE for %ROS_ARCH%
+ if /I "%1" == "Codeblocks" (
+ set CMAKE_GENERATOR="CodeBlocks - MinGW Makefiles"
+ ) else if /I "%1" == "Eclipse" (
+ set CMAKE_GENERATOR="Eclipse CDT4 - MinGW Makefiles"
+ ) else (
+ set CMAKE_GENERATOR="MinGW Makefiles"
+ )
+
) else if defined DDK_TARGET_OS (
+ echo Detected DDK/WDK for %DDK_TARGET_OS%-%_BUILDARCH%%
+ set BUILD_ENVIRONMENT=WDK
if "%_BUILDARCH%" == "x86" (
set ARCH=i386
- )
- if "%_BUILDARCH%" == "AMD64" (
+ ) else if "%_BUILDARCH%" == "AMD64" (
set ARCH=amd64
)
- set BUILD_ENVIRONMENT=WDK
set USE_NMAKE=1
- echo Detected DDK/WDK for %DDK_TARGET_OS%-%ARCH%
-)else if defined VCINSTALLDIR (
-:: VS command prompt does not put this in enviroment vars
+ set USE_WDK_HEADERS=0
+
+) else if defined VCINSTALLDIR (
+ :: VS command prompt does not put this in enviroment vars
cl 2>&1 | find "x86" > NUL && set ARCH=i386
cl 2>&1 | find "x64" > NUL && set ARCH=amd64
cl 2>&1 | find "14." > NUL && set BUILD_ENVIRONMENT=VS8
@@ -30,33 +42,69 @@
echo Error: Visual Studio version too old or version detection failed.
exit /b
)
+
echo Detected Visual Studio Environment %BUILD_ENVIRONMENT%-%ARCH%
- if not "%1" == "VSSolution" (
+ if /I "%1" == "VSSolution" (
+ if "%BUILD_ENVIRONMENT%" == "VS8" (
+ if "%ARCH%" == "amd64" (
+ set CMAKE_GENERATOR="Visual Studio 8 2005 Win64"
+ ) else (
+ set CMAKE_GENERATOR="Visual Studio 8 2005"
+ )
+ ) else if "%BUILD_ENVIRONMENT%" == "VS9" (
+ if "%ARCH%" == "amd64" (
+ set CMAKE_GENERATOR="Visual Studio 9 2008 Win64"
+ ) else (
+ set CMAKE_GENERATOR="Visual Studio 9 2008"
+ )
+ ) else if "%BUILD_ENVIRONMENT%" == "VS10" (
+ if "%ARCH%" == "amd64" (
+ set CMAKE_GENERATOR="Visual Studio 10 Win64"
+ ) else (
+ set CMAKE_GENERATOR="Visual Studio 10"
+ )
+ )
+ ) else (
set USE_NMAKE=1
echo This script defaults to nmake. To use Visual Studio GUI specify "VSSolution" as a parameter.
)
+
) else if defined sdkdir (
+ echo Detected Windows SDK %TARGET_PLATFORM%-%TARGET_CPU%
if "%TARGET_CPU%" == "x86" (
set ARCH=i386
- )
- if "%TARGET_CPU%" == "x64" (
+ ) else if "%TARGET_CPU%" == "x64" (
set ARCH=amd64
)
+
set BUILD_ENVIRONMENT=SDK
set USE_NMAKE=1
- echo Detected Windows SDK %TARGET_PLATFORM%-%ARCH%
+
+) else (
+ echo Error: Unable to detect build environment. Configure script failure.
+ exit /b
)
-if defined ARCH if defined BUILD_ENVIRONMENT (
- goto createdirs
+:: Checkpoint
+if not defined ARCH (
+ echo unknown build architecture
+ exit /b
)
-echo Error: Unable to detect a build environment. Configure script failure.
-exit /b
+:: Detect nmake generator
+if %USE_NMAKE% == 1 (
+ if /I "%1" == "CodeBlocks" (
+ set CMAKE_GENERATOR="CodeBlocks - NMake Makefiles"
+ ) else if /I "%1" == "Eclipse" (
+ set CMAKE_GENERATOR="Eclipse CDT4 - NMake Makefiles"
+ ) else if /I "%1" == "JOM" (
+ set CMAKE_GENERATOR="NMake Makefiles JOM"
+ ) else (
+ set CMAKE_GENERATOR="NMake Makefiles"
+ )
+)
:: Create directories
-:createdirs
-
set REACTOS_OUTPUT_PATH=output-%BUILD_ENVIRONMENT%-%ARCH%
if "%REACTOS_SOURCE_DIR%" == "%CD%\" (
echo Creating directories in %REACTOS_OUTPUT_PATH%
@@ -74,7 +122,6 @@
mkdir reactos
)
-:hostprep
echo Preparing host tools...
cd host-tools
if EXIST CMakeCache.txt (
@@ -82,64 +129,28 @@
)
set REACTOS_BUILD_TOOLS_DIR=%CD%
-if "%BUILD_ENVIRONMENT%" == "MinGW" (
- cmake -G "MinGW Makefiles" -DARCH=%ARCH% %REACTOS_SOURCE_DIR%
-) else if defined USE_NMAKE (
- cmake -G "NMake Makefiles" -DARCH=%ARCH% %REACTOS_SOURCE_DIR%
-) else if "%BUILD_ENVIRONMENT%" == "VS8" (
- if "%ARCH%" == "amd64" (
- cmake -G "Visual Studio 8 2005 Win64" -DARCH=%ARCH% %REACTOS_SOURCE_DIR%
- ) else (
- cmake -G "Visual Studio 8 2005" -DARCH=%ARCH% %REACTOS_SOURCE_DIR%
- )
-) else if "%BUILD_ENVIRONMENT%" == "VS9" (
- if "%ARCH%" == "amd64" (
- cmake -G "Visual Studio 9 2008 Win64" -DARCH=%ARCH% %REACTOS_SOURCE_DIR%
- ) else (
- cmake -G "Visual Studio 9 2008" -DARCH=%ARCH% %REACTOS_SOURCE_DIR%
- )
-) else if "%BUILD_ENVIRONMENT%" == "VS10" (
- if "%ARCH%" == "amd64" (
- cmake -G "Visual Studio 10 Win64" -DARCH=%ARCH% %REACTOS_SOURCE_DIR%
- ) else (
- cmake -G "Visual Studio 10" -DARCH=%ARCH% %REACTOS_SOURCE_DIR%
- )
-)
+cmake -G %CMAKE_GENERATOR% -DARCH=%ARCH% %REACTOS_SOURCE_DIR%
cd..
-:reactprep
echo Preparing reactos...
-
cd reactos
if EXIST CMakeCache.txt (
del CMakeCache.txt /q
)
if "%BUILD_ENVIRONMENT%" == "MinGW" (
- cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR%
-) else if defined USE_NMAKE (
- cmake -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR%
-) else if "%BUILD_ENVIRONMENT%" == "VS8" (
- if "%ARCH%" == "amd64" (
- cmake -G "Visual Studio 8 2005 Win64" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR%
- ) else (
- cmake -G "Visual Studio 8 2005" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR%
- )
-) else if "%BUILD_ENVIRONMENT%" == "VS9" (
- if "%ARCH%" == "amd64" (
- cmake -G "Visual Studio 9 2008 Win64" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR%
- ) else (
- cmake -G "Visual Studio 9 2008" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR%
- )
-) else if "%BUILD_ENVIRONMENT%" == "VS10" (
- if "%ARCH%" == "amd64" (
- cmake -G "Visual Studio 10 Win64" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR%
- ) else (
- cmake -G "Visual Studio 10" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR%
- )
+ cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR%
+) else if "%BUILD_ENVIRONMENT%" == "WDK" (
+ cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DUSE_WDK_HEADERS=%USE_WDK_HEADERS% -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR%
+) else (
+ cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR%
)
cd..
-echo Configure script complete! Enter directories and execute appropriate build commands(ex: make, nmake, etc...).
+echo Configure script complete! Enter directories and execute appropriate build commands(ex: make, nmake, jom, etc...).
+exit /b
+:cmake_notfound
+ echo Unable to find cmake, if it is installed, check your PATH variable.
+ exit /b
Modified: branches/GSoC_2011/GdiFontDriver/configure.sh
URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/configure.sh?rev=53002&r1=53001&r2=53002&view=diff
==============================================================================
--- branches/GSoC_2011/GdiFontDriver/configure.sh [iso-8859-1] (original)
+++ branches/GSoC_2011/GdiFontDriver/configure.sh [iso-8859-1] Sat Jul 30 09:04:33 2011
@@ -30,8 +30,14 @@
REACTOS_BUILD_TOOLS_DIR="$PWD"
cmake -G "Unix Makefiles" -DARCH=$ARCH "$REACTOS_SOURCE_DIR"
+echo Preparing reactos...
cd ../reactos
-cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$REACTOS_SOURCE_DIR"
+if [ -f CMakeCache.txt ]
+then
+ rm -f CMakeCache.txt
+fi
+
+cmake -G "Unix Makefiles" -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$REACTOS_SOURCE_DIR"
echo Configure script complete! Enter directories and execute appropriate build commands\(ex: make, makex, etc...\).
Modified: branches/GSoC_2011/GdiFontDriver/toolchain-msvc.cmake
URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/toolchain-msvc.cmake?rev=53002&r1=53001&r2=53002&view=diff
==============================================================================
--- branches/GSoC_2011/GdiFontDriver/toolchain-msvc.cmake [iso-8859-1] (original)
+++ branches/GSoC_2011/GdiFontDriver/toolchain-msvc.cmake [iso-8859-1] Sat Jul 30 09:04:33 2011
@@ -13,12 +13,6 @@
set(CMAKE_ASM_COMPILER ml)
endif()
-set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <DEFINES> /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>")
-
-set(CMAKE_ASM_COMPILE_OBJECT
- "<CMAKE_C_COMPILER> /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp"
- "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp")
-
set(CMAKE_C_STANDARD_LIBRARIES "" CACHE INTERNAL "")
if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86")
More information about the Ros-diffs
mailing list