[hpoussin] 26131: Add a variable to change the name of the ReactOS directory on bootcd. If a non default name is chosen, the cdrom is created, but it is unusable as freeldr doesn't find txtsetup.inf
Author: hpoussin Date: Sun Mar 18 17:33:17 2007 New Revision: 26131
URL: http://svn.reactos.org/svn/reactos?rev=26131&view=rev Log: Add a variable to change the name of the ReactOS directory on bootcd. If a non default name is chosen, the cdrom is created, but it is unusable as freeldr doesn't find txtsetup.inf
Modified: trunk/reactos/Makefile trunk/reactos/base/setup/reactos/reactos.rbuild trunk/reactos/boot/bootdata/bootdata.rbuild trunk/reactos/dll/ntdll/ntdll.rbuild trunk/reactos/drivers/base/blue/blue.rbuild trunk/reactos/drivers/base/bootvid/bootvid.rbuild trunk/reactos/drivers/base/kdcom/kdcom.rbuild trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild trunk/reactos/drivers/filesystems/vfat/vfatfs.rbuild trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild trunk/reactos/drivers/storage/atapi/atapi.rbuild trunk/reactos/drivers/storage/buslogic/buslogic.rbuild trunk/reactos/drivers/storage/cdrom/cdrom.rbuild trunk/reactos/drivers/storage/class2/class2.rbuild trunk/reactos/drivers/storage/disk/disk.rbuild trunk/reactos/drivers/storage/diskdump/diskdump.rbuild trunk/reactos/drivers/storage/floppy/floppy.rbuild trunk/reactos/drivers/storage/scsiport/scsiport.rbuild trunk/reactos/drivers/test/csqtest/csqtest.rbuild trunk/reactos/drivers/test/kmtest/kmtest.rbuild trunk/reactos/hal/halx86/generic/reboot.c trunk/reactos/hal/halx86/mp/halmp.rbuild trunk/reactos/hal/halx86/up/halup.rbuild trunk/reactos/media/drivers/etc/etc.rbuild trunk/reactos/media/nls/nls.rbuild trunk/reactos/ntoskrnl/kd64/kddata.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/bootstrap.cpp trunk/reactos/tools/rbuild/cdfile.cpp trunk/reactos/tools/rbuild/project.cpp trunk/reactos/tools/rbuild/rbuild.h
Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=26131&r1=2... ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Sun Mar 18 17:33:17 2007 @@ -68,6 +68,11 @@ # generated files that makes up the result of the build process. # Examples of output files include *.exe, *.dll, and *.sys. N.B. Don't # put a path separator at the end. The variable defaults to .\output-i386. +# +# ROS_CDOUTPUT +# This variable controls the name of the ReactOS directory on cdrom. +# The variable defaults to reactos. +# Warning: setting this value may lead to a not bootable/installable cdrom. # # ROS_TEMPORARY # This variable controls where to put temporary files. Temporary files @@ -321,16 +326,31 @@ ifneq ($(ROS_INTERMEDIATE),) INTERMEDIATE := $(ROS_INTERMEDIATE) else - INTERMEDIATE := obj-i386 + ifneq ($(ROS_CDOUTPUT),) + INTERMEDIATE := obj-$(ROS_CDOUTPUT) + else + INTERMEDIATE := obj-i386 + endif endif INTERMEDIATE_ := $(INTERMEDIATE)$(SEP)
ifneq ($(ROS_OUTPUT),) OUTPUT := $(ROS_OUTPUT) else - OUTPUT := output-i386 + ifneq ($(ROS_CDOUTPUT),) + OUTPUT := output-$(ROS_CDOUTPUT) + else + OUTPUT := output-i386 + endif endif OUTPUT_ := $(OUTPUT)$(SEP) + +ifneq ($(ROS_CDOUTPUT),) + CDOUTPUT := $(ROS_CDOUTPUT) +else + CDOUTPUT := reactos +endif +CDOUTPUT_ := $(CDOUTPUT)$(SEP)
ifneq ($(ROS_TEMPORARY),) TEMPORARY := $(ROS_TEMPORARY) @@ -342,7 +362,11 @@ ifneq ($(ROS_INSTALL),) INSTALL := $(ROS_INSTALL) else - INSTALL := reactos + ifneq ($(ROS_CDOUTPUT),) + INSTALL := reactos.$(ROS_CDOUTPUT) + else + INSTALL := reactos + endif endif INSTALL_ := $(INSTALL)$(SEP)
Modified: trunk/reactos/base/setup/reactos/reactos.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos.... ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.rbuild (original) +++ trunk/reactos/base/setup/reactos/reactos.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="reactos" type="win32gui"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <include base="reactos">.</include> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define>
Modified: trunk/reactos/boot/bootdata/bootdata.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootdata.rbui... ============================================================================== --- trunk/reactos/boot/bootdata/bootdata.rbuild (original) +++ trunk/reactos/boot/bootdata/bootdata.rbuild Sun Mar 18 17:33:17 2007 @@ -2,12 +2,12 @@ <cdfile>autorun.inf</cdfile> <cdfile>icon.ico</cdfile> <cdfile>readme.txt</cdfile> -<cdfile base="reactos">hivecls.inf</cdfile> -<cdfile base="reactos">hivedef.inf</cdfile> -<cdfile base="reactos">hivesft.inf</cdfile> -<cdfile base="reactos">hivesys.inf</cdfile> -<cdfile base="reactos">txtsetup.sif</cdfile> -<!--<cdfile base="reactos">unattend.inf</cdfile>--> +<cdfile base="$(CDOUTPUT)">hivecls.inf</cdfile> +<cdfile base="$(CDOUTPUT)">hivedef.inf</cdfile> +<cdfile base="$(CDOUTPUT)">hivesft.inf</cdfile> +<cdfile base="$(CDOUTPUT)">hivesys.inf</cdfile> +<cdfile base="$(CDOUTPUT)">txtsetup.sif</cdfile> +<!--<cdfile base="$(CDOUTPUT)">unattend.inf</cdfile>--> <directory name="bootcd"> <xi:include href="bootcd/bootcd.rbuild" /> </directory>
Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev=... ============================================================================== --- trunk/reactos/dll/ntdll/ntdll.rbuild (original) +++ trunk/reactos/dll/ntdll/ntdll.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="ntdll" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_NTDLL}" installbase="system32" installname="ntdll.dll"> - <bootstrap base="reactos/system32" /> + <bootstrap base="$(CDOUTPUT)/system32" /> <importlibrary definition="def/ntdll.def" /> <include base="ntdll">inc</include> <include base="ReactOS">include/reactos/subsys</include>
Modified: trunk/reactos/drivers/base/blue/blue.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/blue/blue.rbui... ============================================================================== --- trunk/reactos/drivers/base/blue/blue.rbuild (original) +++ trunk/reactos/drivers/base/blue/blue.rbuild Sun Mar 18 17:33:17 2007 @@ -1,6 +1,6 @@ <module name="blue" type="kernelmodedriver" installbase="system32/drivers" installname="blue.sys"> - <bootstrap base="reactos" /> - <define name="__USE_W32API" /> + <bootstrap base="$(CDOUTPUT)" /> + <define name="__USE_W32API" /> <include base="ReactOS">include/reactos/drivers</include> <library>ntoskrnl</library> <library>hal</library>
Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootvi... ============================================================================== --- trunk/reactos/drivers/base/bootvid/bootvid.rbuild (original) +++ trunk/reactos/drivers/base/bootvid/bootvid.rbuild Sun Mar 18 17:33:17 2007 @@ -1,8 +1,8 @@ <module name="bootvid" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="bootvid.dll"> <importlibrary definition="bootvid.def"></importlibrary> - <bootstrap base="reactos" nameoncd="bootvid.dll" /> - <include base="bootvid">.</include> - <define name="__USE_W32API" /> + <bootstrap base="$(CDOUTPUT)" nameoncd="bootvid.dll" /> + <include base="bootvid">.</include> + <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> <file>bootvid.c</file>
Modified: trunk/reactos/drivers/base/kdcom/kdcom.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.rb... ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom.rbuild (original) +++ trunk/reactos/drivers/base/kdcom/kdcom.rbuild Sun Mar 18 17:33:17 2007 @@ -1,9 +1,9 @@ <module name="kdcom" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="kdcom.dll"> <importlibrary definition="kdcom.def"></importlibrary> - <bootstrap base="reactos" nameoncd="kdcom.dll" /> - <include base="kdcom">.</include> - <define name="__USE_W32API" /> + <bootstrap base="$(CDOUTPUT)" nameoncd="kdcom.dll" /> + <include base="kdcom">.</include> + <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> - <file>kdbg.c</file> + <file>kdbg.c</file> </module>
Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/cd... ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="cdfs" type="kernelmodedriver" installbase="system32/drivers" installname="cdfs.sys"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <include base="cdfs">.</include> <define name="__USE_W32API" /> <library>ntoskrnl</library>
Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/nt... ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild Sun Mar 18 17:33:17 2007 @@ -1,7 +1,7 @@ <module name="ntfs" type="kernelmodedriver" installbase="system32/drivers" installname="ntfs.sys"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <include base="ntfs">.</include> - <define name="__USE_W32API" /> + <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> <file>attrib.c</file>
Modified: trunk/reactos/drivers/filesystems/vfat/vfatfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/vf... ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/vfatfs.rbuild (original) +++ trunk/reactos/drivers/filesystems/vfat/vfatfs.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="vfatfs" type="kernelmodedriver" installbase="system32/drivers" installname="vfatfs.sys"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <include base="vfatfs">.</include> <define name="__USE_W32API" /> <linkerflag>-lgcc</linkerflag>
Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i804... ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="i8042prt" type="kernelmodedriver" installbase="system32/drivers" installname="i8042prt.sys"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <include base="i8042prt">.</include> <define name="__USE_W32API" /> <define name="__REACTOS__" />
Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbdc... ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="kbdclass" type="kernelmodedriver" installbase="system32/drivers" installname="kbdclass.sys"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <define name="NDEBUG" /> <library>pseh</library>
Modified: trunk/reactos/drivers/storage/atapi/atapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/atapi/atapi... ============================================================================== --- trunk/reactos/drivers/storage/atapi/atapi.rbuild (original) +++ trunk/reactos/drivers/storage/atapi/atapi.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="atapi" type="kernelmodedriver" installbase="system32/drivers" installname="atapi.sys"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <include base="atapi">.</include> <library>ntoskrnl</library>
Modified: trunk/reactos/drivers/storage/buslogic/buslogic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/buslogic/bu... ============================================================================== --- trunk/reactos/drivers/storage/buslogic/buslogic.rbuild (original) +++ trunk/reactos/drivers/storage/buslogic/buslogic.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="buslogic" type="kernelmodedriver" installbase="system32/drivers" installname="buslogic.sys"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <include base="buslogic">.</include> <library>ntoskrnl</library>
Modified: trunk/reactos/drivers/storage/cdrom/cdrom.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/cdrom/cdrom... ============================================================================== --- trunk/reactos/drivers/storage/cdrom/cdrom.rbuild (original) +++ trunk/reactos/drivers/storage/cdrom/cdrom.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="cdrom" type="kernelmodedriver" installbase="system32/drivers" installname="cdrom.sys"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library>
Modified: trunk/reactos/drivers/storage/class2/class2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class2/clas... ============================================================================== --- trunk/reactos/drivers/storage/class2/class2.rbuild (original) +++ trunk/reactos/drivers/storage/class2/class2.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="class2" type="exportdriver" installbase="system32/drivers" installname="class2.sys"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <importlibrary definition="class2.def" /> <library>ntoskrnl</library>
Modified: trunk/reactos/drivers/storage/disk/disk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/disk/disk.r... ============================================================================== --- trunk/reactos/drivers/storage/disk/disk.rbuild (original) +++ trunk/reactos/drivers/storage/disk/disk.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="disk" type="kernelmodedriver" installbase="system32/drivers" installname="disk.sys" allowwarnings="true"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <linkerflag>-lgcc</linkerflag> <library>ntoskrnl</library>
Modified: trunk/reactos/drivers/storage/diskdump/diskdump.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/diskdump/di... ============================================================================== --- trunk/reactos/drivers/storage/diskdump/diskdump.rbuild (original) +++ trunk/reactos/drivers/storage/diskdump/diskdump.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="diskdump" type="exportdriver" installbase="system32/drivers" installname="diskdump.sys"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <include base="ReactOS">include/reactos/drivers</include> <library definition="diskdump.def" />
Modified: trunk/reactos/drivers/storage/floppy/floppy.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flop... ============================================================================== --- trunk/reactos/drivers/storage/floppy/floppy.rbuild (original) +++ trunk/reactos/drivers/storage/floppy/floppy.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="floppy" type="kernelmodedriver" installbase="system32/drivers" installname="floppy.sys"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <include base="floppy">.</include> <library>ntoskrnl</library>
Modified: trunk/reactos/drivers/storage/scsiport/scsiport.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/sc... ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.rbuild (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="scsiport" type="exportdriver" installbase="system32/drivers" installname="scsiport.sys"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <define name="_SCSIPORT_" /> <importlibrary definition="scsiport.def" />
Modified: trunk/reactos/drivers/test/csqtest/csqtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/test/csqtest/csqtes... ============================================================================== --- trunk/reactos/drivers/test/csqtest/csqtest.rbuild (original) +++ trunk/reactos/drivers/test/csqtest/csqtest.rbuild Sun Mar 18 17:33:17 2007 @@ -1,6 +1,6 @@ <module name="csqtest" type="kernelmodedriver" installbase="system32/drivers" installname="csqtest.sys"> - <bootstrap base="reactos" /> - <define name="__USE_W32API" /> + <bootstrap base="$(CDOUTPUT)" /> + <define name="__USE_W32API" /> <include base="ReactOS">include/reactos/drivers</include> <library>ntoskrnl</library> <library>hal</library>
Modified: trunk/reactos/drivers/test/kmtest/kmtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/test/kmtest/kmtest.... ============================================================================== --- trunk/reactos/drivers/test/kmtest/kmtest.rbuild (original) +++ trunk/reactos/drivers/test/kmtest/kmtest.rbuild Sun Mar 18 17:33:17 2007 @@ -1,6 +1,6 @@ <module name="kmtest" type="kernelmodedriver" installbase="system32/drivers" installname="kmtest.sys"> - <bootstrap base="reactos" /> - <define name="__USE_W32API" /> + <bootstrap base="$(CDOUTPUT)" /> + <define name="__USE_W32API" /> <include base="ReactOS">include/reactos/drivers</include> <library>ntoskrnl</library> <library>hal</library>
Modified: trunk/reactos/hal/halx86/generic/reboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/reboot.c... ============================================================================== --- trunk/reactos/hal/halx86/generic/reboot.c (original) +++ trunk/reactos/hal/halx86/generic/reboot.c Sun Mar 18 17:33:17 2007 @@ -15,7 +15,7 @@
/* PRIVATE FUNCTIONS *********************************************************/
-VOID +static VOID NTAPI HalpWriteResetCommand(VOID) { @@ -23,7 +23,7 @@ WRITE_PORT_UCHAR((PUCHAR)0x64, 0xFE); };
-VOID +static VOID NTAPI HalpReboot(VOID) {
Modified: trunk/reactos/hal/halx86/mp/halmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/halmp.rbuild?... ============================================================================== --- trunk/reactos/hal/halx86/mp/halmp.rbuild (original) +++ trunk/reactos/hal/halx86/mp/halmp.rbuild Sun Mar 18 17:33:17 2007 @@ -1,6 +1,6 @@ <module name="halmp" type="kernelmodedll" entrypoint="0"> <importlibrary definition="../../hal/hal.def" /> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <include base="hal_generic">../include</include> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> @@ -11,7 +11,7 @@ <library>hal_generic_pc</library> <library>ntoskrnl</library> <file>apic.c</file> - <file>halinit.c</file> + <file>halinit.c</file> <file>halinit_mp.c</file> <file>ioapic.c</file> <file>ipi_mp.c</file>
Modified: trunk/reactos/hal/halx86/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/halup.rbuild?... ============================================================================== --- trunk/reactos/hal/halx86/up/halup.rbuild (original) +++ trunk/reactos/hal/halx86/up/halup.rbuild Sun Mar 18 17:33:17 2007 @@ -1,12 +1,12 @@ <module name="halup" type="kernelmodedll" entrypoint="0"> <importlibrary definition="../../hal/hal.def" /> - <bootstrap base="reactos" nameoncd="hal.dll" /> + <bootstrap base="$(CDOUTPUT)" nameoncd="hal.dll" /> <include base="hal_generic">../include</include> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> <define name="__USE_W32API" /> <define name="_NTHAL_" /> - <linkerflag>-enable-stdcall-fixup</linkerflag> + <linkerflag>-enable-stdcall-fixup</linkerflag> <library>hal_generic</library> <library>hal_generic_up</library> <library>hal_generic_pc</library>
Modified: trunk/reactos/media/drivers/etc/etc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/drivers/etc/etc.rbuil... ============================================================================== --- trunk/reactos/media/drivers/etc/etc.rbuild (original) +++ trunk/reactos/media/drivers/etc/etc.rbuild Sun Mar 18 17:33:17 2007 @@ -1,6 +1,8 @@ -<cdfile base="reactos">services</cdfile> +<group> +<cdfile base="$(CDOUTPUT)">services</cdfile> <installfile base="system32/drivers/etc">services</installfile> <if property="KDBG" value="1"> - <cdfile base="reactos">KDBinit</cdfile> + <cdfile base="$(CDOUTPUT)">KDBinit</cdfile> <installfile base="system32/drivers/etc">KDBinit</installfile> -</if> +</if> +</group>
Modified: trunk/reactos/media/nls/nls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/nls.rbuild?rev=26... ============================================================================== --- trunk/reactos/media/nls/nls.rbuild (original) +++ trunk/reactos/media/nls/nls.rbuild Sun Mar 18 17:33:17 2007 @@ -1,7 +1,7 @@ <group> -<cdfile base="reactos">c_437.nls</cdfile> -<cdfile base="reactos">c_1252.nls</cdfile> -<cdfile base="reactos">l_intl.nls</cdfile> +<cdfile base="$(CDOUTPUT)">c_437.nls</cdfile> +<cdfile base="$(CDOUTPUT)">c_1252.nls</cdfile> +<cdfile base="$(CDOUTPUT)">l_intl.nls</cdfile>
<installfile base="system32">c_037.nls</installfile> <installfile base="system32">c_424.nls</installfile>
Modified: trunk/reactos/ntoskrnl/kd64/kddata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kddata.c?rev=... ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kddata.c (original) +++ trunk/reactos/ntoskrnl/kd64/kddata.c Sun Mar 18 17:33:17 2007 @@ -326,7 +326,15 @@ DBGKD_64BIT_PROTOCOL_VERSION2, KD_SECONDARY_VERSION_DEFAULT, DBGKD_VERS_FLAG_DATA, +#if defined(_M_IX86) IMAGE_FILE_MACHINE_I386, +#elif defined(_M_PPC) + IMAGE_FILE_MACHINE_POWERPC, +#elif defined(_M_MIPS) + IMAGE_FILE_MACHINE_R4000, +#else +#error Unknown platform +#endif PACKET_TYPE_MAX, 0, 0,
Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?re... ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Sun Mar 18 17:33:17 2007 @@ -1,5 +1,5 @@ <module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <importlibrary definition="ntoskrnl.def" /> <define name="_SEH_NO_NATIVE_NLG" /> <define name="_DISABLE_TIDENTS" />
Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/... ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sun Mar 18 17:33:17 2007 @@ -3153,7 +3153,7 @@ NormalizeFilename ( "boot" + sSep + "freeldr" + sSep + "bootsect" + sSep + bootloader.c_str() ), backend->outputDirectory );
- string bootcdReactosNoFixup = bootcdDirectory + sSep + "reactos"; + string bootcdReactosNoFixup = bootcdDirectory + sSep + Environment::GetCdOutputPath (); string bootcdReactos = PassThruCacheDirectory ( NormalizeFilename ( bootcdReactosNoFixup + sSep ), backend->outputDirectory );
Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp?... ============================================================================== --- trunk/reactos/tools/rbuild/bootstrap.cpp (original) +++ trunk/reactos/tools/rbuild/bootstrap.cpp Sun Mar 18 17:33:17 2007 @@ -73,6 +73,18 @@ __LINE__ ); }
+string +Bootstrap::ReplaceVariable ( const string& name, + const string& value, + string path ) +{ + size_t i = path.find ( name ); + if ( i != string::npos ) + return path.replace ( i, name.length (), value ); + else + return path; +} + void Bootstrap::Initialize () { @@ -85,7 +97,7 @@
const XMLAttribute* att = node.GetAttribute ( "base", false ); if ( att != NULL ) - base = att->value; + base = ReplaceVariable ( "$(CDOUTPUT)", Environment::GetCdOutputPath (), att->value ); else base = "";
Modified: trunk/reactos/tools/rbuild/cdfile.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/cdfile.cpp?rev... ============================================================================== --- trunk/reactos/tools/rbuild/cdfile.cpp (original) +++ trunk/reactos/tools/rbuild/cdfile.cpp Sun Mar 18 17:33:17 2007 @@ -22,6 +22,18 @@
using std::string;
+string +CDFile::ReplaceVariable ( const string& name, + const string& value, + string path ) +{ + size_t i = path.find ( name ); + if ( i != string::npos ) + return path.replace ( i, name.length (), value ); + else + return path; +} + CDFile::CDFile ( const Project& project_, const XMLElement& cdfileNode, const string& path ) @@ -30,7 +42,7 @@ { const XMLAttribute* att = node.GetAttribute ( "base", false ); if ( att != NULL ) - base = att->value; + base = ReplaceVariable ( "$(CDOUTPUT)", Environment::GetCdOutputPath (), att->value ); else base = "";
Modified: trunk/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.cpp?re... ============================================================================== --- trunk/reactos/tools/rbuild/project.cpp (original) +++ trunk/reactos/tools/rbuild/project.cpp Sun Mar 18 17:33:17 2007 @@ -49,21 +49,34 @@ /* static */ string Environment::GetIntermediatePath () { + string defaultIntermediate = + string( "obj-" ) + GetEnvironmentVariablePathOrDefault ( "ROS_CDOUTPUT", "i386" ); return GetEnvironmentVariablePathOrDefault ( "ROS_INTERMEDIATE", - "obj-i386" ); + defaultIntermediate ); }
/* static */ string Environment::GetOutputPath () { + string defaultOutput = + string( "output-" ) + GetEnvironmentVariablePathOrDefault ( "ROS_CDOUTPUT", "i386" ); return GetEnvironmentVariablePathOrDefault ( "ROS_OUTPUT", - "output-i386" ); + defaultOutput ); }
/* static */ string Environment::GetInstallPath () { + string defaultInstall = + string( "reactos." ) + GetEnvironmentVariablePathOrDefault ( "ROS_CDOUTPUT", "" ); return GetEnvironmentVariablePathOrDefault ( "ROS_INSTALL", + defaultInstall ); +} + +/* static */ string +Environment::GetCdOutputPath () +{ + return GetEnvironmentVariablePathOrDefault ( "ROS_CDOUTPUT", "reactos" ); }
Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=2... ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Sun Mar 18 17:33:17 2007 @@ -155,6 +155,7 @@ static std::string GetVariable ( const std::string& name ); static std::string GetIntermediatePath (); static std::string GetOutputPath (); + static std::string GetCdOutputPath (); static std::string GetInstallPath (); static std::string GetEnvironmentVariablePathOrDefault ( const std::string& name, const std::string& defaultValue ); @@ -296,7 +297,7 @@ ImportLibrary* importLibrary; bool mangledSymbols; bool isUnicode; - bool isDefaultEntryPoint; + bool isDefaultEntryPoint; Bootstrap* bootstrap; AutoRegister* autoRegister; IfableData non_if_data; @@ -761,6 +762,9 @@ private: bool IsSupportedModuleType ( ModuleType type ); void Initialize(); + static std::string ReplaceVariable ( const std::string& name, + const std::string& value, + std::string path ); };
@@ -780,6 +784,10 @@ ~CDFile (); void ProcessXML(); std::string GetPath () const; +private: + static std::string ReplaceVariable ( const std::string& name, + const std::string& value, + std::string path ); };
-
hpoussin＠svn.reactos.org