[gadamopoulos] 49093: Sync to trunk (2/2) Add crt, ndk, ddk, and dxsdk Remove from build mingw Fix generating buildno.h
Author: gadamopoulos Date: Sun Oct 10 14:08:28 2010 New Revision: 49093
URL: http://svn.reactos.org/svn/reactos?rev=49093&view=rev Log: Sync to trunk (2/2) Add crt, ndk, ddk, and dxsdk Remove from build mingw Fix generating buildno.h
Added: branches/Tree-restructure-test/sdk/include/ddk/ - copied from r48976, trunk/reactos/include/ddk/ branches/Tree-restructure-test/sdk/include/dxsdk/ - copied from r48976, trunk/reactos/include/dxsdk/ branches/Tree-restructure-test/sdk/include/host/ - copied from r48976, branches/Tree-restructure-test/sdk/include/host/ branches/Tree-restructure-test/sdk/include/ndk/ - copied from r48976, trunk/reactos/include/ndk/ branches/Tree-restructure-test/sdk/include/psdk/ - copied from r48976, branches/Tree-restructure-test/sdk/include/psdk/ branches/Tree-restructure-test/sdk/include/reactos/ - copied from r48976, branches/Tree-restructure-test/sdk/include/reactos/ branches/Tree-restructure-test/sdk/libs/atl/ - copied from r48976, branches/Tree-restructure-test/sdk/libs/atl/ branches/Tree-restructure-test/sdk/libs/cmlib/ - copied from r48976, branches/Tree-restructure-test/sdk/libs/cmlib/ branches/Tree-restructure-test/sdk/libs/crt/ - copied from r48976, trunk/reactos/lib/sdk/crt/ branches/Tree-restructure-test/sdk/libs/debugsup/ - copied from r48976, branches/Tree-restructure-test/sdk/libs/debugsup/ branches/Tree-restructure-test/sdk/libs/inflib/ - copied from r48976, trunk/reactos/lib/inflib/ branches/Tree-restructure-test/sdk/libs/libxml2/ - copied from r48976, branches/Tree-restructure-test/sdk/libs/libxml2/ branches/Tree-restructure-test/sdk/libs/mingw/ - copied from r48976, branches/Tree-restructure-test/sdk/libs/mingw/ branches/Tree-restructure-test/sdk/libs/pseh/ - copied from r48976, branches/Tree-restructure-test/sdk/libs/pseh/ branches/Tree-restructure-test/sdk/libs/rossym/ - copied from r48976, branches/Tree-restructure-test/sdk/libs/rossym/ branches/Tree-restructure-test/sdk/libs/wcsfuncs/ - copied from r48976, branches/Tree-restructure-test/sdk/libs/wcsfuncs/ branches/Tree-restructure-test/sdk/libs/zlib/ - copied from r48976, branches/Tree-restructure-test/sdk/libs/zlib/ branches/Tree-restructure-test/sdk/tools/bin2c.c - copied unchanged from r48976, trunk/reactos/tools/bin2c.c branches/Tree-restructure-test/sdk/tools/buildno/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/buildno/ branches/Tree-restructure-test/sdk/tools/cabman/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/cabman/ branches/Tree-restructure-test/sdk/tools/cdmake/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/cdmake/ branches/Tree-restructure-test/sdk/tools/create_nls/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/create_nls/ branches/Tree-restructure-test/sdk/tools/dumpstab.c - copied unchanged from r48976, trunk/reactos/tools/dumpstab.c branches/Tree-restructure-test/sdk/tools/gendib/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/gendib/ branches/Tree-restructure-test/sdk/tools/geninc/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/geninc/ branches/Tree-restructure-test/sdk/tools/hpp/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/hpp/ branches/Tree-restructure-test/sdk/tools/kbdtool/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/kbdtool/ branches/Tree-restructure-test/sdk/tools/log2lines/ - copied from r48976, trunk/reactos/tools/log2lines/ branches/Tree-restructure-test/sdk/tools/mkconfig.c - copied unchanged from r48976, trunk/reactos/tools/mkconfig.c branches/Tree-restructure-test/sdk/tools/mkhive/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/mkhive/ branches/Tree-restructure-test/sdk/tools/ms2ps/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/ms2ps/ branches/Tree-restructure-test/sdk/tools/nandflash/ - copied from r48976, trunk/reactos/tools/nandflash/ branches/Tree-restructure-test/sdk/tools/nci/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/nci/ branches/Tree-restructure-test/sdk/tools/ofw_interface/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/ofw_interface/ branches/Tree-restructure-test/sdk/tools/pefixup.c - copied unchanged from r48976, trunk/reactos/tools/pefixup.c branches/Tree-restructure-test/sdk/tools/pipetools/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/pipetools/ branches/Tree-restructure-test/sdk/tools/rbuild/ - copied from r48976, trunk/reactos/tools/rbuild/ branches/Tree-restructure-test/sdk/tools/rbuild_helper/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/rbuild_helper/ branches/Tree-restructure-test/sdk/tools/regtests2xml/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/regtests2xml/ branches/Tree-restructure-test/sdk/tools/rgenstat/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/rgenstat/ branches/Tree-restructure-test/sdk/tools/rsym/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/rsym/ branches/Tree-restructure-test/sdk/tools/ssprintf.cpp - copied unchanged from r48976, trunk/reactos/tools/ssprintf.cpp branches/Tree-restructure-test/sdk/tools/ssprintf.h - copied unchanged from r48976, trunk/reactos/tools/ssprintf.h branches/Tree-restructure-test/sdk/tools/stubgen.c - copied unchanged from r48976, trunk/reactos/tools/stubgen.c branches/Tree-restructure-test/sdk/tools/sysgen/ - copied from r48976, trunk/reactos/tools/sysgen/ branches/Tree-restructure-test/sdk/tools/unicode/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/unicode/ branches/Tree-restructure-test/sdk/tools/utf16le/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/utf16le/ branches/Tree-restructure-test/sdk/tools/widl/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/widl/ branches/Tree-restructure-test/sdk/tools/winebuild/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/winebuild/ branches/Tree-restructure-test/sdk/tools/wmc/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/wmc/ branches/Tree-restructure-test/sdk/tools/wpp/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/wpp/ branches/Tree-restructure-test/sdk/tools/wrc/ - copied from r48976, branches/Tree-restructure-test/sdk/tools/wrc/ branches/Tree-restructure-test/sdk/tools/xml.cpp - copied unchanged from r48976, trunk/reactos/tools/xml.cpp branches/Tree-restructure-test/sdk/tools/xml.h - copied unchanged from r48976, trunk/reactos/tools/xml.h Modified: branches/Tree-restructure-test/Makefile branches/Tree-restructure-test/ReactOS-amd64.rbuild branches/Tree-restructure-test/ReactOS-arm.rbuild branches/Tree-restructure-test/ReactOS-generic.rbuild branches/Tree-restructure-test/ReactOS-i386.rbuild branches/Tree-restructure-test/baseaddress.rbuild branches/Tree-restructure-test/config-arm.template.rbuild branches/Tree-restructure-test/sdk/include/include.rbuild branches/Tree-restructure-test/sdk/libs/inflib/inflib.mak branches/Tree-restructure-test/sdk/libs/libs.rbuild branches/Tree-restructure-test/sdk/tools/buildno/buildno.mak branches/Tree-restructure-test/sdk/tools/rbuild/backend/mingw/mingw.cpp branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.h branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.mak branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.sln branches/Tree-restructure-test/sdk/tools/rbuild/test.h branches/Tree-restructure-test/sdk/tools/tools.mak
Modified: branches/Tree-restructure-test/Makefile URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/Makefile?r... ============================================================================== --- branches/Tree-restructure-test/Makefile [iso-8859-1] (original) +++ branches/Tree-restructure-test/Makefile [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -169,11 +169,7 @@ endif
ifeq ($(ROS_AUTOMAKE),) - ifeq ($(ARCH),i386) - ROS_AUTOMAKE=makefile.auto - else ROS_AUTOMAKE=makefile-$(ARCH).auto - endif endif
all: $(ROS_AUTOMAKE) @@ -423,7 +419,7 @@ endif endif
-BUILDNO_H = $(INTERMEDIATE_)include$(SEP)reactos$(SEP)buildno.h +BUILDNO_H = $(INTERMEDIATE_)sdk$(SEP)include$(SEP)reactos$(SEP)buildno.h
include sdk/libs/lib.mak include sdk/tools/tools.mak @@ -432,9 +428,9 @@ PREAUTO := \ $(BIN2C_TARGET) \ $(BIN2RES_TARGET) \ -# $(BUILDNO_H) \ - $(GENDIB_DIB_FILES) \ - $(NCI_SERVICE_FILES) + $(BUILDNO_H) \ + $(NCI_SERVICE_FILES) \ + $(GENDIB_DIB_FILES)
ifeq ($(ARCH),powerpc) PREAUTO += $(OFW_INTERFACE_SERVICE_FILES) $(PPCMMU_TARGETS) @@ -444,8 +440,7 @@ ROS_BUILDENGINE=$(RBUILD_TARGET) endif
-$(ROS_AUTOMAKE): $(ROS_BUILDENGINE) $(XMLBUILDFILES) | $(PREAUTO) - ${mkdir} $(OUTPUT_)media$(SEP)inf 2>$(NUL) +$(ROS_AUTOMAKE): $(ROS_BUILDENGINE) $(XMLBUILDFILES) | $(BUILDNO_H) $(ECHO_RBUILD) $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) mingw
Modified: branches/Tree-restructure-test/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/ReactOS-am... ============================================================================== --- branches/Tree-restructure-test/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ branches/Tree-restructure-test/ReactOS-amd64.rbuild [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile-amd64.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> +<project name="ReactOS" makefile="makefile-amd64.auto" xmlns:xi="http://www.w3.org/2001/XInclude" allowwarnings="true"> <xi:include href="config-amd64.rbuild"> xi:fallback <xi:include href="config-amd64.template.rbuild" /> @@ -18,6 +18,7 @@ <define name="TARGET_amd64" host="true" />
<define name="USE_COMPILER_EXCEPTIONS" /> + <define name ="NO_UNDERSCORE_PREFIX" />
<property name="PLATFORM" value="PC"/> <property name="usewrc" value="false"/> @@ -28,11 +29,13 @@ <compilerflag>-ftracer</compilerflag> <compilerflag>-momit-leaf-frame-pointer</compilerflag> </if> + <compilerflag>-fms-extensions</compilerflag> <compilerflag>-mpreferred-stack-boundary=4</compilerflag> <compilerflag compiler="midl">-m64 --win64</compilerflag> <!-- compilerflag compiler="cc,cxx">-gstabs+</compilerflag --> <!-- compilerflag compiler="as">-gstabs+</compilerflag --> <compilerflag>-U_X86_</compilerflag> + <compilerflag>-UWIN32</compilerflag> <compilerflag>-Wno-format</compilerflag> </group>
@@ -42,11 +45,31 @@ <linkerflag>-section-alignment=0x1000</linkerflag> <linkerflag>--unique=.eh_frame</linkerflag> <linkerflag>-static</linkerflag> + <linkerflag>--exclude-all-symbols</linkerflag> </group>
<if property="USERMODE" value="1"> <directory name="base"> - <xi:include href="base/base.rbuild" /> + <directory name="applications"> + <xi:include href="base/applications/applications.rbuild" /> + </directory> + <directory name="services"> + <xi:include href="base/services/services.rbuild" /> + </directory> + <directory name="setup"> + <xi:include href="base/setup/setup.rbuild" /> + </directory> + <directory name="shell"> + <directory name="cmd"> + <xi:include href="base/shell/cmd/cmd.rbuild" /> + </directory> + <directory name="explorer-new"> + <xi:include href="base/shell/explorer-new/explorer.rbuild" /> + </directory> + </directory> + <directory name="system"> + <xi:include href="base/system/system.rbuild" /> + </directory> </directory> <directory name="dll"> <xi:include href="dll/dll.rbuild" />
Modified: branches/Tree-restructure-test/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/ReactOS-ar... ============================================================================== --- branches/Tree-restructure-test/ReactOS-arm.rbuild [iso-8859-1] (original) +++ branches/Tree-restructure-test/ReactOS-arm.rbuild [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -7,18 +7,18 @@ </xi:fallback> </xi:include>
- <xi:include href="ReactOS-generic.rbuild" /> + <xi:include href="ReactOS-generic.rbuild" />
- <!-- <define name="_M_ARM" /> Already defined by toolchain --> + <!-- <define name="_M_ARM" /> Already defined by toolchain --> <define name="_ARM_" /> <define name="__arm__" /> <define name="TARGET_arm" host="true" />
- <define name="USE_COMPILER_EXCEPTIONS" /> + <define name="USE_COMPILER_EXCEPTIONS" />
- <property name="WINEBUILD_FLAGS" value="--kill-at"/> + <property name="WINEBUILD_FLAGS" value="--kill-at"/>
- <include>include/reactos/arm</include> + <include>include/reactos/arm</include>
<if property="SARCH" value="versatile"> <define name="BOARD_CONFIG_VERSATILE"/> @@ -28,17 +28,18 @@ <if property="OPTIMIZE" value="1"> <compilerflag>-ftracer</compilerflag> </if> - <compilerflag>-Wno-attributes</compilerflag> - <compilerflag>-U_UNICODE</compilerflag> - <compilerflag>-UUNICODE</compilerflag> + <compilerflag>-fms-extensions</compilerflag> + <compilerflag>-Wno-attributes</compilerflag> + <compilerflag>-U_UNICODE</compilerflag> + <compilerflag>-UUNICODE</compilerflag> </group>
<define name="__MSVCRT__"/> <!-- DUBIOUS -->
<group linkerset="ld"> - <linkerflag>--strip-debug</linkerflag> <!-- INVESTIGATE --> - <linkerflag>-static</linkerflag> <!-- INVESTIGATE --> + <linkerflag>--strip-debug</linkerflag> <!-- INVESTIGATE --> + <linkerflag>-static</linkerflag> <!-- INVESTIGATE --> <linkerflag>-file-alignment=0x1000</linkerflag> <linkerflag>-section-alignment=0x1000</linkerflag> </group> @@ -52,7 +53,10 @@ <directory name="drivers"> <directory name="csq"> <xi:include href="lib/drivers/csq/csq.rbuild" /> - </directory> + </directory> + </directory> + <directory name="cportlib"> + <xi:include href="lib/cportlib/cportlib.rbuild" /> </directory> <directory name="debugsup"> <xi:include href="lib/debugsup/debugsup.rbuild" /> @@ -73,6 +77,9 @@ <directory name="inflib"> <xi:include href="lib/inflib/inflib.rbuild" /> </directory> + <directory name="newinflib"> + <xi:include href="lib/newinflib/inflib.rbuild" /> + </directory> <directory name="cmlib"> <xi:include href="lib/cmlib/cmlib.rbuild" /> </directory> @@ -86,6 +93,9 @@ <directory name="crt"> <xi:include href="lib/sdk/crt/crt.rbuild" /> <xi:include href="lib/sdk/crt/libcntpr.rbuild" /> + </directory> + <directory name="ioevent"> + <xi:include href="lib/sdk/ioevent/ioevent.rbuild" /> </directory> <directory name="nt"> <xi:include href="lib/sdk/nt/nt.rbuild" /> @@ -111,17 +121,7 @@ <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> </directory> <directory name="hal"> - <directory name="halarm"> - <directory name="generic"> - <xi:include href="hal/halarm/generic/generic.rbuild" /> - </directory> - <directory name="up"> - <xi:include href="hal/halarm/up/halup.rbuild" /> - </directory> - </directory> - <directory name="hal"> - <xi:include href="hal/hal/hal.rbuild" /> - </directory> + <xi:include href="hal/hal.rbuild" /> </directory> <directory name="boot"> <xi:include href="boot/boot.rbuild" /> @@ -155,9 +155,9 @@ </directory> <directory name="base"> <directory name="system"> - <directory name="smss"> - <xi:include href="base/system/smss/smss.rbuild" /> - </directory> + <directory name="smss"> + <xi:include href="base/system/smss/smss.rbuild" /> + </directory> </directory> </directory> </project>
Modified: branches/Tree-restructure-test/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/ReactOS-ge... ============================================================================== --- branches/Tree-restructure-test/ReactOS-generic.rbuild [iso-8859-1] (original) +++ branches/Tree-restructure-test/ReactOS-generic.rbuild [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -63,31 +63,31 @@ <define name="_SETUPAPI_VER">0x600</define> </if>
- <include>.</include> - <include>include</include> - <include root="intermediate">include</include> - <include>include/psdk</include> - <include root="intermediate">include/psdk</include> - <include>include/dxsdk</include> - <include root="intermediate">include/dxsdk</include> - <include>include/crt</include> - <include compilerset="gcc">include/crt/mingw32</include> - <include compilerset="msc">include/crt/msc</include> - <include>include/ddk</include> - <include>include/GL</include> - <include>include/ndk</include> - <include>include/reactos</include> - <include root="intermediate">include/reactos</include> - <include root="intermediate">include/reactos/mc</include> - <include>include/reactos/libs</include> + <include>sdk/include</include> + <include root="intermediate">sdk/include</include> + <include>sdk/include/psdk</include> + <include root="intermediate">sdk/include/psdk</include> + <include>sdk/include/dxsdk</include> + <include root="intermediate">sdk/include/dxsdk</include> + <include>sdk/include/crt</include> + <include compilerset="gcc">sdk/include/crt/mingw32</include> + <include compilerset="msc">sdk/include/crt/msc</include> + <include>sdk/include/ddk</include> + <include>sdk/include/GL</include> + <include>sdk/include/ndk</include> + <include>sdk/include/reactos</include> + <include root="intermediate">sdk/include/reactos</include> + <include root="intermediate">sdk/include/reactos/mc</include> + <include>sdk/include/reactos/libs</include>
- <include host="true">include</include> - <include host="true" root="intermediate">include</include> - <include host="true">include/reactos</include> - <include host="true">include/reactos/wine</include> + <include host="true">sdk/include</include> + <include host="true" root="intermediate">sdk/include</include> + <include host="true">sdk/include/reactos</include> + <include host="true">sdk/include/reactos/wine</include>
<group compilerset="gcc"> <compilerflag>-Wall</compilerflag> + <compilerflag>-Wno-char-subscripts</compilerflag> <compilerflag compiler="cxx">-Wno-non-virtual-dtor</compilerflag> </group>
@@ -117,14 +117,9 @@ </if>
<compilerflag>-fno-strict-aliasing</compilerflag> - <compilerflag>-Wno-strict-aliasing</compilerflag> <compilerflag>-Wpointer-arith</compilerflag> <compilerflag>-Wno-multichar</compilerflag> - <!-- <compilerflag>-Wno-error=uninitialized</compilerflag> - <compilerflag>-Wno-error=unused-function</compilerflag> - <compilerflag>-Wno-error=write-strings</compilerflag> - --> <!-- compilerflag>-H</compilerflag> enable this for header traces --> </group>
Modified: branches/Tree-restructure-test/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/ReactOS-i3... ============================================================================== --- branches/Tree-restructure-test/ReactOS-i386.rbuild [iso-8859-1] (original) +++ branches/Tree-restructure-test/ReactOS-i386.rbuild [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> +<project name="ReactOS" makefile="makefile-i386.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="config.rbuild"> xi:fallback <xi:include href="config.template.rbuild" /> @@ -24,9 +24,12 @@ <compilerflag>-ftracer</compilerflag> <compilerflag>-momit-leaf-frame-pointer</compilerflag> </if> + <compilerflag>-fms-extensions</compilerflag> <compilerflag>-mpreferred-stack-boundary=2</compilerflag> <compilerflag compiler="midl">-m32 --win32</compilerflag> <compilerflag compiler="cc,cxx">-gstabs+</compilerflag> + <compilerflag compiler="cc,cxx">-fno-set-stack-executable</compilerflag> + <compilerflag compiler="cc,cxx">-fno-optimize-sibling-calls</compilerflag> <compilerflag compiler="as">-gstabs+</compilerflag> </group>
Modified: branches/Tree-restructure-test/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/baseaddres... ============================================================================== --- branches/Tree-restructure-test/baseaddress.rbuild [iso-8859-1] (original) +++ branches/Tree-restructure-test/baseaddress.rbuild [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -3,6 +3,7 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <property name="BASEADDRESS_REGTESTS" value="0x07000000" /> <property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> + <property name="BASEADDRESS_FAULTREP" value="0x107A0000" /> <property name="BASEADDRESS_QMGRPRXY" value="0x1f710000" /> <property name="BASEADDRESS_CRYPTDLG" value="0x209c0000" /> <property name="BASEADDRESS_COMCAT" value="0x20a50000" /> @@ -23,13 +24,16 @@ <property name="BASEADDRESS_PSTOREC" value="0x513d0000" /> <property name="BASEADDRESS_LPK" value="0x516c0000" /> <property name="BASEADDRESS_MSGSM32ACM" value="0x56db0000" /> + <property name="BASEADDRESS_MSDVBNP" value="0x58280000" /> <property name="BASEADDRESS_MSG711ACM" value="0x584f0000" /> <property name="BASEADDRESS_IMAADP32ACM" value="0x585e0000" /> + <property name="BASEADDRESS_BDAPLGIN" value="0x58600000" /> <property name="BASEADDRESS_TELEPHON" value="0x58750000" /> <property name="BASEADDRESS_PWRCFG" value="0x587e0000" /> <property name="BASEADDRESS_MMSYS" value="0x588a0000" /> <property name="BASEADDRESS_JOY" value="0x589b0000" /> <property name="BASEADDRESS_QMGR" value="0x59620000" /> + <property name="BASEADDRESS_MSVIDCTL" value="0x59660000" /> <property name="BASEADDRESS_UXTHEME" value="0x5ad70000" /> <property name="BASEADDRESS_VDMDBG" value="0x5b0d0000" /> <property name="BASEADDRESS_UNTFS" value="0x5b340000" /> @@ -116,6 +120,7 @@ <property name="BASEADDRESS_CARDS" value="0x701a0000" /> <property name="BASEADDRESS_WININET" value="0x70200000" /> <property name="BASEADDRESS_WINHTTP" value="0x70c60000" /> + <property name="BASEADDRESS_BATT" value="0x70cb0000" /> <property name="BASEADDRESS_AMSTREAM" value="0x71030000" /> <property name="BASEADDRESS_ACLUI" value="0x71550000" /> <property name="BASEADDRESS_DHCPCSVC" value="0x71650000" /> @@ -128,6 +133,7 @@ <property name="BASEADDRESS_OLESVR32" value="0x71dd0000" /> <property name="BASEADDRESS_OLECLI32" value="0x71df0000" /> <property name="BASEADDRESS_OLETHK32" value="0x71e10000" /> + <property name="BASEADDRESS_NETEVENT" value="0x71e70000" /> <property name="BASEADDRESS_DPLAY" value="0x71e80000" /> <property name="BASEADDRESS_SECURITY" value="0x71f10000" /> <property name="BASEADDRESS_MSSIGN32" value="0x720c0000" /> @@ -182,8 +188,8 @@ <property name="BASEADDRESS_RPCRT4" value="0x76000000" /> <property name="BASEADDRESS_SHLWAPI" value="0x76100000" /> <property name="BASEADDRESS_INETCOMM" value="0x76140000" /> - <property name="BASEADDRESS_COMCTL32" value="0x76160000" /> - <property name="BASEADDRESS_COMDLG32" value="0x76210000" /> + <property name="BASEADDRESS_COMCTL32" value="0x76170000" /> + <property name="BASEADDRESS_COMDLG32" value="0x76230000" /> <property name="BASEADDRESS_WINSTA" value="0x762f0000" /> <property name="BASEADDRESS_IMM32" value="0x76320000" /> <property name="BASEADDRESS_D3D8THK" value="0x76340000" /> @@ -197,15 +203,15 @@ <property name="BASEADDRESS_WAVEMAP" value="0x76610000" /> <property name="BASEADDRESS_MPR" value="0x76620000" /> <property name="BASEADDRESS_MSHTML" value="0x76650000" /> - <property name="BASEADDRESS_ODBC32" value="0x76660000" /> - <property name="BASEADDRESS_SETUPAPI" value="0x76660000" /> - <property name="BASEADDRESS_CRYPTDLL" value="0x76740000" /> - <property name="BASEADDRESS_SHFOLDER" value="0x76760000" /> - <property name="BASEADDRESS_NTDSAPI" value="0x76780000" /> - <property name="BASEADDRESS_NTMARTA" value="0x768a0000" /> - <property name="BASEADDRESS_RASDLG" value="0x768d0000" /> - <property name="BASEADDRESS_GDIPLUS" value="0x76a00000" /> - <property name="BASEADDRESS_ATL" value="0x76a80000" /> + <property name="BASEADDRESS_ODBC32" value="0x76710000" /> + <property name="BASEADDRESS_SETUPAPI" value="0x76730000" /> + <property name="BASEADDRESS_CRYPTDLL" value="0x768f0000" /> + <property name="BASEADDRESS_SHFOLDER" value="0x76900000" /> + <property name="BASEADDRESS_NTDSAPI" value="0x76910000" /> + <property name="BASEADDRESS_NTMARTA" value="0x76920000" /> + <property name="BASEADDRESS_RASDLG" value="0x76930000" /> + <property name="BASEADDRESS_GDIPLUS" value="0x76a70000" /> + <property name="BASEADDRESS_ATL" value="0x76ac0000" /> <property name="BASEADDRESS_SFC" value="0x76b50000" /> <property name="BASEADDRESS_CREDUI" value="0x76bf0000" /> <property name="BASEADDRESS_SFC_OS" value="0x76c10000" /> @@ -236,7 +242,7 @@ <property name="BASEADDRESS_WSHIRDA" value="0x777f0000" /> <property name="BASEADDRESS_VERSION" value="0x77a40000" /> <property name="BASEADDRESS_OLE32" value="0x77a50000" /> - <property name="BASEADDRESS_OLEPRO32" value="0x77b10000" /> + <property name="BASEADDRESS_OLEPRO32" value="0x77b20000" /> <property name="BASEADDRESS_ACTIVEDS" value="0x77cb0000" /> <property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" /> <property name="BASEADDRESS_USER32" value="0x77e50000" />
Modified: branches/Tree-restructure-test/config-arm.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/config-arm... ============================================================================== --- branches/Tree-restructure-test/config-arm.template.rbuild [iso-8859-1] (original) +++ branches/Tree-restructure-test/config-arm.template.rbuild [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -18,7 +18,7 @@ kurobox versatile omap3 --> -<property name="SARCH" value="omap3" /> +<property name="SARCH" value="versatile" />
<!--
Modified: branches/Tree-restructure-test/sdk/include/include.rbuild URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/includ... ============================================================================== --- branches/Tree-restructure-test/sdk/include/include.rbuild [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/include/include.rbuild [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -4,11 +4,9 @@ <directory name="reactos"> <xi:include href="reactos/reactos.rbuild" /> </directory> -<!-- <directory name="dxsdk"> <xi:include href="dxsdk/dxsdk.rbuild" /> </directory> ---> <directory name="psdk"> <xi:include href="psdk/psdk.rbuild" /> </directory>
Modified: branches/Tree-restructure-test/sdk/libs/inflib/inflib.mak URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/libs/i... ============================================================================== --- branches/Tree-restructure-test/sdk/libs/inflib/inflib.mak [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/libs/inflib/inflib.mak [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -32,7 +32,7 @@
INFLIB_HOST_CFLAGS = -O3 -Wall -Wpointer-arith -Wconversion \ -Wstrict-prototypes -Wmissing-prototypes -DINFLIB_HOST \ - -Iinclude/reactos -Iinclude $(HOST_CFLAGS) + -Isdk/include/reactos -Isdk/include $(HOST_CFLAGS)
$(INFLIB_HOST_TARGET): $(INFLIB_HOST_OBJECTS) | $(INFLIB_OUT) $(ECHO_HOSTAR)
Modified: branches/Tree-restructure-test/sdk/libs/libs.rbuild URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/libs/l... ============================================================================== --- branches/Tree-restructure-test/sdk/libs/libs.rbuild [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/libs/libs.rbuild [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -7,14 +7,14 @@ <directory name="cmlib"> <xi:include href="cmlib/cmlib.rbuild" /> </directory> + <directory name="crt"> + <xi:include href="crt/crt.rbuild" /> + </directory> <directory name="debugsup"> <xi:include href="debugsup/debugsup.rbuild" /> </directory> <directory name="inflib"> <xi:include href="inflib/inflib.rbuild" /> - </directory> - <directory name="mingw"> - <xi:include href="mingw/mingw.rbuild" /> </directory> <directory name="pseh"> <xi:include href="pseh/pseh.rbuild" />
Modified: branches/Tree-restructure-test/sdk/tools/buildno/buildno.mak URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools/... ============================================================================== --- branches/Tree-restructure-test/sdk/tools/buildno/buildno.mak [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/buildno/buildno.mak [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -25,11 +25,11 @@ BUILDNO_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(BUILDNO_SOURCES:.cpp=.o))
-BUILDNO_HOST_CXXFLAGS = -I$(TOOLS_BASE) -Iinclude/reactos $(TOOLS_CPPFLAGS) +BUILDNO_HOST_CXXFLAGS = -I$(TOOLS_BASE) -Isdk/include/reactos $(TOOLS_CPPFLAGS)
BUILDNO_HOST_LFLAGS = $(TOOLS_LFLAGS)
-BUILDNO_VERSION = include$(SEP)reactos$(SEP)version.h +BUILDNO_VERSION = sdk$(SEP)include$(SEP)reactos$(SEP)version.h
.PHONY: buildno buildno: $(BUILDNO_TARGET) @@ -52,6 +52,6 @@ #.PHONY: $(BUILDNO_TARGET)
$(BUILDNO_H): $(BUILDNO_TARGET) - ${mkdir} $(INTERMEDIATE_)include$(SEP)reactos 2>$(NUL) + ${mkdir} $(INTERMEDIATE_)sdk$(SEP)include$(SEP)reactos 2>$(NUL) $(ECHO_BUILDNO) $(Q)$(BUILDNO_TARGET) $(BUILDNO_QUIET) $(BUILDNO_H)
Modified: branches/Tree-restructure-test/sdk/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools/... ============================================================================== --- branches/Tree-restructure-test/sdk/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -358,13 +358,13 @@ GenerateGlobalVariables (); GenerateXmlBuildFilesMacro (); ProcessModules (); - GenerateInstallTarget (); - GenerateTestTarget (); +// GenerateInstallTarget (); +// GenerateTestTarget (); GenerateDirectoryTargets (); GenerateDirectories (); - GenerateTestSupportCode (); +// GenerateTestSupportCode (); GenerateCompilationUnitSupportCode (); - GenerateSysSetup (); +// GenerateSysSetup (); GenerateProxyMakefiles (); CheckAutomaticDependencies (); CloseMakefile (); @@ -429,9 +429,9 @@ void MingwBackend::GenerateGlobalVariables () const { - fputs ( "include tools$(SEP)rbuild$(SEP)backend$(SEP)mingw$(SEP)rules.mak\n", fMakefile ); - fprintf ( fMakefile, "include tools$(SEP)rbuild$(SEP)backend$(SEP)mingw$(SEP)linkers$(SEP)%s.mak\n", ProjectNode.GetLinkerSet ().c_str () ); - fprintf ( fMakefile, "include tools$(SEP)rbuild$(SEP)backend$(SEP)mingw$(SEP)compilers$(SEP)%s.mak\n", ProjectNode.GetCompilerSet ().c_str () ); + fprintf ( fMakefile, "include %sbackend$(SEP)mingw$(SEP)rules.mak\n", RBUILD_BASE ); + fprintf ( fMakefile, "include %sbackend$(SEP)mingw$(SEP)linkers$(SEP)%s.mak\n", RBUILD_BASE, ProjectNode.GetLinkerSet ().c_str () ); + fprintf ( fMakefile, "include %sbackend$(SEP)mingw$(SEP)compilers$(SEP)%s.mak\n", RBUILD_BASE, ProjectNode.GetCompilerSet ().c_str () );
if ( mscPath.length() ) fprintf ( fMakefile, "export RBUILD_CL_PATH=%s\n", mscPath.c_str () ); @@ -1093,7 +1093,8 @@ { printf ( "Detecting compiler -pipe support..." );
- string pipe_detection = "tools" + sSep + "rbuild" + sSep + "backend" + sSep + "mingw" + sSep + "pipe_detection.c"; + string rbuild_base = RBUILD_BASE; + string pipe_detection = rbuild_base + "backend" + sSep + "mingw" + sSep + "pipe_detection.c"; string pipe_detectionObjectFilename = ReplaceExtension ( pipe_detection, ".o" ); string command = ssprintf ( @@ -1130,7 +1131,8 @@
if ( configuration.PrecompiledHeadersEnabled && ProjectNode.configuration.Compiler == GnuGcc ) { - string path = "tools" + sSep + "rbuild" + sSep + "backend" + sSep + "mingw" + sSep + "pch_detection.h"; + string rbuild_base = RBUILD_BASE; + string path = rbuild_base + "backend" + sSep + "mingw" + sSep + "pch_detection.h"; string cmd = ssprintf ( "%s -c %s 1>%s 2>%s", FixSeparatorForSystemCommand(compilerCommand).c_str (),
Modified: branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools/... ============================================================================== --- branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.h [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.h [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -67,6 +67,10 @@ #define DEF_SSEP "/" #define DEF_SBAD_SEP "\" #endif + +#define SSEP DEF_SSEP +#define TOOLS_BASE "sdk" SSEP "tools" SSEP +#define RBUILD_BASE TOOLS_BASE "rbuild" SSEP
#define MS_VS_DEF_VERSION "9.00"
Modified: branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools/... ============================================================================== --- branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.mak [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.mak [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -296,7 +296,7 @@ $(RBUILD_COMMON_OBJECTS) \ $(RBUILD_TEST_SPECIAL_OBJECTS)
-RBUILD_HOST_CXXFLAGS = -I$(RBUILD_BASE) -I$(TOOLS_BASE) -I$(INFLIB_BASE) $(TOOLS_CPPFLAGS) -Iinclude -Iinclude/reactos +RBUILD_HOST_CXXFLAGS = -I$(RBUILD_BASE) -I$(TOOLS_BASE) -I$(INFLIB_BASE) $(TOOLS_CPPFLAGS) -Isdk/include -Isdk/include/reactos
RBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS)
Modified: branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.sln URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools/... ============================================================================== --- branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.sln [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.sln [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -1,6 +1,7 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rbuild", "rbuild.vcproj", "{D9305AFB-499E-49F1-A865-99DD7E19E762}" + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rbuild", "rbuild.vcxproj", "{D9305AFB-499E-49F1-A865-99DD7E19E762}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution
Modified: branches/Tree-restructure-test/sdk/tools/rbuild/test.h URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools/... ============================================================================== --- branches/Tree-restructure-test/sdk/tools/rbuild/test.h [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/rbuild/test.h [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -20,10 +20,6 @@
#include "rbuild.h" #include "backend/mingw/mingw.h" - -#define SSEP DEF_SSEP - -#define RBUILD_BASE "tools" SSEP "rbuild" SSEP
class BaseTest {
Modified: branches/Tree-restructure-test/sdk/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools/... ============================================================================== --- branches/Tree-restructure-test/sdk/tools/tools.mak [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/tools.mak [iso-8859-1] Sun Oct 10 14:08:28 2010 @@ -43,7 +43,7 @@ include sdk/tools/bin2c.mak include sdk/tools/buildno/buildno.mak include sdk/tools/gendib/gendib.mak -include sdk/tools/rsym/log2lines.mak +include sdk/tools/log2lines/log2lines.mak include sdk/tools/nci/nci.mak ifeq ($(ARCH),powerpc) include sdk/tools/ofw_interface/ofw_interface.mak
-
gadamopoulos＠svn.reactos.org