Rename the rbuild XML files to a .rbuild extension Added: trunk/reactos/ReactOS-ppc.rbuild Deleted: trunk/reactos/ReactOS-ppc.xml Added: trunk/reactos/ReactOS.rbuild Deleted: trunk/reactos/ReactOS.xml Added: trunk/reactos/baseaddress.rbuild Deleted: trunk/reactos/baseaddress.xml Added: trunk/reactos/boot/boot.rbuild Added: trunk/reactos/boot/bootcd/bootcd.rbuild Deleted: trunk/reactos/boot/bootcd/bootcd.xml Deleted: trunk/reactos/boot/bootdata.xml Added: trunk/reactos/config.template.rbuild Deleted: trunk/reactos/config.template.xml Added: trunk/reactos/lib/inflib/inflib.rbuild Deleted: trunk/reactos/lib/inflib/inflib.xml Modified: trunk/reactos/tools/rbuild/rbuild.cpp _____
Copied: trunk/reactos/ReactOS-ppc.rbuild (from rev 9, trunk/reactos/ReactOS-ppc.xml) --- trunk/reactos/ReactOS-ppc.xml 2006-01-28 10:05:43 UTC (rev 9) +++ trunk/reactos/ReactOS-ppc.rbuild 2006-01-28 16:24:46 UTC (rev 10) @@ -0,0 +1,88 @@
+<?xml version="1.0"?> +<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> +<project name="ReactOS" makefile="makefile.ppc" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="config-ppc.rbuild"> + xi:fallback + <xi:include href="config.template.rbuild" /> + </xi:fallback> + </xi:include> + + <xi:include href="baseaddress.rbuild" /> + + <property name="BOOTPROG_PREPARE" value="ppc-le2be" /> + <property name="BOOTPROG_FLATFORMAT" value="-O elf32-powerpc -B powerpc:common" /> + <property name="BOOTPROG_LINKFORMAT" value="-melf32ppc --no-omagic -Ttext 0xe00000 -Tdata 0xe10000" /> + <property name="BOOTPROG_COPYFORMAT" value="--only-section=.text --only-section=.data --only-section=.bss -O aixcoff-rs6000" /> + + <define name="_M_PPC" /> + <define name="_PPC_" /> + <define name="__PowerPC__" /> + <define name="_REACTOS_" /> + <define name="__MINGW_IMPORT" empty="true" /> + <define name="__restrict__" empty="true" /> + <compilerflag>-v</compilerflag> + <if property="MP" value="1"> + <define name="CONFIG_SMP" value="1" /> + </if> + <if property="DBG" value="1"> + <define name="DBG" value="1" /> + <property name="DBG_OR_KDBG" value="true" /> + </if> + <if property="DBG" value="0"> + <compilerflag>-Os</compilerflag> + <compilerflag>-Wno-strict-aliasing</compilerflag> + </if> + <if property="KDBG" value="1"> + <define name="KDBG" value="1" /> + <property name="DBG_OR_KDBG" value="true" /> + </if> + <compilerflag>-Wpointer-arith</compilerflag> + + <include>.</include> + <include>include</include> + <include>include/reactos</include> + <include>include/libs</include> + <include>include/drivers</include> + <include>include/subsys</include> + <include>include/ndk</include> + <include>w32api/include</include> + <include>w32api/include/crt</include> + <include>w32api/include/ddk</include> + + <directory name="apps"> + <xi:include href="apps/directory.rbuild" /> + </directory> + <directory name="boot"> + <xi:include href="boot/boot.rbuild" /> + </directory> + <directory name="drivers"> + <xi:include href="drivers/directory.rbuild" /> + </directory> + <directory name="hal"> + <xi:include href="hal/directory.rbuild" /> + </directory> + <directory name="include"> + <xi:include href="include/directory.rbuild" /> + </directory> + <directory name="lib"> + <xi:include href="lib/directory.rbuild" /> + </directory> + <directory name="media"> + <xi:include href="media/directory.rbuild" /> + </directory> + <directory name="modules"> + <xi:include href="modules/directory.rbuild" /> + </directory> + <directory name="ntoskrnl"> + <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> + </directory> + <directory name="regtests"> + <xi:include href="regtests/directory.rbuild" /> + </directory> + <directory name="services"> + <xi:include href="services/directory.rbuild" /> + </directory> + <directory name="subsys"> + <xi:include href="subsys/directory.rbuild" /> + </directory> +</project> _____
Deleted: trunk/reactos/ReactOS-ppc.xml --- trunk/reactos/ReactOS-ppc.xml 2006-01-28 10:05:43 UTC (rev 9) +++ trunk/reactos/ReactOS-ppc.xml 2006-01-28 16:24:46 UTC (rev 10) @@ -1,91 +0,0 @@
-<?xml version="1.0"?> -<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile.ppc" xmlns:xi="http://www.w3.org/2001/XInclude"> - <xi:include href="config-ppc.xml"> - xi:fallback - <xi:include href="config.template.xml" /> - </xi:fallback> - </xi:include> - - <xi:include href="baseaddress.xml" /> - - <property name="BOOTPROG_PREPARE" value="ppc-le2be" /> - <property name="BOOTPROG_FLATFORMAT" value="-O elf32-powerpc -B powerpc:common" /> - <property name="BOOTPROG_LINKFORMAT" value="-melf32ppc --no-omagic -Ttext 0xe00000 -Tdata 0xe10000" /> - <property name="BOOTPROG_COPYFORMAT" value="--only-section=.text --only-section=.data --only-section=.bss -O aixcoff-rs6000" /> - - <define name="_M_PPC" /> - <define name="_PPC_" /> - <define name="__PowerPC__" /> - <define name="_REACTOS_" /> - <define name="__MINGW_IMPORT" empty="true" /> - <define name="__restrict__" empty="true" /> - <compilerflag>-v</compilerflag> - <if property="MP" value="1"> - <define name="CONFIG_SMP" value="1" /> - </if> - <if property="DBG" value="1"> - <define name="DBG" value="1" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> - <if property="DBG" value="0"> - <compilerflag>-Os</compilerflag> - <compilerflag>-Wno-strict-aliasing</compilerflag> - </if> - <if property="KDBG" value="1"> - <define name="KDBG" value="1" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> - <compilerflag>-Wpointer-arith</compilerflag> - - <include>.</include> - <include>include</include> - <include>include/reactos</include> - <include>include/libs</include> - <include>include/drivers</include> - <include>include/subsys</include> - <include>include/ndk</include> - <include>w32api/include</include> - <include>w32api/include/crt</include> - <include>w32api/include/ddk</include> - - <directory name="apps"> - <xi:include href="apps/directory.xml" /> - </directory> - <directory name="boot"> - <xi:include href="boot/boot.xml" /> - </directory> - <directory name="bootdata"> - <xi:include href="bootdata/bootdata.xml" /> - </directory> - <directory name="drivers"> - <xi:include href="drivers/directory.xml" /> - </directory> - <directory name="hal"> - <xi:include href="hal/directory.xml" /> - </directory> - <directory name="include"> - <xi:include href="include/directory.xml" /> - </directory> - <directory name="lib"> - <xi:include href="lib/directory.xml" /> - </directory> - <directory name="media"> - <xi:include href="media/directory.xml" /> - </directory> - <directory name="modules"> - <xi:include href="modules/directory.xml" /> - </directory> - <directory name="ntoskrnl"> - <xi:include href="ntoskrnl/ntoskrnl.xml" /> - </directory> - <directory name="regtests"> - <xi:include href="regtests/directory.xml" /> - </directory> - <directory name="services"> - <xi:include href="services/directory.xml" /> - </directory> - <directory name="subsys"> - <xi:include href="subsys/directory.xml" /> - </directory> -</project> _____
Copied: trunk/reactos/ReactOS.rbuild (from rev 9, trunk/reactos/ReactOS.xml) --- trunk/reactos/ReactOS.xml 2006-01-28 10:05:43 UTC (rev 9) +++ trunk/reactos/ReactOS.rbuild 2006-01-28 16:24:46 UTC (rev 10) @@ -0,0 +1,88 @@
+<?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"> + <xi:include href="config.rbuild"> + xi:fallback + <xi:include href="config.template.rbuild" /> + </xi:fallback> + </xi:include> + + <xi:include href="baseaddress.rbuild" /> + + <define name="_M_IX86" /> + <define name="_X86_" /> + <define name="__i386__" /> + <define name="_REACTOS_" /> + <if property="MP" value="1"> + <define name="CONFIG_SMP" value="1" /> + </if> + <if property="DBG" value="1"> + <define name="DBG" value="1" /> + <property name="DBG_OR_KDBG" value="true" /> + </if> + <if property="KDBG" value="1"> + <define name="KDBG" value="1" /> + <property name="DBG_OR_KDBG" value="true" /> + </if> + <compilerflag>-Os</compilerflag> + <compilerflag>-Wno-strict-aliasing</compilerflag> + <compilerflag>-ftracer</compilerflag> + <compilerflag>-momit-leaf-frame-pointer</compilerflag> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + <compilerflag>-Wpointer-arith</compilerflag> + + <include>.</include> + <include>include</include> + <include>include/reactos</include> + <include>include/libs</include> + <include>include/drivers</include> + <include>include/subsys</include> + <include>include/ndk</include> + <include>w32api/include</include> + <include>w32api/include/crt</include> + <include>w32api/include/ddk</include> + +<!-- + <directory name="apps"> + <xi:include href="apps/directory.rbuild" /> + </directory> + <directory name="boot"> + <xi:include href="boot/boot.rbuild" /> + </directory> +--> + <directory name="boot"> + <xi:include href="boot/boot.rbuild" /> + </directory> +<!-- + <directory name="drivers"> + <xi:include href="drivers/directory.rbuild" /> + </directory> + <directory name="hal"> + <xi:include href="hal/directory.rbuild" /> + </directory> + <directory name="include"> + <xi:include href="include/directory.rbuild" /> + </directory> + <directory name="lib"> + <xi:include href="lib/directory.rbuild" /> + </directory> + <directory name="media"> + <xi:include href="media/directory.rbuild" /> + </directory> + <directory name="modules"> + <xi:include href="modules/directory.rbuild" /> + </directory> + <directory name="ntoskrnl"> + <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> + </directory> + <directory name="regtests"> + <xi:include href="regtests/directory.rbuild" /> + </directory> + <directory name="services"> + <xi:include href="services/directory.rbuild" /> + </directory> + <directory name="subsys"> + <xi:include href="subsys/directory.rbuild" /> + </directory> +--> +</project> _____
Deleted: trunk/reactos/ReactOS.xml --- trunk/reactos/ReactOS.xml 2006-01-28 10:05:43 UTC (rev 9) +++ trunk/reactos/ReactOS.xml 2006-01-28 16:24:46 UTC (rev 10) @@ -1,88 +0,0 @@
-<?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"> - <xi:include href="config.xml"> - xi:fallback - <xi:include href="config.template.xml" /> - </xi:fallback> - </xi:include> - - <xi:include href="baseaddress.xml" /> - - <define name="_M_IX86" /> - <define name="_X86_" /> - <define name="__i386__" /> - <define name="_REACTOS_" /> - <if property="MP" value="1"> - <define name="CONFIG_SMP" value="1" /> - </if> - <if property="DBG" value="1"> - <define name="DBG" value="1" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> - <if property="KDBG" value="1"> - <define name="KDBG" value="1" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> - <compilerflag>-Os</compilerflag> - <compilerflag>-Wno-strict-aliasing</compilerflag> - <compilerflag>-ftracer</compilerflag> - <compilerflag>-momit-leaf-frame-pointer</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - <compilerflag>-Wpointer-arith</compilerflag> - - <include>.</include> - <include>include</include> - <include>include/reactos</include> - <include>include/libs</include> - <include>include/drivers</include> - <include>include/subsys</include> - <include>include/ndk</include> - <include>w32api/include</include> - <include>w32api/include/crt</include> - <include>w32api/include/ddk</include> - -<!-- - <directory name="apps"> - <xi:include href="apps/directory.xml" /> - </directory> - <directory name="boot"> - <xi:include href="boot/boot.xml" /> - </directory> ---> - <directory name="boot"> - <xi:include href="boot/bootdata.xml" /> - </directory> -<!-- - <directory name="drivers"> - <xi:include href="drivers/directory.xml" /> - </directory> - <directory name="hal"> - <xi:include href="hal/directory.xml" /> - </directory> - <directory name="include"> - <xi:include href="include/directory.xml" /> - </directory> - <directory name="lib"> - <xi:include href="lib/directory.xml" /> - </directory> - <directory name="media"> - <xi:include href="media/directory.xml" /> - </directory> - <directory name="modules"> - <xi:include href="modules/directory.xml" /> - </directory> - <directory name="ntoskrnl"> - <xi:include href="ntoskrnl/ntoskrnl.xml" /> - </directory> - <directory name="regtests"> - <xi:include href="regtests/directory.xml" /> - </directory> - <directory name="services"> - <xi:include href="services/directory.xml" /> - </directory> - <directory name="subsys"> - <xi:include href="subsys/directory.xml" /> - </directory> ---> -</project> _____
Copied: trunk/reactos/baseaddress.rbuild (from rev 9, trunk/reactos/baseaddress.xml) _____
Deleted: trunk/reactos/baseaddress.xml --- trunk/reactos/baseaddress.xml 2006-01-28 10:05:43 UTC (rev 9) +++ trunk/reactos/baseaddress.xml 2006-01-28 16:24:46 UTC (rev 10) @@ -1,123 +0,0 @@
-<group> -<property name="BASEADDRESS_DPLAYX" value="0x5E080000" /> -<property name="BASEADDRESS_DPLAY" value="0x71E80000" /> -<property name="BASEADDRESS_REGTESTS" value="0x07000000" /> -<property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> -<property name="BASEADDRESS_DEVENUM" value="0x35680000" /> -<property name="BASEADDRESS_MMSYS" value="0x588A0000" /> -<property name="BASEADDRESS_UXTHEME" value="0x5AD70000" /> -<property name="BASEADDRESS_VDMDBG" value="0x5B0D0000" /> -<property name="BASEADDRESS_OBJSEL" value="0x5B400000" /> -<property name="BASEADDRESS_SLAYER" value="0x5C7E0000" /> -<property name="BASEADDRESS_DINPUT" value="0x5F580000" /> -<property name="BASEADDRESS_MAPI32" value="0x62250000" /> -<property name="BASEADDRESS_HDWWIZ" value="0x64D40000" /> -<property name="BASEADDRESS_TIMEDATE" value="0x64DA0000" /> -<property name="BASEADDRESS_SYSDM" value="0x64DD0000" /> -<property name="BASEADDRESS_NCPL" value="0x64EA0000" /> -<property name="BASEADDRESS_MAIN" value="0x64F40000" /> -<property name="BASEADDRESS_INTL" value="0x64FB0000" /> -<property name="BASEADDRESS_DESK" value="0x65080000" /> -<property name="BASEADDRESS_APPWIZ" value="0x65100000" /> -<property name="BASEADDRESS_ACCESS" value="0x65180000" /> -<property name="BASEADDRESS_HID" value="0x688F0000" /> -<property name="BASEADDRESS_PSXDLL" value="0x68eb0000" /> -<property name="BASEADDRESS_PSAPI" value="0x68f70000" /> -<property name="BASEADDRESS_OLEACC" value="0x69640000" /> -<property name="BASEADDRESS_MSIMG32" value="0x69cc0000" /> -<property name="BASEADDRESS_NETPLWIZ" value="0x6a240000" /> -<property name="BASEADDRESS_UNICODE" value="0x6b200000" /> -<property name="BASEADDRESS_ADVPACK" value="0x6b300000" /> -<property name="BASEADDRESS_CONTROL" value="0x6b310000" /> -<property name="BASEADDRESS_NCPA" value="0x6b320000" /> -<property name="BASEADDRESS_DBGHELP" value="0x6b330000" /> -<property name="BASEADDRESS_DINPUT8" value="0x6b340000" /> -<property name="BASEADDRESS_DXDIAGN" value="0x6b350000" /> -<property name="BASEADDRESS_DSOUND" value="0x6b360000" /> -<property name="BASEADDRESS_GLU32" value="0x6b370000" /> -<property name="BASEADDRESS_MESA32" value="0x6b380000" /> -<property name="BASEADDRESS_OPENGL32" value="0x6b390000" /> -<property name="BASEADDRESS_SECUR32" value="0x6b3A0000" /> -<property name="BASEADDRESS_SMDLL" value="0x6b3B0000" /> -<property name="BASEADDRESS_URLMON" value="0x6b3C0000" /> -<property name="BASEADDRESS_SERIALUI" value="0x6b3D0000" /> -<property name="BASEADDRESS_CLB" value="0x6f2b0000" /> -<property name="BASEADDRESS_CARDS" value="0x701a0000" /> -<property name="BASEADDRESS_WININET" value="0x70200000" /> -<property name="BASEADDRESS_ACLUI" value="0x71550000" /> -<property name="BASEADDRESS_SHDOCVW" value="0x71700000" /> -<property name="BASEADDRESS_MSWSOCK" value="0x71a30000" /> -<property name="BASEADDRESS_WSOCK32" value="0x71ab0000" /> -<property name="BASEADDRESS_ACLEDIT" value="0x71b70000" /> -<property name="BASEADDRESS_NETAPI32" value="0x71c00000" /> -<property name="BASEADDRESS_SECURITY" value="0x71F10000" /> -<property name="BASEADDRESS_WINFAX" value="0x722C0000" /> -<property name="BASEADDRESS_WINSCARD" value="0x723D0000" /> -<property name="BASEADDRESS_DEVMGR" value="0x72a90000" /> -<property name="BASEADDRESS_AVIFIL32" value="0x73ac0000" /> -<property name="BASEADDRESS_LZ32" value="0x73d80000" /> -<property name="BASEADDRESS_COREDLL" value="0x73d80000" /> -<property name="BASEADDRESS_ICMP" value="0x741F0000" /> -<property name="BASEADDRESS_USERENV" value="0x74850000" /> -<property name="BASEADDRESS_SYSSETUP" value="0x74a30000" /> -<property name="BASEADDRESS_OLEDLG" value="0x74d00000" /> -<property name="BASEADDRESS_SAMSRV" value="0x74f30000" /> -<property name="BASEADDRESS_SAMLIB" value="0x750C0000" /> -<property name="BASEADDRESS_CABINET" value="0x75120000" /> -<property name="BASEADDRESS_MSGINA" value="0x75970000" /> -<property name="BASEADDRESS_IMM32" value="0x75e60000" /> -<property name="BASEADDRESS_COMMCTRL" value="0x75e60000" /> -<property name="BASEADDRESS_RPCRT4" value="0x76000000" /> -<property name="BASEADDRESS_SHLWAPI" value="0x76120000" /> -<property name="BASEADDRESS_COMCTL32" value="0x76160000" /> -<property name="BASEADDRESS_COMDLG32" value="0x76210000" /> -<property name="BASEADDRESS_OLEAUT32" value="0x76290000" /> -<property name="BASEADDRESS_RICHED32" value="0x76340000" /> -<property name="BASEADDRESS_D3D8THK" value="0x76340000" /> -<property name="BASEADDRESS_RICHED20" value="0x76360000" /> -<property name="BASEADDRESS_TWAIN_32" value="0x76380000" /> -<property name="BASEADDRESS_LSASRV" value="0x76540000" /> -<property name="BASEADDRESS_MIDIMAP" value="0x76600000" /> -<property name="BASEADDRESS_ODBC32" value="0x76660000" /> -<property name="BASEADDRESS_WAVEMAP" value="0x76610000" /> -<property name="BASEADDRESS_MPR" value="0x76620000" /> -<property name="BASEADDRESS_SETUPAPI" value="0x76660000" /> -<property name="BASEADDRESS_SHFOLDER" value="0x76780000" /> -<property name="BASEADDRESS_NTMARTA" value="0x768A0000" /> -<property name="BASEADDRESS_GDIPLUS" value="0x76a00000" /> -<property name="BASEADDRESS_WINTRUST" value="0x76c30000" /> -<property name="BASEADDRESS_IMAGEHLP" value="0x76c90000" /> -<property name="BASEADDRESS_FMIFS" value="0x76df0000" /> -<property name="BASEADDRESS_SHELL32" value="0x77260000" /> -<property name="BASEADDRESS_IPHLPAPI" value="0x77400000" /> -<property name="BASEADDRESS_MSVFW32" value="0x77400000" /> -<property name="BASEADDRESS_MSACM32" value="0x77400000" /> -<property name="BASEADDRESS_MMDRV" value="0x77530000" /> -<property name="BASEADDRESS_CRTDLL" value="0x77630000" /> -<property name="BASEADDRESS_AUTHZ" value="0x77690000" /> -<property name="BASEADDRESS_CFGMGR32" value="0x77700000" /> -<property name="BASEADDRESS_PACKET" value="0x77780000" /> -<property name="BASEADDRESS_MSAFD" value="0x777a0000" /> -<property name="BASEADDRESS_MSI" value="0x777b0000" /> -<property name="BASEADDRESS_SNMPAPI" value="0x777c0000" /> -<property name="BASEADDRESS_IPRTPRIO" value="0x777c0000" /> -<property name="BASEADDRESS_WSHTCPIP" value="0x777c0000" /> -<property name="BASEADDRESS_WINMM" value="0x777d0000" /> -<property name="BASEADDRESS_WS2HELP" value="0x777e0000" /> -<property name="BASEADDRESS_WSHIRDA" value="0x777f0000" /> -<property name="BASEADDRESS_WINSPOOL" value="0x77800000" /> -<property name="BASEADDRESS_VERSION" value="0x77a40000" /> -<property name="BASEADDRESS_OLE32" value="0x77a50000" /> -<property name="BASEADDRESS_WS2_32" value="0x77aa0000" /> -<property name="BASEADDRESS_OLEPRO32" value="0x77aa0000" /> -<property name="BASEADDRESS_CRYPT32" value="0x77ab0000" /> -<property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" /> -<property name="BASEADDRESS_USER32" value="0x77e50000" /> -<property name="BASEADDRESS_GDI32" value="0x77f10000" /> -<property name="BASEADDRESS_DNSAPI" value="0x77f30000" /> -<property name="BASEADDRESS_MSVCRT" value="0x78000000" /> -<property name="BASEADDRESS_MSVCRT20" value="0x78500000" /> -<property name="BASEADDRESS_KERNEL32" value="0x7c800000" /> -<property name="BASEADDRESS_NTDLL" value="0x7C900000" /> -<property name="BASEADDRESS_FREETYPE" value="0x7F000000" /> -</group> _____
Copied: trunk/reactos/boot/boot.rbuild (from rev 9, trunk/reactos/boot/bootdata.xml) --- trunk/reactos/boot/bootdata.xml 2006-01-28 10:05:43 UTC (rev 9) +++ trunk/reactos/boot/boot.rbuild 2006-01-28 16:24:46 UTC (rev 10) @@ -0,0 +1,5 @@
+<group> +<directory name="bootcd"> + <xi:include href="bootcd/bootcd.rbuild" /> +</directory> +</group> _____
Copied: trunk/reactos/boot/bootcd/bootcd.rbuild (from rev 9, trunk/reactos/boot/bootcd/bootcd.xml) _____
Deleted: trunk/reactos/boot/bootcd/bootcd.xml --- trunk/reactos/boot/bootcd/bootcd.xml 2006-01-28 10:05:43 UTC (rev 9) +++ trunk/reactos/boot/bootcd/bootcd.xml 2006-01-28 16:24:46 UTC (rev 10) @@ -1,2 +0,0 @@
-<module name="bootcd" type="iso"> -</module> _____
Deleted: trunk/reactos/boot/bootdata.xml --- trunk/reactos/boot/bootdata.xml 2006-01-28 10:05:43 UTC (rev 9) +++ trunk/reactos/boot/bootdata.xml 2006-01-28 16:24:46 UTC (rev 10) @@ -1,5 +0,0 @@
-<group> -<directory name="bootcd"> - <xi:include href="bootcd/bootcd.xml" /> -</directory> -</group> _____
Copied: trunk/reactos/config.template.rbuild (from rev 9, trunk/reactos/config.template.xml) _____
Deleted: trunk/reactos/config.template.xml --- trunk/reactos/config.template.xml 2006-01-28 10:05:43 UTC (rev 9) +++ trunk/reactos/config.template.xml 2006-01-28 16:24:46 UTC (rev 10) @@ -1,51 +0,0 @@
-<!-- - This file is a template used as a starting point for compile-time - configuration of ReactOS. Make a copy of this file and name it config.xml. - Then change the options in config.xml. If you don't have a config.xml file, - then the defaults in this file, config.template.xml, will be used instead. - - Boolean options can obtain the values 0 (disabled) or 1 (enabled). String - options can obtain any value specified in the comment before it. ---> - - -<!-- - Architecture to build for. Specify one of: - i386 ---> -<property name="ARCH" value="i386" /> - -<!-- - Sub-architecture to build for. Specify one of: - xbox ---> -<property name="SARCH" value="" /> - - -<!-- - Which CPU ReactOS should be optimized for. Specify one of: - i486, i586, pentium, pentium2, pentium3, pentium4, athlon-xp, athlon-mp, - k6-2 - - See GCC manual for more CPU names and which CPUs GCC can optimize for. ---> -<property name="OARCH" value="i486" /> - - -<!-- - Whether to compile for an uniprocessor or multiprocessor machine. ---> -<property name="MP" value="0" /> - - -<!-- - Whether to compile in the integrated kernel debugger. ---> -<property name="KDBG" value="0" /> - - -<!-- - Whether to compile for debugging. No compiler optimizations will be - performed. ---> -<property name="DBG" value="1" /> _____
Copied: trunk/reactos/lib/inflib/inflib.rbuild (from rev 9, trunk/reactos/lib/inflib/inflib.xml) _____
Deleted: trunk/reactos/lib/inflib/inflib.xml --- trunk/reactos/lib/inflib/inflib.xml 2006-01-28 10:05:43 UTC (rev 9) +++ trunk/reactos/lib/inflib/inflib.xml 2006-01-28 16:24:46 UTC (rev 10) @@ -1,11 +0,0 @@
-<module name="inflib" type="staticlibrary"> - <include base="inflib">.</include> - <define name="__NO_CTYPE_INLINES" /> - <pch>inflib.h</pch> - <file>infcore.c</file> - <file>infget.c</file> - <file>infput.c</file> - <file>infrosgen.c</file> - <file>infrosget.c</file> - <file>infrosput.c</file> -</module> _____
Modified: trunk/reactos/tools/rbuild/rbuild.cpp --- trunk/reactos/tools/rbuild/rbuild.cpp 2006-01-28 10:05:43 UTC (rev 9) +++ trunk/reactos/tools/rbuild/rbuild.cpp 2006-01-28 16:24:46 UTC (rev 10) @@ -33,7 +33,7 @@
using std::vector;
static string BuildSystem; -static string RootXmlFile = "ReactOS.xml"; +static string RootXmlFile = "ReactOS.rbuild"; static Configuration configuration;
bool @@ -229,7 +229,7 @@ printf ( " -v Be verbose.\n" ); printf ( " -c Clean as you go. Delete generated files as soon as they are not\n" ); printf ( " needed anymore.\n" ); - printf ( " -r{file.xml} Name of the root xml file. Default is ReactOS.xml.\n" ); + printf ( " -r{file.xml} Name of the root xml file. Default is ReactOS.rbuild.\n" ); printf ( " -dd Disable automatic dependencies.\n" ); printf ( " -dm{module} Check only automatic dependencies for this module.\n" ); printf ( " -ud Disable multiple source files per compilation unit.\n" );
-
gvg＠svn.reactos.org