Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 25747: - Better fix for LiveCD issue; now it should work no matter what.
by ion＠svn.reactos.org 07 Feb '07

07 Feb '07

Author: ion Date: Wed Feb 7 19:31:24 2007 New Revision: 25747 URL: http://svn.reactos.org/svn/reactos?rev=25747&view=rev Log: - Better fix for LiveCD issue; now it should work no matter what. Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/arcname.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c Wed Feb 7 19:31:24 2007 @@ -33,6 +33,8 @@ FILE_BASIC_INFORMATION FileInfo; NTSTATUS Status; PCHAR p, q; + PCONFIGURATION_INFORMATION ConfigInfo = IoGetConfigurationInformation(); + extern BOOLEAN InitIsWinPEMode, ExpInTextModeSetup; /* Only ARC Name left - Build full ARC Name */ p = strstr(KeLoaderBlock->ArcBootDeviceName, "cdrom"); @@ -86,7 +88,7 @@ RtlFreeUnicodeString(&DeviceName); } - if (!(strstr(KeLoaderBlock->LoadOptions, "MININT"))) + if (!InitIsWinPEMode) { /* Build the name */ sprintf(p, "cdrom(%lu)", DeviceNumber); @@ -102,13 +104,16 @@ } } } + + /* OK, how many disks are there? */ + DeviceNumber += ConfigInfo->DiskCount; /* Return whether this is the CD or not */ - if (DeviceNumber != 1) + if ((InitIsWinPEMode) || (ExpInTextModeSetup)) { /* Hack until IoAssignDriveLetters is fixed */ - swprintf(SharedUserData->NtSystemRoot, L"D:\\reactos"); - return TRUE; + swprintf(SharedUserData->NtSystemRoot, L"%c:\\reactos", 'C' + DeviceNumber); + return TRUE; } /* Failed */

1 0

[ion] 25746: - Fix IopApplyReactOSCdRomHack to handle LiveCD case properly. LiveCD should now boot*. - Fix invalid inbv called during shutdown. - Don't call HalResetDisplay during VidReset since it's not yet implemented and this will crash the system. - Temporarily disable bootvid in LiveCD until it works, and enable debugging output so LiveCDs can output some debugging information in case of bugs. * LiveCD won't actually work because for some time now, ReactOS needs to be "installed" because of
by ion＠svn.reactos.org 07 Feb '07

07 Feb '07

Author: ion Date: Wed Feb 7 09:08:24 2007 New Revision: 25746 URL: http://svn.reactos.org/svn/reactos?rev=25746&view=rev Log: - Fix IopApplyReactOSCdRomHack to handle LiveCD case properly. LiveCD should now boot*. - Fix invalid inbv called during shutdown. - Don't call HalResetDisplay during VidReset since it's not yet implemented and this will crash the system. - Temporarily disable bootvid in LiveCD until it works, and enable debugging output so LiveCDs can output some debugging information in case of bugs. * LiveCD won't actually work because for some time now, ReactOS needs to be "installed" because of missing PnP entries. LiveCD Boot will cause a message box saying "EnableUserModePnPManager" failed. hpoussin? Modified: trunk/reactos/boot/bootdata/livecd.ini trunk/reactos/drivers/base/bootvid/bootvid.c trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/ex/power.c trunk/reactos/ntoskrnl/io/iomgr/arcname.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/boot/bootdata/livecd.ini URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecd.ini?r… ============================================================================== --- trunk/reactos/boot/bootdata/livecd.ini (original) +++ trunk/reactos/boot/bootdata/livecd.ini Wed Feb 7 09:08:24 2007 @@ -25,4 +25,4 @@ [ReactOS] BootType=ReactOS SystemPath=LiveCD -Options= +Options=/DEBUGPORT=COM1 /NOGUIBOOT Modified: trunk/reactos/drivers/base/bootvid/bootvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… ============================================================================== --- trunk/reactos/drivers/base/bootvid/bootvid.c (original) +++ trunk/reactos/drivers/base/bootvid/bootvid.c Wed Feb 7 09:08:24 2007 @@ -463,7 +463,7 @@ curr_y = 0; /* Clear the screen with HAL if we were asked to */ - if (HalReset) HalResetDisplay(); + //if (HalReset) HalResetDisplay(); /* Re-initialize the VGA Display */ VgaInterpretCmdStream(AT_Initialization); Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=257… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Wed Feb 7 09:08:24 2007 @@ -15,9 +15,7 @@ // Global: // - TODO: Complete the list of bufxies // - Fix DPCs interrupting code at DISPATCH_LEVEL -// - Fix process reference count leak. // - Fix atapi.sys or serial.sys loading one more time at each boot. -// - Fix LiveCD. // /////////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/ntoskrnl/ex/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/power.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/ex/power.c (original) +++ trunk/reactos/ntoskrnl/ex/power.c Wed Feb 7 09:08:24 2007 @@ -150,7 +150,7 @@ InbvSetTextColor(15); InbvInstallDisplayStringFilter(NULL); InbvEnableDisplayString(TRUE); - InbvSetScrollRegion(0, 0, 639, 479); + //InbvSetScrollRegion(0, 0, 639, 479); } if (Action == ShutdownNoReboot) Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/arcname.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c Wed Feb 7 09:08:24 2007 @@ -86,17 +86,20 @@ RtlFreeUnicodeString(&DeviceName); } - /* Build the name */ - sprintf(p, "cdrom(%lu)", DeviceNumber); - - /* Adjust original command line */ - q = strchr(p, ')'); - if (q) + if (!(strstr(KeLoaderBlock->LoadOptions, "MININT"))) { - q++; - strcpy(Buffer, q); + /* Build the name */ sprintf(p, "cdrom(%lu)", DeviceNumber); - strcat(p, Buffer); + + /* Adjust original command line */ + q = strchr(p, ')'); + if (q) + { + q++; + strcpy(Buffer, q); + sprintf(p, "cdrom(%lu)", DeviceNumber); + strcat(p, Buffer); + } } } Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Wed Feb 7 09:08:24 2007 @@ -480,7 +480,7 @@ /* * Initialise the modified page writer. */ - MmInitMpwThread(); + if (!strstr(LoaderBlock->LoadOptions, "MININT")) MmInitMpwThread(); /* Initialize the balance set manager */ MmInitBsmThread();

1 0

[dgorbachev] 25745: Fix "keyboard does not respond" bug. Thanks to Peter Krawies (breakoutbox /AT/ web /DOT/ de)
by dgorbachev＠svn.reactos.org 07 Feb '07

07 Feb '07

Author: dgorbachev Date: Wed Feb 7 03:29:50 2007 New Revision: 25745 URL: http://svn.reactos.org/svn/reactos?rev=25745&view=rev Log: Fix "keyboard does not respond" bug. Thanks to Peter Krawies (breakoutbox /AT/ web /DOT/ de) Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Wed Feb 7 03:29:50 2007 @@ -1925,6 +1925,8 @@ { UCHAR Scancode; UCHAR Status; + ULONG Loops; + BOOLEAN Result = TRUE; PS2ControllerWait(); WRITE_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_CONTROL, @@ -1935,31 +1937,43 @@ WRITE_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA, 0xF2); - StallExecutionProcessor(10000); + /* Wait for reply */ + for (Loops = 0; Loops < 10; Loops++) + { + StallExecutionProcessor(10000); + Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); + if ((Status & CONTROLLER_STATUS_OUTPUT_BUFFER_FULL) != 0) + break; + } Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); if ((Status & CONTROLLER_STATUS_MOUSE_OUTPUT_BUFFER_FULL) == 0) - { - return FALSE; - } + Result = FALSE; Scancode = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA); if (Scancode != 0xFA) - return FALSE; + Result = FALSE; StallExecutionProcessor(10000); Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); if ((Status & CONTROLLER_STATUS_MOUSE_OUTPUT_BUFFER_FULL) == 0) - { - return FALSE; - } + Result = FALSE; Scancode = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA); if (Scancode != 0x00) - return FALSE; - - return TRUE; + Result = FALSE; + + /* Flush output buffer */ + for (Loops = 0; Loops < 10; Loops++) + { + Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); + if ((Status & CONTROLLER_STATUS_OUTPUT_BUFFER_FULL) == 0) + break; + StallExecutionProcessor(10000); + } + + return Result; }

1 0

[dgorbachev] 25744: bootvid.sys -> bootvid.dll
by dgorbachev＠svn.reactos.org 06 Feb '07

06 Feb '07

Author: dgorbachev Date: Tue Feb 6 20:48:21 2007 New Revision: 25744 URL: http://svn.reactos.org/svn/reactos?rev=25744&view=rev Log: bootvid.sys -> bootvid.dll Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Tue Feb 6 20:48:21 2007 @@ -495,7 +495,7 @@ ; Boot Video Driver HKLM,"SYSTEM\CurrentControlSet\Services\BootVideo","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\BootVideo","Group",0x00000000,"Base" -HKLM,"SYSTEM\CurrentControlSet\Services\BootVideo","ImagePath",0x00020000,"system32\drivers\bootvid.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\BootVideo","ImagePath",0x00020000,"system32\drivers\bootvid.dll" HKLM,"SYSTEM\CurrentControlSet\Services\BootVideo","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\BootVideo","Type",0x00010001,0x00000002 Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Tue Feb 6 20:48:21 2007 @@ -16,7 +16,7 @@ atapi.sys = 3 buslogic.sys = 3 blue.sys = 3 -bootvid.sys = 3 +bootvid.dll = 3 c_437.nls = 2 c_1252.nls = 2 cdfs.sys = 3

1 0

[greatlrd] 25743: update my private doc about mmx
by greatlrd＠svn.reactos.org 06 Feb '07

06 Feb '07

Author: greatlrd Date: Tue Feb 6 19:46:33 2007 New Revision: 25743 URL: http://svn.reactos.org/svn/reactos?rev=25743&view=rev Log: update my private doc about mmx Modified: branches/ros-branch-0_3_1/reactos/regress_greatlord.rtf Modified: branches/ros-branch-0_3_1/reactos/regress_greatlord.rtf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/regres… ============================================================================== --- branches/ros-branch-0_3_1/reactos/regress_greatlord.rtf (original) +++ branches/ros-branch-0_3_1/reactos/regress_greatlord.rtf Tue Feb 6 19:46:33 2007 @@ -25,21 +25,20 @@ correct behovir of some api.\par \par \b\par -Known fixed regress from 0.3.0 to 0.3.1 branch\line\b0 1. FPU \par -2. OpenGL works with disable mmx/3dnow/sse \par +Known fixed regress from 0.3.0 to 0.3.1 branch\line\b0 1. FPU/ MMX\par +2. OpenGL works with disable 3dnow/sse \par \b\par Known regress from 0.2.9 to 0.3.0\par \b0 1. ABI word does not work\par -\line 2. FPU does not work\par +\line 2. FPU/ MMX does not work\par why : rewriting/bugfix of ntoskrnl\line\par -3. MMX/3DNOW/SSE does not work. \par +3. 3DNOW/SSE does not work. \par why : rewriting/bugfix of ntoskrnl\line\par 4. Windows redrawing problem cpl \par \line 5. update backgound from some windows. \par \par 6. OpenGL\line\line\b Known regress from 0.3.0 to 0.3.1 branch\line\b0 1. LiveCD\par -2. cmd md\par -3. VBE driver \line\b\par +2. cmd md\b\par \par }

1 0

[greatlrd] 25742: mmx works so activate mmx optimze for mesa32
by greatlrd＠svn.reactos.org 06 Feb '07

06 Feb '07

Author: greatlrd Date: Tue Feb 6 19:44:44 2007 New Revision: 25742 URL: http://svn.reactos.org/svn/reactos?rev=25742&view=rev Log: mmx works so activate mmx optimze for mesa32 Modified: branches/ros-branch-0_3_1/reactos/dll/3rdparty/mesa32/mesa32.rbuild Modified: branches/ros-branch-0_3_1/reactos/dll/3rdparty/mesa32/mesa32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/3r… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/3rdparty/mesa32/mesa32.rbuild (original) +++ branches/ros-branch-0_3_1/reactos/dll/3rdparty/mesa32/mesa32.rbuild Tue Feb 6 19:44:44 2007 @@ -15,6 +15,7 @@ <define name="USE_EXTERNAL_DXTN_LIB=1" /> <define name="USE_MGL_NAMESPACE" /> <define name="USE_X86_ASM" /> + <define name="USE_MMX_ASM" /> <include base="mesa32">include</include> <include base="mesa32">src</include> <include base="mesa32">src/main</include>

1 0

[greatlrd] 25741: update my private regress doc.
by greatlrd＠svn.reactos.org 06 Feb '07

06 Feb '07

Author: greatlrd Date: Tue Feb 6 19:11:20 2007 New Revision: 25741 URL: http://svn.reactos.org/svn/reactos?rev=25741&view=rev Log: update my private regress doc. Modified: branches/ros-branch-0_3_1/reactos/regress_greatlord.rtf Modified: branches/ros-branch-0_3_1/reactos/regress_greatlord.rtf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/regres… ============================================================================== --- branches/ros-branch-0_3_1/reactos/regress_greatlord.rtf (original) +++ branches/ros-branch-0_3_1/reactos/regress_greatlord.rtf Tue Feb 6 19:11:20 2007 @@ -3,14 +3,13 @@ \ul\b GreatLord Status of 0.3.1 branch \ulnone\b0\par Current known regress that need be fixed ?\par \b\par +Second Boot\par +\b0 1. Keyboard does not work to navigate in the install menu. \b\line\par CMD\par \b0 1. MD (makedir) does not create folder with right name \par workaround : unkonwn \par posible fix/patch : known at moment \par \par -\b OPENGL\par -\b0 1. OPENGL still does not working cause of early regress of FPU/MMX/3DNOW/SSE\line workaround : Disable MMX/3DNOW/SSE from mesa3d build config. \line posible fix/patch : when alex implement it in ntoskrnl it will be in next release hopply. \par -\par \b VMWARE\par \par \b0 1. AMD64 CPU with 32/64 bits OS VBE drv will not working in 3 boot\line\par @@ -27,6 +26,7 @@ \par \b\par Known fixed regress from 0.3.0 to 0.3.1 branch\line\b0 1. FPU \par +2. OpenGL works with disable mmx/3dnow/sse \par \b\par Known regress from 0.2.9 to 0.3.0\par \b0 1. ABI word does not work\par @@ -35,7 +35,9 @@ 3. MMX/3DNOW/SSE does not work. \par why : rewriting/bugfix of ntoskrnl\line\par 4. Windows redrawing problem cpl \par -\line 5. update backgound from some windows. \line\line\b Known regress from 0.3.0 to 0.3.1 branch\line\b0 1. LiveCD\par +\line 5. update backgound from some windows. \par +\par +6. OpenGL\line\line\b Known regress from 0.3.0 to 0.3.1 branch\line\b0 1. LiveCD\par 2. cmd md\par 3. VBE driver \line\b\par \par

1 0

[greatlrd] 25740: tempary fix for OpenGL. until ntoskrnl got sse implement. this fix are only for 0.3.1 branch
by greatlrd＠svn.reactos.org 06 Feb '07

06 Feb '07

Author: greatlrd Date: Tue Feb 6 19:10:45 2007 New Revision: 25740 URL: http://svn.reactos.org/svn/reactos?rev=25740&view=rev Log: tempary fix for OpenGL. until ntoskrnl got sse implement. this fix are only for 0.3.1 branch Modified: branches/ros-branch-0_3_1/reactos/dll/3rdparty/mesa32/mesa32.rbuild Modified: branches/ros-branch-0_3_1/reactos/dll/3rdparty/mesa32/mesa32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/3r… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/3rdparty/mesa32/mesa32.rbuild (original) +++ branches/ros-branch-0_3_1/reactos/dll/3rdparty/mesa32/mesa32.rbuild Tue Feb 6 19:10:45 2007 @@ -15,9 +15,6 @@ <define name="USE_EXTERNAL_DXTN_LIB=1" /> <define name="USE_MGL_NAMESPACE" /> <define name="USE_X86_ASM" /> - <define name="USE_MMX_ASM" /> - <define name="USE_SSE_ASM" /> - <define name="USE_3DNOW_ASM" /> <include base="mesa32">include</include> <include base="mesa32">src</include> <include base="mesa32">src/main</include>

1 0

[greatlrd] 25739: Doc what I known is left todo. please update it. what have been regress and which regress have been fixed.
by greatlrd＠svn.reactos.org 06 Feb '07

06 Feb '07

Author: greatlrd Date: Tue Feb 6 18:27:24 2007 New Revision: 25739 URL: http://svn.reactos.org/svn/reactos?rev=25739&view=rev Log: Doc what I known is left todo. please update it. what have been regress and which regress have been fixed. Added: branches/ros-branch-0_3_1/reactos/regress_greatlord.rtf Added: branches/ros-branch-0_3_1/reactos/regress_greatlord.rtf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/regres… ============================================================================== --- branches/ros-branch-0_3_1/reactos/regress_greatlord.rtf (added) +++ branches/ros-branch-0_3_1/reactos/regress_greatlord.rtf Tue Feb 6 18:27:24 2007 @@ -1,0 +1,43 @@ +{\rtf1\ansi\ansicpg1252\deff0\deflang1033{\fonttbl{\f0\fswiss\fcharset0 Arial;}{\f1\fnil\fprq1\fcharset0 Courier New;}} +\viewkind4\uc1\pard\f0\fs20\par +\ul\b GreatLord Status of 0.3.1 branch \ulnone\b0\par +Current known regress that need be fixed ?\par +\b\par +CMD\par +\b0 1. MD (makedir) does not create folder with right name \par + workaround : unkonwn \par + posible fix/patch : known at moment \par + \par +\b OPENGL\par +\b0 1. OPENGL still does not working cause of early regress of FPU/MMX/3DNOW/SSE\line workaround : Disable MMX/3DNOW/SSE from mesa3d build config. \line posible fix/patch : when alex implement it in ntoskrnl it will be in next release hopply. \par +\par +\b VMWARE\par +\par +\b0 1. AMD64 CPU with 32/64 bits OS VBE drv will not working in 3 boot\line\par + workaround : powerdown the virtualmachine before you boot to 3 boot then wait \line few second. then power it up. it works for me. \par +\line posible fix/patch : ntoskrnl/ke/trap.s line 1559 \par + it is \lang1024\f1 NotV86: function that need handling of\par + CheckPrivilegedInstruction2 implement when it\par + is done. This bug will maybe disaper or maybe\line some other serius bug will popup. \lang1033\f0\par +\par +2. VMWARE own display drv can not change the reslutions in ReactOS.\line workaround : unkonwn \b\par +\b0 posible fix/patch : check if all key have been created as they should.\par + if not we need fix our vmware drv install to create \line thuse keys. posible regress is the cmlib that \par + correct behovir of some api.\par +\par +\b\par +Known fixed regress from 0.3.0 to 0.3.1 branch\line\b0 1. FPU \par +\b\par +Known regress from 0.2.9 to 0.3.0\par +\b0 1. ABI word does not work\par +\line 2. FPU does not work\par +why : rewriting/bugfix of ntoskrnl\line\par +3. MMX/3DNOW/SSE does not work. \par +why : rewriting/bugfix of ntoskrnl\line\par +4. Windows redrawing problem cpl \par +\line 5. update backgound from some windows. \line\line\b Known regress from 0.3.0 to 0.3.1 branch\line\b0 1. LiveCD\par +2. cmd md\par +3. VBE driver \line\b\par +\par +} +

1 0

[greatlrd] 25738: fixed ReactOS.xml to ReactOS.rbuild. some one forget change some place to ReactOS.rbuild and update the doc
by greatlrd＠svn.reactos.org 06 Feb '07

06 Feb '07

Author: greatlrd Date: Tue Feb 6 16:34:47 2007 New Revision: 25738 URL: http://svn.reactos.org/svn/reactos?rev=25738&view=rev Log: fixed ReactOS.xml to ReactOS.rbuild. some one forget change some place to ReactOS.rbuild and update the doc Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/doc/rbuild.dbk trunk/reactos/tools/rbuild/doc/rbuild.txt Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Tue Feb 6 16:34:47 2007 @@ -267,7 +267,7 @@ void MingwBackend::GenerateHeader () const { - fprintf ( fMakefile, "# THIS FILE IS AUTOMATICALLY GENERATED, EDIT 'ReactOS.xml' INSTEAD\n\n" ); + fprintf ( fMakefile, "# THIS FILE IS AUTOMATICALLY GENERATED, EDIT 'ReactOS.rbuild' INSTEAD\n\n" ); } string Modified: trunk/reactos/tools/rbuild/doc/rbuild.dbk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/doc/rbuild.db… ============================================================================== --- trunk/reactos/tools/rbuild/doc/rbuild.dbk (original) +++ trunk/reactos/tools/rbuild/doc/rbuild.dbk Tue Feb 6 16:34:47 2007 @@ -59,14 +59,14 @@ <section> <title>Top-level XML Build File</title> - <para>The top-level XML build file (<filename>ReactOS.xml</filename>) is + <para>The top-level XML build file (<filename>ReactOS.rbuild</filename>) is processed by <command>rbuild</command>. The following is an example of how it could look like:<programlisting><?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:include href="config.rbuild"> <xi:fallback> - <xi:include href="config.template.xml" /> + <xi:include href="config.template.rbuild" /> </xi:fallback> </xi:include> @@ -79,7 +79,7 @@ <include base="ReactOS">include</include> <directory name="boot"> - <xi:include href="boot/boot.xml" /> + <xi:include href="boot/boot.rbuild" /> </directory> <module name="bootcd" type="iso"> @@ -92,7 +92,7 @@ <para>XML files used by <command>rbuild</command> are modular and use XInclude to include other chunks of XML in the top-level - <filename>ReactOS.xml</filename> file. The namespace used by XInclude is + <filename>ReactOS.rbuild</filename> file. The namespace used by XInclude is <literal>xi</literal>.</para> <section id="element.xi.include"> @@ -105,9 +105,9 @@ <section> <title>Syntax</title> - <programlisting><xi:include href="<replaceable>config.xml</replaceable>"> + <programlisting><xi:include href="<replaceable>config.rbuild</replaceable>"> <xi:fallback> - <xi:include href="<replaceable>config.template.xml</replaceable>" /> + <xi:include href="<replaceable>config.template.rbuild</replaceable>" /> </xi:fallback> </xi:include></programlisting> </section> @@ -152,7 +152,7 @@ <title>Syntax</title> <programlisting><xi:fallback> - <xi:include href="<replaceable>config.template.xml</replaceable>" /> + <xi:include href="<replaceable>config.template.rbuild</replaceable>" /> </xi:fallback></programlisting> </section> @@ -1642,7 +1642,7 @@ <title>Parents</title> <para>None. This is the top-level (root) element of - <filename>ReactOS.xml</filename> file.</para> + <filename>ReactOS.rbuild</filename> file.</para> </section> <section> Modified: trunk/reactos/tools/rbuild/doc/rbuild.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/doc/rbuild.tx… ============================================================================== --- trunk/reactos/tools/rbuild/doc/rbuild.txt (original) +++ trunk/reactos/tools/rbuild/doc/rbuild.txt Tue Feb 6 16:34:47 2007 @@ -19,14 +19,14 @@ Top-level XML Build File ------------------------ -The top-level xml build file (ReactOS.xml) is processed by rbuild. The following is an example of how it could look like: +The top-level xml build file (ReactOS.rbuild) is processed by rbuild. The following is an example of how it could look like: <?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:include href="config.rbuild"> <xi:fallback> - <xi:include href="config.template.xml" /> + <xi:include href="config.template.rbuild" /> </xi:fallback> </xi:include> @@ -39,7 +39,7 @@ <include base="ReactOS">include</include> <directory name="boot"> - <xi:include href="boot/boot.xml" /> + <xi:include href="boot/boot.rbuild" /> </directory> <module name="bootcd" type="iso"> @@ -52,9 +52,9 @@ It is possible to split an xml build file over several files. The include element in the xi namespace is used to accomplish this. Syntax: - <xi:include href="config.xml"> + <xi:include href="config.rbuild"> <xi:fallback> - <xi:include href="config.template.xml" /> + <xi:include href="config.template.rbuild" /> </xi:fallback> </xi:include>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs