From 9960c6fc9865702d3bf726189c69baf01c3b3594 Mon Sep 17 00:00:00 2001 From: Colin Finck Date: Sat, 15 Sep 2007 14:37:02 +0000 Subject: [PATCH] =?utf8?q?More=20XML=20compliance=20fixes=20for=20the=20.r?= =?utf8?q?build=20files=20by=20Marc=20Piulachs=20(marc=20DOT=20piulachs=20?= =?utf8?q?AT=20codexchange=20DOT=20net)=20The=20added=20'include'=20line?= =?utf8?q?=20in=20"ntoskrnl.rbuild"=20was=20left=20out,=20as=20this=20incl?= =?utf8?q?ude=20path=20is=20already=20added=20through=20the=20"ntoskrnl.h"?= =?utf8?q?=20precompiled=20header.=20(thanks=20to=20Herv=C3=A9=20for=20fig?= =?utf8?q?uring=20this=20out)=20I=20applied=20patches=201904=20and=201905?= =?utf8?q?=20of=20the=20Bugzilla=20bug=20entry.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit See issue #2649 for more details. svn path=/trunk/; revision=29056 --- reactos/ReactOS-generic.rbuild | 2 +- .../base/applications/regedit/regedit.rbuild | 2 +- .../screensavers/logon/logon.rbuild | 3 - reactos/base/shell/explorer/explorer.rbuild | 2 +- reactos/dll/directx/wine/d3d8/d3d8.rbuild | 9 +- .../dll/directx/wine/wined3d/wined3d.rbuild | 2 +- reactos/lib/drivers/ip/ip.rbuild | 12 +- reactos/lib/sdk/sdk.rbuild | 2 +- reactos/ntoskrnl/ntoskrnl.rbuild | 770 +++++++++--------- reactos/subsystems/win32/csrss/csrss.rbuild | 54 +- rosapps/cmdutils/cmdutils.rbuild | 39 +- rosapps/demos/directory.rbuild | 21 +- rosapps/devutils/directory.rbuild | 34 +- rosapps/directory.rbuild | 213 ++--- rosapps/downloader/downloader.rbuild | 53 +- rosapps/lib/directory.rbuild | 9 +- rosapps/net/directory.rbuild | 21 +- rosapps/sysutils/sysutils.rbuild | 84 +- rosapps/templates/directory.rbuild | 20 +- 19 files changed, 687 insertions(+), 665 deletions(-) diff --git a/reactos/ReactOS-generic.rbuild b/reactos/ReactOS-generic.rbuild index c1ff2dbda3b..414b722ca21 100644 --- a/reactos/ReactOS-generic.rbuild +++ b/reactos/ReactOS-generic.rbuild @@ -1,6 +1,6 @@ - + diff --git a/reactos/base/applications/regedit/regedit.rbuild b/reactos/base/applications/regedit/regedit.rbuild index ccd0c76a20e..6b782d48049 100644 --- a/reactos/base/applications/regedit/regedit.rbuild +++ b/reactos/base/applications/regedit/regedit.rbuild @@ -1,6 +1,6 @@ - + . diff --git a/reactos/base/applications/screensavers/logon/logon.rbuild b/reactos/base/applications/screensavers/logon/logon.rbuild index 65d97860d3a..ef7ae7a426c 100644 --- a/reactos/base/applications/screensavers/logon/logon.rbuild +++ b/reactos/base/applications/screensavers/logon/logon.rbuild @@ -10,9 +10,6 @@ kernel32 user32 gdi32 - opengl32 - glu32 - winmm diff --git a/reactos/base/shell/explorer/explorer.rbuild b/reactos/base/shell/explorer/explorer.rbuild index 538c64f163a..1f0fe29fb33 100644 --- a/reactos/base/shell/explorer/explorer.rbuild +++ b/reactos/base/shell/explorer/explorer.rbuild @@ -1,6 +1,6 @@ - + -fexceptions . diff --git a/reactos/dll/directx/wine/d3d8/d3d8.rbuild b/reactos/dll/directx/wine/d3d8/d3d8.rbuild index 21cfbb1733d..7522d95a369 100644 --- a/reactos/dll/directx/wine/d3d8/d3d8.rbuild +++ b/reactos/dll/directx/wine/d3d8/d3d8.rbuild @@ -16,10 +16,10 @@ uuid wine - user32 - opengl32 - gdi32 - advapi32 + user32 + opengl32 + gdi32 + advapi32 kernel32 wined3d @@ -42,5 +42,4 @@ volumetexture.c version.rc d3d8.spec - diff --git a/reactos/dll/directx/wine/wined3d/wined3d.rbuild b/reactos/dll/directx/wine/wined3d/wined3d.rbuild index 2f01e0ecb76..37172db3f07 100644 --- a/reactos/dll/directx/wine/wined3d/wined3d.rbuild +++ b/reactos/dll/directx/wine/wined3d/wined3d.rbuild @@ -16,7 +16,7 @@ user32 opengl32 gdi32 - advapi32 + advapi32 kernel32 uuid msvcrt diff --git a/reactos/lib/drivers/ip/ip.rbuild b/reactos/lib/drivers/ip/ip.rbuild index 3870b379fc0..27a3d161ed9 100644 --- a/reactos/lib/drivers/ip/ip.rbuild +++ b/reactos/lib/drivers/ip/ip.rbuild @@ -8,7 +8,7 @@ - checksum.S + checksum.S address.c @@ -27,20 +27,20 @@ transmit.c - - datagram.c + + datagram.c - rawip.c + rawip.c - accept.c + accept.c event.c if.c tcp.c - udp.c + udp.c diff --git a/reactos/lib/sdk/sdk.rbuild b/reactos/lib/sdk/sdk.rbuild index 9ce5216a56e..4c4795d20b8 100644 --- a/reactos/lib/sdk/sdk.rbuild +++ b/reactos/lib/sdk/sdk.rbuild @@ -1,6 +1,6 @@ - + diff --git a/reactos/ntoskrnl/ntoskrnl.rbuild b/reactos/ntoskrnl/ntoskrnl.rbuild index 48c644b54f2..be4199f845a 100644 --- a/reactos/ntoskrnl/ntoskrnl.rbuild +++ b/reactos/ntoskrnl/ntoskrnl.rbuild @@ -1,389 +1,389 @@ - - - - - - - - - - - - - - . - include - - include/reactos/drivers - csq - hal - pseh - cmlib - rtl - rossym - libcntpr - kdcom - bootvid - wdmguid - - ntoskrnl.h - - - - - boot.S - abios.c - cpu.c - ctxswitch.S - exp.c - irqobj.c - kiinit.c - ldt.c - mtrr.c - patpge.c - systimer.S - thrdini.c - trap.s - usercall_asm.S - usercall.c - v86vdm.c - v86m_sup.S - - - apc.c - balmgr.c - bug.c - clock.c - config.c - devqueue.c - dpc.c - eventobj.c - except.c - freeldr.c - gate.c - gmutex.c - ipi.c - krnlinit.c - mutex.c - procobj.c - profobj.c - queue.c - semphobj.c - spinlock.c - thrdschd.c - thrdobj.c - timerobj.c - wait.c - - - cacheman.c - copy.c - fs.c - mdl.c - pin.c - view.c - - - - - cmhardwr.c - - - cmapi.c - cmboot.c - cmcheck.c - cmcontrl.c - cmconfig.c - cmdata.c - cmindex.c - cminit.c - cmhook.c - cmkcbncb.c - cmkeydel.c - cmmapvw.c - cmname.c - cmparse.c - cmse.c - cmsecach.c - cmsysini.c - cmvalue.c - cmvalche.c - cmwraprs.c - - - ntfunc.c - regfile.c - registry.c - regobj.c - - - dbgkutil.c - dbgkobj.c - - - zw.S - - - - - interlck_asm.S - fastinterlck_asm.S - ioport.S - - - atom.c - callback.c - dbgctrl.c - efi.c - event.c - evtpair.c - fmutex.c - handle.c - harderr.c - hdlsterm.c - init.c - keyedevt.c - locale.c - lookas.c - mutant.c - pushlock.c - profile.c - resource.c - rundown.c - sem.c - shutdown.c - sysinfo.c - time.c - timer.c - uuid.c - win32k.c - work.c - xipdisp.c - zone.c - - - dbcsname.c - fastio.c - faulttol.c - filelock.c - filter.c - filtrctx.c - fsfilter.c - fsrtlpc.c - largemcb.c - name.c - notify.c - oplock.c - pnp.c - stackovf.c - tunnel.c - unc.c - - - disksup.c - fstubex.c - halstub.c - - - inbv.c - - - - adapter.c - arcname.c - bootlog.c - controller.c - device.c - deviface.c - driver.c - drvrlist.c - error.c - file.c - iocomp.c - ioevent.c - iofunc.c - iomdl.c - iomgr.c - iorsrce.c - iotimer.c - iowork.c - irp.c - irq.c - rawfs.c - remlock.c - util.c - symlink.c - volume.c - - - plugplay.c - pnpdma.c - pnpmgr.c - pnpnotify.c - pnpreport.c - pnproot.c - - - - - - - - - i386-dis.c - kdb_help.S - longjmp.S - setjmp.S - - - - - - kdb.c - kdb_cli.c - kdb_expr.c - kdb_keyboard.c - kdb_serial.c - kdb_string.c - - - kdb_symbols.c - - - - - bochs.c - gdbstub.c - kdbg.c - - kdinit.c - kdio.c - kdmain.c - - - - - kdapi.c - kdbreak.c - kddata.c - kdinit.c - kdlock.c - kdprint.c - kdtrap.c - - - - close.c - complete.c - connect.c - create.c - listen.c - port.c - reply.c - send.c - - - - - page.c - - - anonmem.c - aspace.c - balance.c - cont.c - drvlck.c - freelist.c - iospace.c - kmap.c - marea.c - mdlsup.c - mm.c - mminit.c - mpw.c - ncache.c - npool.c - pagefile.c - pageop.c - pager.c - pagfault.c - paging.c - pe.c - physical.c - pool.c - ppool.c - procsup.c - region.c - rmap.c - section.c - sysldr.c - verifier.c - virtual.c - wset.c - elf32.c - elf64.c - - - obdir.c - obinit.c - obhandle.c - obname.c - oblife.c - obref.c - sdcache.c - obsecure.c - oblink.c - obwait.c - - - power.c - events.c - - - debug.c - job.c - kill.c - psnotify.c - process.c - psmgr.c - query.c - quota.c - security.c - state.c - thread.c - win32.c - - - libsupp.c - misc.c - strtok.c - - - access.c - acl.c - audit.c - lsa.c - luid.c - priv.c - sd.c - semgr.c - sid.c - token.c - - - - vdmmain.c - vdmexec.c - - - - wmi.c - - ntoskrnl.rc - -nostartfiles - -nostdlib - -lgcc + + + + + + + + + + + + + + . + include + + include/reactos/drivers + csq + hal + pseh + cmlib + rtl + rossym + libcntpr + kdcom + bootvid + wdmguid + + ntoskrnl.h + + + + + boot.S + abios.c + cpu.c + ctxswitch.S + exp.c + irqobj.c + kiinit.c + ldt.c + mtrr.c + patpge.c + systimer.S + thrdini.c + trap.s + usercall_asm.S + usercall.c + v86vdm.c + v86m_sup.S + + + apc.c + balmgr.c + bug.c + clock.c + config.c + devqueue.c + dpc.c + eventobj.c + except.c + freeldr.c + gate.c + gmutex.c + ipi.c + krnlinit.c + mutex.c + procobj.c + profobj.c + queue.c + semphobj.c + spinlock.c + thrdschd.c + thrdobj.c + timerobj.c + wait.c + + + cacheman.c + copy.c + fs.c + mdl.c + pin.c + view.c + + + + + cmhardwr.c + + + cmapi.c + cmboot.c + cmcheck.c + cmcontrl.c + cmconfig.c + cmdata.c + cmindex.c + cminit.c + cmhook.c + cmkcbncb.c + cmkeydel.c + cmmapvw.c + cmname.c + cmparse.c + cmse.c + cmsecach.c + cmsysini.c + cmvalue.c + cmvalche.c + cmwraprs.c + + + ntfunc.c + regfile.c + registry.c + regobj.c + + + dbgkutil.c + dbgkobj.c + + + zw.S + + + + + interlck_asm.S + fastinterlck_asm.S + ioport.S + + + atom.c + callback.c + dbgctrl.c + efi.c + event.c + evtpair.c + fmutex.c + handle.c + harderr.c + hdlsterm.c + init.c + keyedevt.c + locale.c + lookas.c + mutant.c + pushlock.c + profile.c + resource.c + rundown.c + sem.c + shutdown.c + sysinfo.c + time.c + timer.c + uuid.c + win32k.c + work.c + xipdisp.c + zone.c + + + dbcsname.c + fastio.c + faulttol.c + filelock.c + filter.c + filtrctx.c + fsfilter.c + fsrtlpc.c + largemcb.c + name.c + notify.c + oplock.c + pnp.c + stackovf.c + tunnel.c + unc.c + + + disksup.c + fstubex.c + halstub.c + + + inbv.c + + + + adapter.c + arcname.c + bootlog.c + controller.c + device.c + deviface.c + driver.c + drvrlist.c + error.c + file.c + iocomp.c + ioevent.c + iofunc.c + iomdl.c + iomgr.c + iorsrce.c + iotimer.c + iowork.c + irp.c + irq.c + rawfs.c + remlock.c + util.c + symlink.c + volume.c + + + plugplay.c + pnpdma.c + pnpmgr.c + pnpnotify.c + pnpreport.c + pnproot.c + + + + + + + + + i386-dis.c + kdb_help.S + longjmp.S + setjmp.S + + + + + + kdb.c + kdb_cli.c + kdb_expr.c + kdb_keyboard.c + kdb_serial.c + kdb_string.c + + + kdb_symbols.c + + + + + bochs.c + gdbstub.c + kdbg.c + + kdinit.c + kdio.c + kdmain.c + + + + + kdapi.c + kdbreak.c + kddata.c + kdinit.c + kdlock.c + kdprint.c + kdtrap.c + + + + close.c + complete.c + connect.c + create.c + listen.c + port.c + reply.c + send.c + + + + + page.c + + + anonmem.c + aspace.c + balance.c + cont.c + drvlck.c + freelist.c + iospace.c + kmap.c + marea.c + mdlsup.c + mm.c + mminit.c + mpw.c + ncache.c + npool.c + pagefile.c + pageop.c + pager.c + pagfault.c + paging.c + pe.c + physical.c + pool.c + ppool.c + procsup.c + region.c + rmap.c + section.c + sysldr.c + verifier.c + virtual.c + wset.c + elf32.c + elf64.c + + + obdir.c + obinit.c + obhandle.c + obname.c + oblife.c + obref.c + sdcache.c + obsecure.c + oblink.c + obwait.c + + + power.c + events.c + + + debug.c + job.c + kill.c + psnotify.c + process.c + psmgr.c + query.c + quota.c + security.c + state.c + thread.c + win32.c + + + libsupp.c + misc.c + strtok.c + + + access.c + acl.c + audit.c + lsa.c + luid.c + priv.c + sd.c + semgr.c + sid.c + token.c + + + + vdmmain.c + vdmexec.c + + + + wmi.c + + ntoskrnl.rc + -nostartfiles + -nostdlib + -lgcc diff --git a/reactos/subsystems/win32/csrss/csrss.rbuild b/reactos/subsystems/win32/csrss/csrss.rbuild index 52b3eafed2c..39c3bc66b61 100644 --- a/reactos/subsystems/win32/csrss/csrss.rbuild +++ b/reactos/subsystems/win32/csrss/csrss.rbuild @@ -1,31 +1,31 @@ - - - . - include - include/reactos/subsys - include/reactos/drivers - - 0x0600 - 0x0501 - nt - ntdll - smdll - - handle.c - process.c - user.c - wapi.c + + + . + include + include/reactos/subsys + include/reactos/drivers + + 0x0600 + 0x0501 + nt + ntdll + smdll + + handle.c + process.c + user.c + wapi.c + + csrss.h + csrss.c + init.c + print.c + video.c + csrss.rc + + + - csrss.h - csrss.c - init.c - print.c - video.c - csrss.rc - - - - diff --git a/rosapps/cmdutils/cmdutils.rbuild b/rosapps/cmdutils/cmdutils.rbuild index 5007a13a831..0df053975e8 100644 --- a/rosapps/cmdutils/cmdutils.rbuild +++ b/rosapps/cmdutils/cmdutils.rbuild @@ -1,20 +1,21 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/rosapps/demos/directory.rbuild b/rosapps/demos/directory.rbuild index 54a77ba47c3..7e5a0c258b9 100644 --- a/rosapps/demos/directory.rbuild +++ b/rosapps/demos/directory.rbuild @@ -1,11 +1,14 @@ - - - + + + + + - - - + + + - - - + + + + diff --git a/rosapps/devutils/directory.rbuild b/rosapps/devutils/directory.rbuild index 21cd2fc3195..3243850e772 100644 --- a/rosapps/devutils/directory.rbuild +++ b/rosapps/devutils/directory.rbuild @@ -1,21 +1,23 @@ - - - + + + + + - - - + + + - - - + + + - - - - - - - + + + + + + + diff --git a/rosapps/directory.rbuild b/rosapps/directory.rbuild index ce9eb027b31..ba7b0e29402 100644 --- a/rosapps/directory.rbuild +++ b/rosapps/directory.rbuild @@ -1,104 +1,109 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rosapps/downloader/downloader.rbuild b/rosapps/downloader/downloader.rbuild index 4b3a834a937..1c8778614e9 100644 --- a/rosapps/downloader/downloader.rbuild +++ b/rosapps/downloader/downloader.rbuild @@ -1,29 +1,30 @@ - -downloader.xml - - . - . + + downloader.xml + + . + . - - 0x0501 - + 0x0501 + 0x0600 - main.c - xml.c - download.c - downloader.rc - + kernel32 + advapi32 + ntdll + user32 + gdi32 + shell32 + comctl32 + msimg32 + shlwapi + urlmon + uuid + expat + + main.c + xml.c + download.c + downloader.rc + + diff --git a/rosapps/lib/directory.rbuild b/rosapps/lib/directory.rbuild index 2fde578dced..e8126388361 100644 --- a/rosapps/lib/directory.rbuild +++ b/rosapps/lib/directory.rbuild @@ -1,3 +1,6 @@ - - - \ No newline at end of file + + + + + + diff --git a/rosapps/net/directory.rbuild b/rosapps/net/directory.rbuild index 37796300ae2..8007f5e7df1 100644 --- a/rosapps/net/directory.rbuild +++ b/rosapps/net/directory.rbuild @@ -1,12 +1,15 @@ - - - + + + + + - - - + + + - - - + + + + diff --git a/rosapps/sysutils/sysutils.rbuild b/rosapps/sysutils/sysutils.rbuild index 4a6ca80355b..7a623bae38c 100644 --- a/rosapps/sysutils/sysutils.rbuild +++ b/rosapps/sysutils/sysutils.rbuild @@ -1,40 +1,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rosapps/templates/directory.rbuild b/rosapps/templates/directory.rbuild index 333936e95b8..d737274b524 100644 --- a/rosapps/templates/directory.rbuild +++ b/rosapps/templates/directory.rbuild @@ -1,8 +1,12 @@ - - - - \ No newline at end of file + + + + + + + + -- 2.17.1