Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

[hpoussin] 14075: Add registry entries for serial driver
by hpoussin＠svn.reactos.com 14 Mar '05

14 Mar '05

Add registry entries for serial driver Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-03-14 20:59:50 UTC (rev 14074) +++ trunk/reactos/bootdata/hivesys.inf 2005-03-14 21:30:25 UTC (rev 14075) @@ -676,6 +676,11 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Serial","ImagePath",0x00020000," system32\drivers\serial.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Start",0x00010001,0x000 00001 HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Type",0x00010001,0x0000 0001 +;hard coded values +HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","0",0x00000000,"AC PI\PNP0501" +HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","Count",0x00010001 ,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","NextInstance",0x0 0010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\0000","Service",0x0000 0000,"serial" ; Packet driver HKLM,"SYSTEM\CurrentControlSet\Services\Packet","ErrorControl",0x0001000 1,0x00000001

1 0

[hpoussin] 14074: Start of the serial driver:
by hpoussin＠svn.reactos.com 14 Mar '05

14 Mar '05

Start of the serial driver: Handle write support and some IOCTL codes First serial port is mapped to COM3 and second serial port is mapped to COM4. This prevents conflicts with existing code. Added: trunk/reactos/drivers/dd/serial/cleanup.c Added: trunk/reactos/drivers/dd/serial/close.c Added: trunk/reactos/drivers/dd/serial/create.c Added: trunk/reactos/drivers/dd/serial/devctrl.c Added: trunk/reactos/drivers/dd/serial/info.c Modified: trunk/reactos/drivers/dd/serial/makefile Added: trunk/reactos/drivers/dd/serial/misc.c Added: trunk/reactos/drivers/dd/serial/pnp.c Added: trunk/reactos/drivers/dd/serial/power.c Added: trunk/reactos/drivers/dd/serial/rw.c Modified: trunk/reactos/drivers/dd/serial/serial.c Added: trunk/reactos/drivers/dd/serial/serial.h _____ Added: trunk/reactos/drivers/dd/serial/cleanup.c --- trunk/reactos/drivers/dd/serial/cleanup.c 2005-03-14 20:38:32 UTC (rev 14073) +++ trunk/reactos/drivers/dd/serial/cleanup.c 2005-03-14 20:59:50 UTC (rev 14074) @@ -0,0 +1,22 @@ +/* $Id: + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/dd/serial/cleanup.c + * PURPOSE: Serial IRP_MJ_CLEANUP operations + * + * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + */ + +#define NDEBUG +#include "serial.h" + +NTSTATUS STDCALL +SerialCleanup( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT("Serial: IRP_MJ_CLEANUP\n"); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} _____ Added: trunk/reactos/drivers/dd/serial/close.c --- trunk/reactos/drivers/dd/serial/close.c 2005-03-14 20:38:32 UTC (rev 14073) +++ trunk/reactos/drivers/dd/serial/close.c 2005-03-14 20:59:50 UTC (rev 14074) @@ -0,0 +1,22 @@ +/* $Id: + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/dd/serial/close.c + * PURPOSE: Serial IRP_MJ_CLOSE operations + * + * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + */ + +#define NDEBUG +#include "serial.h" + +NTSTATUS STDCALL +SerialClose( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT("Serial: IRP_MJ_CLOSE\n"); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} _____ Added: trunk/reactos/drivers/dd/serial/create.c --- trunk/reactos/drivers/dd/serial/create.c 2005-03-14 20:38:32 UTC (rev 14073) +++ trunk/reactos/drivers/dd/serial/create.c 2005-03-14 20:59:50 UTC (rev 14074) @@ -0,0 +1,52 @@ +/* $Id: + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/dd/serial/create.c + * PURPOSE: Serial IRP_MJ_CREATE operations + * + * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + */ + +#define NDEBUG +#include "serial.h" + +NTSTATUS STDCALL +SerialCreate( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION Stack; + PFILE_OBJECT FileObject; + PSERIAL_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; + + DPRINT("Serial: IRP_MJ_CREATE\n"); + Stack = IoGetCurrentIrpStackLocation(Irp); + FileObject = Stack->FileObject; + DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + if (Stack->Parameters.Create.Options & FILE_DIRECTORY_FILE) + { + CHECKPOINT; + Status = STATUS_NOT_A_DIRECTORY; + goto ByeBye; + } + + if (FileObject->FileName.Length != 0 || + FileObject->RelatedFileObject != NULL) + { + CHECKPOINT; + Status = STATUS_ACCESS_DENIED; + goto ByeBye; + } + + DPRINT("Serial: open COM%lu: successfull\n", DeviceExtension->ComPort); + Status = STATUS_SUCCESS; + +ByeBye: + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} _____ Added: trunk/reactos/drivers/dd/serial/devctrl.c --- trunk/reactos/drivers/dd/serial/devctrl.c 2005-03-14 20:38:32 UTC (rev 14073) +++ trunk/reactos/drivers/dd/serial/devctrl.c 2005-03-14 20:59:50 UTC (rev 14074) @@ -0,0 +1,551 @@ +/* $Id: + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/dd/serial/devctrl.c + * PURPOSE: Serial IRP_MJ_DEVICE_CONTROL operations + * + * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + */ +/* FIXME: call IoAcquireRemoveLock/IoReleaseRemoveLock around each I/O operation */ + +#define NDEBUG +#include "serial.h" + +NTSTATUS STDCALL +SerialSetBaudRate( + IN PSERIAL_DEVICE_EXTENSION DeviceExtension, + IN ULONG NewBaudRate) +{ + USHORT divisor; + PUCHAR ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; + NTSTATUS Status = STATUS_SUCCESS; + + if (NewBaudRate & SERIAL_BAUD_USER) + { + divisor = (USHORT)(BAUD_CLOCK / (CLOCKS_PER_BIT * (NewBaudRate & ~SERIAL_BAUD_USER))); + } + else + { + switch (NewBaudRate) + { + case SERIAL_BAUD_075: divisor = 0x600; break; + case SERIAL_BAUD_110: divisor = 0x400; break; + case SERIAL_BAUD_134_5: divisor = 0x360; break; + case SERIAL_BAUD_150: divisor = 0x300; break; + case SERIAL_BAUD_300: divisor = 0x180; break; + case SERIAL_BAUD_600: divisor = 0xc0; break; + case SERIAL_BAUD_1200: divisor = 0x60; break; + case SERIAL_BAUD_1800: divisor = 0x40; break; + case SERIAL_BAUD_2400: divisor = 0x30; break; + case SERIAL_BAUD_4800: divisor = 0x18; break; + case SERIAL_BAUD_7200: divisor = 0x10; break; + case SERIAL_BAUD_9600: divisor = 0xc; break; + case SERIAL_BAUD_14400: divisor = 0x8; break; + case SERIAL_BAUD_38400: divisor = 0x3; break; + case SERIAL_BAUD_57600: divisor = 0x2; break; + case SERIAL_BAUD_115200: divisor = 0x1; break; + case SERIAL_BAUD_56K: divisor = 0x2; break; + case SERIAL_BAUD_128K: divisor = 0x1; break; + default: Status = STATUS_INVALID_PARAMETER; + } + } + + if (NT_SUCCESS(Status)) + { + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + if (NT_SUCCESS(Status)) + { + UCHAR Lcr; + DPRINT("Serial: SerialSetBaudRate(COM%lu, %lu Bauds)\n", DeviceExtension->ComPort, BAUD_CLOCK / (CLOCKS_PER_BIT * divisor)); + /* FIXME: update DeviceExtension->LowerDevice when modifying LCR? */ + /* Set Bit 7 of LCR to expose baud registers */ + Lcr = READ_PORT_UCHAR(SER_LCR(ComPortBase)); + Lcr |= SR_LCR_DLAB; + WRITE_PORT_UCHAR(SER_LCR(ComPortBase), Lcr); + /* Write the baud rate */ + WRITE_PORT_UCHAR(SER_DLL(ComPortBase), divisor & 0xff); + WRITE_PORT_UCHAR(SER_DLM(ComPortBase), divisor >> 8); + /* Switch back to normal registers */ + Lcr ^= SR_LCR_DLAB; + WRITE_PORT_UCHAR(SER_LCR(ComPortBase), Lcr); + + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + } + } + + if (NT_SUCCESS(Status)) + DeviceExtension->BaudRate = NewBaudRate; + return Status; +} + +NTSTATUS STDCALL +SerialSetLineControl( + IN PSERIAL_DEVICE_EXTENSION DeviceExtension, + IN PSERIAL_LINE_CONTROL NewSettings) +{ + UCHAR Lcr = 0; + NTSTATUS Status; + + DPRINT("Serial: SerialSetLineControl(COM%lu, Settings { %lu %lu %lu })\n", + DeviceExtension->ComPort, NewSettings->StopBits, NewSettings->Parity, NewSettings->WordLength); + + /* Verify parameters */ + switch (NewSettings->WordLength) + { + case 5: Lcr |= SR_LCR_CS5; break; + case 6: Lcr |= SR_LCR_CS6; break; + case 7: Lcr |= SR_LCR_CS7; break; + case 8: Lcr |= SR_LCR_CS8; break; + default: return STATUS_INVALID_PARAMETER; + } + + if (NewSettings->WordLength < 5 || NewSettings->WordLength > 8) + return STATUS_INVALID_PARAMETER; + + switch (NewSettings->Parity) + { + case NO_PARITY: Lcr |= SR_LCR_PNO; break; + case ODD_PARITY: Lcr |= SR_LCR_POD; break; + case EVEN_PARITY: Lcr |= SR_LCR_PEV; break; + case MARK_PARITY: Lcr |= SR_LCR_PMK; break; + case SPACE_PARITY: Lcr |= SR_LCR_PSP; break; + default: return STATUS_INVALID_PARAMETER; + } + + switch (NewSettings->StopBits) + { + case STOP_BIT_1: + Lcr |= SR_LCR_ST1; + break; + case STOP_BITS_1_5: + if (NewSettings->WordLength != 5) + return STATUS_INVALID_PARAMETER; + Lcr |= SR_LCR_ST2; + break; + case STOP_BITS_2: + if (NewSettings->WordLength < 6 || NewSettings->WordLength > 8) + return STATUS_INVALID_PARAMETER; + Lcr |= SR_LCR_ST2; + break; + default: + return STATUS_INVALID_PARAMETER; + } + + /* Update current parameters */ + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + if (!NT_SUCCESS(Status)) + return Status; + WRITE_PORT_UCHAR(SER_LCR((PUCHAR)DeviceExtension->BaseAddress), Lcr); + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); + + if (NT_SUCCESS(Status)) + DeviceExtension->SerialLineControl = *NewSettings; + + return Status; +} + +NTSTATUS STDCALL +SerialDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION Stack; + PSERIAL_DEVICE_EXTENSION DeviceExtension; + ULONG LengthIn, LengthOut; + ULONG Information = 0; + PUCHAR Buffer; + PUCHAR ComPortBase; + NTSTATUS Status; + + DPRINT("Serial: IRP_MJ_DEVICE_CONTROL dispatch\n"); + + /* FIXME: pend operation if possible */ + + Stack = IoGetCurrentIrpStackLocation(Irp); + LengthIn = Stack->Parameters.DeviceIoControl.InputBufferLength; + LengthOut = Stack->Parameters.DeviceIoControl.OutputBufferLength; + Buffer = Irp->AssociatedIrp.SystemBuffer; + DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; + + /* FIXME: need to probe buffers */ + /* FIXME: see http://www.osronline.com/ddkx/serial/serref_61bm.htm */ + switch (Stack->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_SERIAL_CLEAR_STATS: + { + /* FIXME */ + DPRINT1("Serial: IOCTL_SERIAL_CLEAR_STATS not implemented.\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case IOCTL_SERIAL_CLR_DTR: + { + DPRINT("Serial: IOCTL_SERIAL_CLR_DTR\n"); + /* FIXME: If the handshake flow control of the device is configured to + * automatically use DTR, return STATUS_INVALID_PARAMETER */ + DeviceExtension->MCR &= ~SR_MCR_DTR; + WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); + Status = STATUS_SUCCESS; + break; + } + case IOCTL_SERIAL_CLR_RTS: + { + DPRINT("Serial: IOCTL_SERIAL_CLR_RTS\n"); + /* FIXME: If the handshake flow control of the device is configured to + * automatically use RTS, return STATUS_INVALID_PARAMETER */ + DeviceExtension->MCR &= ~SR_MCR_RTS; + WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); + Status = STATUS_SUCCESS; + break; + } + case IOCTL_SERIAL_CONFIG_SIZE: + { + /* Obsolete on Microsoft Windows 2000+ */ + PULONG pConfigSize; + DPRINT("Serial: IOCTL_SERIAL_CONFIG_SIZE\n"); + if (LengthOut != sizeof(ULONG) || Buffer == NULL) + Status = STATUS_INVALID_PARAMETER; + else + { + pConfigSize = (PULONG)Buffer; + *pConfigSize = 0; + Status = STATUS_SUCCESS; + } + break; + } + case IOCTL_SERIAL_GET_BAUD_RATE: + { + DPRINT("Serial: IOCTL_SERIAL_GET_BAUD_RATE\n"); + if (LengthOut < sizeof(SERIAL_BAUD_RATE)) + Status = STATUS_BUFFER_TOO_SMALL; + else if (Buffer == NULL) + Status = STATUS_INVALID_PARAMETER; + else + { + ((PSERIAL_BAUD_RATE)Buffer)->BaudRate = DeviceExtension->BaudRate; + Information = sizeof(SERIAL_BAUD_RATE); + Status = STATUS_SUCCESS; + } + } + case IOCTL_SERIAL_GET_CHARS: + { + /* FIXME */ + DPRINT1("Serial: IOCTL_SERIAL_GET_CHARS not implemented.\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case IOCTL_SERIAL_GET_COMMSTATUS: + { + /* FIXME */ + DPRINT1("Serial: IOCTL_SERIAL_GET_COMMSTATUS not implemented.\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case IOCTL_SERIAL_GET_DTRRTS: + { + PULONG pDtrRts; + DPRINT("Serial: IOCTL_SERIAL_GET_DTRRTS\n"); + if (LengthOut != sizeof(ULONG) || Buffer == NULL) + Status = STATUS_INVALID_PARAMETER; + else + { + pDtrRts = (PULONG)Buffer; + *pDtrRts = 0; + if (DeviceExtension->MCR & SR_MCR_DTR) + *pDtrRts |= SERIAL_DTR_STATE; + if (DeviceExtension->MCR & SR_MCR_RTS) + *pDtrRts |= SERIAL_RTS_STATE; + Status = STATUS_SUCCESS; + } + break; + } + case IOCTL_SERIAL_GET_HANDFLOW: + { + /* FIXME */ + DPRINT1("Serial: IOCTL_SERIAL_GET_HANDFLOW not implemented.\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case IOCTL_SERIAL_GET_LINE_CONTROL: + { + DPRINT("Serial: IOCTL_SERIAL_GET_LINE_CONTROL\n"); + if (LengthOut < sizeof(SERIAL_LINE_CONTROL)) + Status = STATUS_BUFFER_TOO_SMALL; + else if (Buffer == NULL) + Status = STATUS_INVALID_PARAMETER; + else + { + *((PSERIAL_LINE_CONTROL)Buffer) = DeviceExtension->SerialLineControl; + Information = sizeof(SERIAL_LINE_CONTROL); + Status = STATUS_SUCCESS; + } + break; + } + case IOCTL_SERIAL_GET_MODEM_CONTROL: + { + PULONG pMCR; + DPRINT("Serial: IOCTL_SERIAL_GET_MODEM_CONTROL\n"); + if (LengthOut != sizeof(ULONG) || Buffer == NULL) + Status = STATUS_INVALID_PARAMETER; + else + { + pMCR = (PULONG)Buffer; + *pMCR = DeviceExtension->MCR; + Status = STATUS_SUCCESS; + } + break; + } + case IOCTL_SERIAL_GET_MODEMSTATUS: + { + PULONG pMSR; + DPRINT("Serial: IOCTL_SERIAL_GET_MODEMSTATUS\n"); + if (LengthOut != sizeof(ULONG) || Buffer == NULL) + Status = STATUS_INVALID_PARAMETER; + else + { + pMSR = (PULONG)Buffer; + *pMSR = DeviceExtension->MSR; + Status = STATUS_SUCCESS; + } + break; + } + case IOCTL_SERIAL_GET_PROPERTIES: + { + /* FIXME */ + DPRINT1("Serial: IOCTL_SERIAL_GET_PROPERTIES not implemented.\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case IOCTL_SERIAL_GET_STATS: + { + /* FIXME */ + DPRINT1("Serial: IOCTL_SERIAL_GET_STATS not implemented.\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case IOCTL_SERIAL_GET_TIMEOUTS: + { + /* FIXME */ + DPRINT1("Serial: IOCTL_SERIAL_GET_TIMEOUTS not implemented.\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case IOCTL_SERIAL_GET_WAIT_MASK: + { + PULONG pWaitMask; + DPRINT("Serial: IOCTL_SERIAL_GET_WAIT_MASK\n"); + if (LengthOut != sizeof(ULONG) || Buffer == NULL) + Status = STATUS_INVALID_PARAMETER; + else + { + pWaitMask = (PULONG)Buffer; + *pWaitMask = DeviceExtension->WaitMask; + Status = STATUS_SUCCESS; + } + break; + } + case IOCTL_SERIAL_IMMEDIATE_CHAR: + { + /* FIXME */ + DPRINT1("Serial: IOCTL_SERIAL_IMMEDIATE_CHAR not implemented.\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case IOCTL_SERIAL_LSRMST_INSERT: + { + /* FIXME */ + DPRINT1("Serial: IOCTL_SERIAL_LSRMST_INSERT not implemented.\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case IOCTL_SERIAL_PURGE: + { + /* FIXME */ + DPRINT1("Serial: IOCTL_SERIAL_PURGE not implemented.\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case IOCTL_SERIAL_RESET_DEVICE: + { + /* FIXME */ + DPRINT1("Serial: IOCTL_SERIAL_RESET_DEVICE not implemented.\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case IOCTL_SERIAL_SET_BAUD_RATE: + { + PULONG pNewBaudRate; + DPRINT("Serial: IOCTL_SERIAL_SET_BAUD_RATE\n"); + if (LengthIn != sizeof(ULONG) || Buffer == NULL) + Status = STATUS_INVALID_PARAMETER; + else + { + pNewBaudRate = (PULONG)Buffer; + Status = SerialSetBaudRate(DeviceExtension, *pNewBaudRate); + } + break; + } + case IOCTL_SERIAL_SET_BREAK_OFF: + { + /* FIXME */ + DPRINT1("Serial: IOCTL_SERIAL_SET_BREAK_OFF not implemented.\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case IOCTL_SERIAL_SET_BREAK_ON: + { + /* FIXME */ + DPRINT1("Serial: IOCTL_SERIAL_SET_BREAK_ON not implemented.\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case IOCTL_SERIAL_SET_CHARS: + { + /* FIXME */ + DPRINT1("Serial: IOCTL_SERIAL_SET_CHARS not implemented.\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case IOCTL_SERIAL_SET_DTR: + { + /* FIXME: If the handshake flow control of the device is configured to + * automatically use DTR, return STATUS_INVALID_PARAMETER */ + DPRINT("Serial: IOCTL_SERIAL_SET_DTR\n"); + if (!(DeviceExtension->MCR & SR_MCR_DTR)) + { + DeviceExtension->MCR |= SR_MCR_DTR; + WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); + } + Status = STATUS_SUCCESS; + break; + } + case IOCTL_SERIAL_SET_FIFO_CONTROL: + { + DPRINT("Serial: IOCTL_SERIAL_SET_FIFO_CONTROL\n"); + if (LengthIn != sizeof(ULONG) || Buffer == NULL) + Status = STATUS_INVALID_PARAMETER; + else + { + WRITE_PORT_UCHAR(SER_FCR(ComPortBase), (UCHAR)((*(PULONG)Buffer) & 0xff)); + Status = STATUS_SUCCESS; + } + break; + } + case IOCTL_SERIAL_SET_HANDFLOW: + { + /* FIXME */ + DPRINT1("Serial: IOCTL_SERIAL_SET_HANDFLOW not implemented.\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case IOCTL_SERIAL_SET_LINE_CONTROL: + { + DPRINT("Serial: IOCTL_SERIAL_SET_LINE_CONTROL\n"); + if (LengthIn < sizeof(SERIAL_LINE_CONTROL)) + Status = STATUS_BUFFER_TOO_SMALL; + else if (Buffer == NULL) + Status = STATUS_INVALID_PARAMETER; + else + Status = SerialSetLineControl(DeviceExtension, (PSERIAL_LINE_CONTROL)Buffer); + break; + } + case IOCTL_SERIAL_SET_MODEM_CONTROL: + { + PULONG pMCR; + DPRINT("Serial: IOCTL_SERIAL_SET_MODEM_CONTROL\n"); + if (LengthIn != sizeof(ULONG) || Buffer == NULL) + Status = STATUS_INVALID_PARAMETER; + else + { + pMCR = (PULONG)Buffer; + DeviceExtension->MCR = (UCHAR)(*pMCR & 0xff); + WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); + Status = STATUS_SUCCESS; + } + break; + } + case IOCTL_SERIAL_SET_QUEUE_SIZE: + { + /* FIXME */ + DPRINT1("Serial: IOCTL_SERIAL_SET_QUEUE_SIZE not implemented.\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case IOCTL_SERIAL_SET_RTS: + { + /* FIXME: If the handshake flow control of the device is configured to + * automatically use DTR, return STATUS_INVALID_PARAMETER */ + DPRINT("Serial: IOCTL_SERIAL_SET_RTS\n"); + if (!(DeviceExtension->MCR & SR_MCR_RTS)) + { + DeviceExtension->MCR |= SR_MCR_RTS; + WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); + } + Status = STATUS_SUCCESS; + break; + } + case IOCTL_SERIAL_SET_TIMEOUTS: + { + /* FIXME */ + DPRINT1("Serial: IOCTL_SERIAL_SET_TIMEOUTS not implemented.\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case IOCTL_SERIAL_SET_WAIT_MASK: + { + PULONG pWaitMask; + DPRINT("Serial: IOCTL_SERIAL_SET_WAIT_MASK\n"); + if (LengthIn != sizeof(ULONG) || Buffer == NULL) + Status = STATUS_INVALID_PARAMETER; + else + { + pWaitMask = (PULONG)Buffer; + DeviceExtension->WaitMask = *pWaitMask; + Status = STATUS_SUCCESS; + } + break; + } + case IOCTL_SERIAL_SET_XOFF: + { + /* FIXME */ + DPRINT1("Serial: IOCTL_SERIAL_SET_XOFF not implemented.\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case IOCTL_SERIAL_SET_XON: + { + /* FIXME */ + DPRINT1("Serial: IOCTL_SERIAL_SET_XON not implemented.\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case IOCTL_SERIAL_WAIT_ON_MASK: + { + /* FIXME */ + DPRINT1("Serial: IOCTL_SERIAL_WAIT_ON_MASK not implemented.\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case IOCTL_SERIAL_XOFF_COUNTER: + { + /* FIXME */ + DPRINT1("Serial: IOCTL_SERIAL_XOFF_COUNTER not implemented.\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + default: + { + /* Pass Irp to lower driver */ + DPRINT("Serial: Unknown IOCTL code 0x%x\n", Stack->Parameters.DeviceIoControl.IoControlCode); + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(DeviceExtension->LowerDevice, Irp); + } + } + + Irp->IoStatus.Information = Information; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} _____ Added: trunk/reactos/drivers/dd/serial/info.c --- trunk/reactos/drivers/dd/serial/info.c 2005-03-14 20:38:32 UTC (rev 14073) +++ trunk/reactos/drivers/dd/serial/info.c 2005-03-14 20:59:50 UTC (rev 14074) @@ -0,0 +1,79 @@ +/* $Id: + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/dd/serial/info.c + * PURPOSE: Serial IRP_MJ_QUERY_INFORMATION operations + * + * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + */ + +#define NDEBUG2 +#include "serial.h" + +NTSTATUS STDCALL +SerialQueryInformation( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PSERIAL_DEVICE_EXTENSION DeviceExtension; + PIO_STACK_LOCATION Stack; + PVOID SystemBuffer; + ULONG BufferLength; + NTSTATUS Status; + + DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + Stack = IoGetCurrentIrpStackLocation(Irp); + SystemBuffer = Irp->AssociatedIrp.SystemBuffer; + BufferLength = Stack->Parameters.QueryFile.Length; + + switch (Stack->Parameters.QueryFile.FileInformationClass) + { + case FileStandardInformation: + { + PFILE_STANDARD_INFORMATION StandardInfo = (PFILE_STANDARD_INFORMATION)SystemBuffer; + + DPRINT("Serial: IRP_MJ_QUERY_INFORMATION / FileStandardInformation\n"); + if (BufferLength < sizeof(FILE_STANDARD_INFORMATION)) + Status = STATUS_BUFFER_OVERFLOW; + else + { + StandardInfo->AllocationSize.QuadPart = 0; + StandardInfo->EndOfFile.QuadPart = 0; + StandardInfo->Directory = FALSE; + StandardInfo->NumberOfLinks = 0; + StandardInfo->DeletePending = FALSE; /* FIXME: should be TRUE sometimes */ + Status = STATUS_SUCCESS; + } + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + break; + } + case FilePositionInformation: + { + PFILE_POSITION_INFORMATION PositionInfo = (PFILE_POSITION_INFORMATION)SystemBuffer; + + DPRINT("Serial: IRP_MJ_QUERY_INFORMATION / FilePositionInformation\n"); + if (BufferLength < sizeof(PFILE_POSITION_INFORMATION)) + Status = STATUS_BUFFER_OVERFLOW; + else + { + PositionInfo->CurrentByteOffset.QuadPart = 0; + Status = STATUS_SUCCESS; + } + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + break; + } + default: + { + DPRINT("Serial: IRP_MJ_QUERY_INFORMATION: Unexpected file information class 0x%02x\n", Stack->Parameters.QueryFile.FileInformationClass); + IoSkipCurrentIrpStackLocation(Irp); + Status = IoCallDriver(DeviceExtension->LowerDevice, Irp); + } + } + + return Status; +} _____ Modified: trunk/reactos/drivers/dd/serial/makefile --- trunk/reactos/drivers/dd/serial/makefile 2005-03-14 20:38:32 UTC (rev 14073) +++ trunk/reactos/drivers/dd/serial/makefile 2005-03-14 20:59:50 UTC (rev 14074) @@ -6,7 +6,17 @@ TARGET_NAME = serial -TARGET_OBJECTS = serial.o +TARGET_OBJECTS = \ + cleanup.o \ + close.o \ + create.o \ + devctrl.o \ + info.o \ + misc.o \ + pnp.o \ + power.o \ + rw.o \ + serial.o TARGET_CFLAGS = -Wall -Werror -D__USE_W32API _____ Added: trunk/reactos/drivers/dd/serial/misc.c --- trunk/reactos/drivers/dd/serial/misc.c 2005-03-14 20:38:32 UTC (rev 14073) +++ trunk/reactos/drivers/dd/serial/misc.c 2005-03-14 20:59:50 UTC (rev 14074) @@ -0,0 +1,175 @@ +/* $Id: + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/dd/serial/misc.c + * PURPOSE: Misceallenous operations + * + * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + */ + +#define NDEBUG +#include "serial.h" + +NTSTATUS +ForwardIrpAndWaitCompletion( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + if (Irp->PendingReturned) + KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +ForwardIrpAndWait( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PDEVICE_OBJECT LowerDevice = ((PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; + KEVENT Event; + NTSTATUS Status; + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + IoCopyCurrentIrpStackLocationToNext(Irp); + + DPRINT("Serial: Calling lower device %p [%wZ]\n", LowerDevice, &LowerDevice->DriverObject->DriverName); + IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); + + Status = IoCallDriver(LowerDevice, Irp); + if (Status == STATUS_PENDING) + { + Status = KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + if (NT_SUCCESS(Status)) + Status = Irp->IoStatus.Status; + } + + return Status; +} + +BOOLEAN STDCALL +SerialInterruptService( + IN PKINTERRUPT Interrupt, + IN OUT PVOID ServiceContext) +{ + PDEVICE_OBJECT DeviceObject; + PSERIAL_DEVICE_EXTENSION DeviceExtension; + PUCHAR ComPortBase; + UCHAR Iir; + + DeviceObject = (PDEVICE_OBJECT)ServiceContext; + DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; + + DPRINT1("Serial: Maybe our interrupt?\n"); /* FIXME */ + + Iir = READ_PORT_UCHAR(SER_IIR(ComPortBase)); +#if 0 + if (Iir == 0xff) + return TRUE; + CHECKPOINT1; + Iir &= SR_IIR_ID_MASK; + if (!(Iir & SR_IIR_SELF)) { return FALSE; } + CHECKPOINT1; +#else + Iir &= SR_IIR_ID_MASK; + Iir |= SR_IIR_SELF; +#endif + DPRINT1("Serial: Iir = 0x%x\n", Iir); + + switch (Iir) + { + case SR_IIR_MSR_CHANGE: + { + DPRINT1("Serial: SR_IIR_MSR_CHANGE\n"); + DeviceExtension->MSR = READ_PORT_UCHAR(SER_MSR(ComPortBase)); + /* FIXME: what to do? */ + //return KeInsertQueueDpc (&Self->MsrChangeDpc, Self, 0); + //return TRUE; + break; + } + case SR_IIR_THR_EMPTY: + { + DPRINT1("Serial: SR_IIR_THR_EMPTY\n"); + break; + /*if (!Self->WaitingSendBytes.Empty() && + (READ_PORT_UCHAR( Self->Port + UART_LSR ) & LSR_THR_EMPTY) ) + WRITE_PORT_UCHAR( Self->Port + UART_THR, + Self->WaitingSendBytes.PopFront() ); + return KeInsertQueueDpc( &Self->TransmitDpc, Self, 0 );*/ + } + case SR_IIR_DATA_RECEIVED: + { + DPRINT1("Serial: SR_IIR_DATA_RECEIVED\n"); + if (READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_DR) + { + DPRINT1("Serial: Byte received: 0x%x\n", READ_PORT_UCHAR(SER_RBR(ComPortBase))); + return TRUE; + } + break; + /*if( READ_PORT_UCHAR( Self->Port + UART_LSR ) & LSR_DATA_RECEIVED ) + Self->WaitingReadBytes.PushBack + ( READ_PORT_UCHAR( Self->Port + UART_RDR ) ); + return KeInsertQueueDpc( &Self->DataInDpc, Self, 0 );*/ + } + case SR_IIR_ERROR: + { + DPRINT1("Serial: SR_IIR_ERROR\n"); + break; + /*Error = READ_PORT_UCHAR( Self->Port + UART_LSR ); + if( Error & LSR_OVERRUN ) + Self->WaitingReadBytes.PushBack( SerialFifo::OVERRUN ); + if( Error & LSR_PARITY_ERROR ) + Self->WaitingReadBytes.PushBack( SerialFifo::PARITY ); + if( Error & LSR_FRAMING_ERROR ) + Self->WaitingReadBytes.PushBack( SerialFifo::FRAMING ); + if( Error & LSR_BREAK ) + Self->WaitingReadBytes.PushBack( SerialFifo::BREAK ); + if( Error & LSR_TIMEOUT ) + Self->WaitingReadBytes.PushBack( SerialFifo::TIMEOUT ); + return KeInsertQueueDpc( &Self->DataInDpc, Self, 0 );*/ + } + } + return FALSE; +#if 0 + InterruptId = READ_PORT_UCHAR(SER_IIR(ComPortBase)) & SR_IIR_IID; + DPRINT1("Serial: Interrupt catched: id = %x\n", InterruptId); + /* FIXME: sometimes, update DeviceExtension->IER */ + /* FIXME: sometimes, update DeviceExtension->MCR */ + /* FIXME: sometimes, update DeviceExtension->MSR */ + switch (InterruptId) + { + case 3 << 1: + { + /* line status changed */ + DPRINT("Serial: Line status changed\n"); + break; + } + case 2 << 1: + { + /* data available */ + UCHAR ReceivedByte = READ_PORT_UCHAR(ComPortBase); + DPRINT("Serial: Data available\n"); + DPRINT1("Serial: received %d\n", ReceivedByte); + //Buffer[Information++] = ReceivedByte; + } + case 1 << 1: + { + /* transmit register empty */ + DPRINT("Serial: Transmit register empty\n"); + } + case 0 << 1: + { + /* modem status change */ + UCHAR ReceivedByte = READ_PORT_UCHAR(SER_MSR(ComPortBase)); + DPRINT("Serial: Modem status change\n"); + DPRINT1("Serial: new status = 0x%02x\n", ReceivedByte); + } + } + return TRUE; + } + else + return FALSE; +#endif +} _____ Added: trunk/reactos/drivers/dd/serial/pnp.c --- trunk/reactos/drivers/dd/serial/pnp.c 2005-03-14 20:38:32 UTC (rev 14073) +++ trunk/reactos/drivers/dd/serial/pnp.c 2005-03-14 20:59:50 UTC (rev 14074) @@ -0,0 +1,275 @@ +/* $Id: + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/dd/serial/pnp.c + * PURPOSE: Serial IRP_MJ_PNP operations + * + * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + */ +/* FIXME: call IoAcquireRemoveLock/IoReleaseRemoveLock around each I/O operation */ + +#define NDEBUG +#include "serial.h" + +NTSTATUS STDCALL +SerialAddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT Pdo) +{ + PDEVICE_OBJECT Fdo; + PSERIAL_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; + WCHAR DeviceNameBuffer[32]; + UNICODE_STRING DeviceName; + static ULONG DeviceNumber = 0; + + DPRINT("Serial: SerialAddDevice called\n"); + + /* Create new device object */ + swprintf(DeviceNameBuffer, L"\\Device\\Serial%lu", DeviceNumber); + RtlInitUnicodeString(&DeviceName, DeviceNameBuffer); + Status = IoCreateDevice(DriverObject, + sizeof(SERIAL_DEVICE_EXTENSION), + &DeviceName, + FILE_DEVICE_SERIAL_PORT, + FILE_DEVICE_SECURE_OPEN, + FALSE, + &Fdo); + if (!NT_SUCCESS(Status)) + { + DPRINT("Serial: IoCreateDevice() failed with status 0x%08x\n", Status); [truncated at 1000 lines; 773 more skipped]

1 0

[royce] 14073: reorder dependencies to fix $(ECHO_CC) output
by royce＠svn.reactos.com 14 Mar '05

14 Mar '05

reorder dependencies to fix $(ECHO_CC) output Modified: branches/xmlbuildsystem/reactos/tools/wpp/wpp.mak _____ Modified: branches/xmlbuildsystem/reactos/tools/wpp/wpp.mak --- branches/xmlbuildsystem/reactos/tools/wpp/wpp.mak 2005-03-14 20:30:45 UTC (rev 14072) +++ branches/xmlbuildsystem/reactos/tools/wpp/wpp.mak 2005-03-14 20:38:32 UTC (rev 14073) @@ -17,25 +17,28 @@ WPP_HOST_CFLAGS = -D__USE_W32API -I$(WPP_BASE) -Iinclude -Iinclude/wine -g +.PHONY: wpp +wpp: $(WPP_TARGET) + $(WPP_TARGET): $(INTERMEDIATE)$(WPP_BASE) $(WPP_OBJECTS) $(ECHO_AR) ${host_ar} -rc $(WPP_TARGET) $(WPP_OBJECTS) -$(INTERMEDIATE)$(WPP_BASE)$(SEP)lex.yy.o: $(INTERMEDIATE)$(WPP_BASE) $(WPP_BASE)$(SEP)lex.yy.c +$(INTERMEDIATE)$(WPP_BASE)$(SEP)lex.yy.o: $(WPP_BASE)$(SEP)lex.yy.c $(INTERMEDIATE)$(WPP_BASE) $(ECHO_CC) - ${host_gcc} $(WPP_HOST_CFLAGS) -c $(WPP_BASE)$(SEP)lex.yy.c -o $(INTERMEDIATE)$(WPP_BASE)$(SEP)lex.yy.o + ${host_gcc} $(WPP_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(WPP_BASE)$(SEP)preproc.o: $(INTERMEDIATE)$(WPP_BASE) $(WPP_BASE)$(SEP)preproc.c +$(INTERMEDIATE)$(WPP_BASE)$(SEP)preproc.o: $(WPP_BASE)$(SEP)preproc.c $(INTERMEDIATE)$(WPP_BASE) $(ECHO_CC) - ${host_gcc} $(WPP_HOST_CFLAGS) -c $(WPP_BASE)$(SEP)preproc.c -o $(INTERMEDIATE)$(WPP_BASE)$(SEP)preproc.o + ${host_gcc} $(WPP_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(WPP_BASE)$(SEP)wpp.o: $(INTERMEDIATE)$(WPP_BASE) $(WPP_BASE)$(SEP)wpp.c +$(INTERMEDIATE)$(WPP_BASE)$(SEP)wpp.o: $(WPP_BASE)$(SEP)wpp.c $(INTERMEDIATE)$(WPP_BASE) $(ECHO_CC) - ${host_gcc} $(WPP_HOST_CFLAGS) -c $(WPP_BASE)$(SEP)wpp.c -o $(INTERMEDIATE)$(WPP_BASE)$(SEP)wpp.o + ${host_gcc} $(WPP_HOST_CFLAGS) -c $< -o $@ -$(INTERMEDIATE)$(WPP_BASE)$(SEP)wpp.tab.o: $(INTERMEDIATE)$(WPP_BASE) $(WPP_BASE)$(SEP)wpp.tab.c +$(INTERMEDIATE)$(WPP_BASE)$(SEP)wpp.tab.o: $(WPP_BASE)$(SEP)wpp.tab.c $(INTERMEDIATE)$(WPP_BASE) $(ECHO_CC) - ${host_gcc} $(WPP_HOST_CFLAGS) -c $(WPP_BASE)$(SEP)wpp.tab.c -o $(INTERMEDIATE)$(WPP_BASE)$(SEP)wpp.tab.o + ${host_gcc} $(WPP_HOST_CFLAGS) -c $< -o $@ .PHONY: wpp_clean wpp_clean:

1 0

[royce] 14072: reorder dependencies to fix $(ECHO_CC) output
by royce＠svn.reactos.com 14 Mar '05

14 Mar '05

reorder dependencies to fix $(ECHO_CC) output Modified: branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak _____ Modified: branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak --- branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak 2005-03-14 20:06:14 UTC (rev 14071) +++ branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak 2005-03-14 20:30:45 UTC (rev 14072) @@ -95,271 +95,271 @@ $(ECHO_AR) ${host_ar} -rc $(UNICODE_TARGET) $(UNICODE_OBJECTS) -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)casemap.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)casemap.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)casemap.o: $(UNICODE_BASE)$(SEP)casemap.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)casemap.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)casemap.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)compose.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)compose.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)compose.o: $(UNICODE_BASE)$(SEP)compose.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)compose.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)compose.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)cptable.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)cptable.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)cptable.o: $(UNICODE_BASE)$(SEP)cptable.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)cptable.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)cptable.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)mbtowc.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)mbtowc.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)mbtowc.o: $(UNICODE_BASE)$(SEP)mbtowc.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)mbtowc.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)mbtowc.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)string.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)string.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)string.o: $(UNICODE_BASE)$(SEP)string.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)string.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)string.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)wctomb.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)wctomb.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)wctomb.o: $(UNICODE_BASE)$(SEP)wctomb.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)wctomb.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)wctomb.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)wctype.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)wctype.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)wctype.o: $(UNICODE_BASE)$(SEP)wctype.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)wctype.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)wctype.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_037.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_037.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_037.o: $(UNICODE_BASE)$(SEP)c_037.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_037.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_037.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_424.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_424.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_424.o: $(UNICODE_BASE)$(SEP)c_424.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_424.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_424.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_437.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_437.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_437.o: $(UNICODE_BASE)$(SEP)c_437.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_437.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_437.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_500.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_500.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_500.o: $(UNICODE_BASE)$(SEP)c_500.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_500.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_500.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_737.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_737.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_737.o: $(UNICODE_BASE)$(SEP)c_737.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_737.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_737.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_775.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_775.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_775.o: $(UNICODE_BASE)$(SEP)c_775.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_775.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_775.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_850.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_850.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_850.o: $(UNICODE_BASE)$(SEP)c_850.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_850.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_850.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_852.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_852.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_852.o: $(UNICODE_BASE)$(SEP)c_852.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_852.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_852.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_855.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_855.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_855.o: $(UNICODE_BASE)$(SEP)c_855.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_855.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_855.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_856.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_856.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_856.o: $(UNICODE_BASE)$(SEP)c_856.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_856.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_856.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_857.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_857.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_857.o: $(UNICODE_BASE)$(SEP)c_857.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_857.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_857.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_860.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_860.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_860.o: $(UNICODE_BASE)$(SEP)c_860.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_860.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_860.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_861.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_861.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_861.o: $(UNICODE_BASE)$(SEP)c_861.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_861.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_861.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_862.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_862.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_862.o: $(UNICODE_BASE)$(SEP)c_862.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_862.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_862.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_863.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_863.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_863.o: $(UNICODE_BASE)$(SEP)c_863.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_863.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_863.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_864.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_864.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_864.o: $(UNICODE_BASE)$(SEP)c_864.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_864.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_864.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_865.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_865.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_865.o: $(UNICODE_BASE)$(SEP)c_865.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_865.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_865.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_866.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_866.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_866.o: $(UNICODE_BASE)$(SEP)c_866.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_866.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_866.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_869.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_869.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_869.o: $(UNICODE_BASE)$(SEP)c_869.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_869.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_869.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_874.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_874.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_874.o: $(UNICODE_BASE)$(SEP)c_874.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_874.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_874.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_875.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_875.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_875.o: $(UNICODE_BASE)$(SEP)c_875.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_875.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_875.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_878.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_878.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_878.o: $(UNICODE_BASE)$(SEP)c_878.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_878.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_878.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_932.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_932.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_932.o: $(UNICODE_BASE)$(SEP)c_932.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_932.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_932.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_936.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_936.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_936.o: $(UNICODE_BASE)$(SEP)c_936.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_936.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_936.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_949.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_949.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_949.o: $(UNICODE_BASE)$(SEP)c_949.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_949.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_949.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_950.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_950.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_950.o: $(UNICODE_BASE)$(SEP)c_950.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_950.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_950.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1006.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_1006.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1006.o: $(UNICODE_BASE)$(SEP)c_1006.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1006.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1006.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1026.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_1026.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1026.o: $(UNICODE_BASE)$(SEP)c_1026.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1026.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1026.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1250.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_1250.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1250.o: $(UNICODE_BASE)$(SEP)c_1250.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1250.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1250.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1251.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_1251.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1251.o: $(UNICODE_BASE)$(SEP)c_1251.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1251.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1251.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1252.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_1252.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1252.o: $(UNICODE_BASE)$(SEP)c_1252.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1252.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1252.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1253.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_1253.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1253.o: $(UNICODE_BASE)$(SEP)c_1253.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1253.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1253.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1254.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_1254.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1254.o: $(UNICODE_BASE)$(SEP)c_1254.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1254.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1254.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1255.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_1255.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1255.o: $(UNICODE_BASE)$(SEP)c_1255.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1255.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1255.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1256.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_1256.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1256.o: $(UNICODE_BASE)$(SEP)c_1256.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1256.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1256.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1257.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_1257.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1257.o: $(UNICODE_BASE)$(SEP)c_1257.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1257.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1257.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1258.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_1258.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1258.o: $(UNICODE_BASE)$(SEP)c_1258.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_1258.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_1258.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10000.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_10000.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10000.o: $(UNICODE_BASE)$(SEP)c_10000.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_10000.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10000.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10006.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_10006.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10006.o: $(UNICODE_BASE)$(SEP)c_10006.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_10006.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10006.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10007.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_10007.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10007.o: $(UNICODE_BASE)$(SEP)c_10007.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_10007.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10007.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10029.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_10029.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10029.o: $(UNICODE_BASE)$(SEP)c_10029.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_10029.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10029.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10079.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_10079.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10079.o: $(UNICODE_BASE)$(SEP)c_10079.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_10079.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10079.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10081.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_10081.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10081.o: $(UNICODE_BASE)$(SEP)c_10081.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_10081.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_10081.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_20866.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_20866.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_20866.o: $(UNICODE_BASE)$(SEP)c_20866.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_20866.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_20866.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_20932.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_20932.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_20932.o: $(UNICODE_BASE)$(SEP)c_20932.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_20932.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_20932.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_21866.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_21866.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_21866.o: $(UNICODE_BASE)$(SEP)c_21866.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_21866.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_21866.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28591.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28591.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28591.o: $(UNICODE_BASE)$(SEP)c_28591.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28591.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28591.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28592.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28592.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28592.o: $(UNICODE_BASE)$(SEP)c_28592.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28592.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28592.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28593.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28593.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28593.o: $(UNICODE_BASE)$(SEP)c_28593.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28593.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28593.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28594.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28594.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28594.o: $(UNICODE_BASE)$(SEP)c_28594.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28594.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28594.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28595.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28595.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28595.o: $(UNICODE_BASE)$(SEP)c_28595.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28595.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28595.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28596.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28596.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28596.o: $(UNICODE_BASE)$(SEP)c_28596.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28596.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28596.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28597.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28597.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28597.o: $(UNICODE_BASE)$(SEP)c_28597.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28597.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28597.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28598.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28598.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28598.o: $(UNICODE_BASE)$(SEP)c_28598.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28598.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28598.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28599.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28599.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28599.o: $(UNICODE_BASE)$(SEP)c_28599.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28599.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28599.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28600.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28600.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28600.o: $(UNICODE_BASE)$(SEP)c_28600.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28600.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28600.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28603.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28603.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28603.o: $(UNICODE_BASE)$(SEP)c_28603.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28603.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28603.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28604.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28604.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28604.o: $(UNICODE_BASE)$(SEP)c_28604.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28604.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28604.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28605.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28605.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28605.o: $(UNICODE_BASE)$(SEP)c_28605.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28605.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28605.o -$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28606.o: $(UNICODE_BASE_DIR) $(UNICODE_BASE)$(SEP)c_28606.c +$(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28606.o: $(UNICODE_BASE)$(SEP)c_28606.c $(UNICODE_BASE_DIR) $(ECHO_CC) ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $(UNICODE_BASE)$(SEP)c_28606.c -o $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)c_28606.o

1 0

[royce] 14071: fix dlltool target directory dependencies
by royce＠svn.reactos.com 14 Mar '05

14 Mar '05

fix dlltool target directory dependencies add buildno's output to clean: Modified: branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak --- branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak 2005-03-14 19:42:00 UTC (rev 14070) +++ branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak 2005-03-14 20:06:14 UTC (rev 14071) @@ -3,7 +3,7 @@ BUILDNO_BASE_DIR = $(INTERMEDIATE)$(BUILDNO_BASE) $(BUILDNO_BASE_DIR): $(RMKDIR_TARGET) - ${mkdir} $(INTERMEDIATE)$(BUILDNO_BASE) + ${mkdir} $@ BUILDNO_TARGET = \ $(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)buildno$(EXEPOSTFIX) @@ -44,6 +44,7 @@ .PHONY: buildno_clean buildno_clean: -@$(rm) $(BUILDNO_TARGET) $(BUILDNO_OBJECTS) 2>$(NUL) +clean: buildno_clean $(BUILDNO_H): $(BUILDNO_TARGET) $(EXEPREFIX)$(BUILDNO_TARGET) $(BUILDNO_H) _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-14 19:42:00 UTC (rev 14070) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-14 20:06:14 UTC (rev 14071) @@ -1109,9 +1109,10 @@ string archiveFilename = GetModuleArchiveFilename ( module ); fprintf ( fMakefile, - "%s: %s\n", + "%s: %s %s\n", archiveFilename.c_str (), - objs_macro.c_str ()); + objs_macro.c_str (), + GetDirectory(archiveFilename).c_str() ); fprintf ( fMakefile, "\t$(ECHO_AR)\n" ); @@ -1213,7 +1214,9 @@ nasmflagsMacro = ssprintf ("$(%s)", nasmflagsMacro.c_str ()); objectsMacro = ssprintf ("$(%s)", objectsMacro.c_str ()); - string ar_target = GenerateArchiveTarget ( module, ar, objectsMacro ); + string ar_target = + GenerateArchiveTarget ( module, ar, objectsMacro ); + GenerateObjectFileTargets ( module, cc, cppc, @@ -1366,8 +1369,8 @@ string definitionDependencies = GetDefinitionDependencies ( module ); fprintf ( fMakefile, "%s: %s %s\n", library_target.c_str (), - library_target.c_str (), - definitionDependencies.c_str () ); + definitionDependencies.c_str (), + GetDirectory(library_target).c_str () ); fprintf ( fMakefile, "\t$(ECHO_DLLTOOL)\n" );

1 0

[chorns] 14070: Report why a file is marked for rebuild
by chorns＠svn.reactos.com 14 Mar '05

14 Mar '05

Report why a file is marked for rebuild Modified: branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp 2005-03-14 19:38:13 UTC (rev 14069) +++ branches/xmlbuildsystem/reactos/tools/rbuild/automaticdependency.cpp 2005-03-14 19:42:00 UTC (rev 14070) @@ -406,8 +406,9 @@ assert ( sourceFile->youngestLastWriteTime != 0 ); if ( sourceFile->youngestLastWriteTime > sourceFile->lastWriteTime ) { - printf ( "Marking %s for rebuild\n", - sourceFile->filename.c_str () ); + printf ( "Marking %s for rebuild due to younger file %s\n", + sourceFile->filename.c_str (), + sourceFile->youngestFile->filename.c_str () ); timebuf.actime = sourceFile->youngestLastWriteTime; timebuf.modtime = sourceFile->youngestLastWriteTime; utime ( sourceFile->filename.c_str (),

1 0

[royce] 14069: list directory dependencies last, so that $(ECHO_FOO) prints the right thing. also use $@ where possible to reduce makefile.auto size a bit
by royce＠svn.reactos.com 14 Mar '05

14 Mar '05

list directory dependencies last, so that $(ECHO_FOO) prints the right thing. also use $@ where possible to reduce makefile.auto size a bit Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-14 19:31:25 UTC (rev 14068) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-14 19:38:13 UTC (rev 14069) @@ -727,14 +727,13 @@ fprintf ( fMakefile, "%s: %s %s\n", objectFilename.c_str (), - GetDirectory ( objectFilename ).c_str (), - deps.c_str () ); + deps.c_str (), + GetDirectory ( objectFilename ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_CC)\n" ); fprintf ( fMakefile, - "\t%s -c %s -o %s %s\n", + "\t%s -c %s -o $@ %s\n", cc.c_str (), sourceFilename.c_str (), - objectFilename.c_str (), cflagsMacro.c_str () ); } @@ -749,14 +748,13 @@ fprintf ( fMakefile, "%s: %s %s\n", objectFilename.c_str (), - GetDirectory ( objectFilename ).c_str (), - sourceFilename.c_str () ); + sourceFilename.c_str (), + GetDirectory ( objectFilename ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_GAS)\n" ); fprintf ( fMakefile, - "\t%s -x assembler-with-cpp -c %s -o %s -D__ASM__ %s\n", + "\t%s -x assembler-with-cpp -c %s -o $@ -D__ASM__ %s\n", cc.c_str (), sourceFilename.c_str (), - objectFilename.c_str (), cflagsMacro.c_str () ); } @@ -770,14 +768,13 @@ fprintf ( fMakefile, "%s: %s %s\n", objectFilename.c_str (), - GetDirectory ( objectFilename ).c_str (), - sourceFilename.c_str () ); + sourceFilename.c_str (), + GetDirectory ( objectFilename ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_NASM)\n" ); fprintf ( fMakefile, - "\t%s -f win32 %s -o %s %s\n", + "\t%s -f win32 %s -o $@ %s\n", "$(Q)nasm", sourceFilename.c_str (), - objectFilename.c_str (), nasmflagsMacro.c_str () ); } @@ -795,8 +792,8 @@ fprintf ( fMakefile, "%s: %s %s $(WRC_TARGET)\n", objectFilename.c_str (), - GetDirectory ( objectFilename ).c_str (), - sourceFilename.c_str () ); + sourceFilename.c_str (), + GetDirectory ( objectFilename ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_WRC)\n" ); fprintf ( fMakefile, "\t${gcc} -xc -E -DRC_INVOKED ${%s} %s > %s\n",

1 0

[chorns] 14068: Depend on the object file directory, not the object file.
by chorns＠svn.reactos.com 14 Mar '05

14 Mar '05

Depend on the object file directory, not the object file. Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-14 19:11:03 UTC (rev 14067) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-14 19:31:25 UTC (rev 14068) @@ -725,8 +725,9 @@ string objectFilename = PassThruCacheDirectory ( GetObjectFilename ( module, sourceFilename ) ); fprintf ( fMakefile, - "%s: %s\n", + "%s: %s %s\n", objectFilename.c_str (), + GetDirectory ( objectFilename ).c_str (), deps.c_str () ); fprintf ( fMakefile, "\t$(ECHO_CC)\n" ); fprintf ( fMakefile, @@ -748,7 +749,7 @@ fprintf ( fMakefile, "%s: %s %s\n", objectFilename.c_str (), - objectFilename.c_str (), + GetDirectory ( objectFilename ).c_str (), sourceFilename.c_str () ); fprintf ( fMakefile, "\t$(ECHO_GAS)\n" ); fprintf ( fMakefile, @@ -769,7 +770,7 @@ fprintf ( fMakefile, "%s: %s %s\n", objectFilename.c_str (), - objectFilename.c_str (), + GetDirectory ( objectFilename ).c_str (), sourceFilename.c_str () ); fprintf ( fMakefile, "\t$(ECHO_NASM)\n" ); fprintf ( fMakefile, @@ -794,7 +795,7 @@ fprintf ( fMakefile, "%s: %s %s $(WRC_TARGET)\n", objectFilename.c_str (), - objectFilename.c_str (), + GetDirectory ( objectFilename ).c_str (), sourceFilename.c_str () ); fprintf ( fMakefile, "\t$(ECHO_WRC)\n" ); fprintf ( fMakefile,

1 0

[royce] 14067: echo [WMC] commands
by royce＠svn.reactos.com 14 Mar '05

14 Mar '05

echo [WMC] commands remove some unnecessary indirect dependencies have rbuild mkdir commands depend directly on RMKDIR_TARGET don't have object files depend on themselves! add rmkdir, rsym, and wmc phony targets Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/tools.mak Modified: branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-03-14 18:51:29 UTC (rev 14066) +++ branches/xmlbuildsystem/reactos/Makefile 2005-03-14 19:11:03 UTC (rev 14067) @@ -53,6 +53,7 @@ ECHO_LD =@echo [LD] $@ ECHO_RBUILD =@echo [RBUILD] $@ ECHO_RSYM =@echo [RSYM] $@ + ECHO_WMC =@echo [WMC] $@ ECHO_NCI =@echo [NCI] $@ ECHO_CABMAN =@echo [CABMAN] $< ECHO_CDMAKE =@echo [CDMAKE] $@ @@ -71,6 +72,7 @@ ECHO_LD = ECHO_RBUILD = ECHO_RSYM = + ECHO_WMC = ECHO_NCI = ECHO_CABMAN = ECHO_CDMAKE = @@ -156,16 +158,18 @@ $(ERRCODES_RC) \ $(NCI_SERVICE_FILES) -makefile.auto: $(RMKDIR_TARGET) $(BIN2RES_TARGET) $(WINEBUILD_TARGET) $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) +makefile.auto: $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) $(ECHO_RBUILD) $(Q)tools$(SEP)rbuild$(SEP)rbuild$(EXEPOSTFIX) mingw $(BUGCODES_H) $(BUGCODES_RC): $(WMC_TARGET) $(NTOSKRNL_MC) - $(WMC_TARGET) -i -H $(BUGCODES_H) -o $(BUGCODES_RC) $(NTOSKRNL_MC) + $(ECHO_WMC) + $(Q)$(WMC_TARGET) -i -H $(BUGCODES_H) -o $(BUGCODES_RC) $(NTOSKRNL_MC) $(ERRCODES_H) $(ERRCODES_RC): $(WMC_TARGET) $(KERNEL32_MC) - $(WMC_TARGET) -i -H $(ERRCODES_H) -o $(ERRCODES_RC) $(KERNEL32_MC) + $(ECHO_WMC) + $(Q)$(WMC_TARGET) -i -H $(ERRCODES_H) -o $(ERRCODES_RC) $(KERNEL32_MC) .PHONY: makefile_auto_clean makefile_auto_clean: _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-14 18:51:29 UTC (rev 14066) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-14 19:11:03 UTC (rev 14067) @@ -336,7 +336,7 @@ if ( IncludeDirectoryTarget ( *i ) ) { fprintf ( fMakefile, - "%s:\n", + "%s: $(RMKDIR_TARGET)\n", i->c_str () ); fprintf ( fMakefile, "\t${mkdir} %s\n\n", _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-14 18:51:29 UTC (rev 14066) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-14 19:11:03 UTC (rev 14067) @@ -725,9 +725,8 @@ string objectFilename = PassThruCacheDirectory ( GetObjectFilename ( module, sourceFilename ) ); fprintf ( fMakefile, - "%s: %s %s\n", + "%s: %s\n", objectFilename.c_str (), - objectFilename.c_str (), deps.c_str () ); fprintf ( fMakefile, "\t$(ECHO_CC)\n" ); fprintf ( fMakefile, @@ -835,7 +834,7 @@ CLEAN_FILE ( stub_file ); fprintf ( fMakefile, - "%s: %s\n", + "%s: %s $(WINEBUILD_TARGET)\n", def_file.c_str (), sourceFilename.c_str () ); fprintf ( fMakefile, "\t$(ECHO_WINEBLD)\n" ); @@ -1848,7 +1847,7 @@ { fprintf ( fMakefile, ".PHONY: %s_extractresources\n\n", module.name.c_str () ); - fprintf ( fMakefile, "%s_extractresources: bin2res\n", + fprintf ( fMakefile, "%s_extractresources: $(BIN2RES_TARGET)\n", module.name.c_str () ); const vector<File*>& files = module.non_if_data.files; for ( size_t i = 0; i < files.size (); i++ ) _____ Modified: branches/xmlbuildsystem/reactos/tools/tools.mak --- branches/xmlbuildsystem/reactos/tools/tools.mak 2005-03-14 18:51:29 UTC (rev 14066) +++ branches/xmlbuildsystem/reactos/tools/tools.mak 2005-03-14 19:11:03 UTC (rev 14067) @@ -13,6 +13,9 @@ RMKDIR_HOST_LFLAGS = -g +.PHONY: rmkdir +rmkdir: $(RMKDIR_TARGET) + $(RMKDIR_TARGET): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_OBJECTS) $(ECHO_LD) ${host_gcc} $(RMKDIR_OBJECTS) $(RMKDIR_HOST_LFLAGS) -o $(RMKDIR_TARGET) @@ -42,6 +45,9 @@ RSYM_HOST_LFLAGS = -g +.PHONY: rsym +rsym: $(RSYM_TARGET) + $(RSYM_TARGET): $(RSYM_OBJECTS) $(ECHO_LD) ${host_gcc} $(RSYM_OBJECTS) $(RSYM_HOST_LFLAGS) -o $(RSYM_TARGET) _____ Modified: branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak --- branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak 2005-03-14 18:51:29 UTC (rev 14066) +++ branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak 2005-03-14 19:11:03 UTC (rev 14067) @@ -25,6 +25,9 @@ WMC_HOST_LFLAGS = -g +.PHONY: wmc +wmc: $(WMC_TARGET) + $(WMC_TARGET): $(WMC_BASE_DIR) $(WMC_OBJECTS) $(ECHO_LD) ${host_gcc} $(WMC_OBJECTS) $(WMC_HOST_LFLAGS) -o $(WMC_TARGET)

1 0

[chorns] 14066: * Build bin2res and cabman in bootstrap makefiles
by chorns＠svn.reactos.com 14 Mar '05

14 Mar '05

* Build bin2res and cabman in bootstrap makefiles * Remove make directory hack as it wasn't needed anyway Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/ReactOS.xml Added: branches/xmlbuildsystem/reactos/lib/zlib/zlib.mak Modified: branches/xmlbuildsystem/reactos/lib/zlib/zlib.xml Deleted: branches/xmlbuildsystem/reactos/tools/bin2res/Makefile Added: branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.mak Deleted: branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.xml Modified: branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak Added: branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak Deleted: branches/xmlbuildsystem/reactos/tools/cabman/cabman.xml Deleted: branches/xmlbuildsystem/reactos/tools/cabman/makefile Modified: branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak Modified: branches/xmlbuildsystem/reactos/tools/nci/nci.mak Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rmkdir.c Modified: branches/xmlbuildsystem/reactos/tools/tools.mak Deleted: branches/xmlbuildsystem/reactos/tools/tools.xml Modified: branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak Modified: branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.mak Modified: branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak Modified: branches/xmlbuildsystem/reactos/tools/wpp/wpp.mak Modified: branches/xmlbuildsystem/reactos/tools/wrc/wrc.mak _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/Makefile 2005-03-14 18:51:29 UTC (rev 14066) @@ -133,11 +133,9 @@ endif mkdir = $(Q)$(INTERMEDIATE)rmkdir -CREATED = .created -directories: - -${nmkdir} $(INTERMEDIATE_NO_SLASH) - -${nmkdir} $(OUTPUT_NO_SLASH) +$(INTERMEDIATE_NO_SLASH): + ${nmkdir} $(INTERMEDIATE_NO_SLASH) NTOSKRNL_MC = .$(SEP)ntoskrnl$(SEP)ntoskrnl.mc KERNEL32_MC = .$(SEP)lib$(SEP)kernel32$(SEP)kernel32.mc @@ -158,7 +156,7 @@ $(ERRCODES_RC) \ $(NCI_SERVICE_FILES) -makefile.auto: $(RMKDIR_TARGET) $(WINEBUILD_TARGET) $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) +makefile.auto: $(RMKDIR_TARGET) $(BIN2RES_TARGET) $(WINEBUILD_TARGET) $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) $(ECHO_RBUILD) $(Q)tools$(SEP)rbuild$(SEP)rbuild$(EXEPOSTFIX) mingw _____ Modified: branches/xmlbuildsystem/reactos/ReactOS.xml --- branches/xmlbuildsystem/reactos/ReactOS.xml 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/ReactOS.xml 2005-03-14 18:51:29 UTC (rev 14066) @@ -35,9 +35,6 @@ <directory name="drivers"> <xi:include href="drivers/directory.xml" /> </directory> - <directory name="tools"> - <xi:include href="tools/tools.xml" /> - </directory> <directory name="hal"> <xi:include href="hal/directory.xml" /> </directory> _____ Copied: branches/xmlbuildsystem/reactos/lib/zlib/zlib.mak (from rev 14030, branches/xmlbuildsystem/reactos/lib/zlib/Makefile.host) --- branches/xmlbuildsystem/reactos/lib/zlib/Makefile.host 2005-03-13 21:02:04 UTC (rev 14030) +++ branches/xmlbuildsystem/reactos/lib/zlib/zlib.mak 2005-03-14 18:51:29 UTC (rev 14066) @@ -0,0 +1,46 @@ +ZLIB_BASE = lib$(SEP)zlib + +ZLIB_BASE_DIR = $(INTERMEDIATE)$(ZLIB_BASE) + +#$(ZLIB_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET) +# ${mkdir} $(INTERMEDIATE)$(ZLIB_BASE) + +ZLIB_HOST_TARGET = \ + $(INTERMEDIATE)$(ZLIB_BASE)$(SEP)zlib.host.a + +ZLIB_HOST_SOURCES = \ + $(ZLIB_BASE)$(SEP)cdmake.c \ + $(ZLIB_BASE)$(SEP)llmosrt.c \ + $(ZLIB_BASE)$(SEP)adler32.c \ + $(ZLIB_BASE)$(SEP)compress.c \ + $(ZLIB_BASE)$(SEP)crc32.c \ + $(ZLIB_BASE)$(SEP)gzio.c \ + $(ZLIB_BASE)$(SEP)uncompr.c \ + $(ZLIB_BASE)$(SEP)deflate.c \ + $(ZLIB_BASE)$(SEP)trees.c \ + $(ZLIB_BASE)$(SEP)zutil.c \ + $(ZLIB_BASE)$(SEP)inflate.c \ + $(ZLIB_BASE)$(SEP)infblock.c \ + $(ZLIB_BASE)$(SEP)inftrees.c \ + $(ZLIB_BASE)$(SEP)infcodes.c \ + $(ZLIB_BASE)$(SEP)infutil.c \ + $(ZLIB_BASE)$(SEP)inffast.c + +ZLIB_HOST_OBJECTS = \ + $(ZLIB_HOST_SOURCES:.c=.o) + +ZLIB_HOST_CFLAGS = -MMD -O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ + -Wstrict-prototypes -Wmissing-prototypes + +$(ZLIB_HOST_TARGET): $(ZLIB_HOST_BASE_DIR) $(ZLIB_HOST_OBJECTS) + $(ECHO_AR) + $(host_ar) -r $(ZLIB_HOST_TARGET) $(ZLIB_HOST_OBJECTS) + +$(ZLIB_HOST_OBJECTS): %.o : %.c $(ZLIB_BASE_DIR) + $(ECHO_CC) + ${host_gcc} $(ZLIB_HOST_CFLAGS) -c $< -o $@ + +.PHONY: zlib_host_clean +zlib_host_clean: + -@$(rm) $(ZLIB_HOST_TARGET) $(ZLIB_HOST_OBJECTS) 2>$(NUL) +clean: zlib_clean _____ Modified: branches/xmlbuildsystem/reactos/lib/zlib/zlib.xml --- branches/xmlbuildsystem/reactos/lib/zlib/zlib.xml 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/lib/zlib/zlib.xml 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,7 +1,3 @@ <module name="zlib" type="staticlibrary"> <xi:include href="zlib_common.xml" /> </module> - -<module name="hostzlib" type="staticlibrary" host="true" prefix="host_"> - <xi:include href="zlib_common.xml" /> -</module> _____ Deleted: branches/xmlbuildsystem/reactos/tools/bin2res/Makefile --- branches/xmlbuildsystem/reactos/tools/bin2res/Makefile 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/bin2res/Makefile 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,33 +0,0 @@ -PATH_TO_TOP = ../.. - -TARGET = bin2res$(EXE_POSTFIX) - -all: $(TARGET) - -OBJECTS = bin2res.o mkstemps.o - -CLEAN_FILES = *.o bin2res$(EXE_POSTFIX) - -HOST_CFLAGS = -I$(PATH_TO_TOP)/include/wine -D__REACTOS__ -Wall -Werror - -bin2res.o: bin2res.c - $(HOST_CC) -g $(HOST_CFLAGS) -c bin2res.c -o bin2res.o - -mkstemps.o: mkstemps.c - $(HOST_CC) -g $(HOST_CFLAGS) -c mkstemps.c -o mkstemps.o - -bin2res$(EXE_POSTFIX): $(OBJECTS) - $(HOST_CC) -g $(OBJECTS) -o $(TARGET) - -ifeq ($(HOST),mingw32-linux) -clean: - rm -f *.o $(TARGET) -endif -ifneq ($(HOST),mingw32-linux) -clean: - del *.o $(TARGET) -endif - -.PHONY: clean - -include $(PATH_TO_TOP)/rules.mak _____ Copied: branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.mak (from rev 14030, branches/xmlbuildsystem/reactos/tools/bin2res/Makefile) --- branches/xmlbuildsystem/reactos/tools/bin2res/Makefile 2005-03-13 21:02:04 UTC (rev 14030) +++ branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.mak 2005-03-14 18:51:29 UTC (rev 14066) @@ -0,0 +1,33 @@ +BIN2RES_BASE = tools$(SEP)bin2res + +BIN2RES_BASE_DIR = $(INTERMEDIATE)$(BIN2RES_BASE) + +$(BIN2RES_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET) + ${mkdir} $(INTERMEDIATE)$(BIN2RES_BASE) + +BIN2RES_TARGET = \ + $(INTERMEDIATE)$(BIN2RES_BASE)$(SEP)bin2res$(EXEPOSTFIX) + +BIN2RES_SOURCES = \ + $(BIN2RES_BASE)$(SEP)bin2res.c \ + $(BIN2RES_BASE)$(SEP)mkstemps.c + +BIN2RES_OBJECTS = \ + $(BIN2RES_SOURCES:.c=.o) + +BIN2RES_HOST_CFLAGS = -Iinclude/wine -D__REACTOS__ -g -Werror -Wall + +BIN2RES_HOST_LFLAGS = -g + +$(BIN2RES_TARGET): $(BIN2RES_BASE_DIR) $(BIN2RES_OBJECTS) + $(ECHO_LD) + ${host_gcc} $(BIN2RES_OBJECTS) $(BIN2RES_HOST_LFLAGS) -o $(BIN2RES_TARGET) + +$(BIN2RES_OBJECTS): %.o : %.c $(BIN2RES_BASE_DIR) + $(ECHO_CC) + ${host_gcc} $(BIN2RES_HOST_CFLAGS) -c $< -o $@ + +.PHONY: bin2res_clean +bin2res_clean: + -@$(rm) $(BIN2RES_TARGET) $(BIN2RES_OBJECTS) 2>$(NUL) +clean: bin2res_clean _____ Deleted: branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.xml --- branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.xml 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/bin2res/bin2res.xml 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,6 +0,0 @@ -<module name="bin2res" type="buildtool"> - <include base="ReactOS">include/wine</include> - <define name="__REACTOS__" /> - <file>bin2res.c</file> - <file>mkstemps.c</file> -</module> _____ Modified: branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak --- branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/buildno/buildno.mak 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,6 +1,6 @@ BUILDNO_BASE = tools$(SEP)buildno -BUILDNO_BASE_DIR = $(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)$(CREATED) +BUILDNO_BASE_DIR = $(INTERMEDIATE)$(BUILDNO_BASE) $(BUILDNO_BASE_DIR): $(RMKDIR_TARGET) ${mkdir} $(INTERMEDIATE)$(BUILDNO_BASE) @@ -23,7 +23,7 @@ $(BUILDNO_TARGET): $(BUILDNO_BASE_DIR) $(BUILDNO_OBJECTS) $(ECHO_LD) - ${host_gpp} $(BUILDNO_OBJECTS) $(BUILDNO_HOST_CFLAGS) -o $(BUILDNO_TARGET) + ${host_gpp} $(BUILDNO_OBJECTS) $(BUILDNO_HOST_LFLAGS) -o $(BUILDNO_TARGET) $(INTERMEDIATE)$(BUILDNO_BASE)$(SEP)buildno.o: $(BUILDNO_BASE_DIR) $(BUILDNO_BASE)$(SEP)buildno.cpp $(ECHO_CC) _____ Copied: branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak (from rev 14030, branches/xmlbuildsystem/reactos/tools/cabman/makefile) --- branches/xmlbuildsystem/reactos/tools/cabman/makefile 2005-03-13 21:02:04 UTC (rev 14030) +++ branches/xmlbuildsystem/reactos/tools/cabman/cabman.mak 2005-03-14 18:51:29 UTC (rev 14066) @@ -0,0 +1,51 @@ +CABMAN_BASE = tools$(SEP)cabman + +CABMAN_BASE_DIR = $(INTERMEDIATE)$(CABMAN_BASE) + +$(CABMAN_BASE_DIR): $(RMKDIR_TARGET) + ${mkdir} $(INTERMEDIATE)$(CABMAN_BASE) + +CABMAN_TARGET = \ + $(INTERMEDIATE)$(CABMAN_BASE)$(SEP)cabman$(EXEPOSTFIX) + +CABMAN_SOURCES = \ + $(CABMAN_BASE)$(SEP)cabinet.cxx \ + $(CABMAN_BASE)$(SEP)dfp.cxx \ + $(CABMAN_BASE)$(SEP)main.cxx \ + $(CABMAN_BASE)$(SEP)mszip.cxx \ + $(CABMAN_BASE)$(SEP)raw.cxx + +CABMAN_OBJECTS = \ + $(addprefix $(INTERMEDIATE), $(CABMAN_SOURCES:.cxx=.o)) + +CABMAN_HOST_CFLAGS = -Iinclude/reactos -g -Werror -Wall + +CABMAN_HOST_LFLAGS = -g $(ZLIB_HOST_TARGET) + +$(CABMAN_TARGET): $(CABMAN_BASE_DIR) $(CABMAN_OBJECTS) + $(ECHO_LD) + ${host_gpp} $(CABMAN_OBJECTS) $(CABMAN_HOST_LFLAGS) -o $(CABMAN_TARGET) + +$(INTERMEDIATE)$(CABMAN_BASE)$(SEP)cabinet.o: $(CABMAN_BASE_DIR) $(CABMAN_BASE)$(SEP)cabinet.cxx + $(ECHO_CC) + ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $(CABMAN_BASE)$(SEP)cabinet.cxx -o $(INTERMEDIATE)$(CABMAN_BASE)$(SEP)cabinet.o + +$(INTERMEDIATE)$(CABMAN_BASE)$(SEP)dfp.o: $(CABMAN_BASE_DIR) $(CABMAN_BASE)$(SEP)dfp.cxx + $(ECHO_CC) + ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $(CABMAN_BASE)$(SEP)dfp.cxx -o $(INTERMEDIATE)$(CABMAN_BASE)$(SEP)dfp.o + +$(INTERMEDIATE)$(CABMAN_BASE)$(SEP)main.o: $(CABMAN_BASE_DIR) $(CABMAN_BASE)$(SEP)main.cxx + $(ECHO_CC) + ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $(CABMAN_BASE)$(SEP)main.cxx -o $(INTERMEDIATE)$(CABMAN_BASE)$(SEP)main.o + +$(INTERMEDIATE)$(CABMAN_BASE)$(SEP)mszip.o: $(CABMAN_BASE_DIR) $(CABMAN_BASE)$(SEP)mszip.cxx + $(ECHO_CC) + ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $(CABMAN_BASE)$(SEP)mszip.cxx -o $(INTERMEDIATE)$(CABMAN_BASE)$(SEP)mszip.o + +$(INTERMEDIATE)$(CABMAN_BASE)$(SEP)raw.o: $(CABMAN_BASE_DIR) $(CABMAN_BASE)$(SEP)raw.cxx + $(ECHO_CC) + ${host_gpp} $(CABMAN_HOST_CFLAGS) -c $(CABMAN_BASE)$(SEP)raw.cxx -o $(INTERMEDIATE)$(CABMAN_BASE)$(SEP)raw.o + +.PHONY: cabman_clean +cabman_clean: + -@$(rm) $(CABMAN_TARGET) $(CABMAN_OBJECTS) 2>$(NUL) _____ Deleted: branches/xmlbuildsystem/reactos/tools/cabman/cabman.xml --- branches/xmlbuildsystem/reactos/tools/cabman/cabman.xml 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/cabman/cabman.xml 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,10 +0,0 @@ -<module name="cabman" type="buildtool"> - <include base="cabman">.</include> - <include base="hostzlib">.</include> - <library>hostzlib</library> - <file>cabinet.cxx</file> - <file>dfp.cxx</file> - <file>main.cxx</file> - <file>mszip.cxx</file> - <file>raw.cxx</file> -</module> \ No newline at end of file _____ Deleted: branches/xmlbuildsystem/reactos/tools/cabman/makefile --- branches/xmlbuildsystem/reactos/tools/cabman/makefile 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/cabman/makefile 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,3 +0,0 @@ -TOP = ../.. -DEFAULT = cabman -include $(TOP)/proxy.mak \ No newline at end of file _____ Modified: branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak --- branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/cdmake/cdmake.mak 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,8 +1,8 @@ CDMAKE_BASE = tools$(SEP)cdmake -CDMAKE_BASE_DIR = $(INTERMEDIATE)$(CDMAKE_BASE)$(SEP)$(CREATED) +CDMAKE_BASE_DIR = $(INTERMEDIATE)$(CDMAKE_BASE) -$(CDMAKE_BASE_DIR): $(RMKDIR_TARGET) +$(CDMAKE_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET) ${mkdir} $(INTERMEDIATE)$(CDMAKE_BASE) CDMAKE_TARGET = \ @@ -21,11 +21,11 @@ $(CDMAKE_TARGET): $(CDMAKE_BASE_DIR) $(CDMAKE_OBJECTS) $(ECHO_LD) - ${host_gcc} $(CDMAKE_OBJECTS) $(CDMAKE_HOST_CFLAGS) -o $(CDMAKE_TARGET) + ${host_gcc} $(CDMAKE_OBJECTS) $(CDMAKE_HOST_LFLAGS) -o $(CDMAKE_TARGET) $(CDMAKE_OBJECTS): %.o : %.c $(CDMAKE_BASE_DIR) $(ECHO_CC) - ${host_gcc} $(CDMAKE_CFLAGS) -c $< -o $@ + ${host_gcc} $(CDMAKE_HOST_CFLAGS) -c $< -o $@ .PHONY: cdmake_clean cdmake_clean: _____ Modified: branches/xmlbuildsystem/reactos/tools/nci/nci.mak --- branches/xmlbuildsystem/reactos/tools/nci/nci.mak 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/nci/nci.mak 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,8 +1,8 @@ NCI_BASE = tools$(SEP)nci -CDMAKE_BASE_DIR = $(INTERMEDIATE)$(NCI_BASE)$(SEP)$(CREATED) +CDMAKE_BASE_DIR = $(INTERMEDIATE)$(NCI_BASE) -$(CDMAKE_BASE_DIR): $(RMKDIR_TARGET) +$(CDMAKE_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET) ${mkdir} $(INTERMEDIATE)$(NCI_BASE) NCI_TARGET = \ _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-14 18:51:29 UTC (rev 14066) @@ -32,13 +32,7 @@ directories.insert ( directory ); } -const string -MingwBackend::GetDirectoryDependency ( const string& directory ) -{ - return directory + SSEP "$(CREATED)"; -} - void MingwBackend::Process () { @@ -343,7 +337,7 @@ { fprintf ( fMakefile, "%s:\n", - GetDirectoryDependency ( *i ).c_str () ); + i->c_str () ); fprintf ( fMakefile, "\t${mkdir} %s\n\n", i->c_str () ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-03-14 18:51:29 UTC (rev 14066) @@ -11,7 +11,6 @@ virtual ~MingwBackend () { }; virtual void Process (); void CreateDirectoryTargetIfNotYetCreated ( const std::string& directory ); - const std::string GetDirectoryDependency ( const std::string& directory ); private: void ProcessModule ( Module& module ); void CreateMakefile (); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-03-14 18:51:29 UTC (rev 14066) @@ -90,12 +90,6 @@ return file; } -const string -MingwModuleHandler::GetDirectoryDependency ( const string& file ) -{ - return backend->GetDirectoryDependency ( GetDirectory ( file ) ); -} - void MingwModuleHandler::SetMakefile ( FILE* f ) { @@ -733,7 +727,7 @@ fprintf ( fMakefile, "%s: %s %s\n", objectFilename.c_str (), - GetDirectoryDependency ( objectFilename ).c_str (), + objectFilename.c_str (), deps.c_str () ); fprintf ( fMakefile, "\t$(ECHO_CC)\n" ); fprintf ( fMakefile, @@ -755,7 +749,7 @@ fprintf ( fMakefile, "%s: %s %s\n", objectFilename.c_str (), - GetDirectoryDependency ( objectFilename ).c_str (), + objectFilename.c_str (), sourceFilename.c_str () ); fprintf ( fMakefile, "\t$(ECHO_GAS)\n" ); fprintf ( fMakefile, @@ -776,7 +770,7 @@ fprintf ( fMakefile, "%s: %s %s\n", objectFilename.c_str (), - GetDirectoryDependency ( objectFilename ).c_str (), + objectFilename.c_str (), sourceFilename.c_str () ); fprintf ( fMakefile, "\t$(ECHO_NASM)\n" ); fprintf ( fMakefile, @@ -801,7 +795,7 @@ fprintf ( fMakefile, "%s: %s %s $(WRC_TARGET)\n", objectFilename.c_str (), - GetDirectoryDependency ( objectFilename ).c_str (), + objectFilename.c_str (), sourceFilename.c_str () ); fprintf ( fMakefile, "\t$(ECHO_WRC)\n" ); fprintf ( fMakefile, @@ -1375,7 +1369,7 @@ string definitionDependencies = GetDefinitionDependencies ( module ); fprintf ( fMakefile, "%s: %s %s\n", library_target.c_str (), - GetDirectoryDependency ( library_target ).c_str (), + library_target.c_str (), definitionDependencies.c_str () ); fprintf ( fMakefile, "\t$(ECHO_DLLTOOL)\n" ); @@ -2191,7 +2185,7 @@ string targetDirecctory = bootcdDirectory + SSEP + m.bootstrap->base; if ( directories.size () > 0 ) directories += " "; - directories += GetDirectoryDependency ( PassThruCacheDirectory ( FixupTargetFilename ( targetDirecctory ) ) ); + directories += PassThruCacheDirectory ( FixupTargetFilename ( targetDirecctory ) ); } } return directories; @@ -2208,7 +2202,7 @@ string targetDirecctory = bootcdDirectory + SSEP + cdfile.base; if ( directories.size () > 0 ) directories += " "; - directories += GetDirectoryDependency ( PassThruCacheDirectory ( FixupTargetFilename ( targetDirecctory ) ) ); + directories += PassThruCacheDirectory ( FixupTargetFilename ( targetDirecctory ) ); } return directories; } @@ -2280,7 +2274,7 @@ "%s: all %s %s %s %s ${CABMAN_TARGET} ${CDMAKE_TARGET}\n", module.name.c_str (), isoboot.c_str (), - GetDirectoryDependency ( PassThruCacheDirectory ( bootcdReactos ) ).c_str (), + PassThruCacheDirectory ( bootcdReactos ).c_str (), cdDirectories.c_str (), cdFiles.c_str () ); fprintf ( fMakefile, "\t$(ECHO_CABMAN)\n" ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rmkdir.c --- branches/xmlbuildsystem/reactos/tools/rmkdir.c 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/rmkdir.c 2005-03-14 18:51:29 UTC (rev 14066) @@ -2,7 +2,6 @@ #include <string.h> #include <stdlib.h> #include <ctype.h> -#include <fcntl.h> #ifdef _MSC_VER #include <direct.h> #else @@ -10,12 +9,6 @@ #include <sys/stat.h> #include <sys/types.h> #endif -#ifdef WIN32 -#include <sys/utime.h> -#include <time.h> -#else -#include <sys/time.h> -#endif #if defined(WIN32) #define DIR_SEPARATOR_CHAR '\\' @@ -31,7 +24,6 @@ { char* newpath; int i; - int length; //newpath = strdup(origpath); newpath=malloc(strlen(origpath)+1); @@ -55,13 +47,6 @@ #endif i++; } - - length = strlen(newpath); - if (length > 0) - { - if (newpath[length - 1] == DIR_SEPARATOR_CHAR) - newpath[length - 1] = 0; - } return(newpath); } @@ -95,43 +80,6 @@ return(0); } -int -write_created_file() -{ - char filename[256]; - int id; -#ifdef WIN32 - time_t now; - struct utimbuf fnow; -#endif - - strcpy(filename, ".created"); - - id = open(filename, S_IWRITE, S_IRUSR | S_IWUSR); - if (id < 0) - { - id = open(filename, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR); - if (id < 0) - { - fprintf(stderr, "Cannot create file %s.\n", filename); - return(1); - } - } - - close(id); - -#ifdef WIN32 - now = time(NULL); - fnow.actime = now; - fnow.modtime = now; - (int) utime(filename, &fnow); -#else - (int) utimes(filename, NULL); -#endif - - return 0; -} - int main(int argc, char* argv[]) { char* path1; @@ -165,10 +113,9 @@ while (csec != NULL) { - if (mkdir_p(csec) > 0) - exit(1); + mkdir_p(csec); csec = strtok(NULL, DIR_SEPARATOR_STRING); } - - exit(write_created_file()); + + exit(0); } _____ Modified: branches/xmlbuildsystem/reactos/tools/tools.mak --- branches/xmlbuildsystem/reactos/tools/tools.mak 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/tools.mak 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,7 +1,3 @@ -# We have to put rmkdir in $(INTERMEDIATE) and not $(INTERMEDIATE)tools -# since GNU make will always remake directory targets and we can't do the -# .created file trick for rmkdir due to circular dependencies - RMKDIR_BASE = tools RMKDIR_TARGET = \ @@ -17,11 +13,11 @@ RMKDIR_HOST_LFLAGS = -g -$(RMKDIR_TARGET): $(RMKDIR_OBJECTS) +$(RMKDIR_TARGET): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_OBJECTS) $(ECHO_LD) ${host_gcc} $(RMKDIR_OBJECTS) $(RMKDIR_HOST_LFLAGS) -o $(RMKDIR_TARGET) -$(INTERMEDIATE)rmkdir.o: $(RMKDIR_BASE)$(SEP)rmkdir.c +$(INTERMEDIATE)rmkdir.o: $(INTERMEDIATE_NO_SLASH) $(RMKDIR_BASE)$(SEP)rmkdir.c $(ECHO_CC) ${host_gcc} $(RMKDIR_HOST_CFLAGS) -c $(RMKDIR_BASE)$(SEP)rmkdir.c -o $(INTERMEDIATE)rmkdir.o @@ -59,7 +55,9 @@ -@$(rm) $(RSYM_TARGET) $(RSYM_OBJECTS) 2>$(NUL) clean: rsym_clean +include tools/bin2res/bin2res.mak include tools/buildno/buildno.mak +include tools/cabman/cabman.mak include tools/cdmake/cdmake.mak include tools/nci/nci.mak include tools/rbuild/rbuild.mak @@ -68,3 +66,4 @@ include tools/wmc/wmc.mak include tools/wpp/wpp.mak include tools/wrc/wrc.mak +include lib/zlib/zlib.mak _____ Deleted: branches/xmlbuildsystem/reactos/tools/tools.xml --- branches/xmlbuildsystem/reactos/tools/tools.xml 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/tools.xml 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,6 +0,0 @@ -<directory name="bin2res"> - <xi:include href="bin2res/bin2res.xml" /> -</directory> -<directory name="cabman"> - <xi:include href="cabman/cabman.xml" /> -</directory> _____ Modified: branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak --- branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/unicode/unicode.mak 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,8 +1,8 @@ UNICODE_BASE = tools$(SEP)unicode -UNICODE_BASE_DIR = $(INTERMEDIATE)$(UNICODE_BASE)$(SEP)$(CREATED) +UNICODE_BASE_DIR = $(INTERMEDIATE)$(UNICODE_BASE) -$(UNICODE_BASE_DIR): $(RMKDIR_TARGET) +$(UNICODE_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET) ${mkdir} $(INTERMEDIATE)$(UNICODE_BASE) UNICODE_TARGET = \ _____ Modified: branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.mak --- branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.mak 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/winebuild/winebuild.mak 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,8 +1,8 @@ WINEBUILD_BASE = tools$(SEP)winebuild -WINEBUILD_BASE_DIR = $(INTERMEDIATE)$(WINEBUILD_BASE)$(SEP)$(CREATED) +WINEBUILD_BASE_DIR = $(INTERMEDIATE)$(WINEBUILD_BASE) -$(WINEBUILD_BASE_DIR): $(RMKDIR_TARGET) +$(WINEBUILD_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET) ${mkdir} $(INTERMEDIATE)$(WINEBUILD_BASE) WINEBUILD_TARGET = \ _____ Modified: branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak --- branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/wmc/wmc.mak 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,8 +1,8 @@ WMC_BASE = tools$(SEP)wmc -WMC_BASE_DIR = $(INTERMEDIATE)$(WMC_BASE)$(SEP)$(CREATED) +WMC_BASE_DIR = $(INTERMEDIATE)$(WMC_BASE) -$(WMC_BASE_DIR): $(RMKDIR_TARGET) +$(WMC_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET) ${mkdir} $(INTERMEDIATE)$(WMC_BASE) WMC_TARGET = \ _____ Modified: branches/xmlbuildsystem/reactos/tools/wpp/wpp.mak --- branches/xmlbuildsystem/reactos/tools/wpp/wpp.mak 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/wpp/wpp.mak 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,6 +1,6 @@ WPP_BASE = tools$(SEP)wpp -$(INTERMEDIATE)$(WPP_BASE): $(RMKDIR_TARGET) +$(INTERMEDIATE)$(WPP_BASE): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET) ${mkdir} $(INTERMEDIATE)$(WPP_BASE) WPP_TARGET = \ _____ Modified: branches/xmlbuildsystem/reactos/tools/wrc/wrc.mak --- branches/xmlbuildsystem/reactos/tools/wrc/wrc.mak 2005-03-14 16:10:21 UTC (rev 14065) +++ branches/xmlbuildsystem/reactos/tools/wrc/wrc.mak 2005-03-14 18:51:29 UTC (rev 14066) @@ -1,11 +1,11 @@ WRC_BASE = tools$(SEP)wrc -WRC_BASE_DIR = $(INTERMEDIATE)$(WRC_BASE)$(SEP)$(CREATED) +WRC_BASE_DIR = $(INTERMEDIATE)$(WRC_BASE) -$(WRC_BASE_DIR): $(RMKDIR_TARGET) +$(WRC_BASE_DIR): $(INTERMEDIATE_NO_SLASH) $(RMKDIR_TARGET) ${mkdir} $(INTERMEDIATE)$(WRC_BASE) -WRC_BASE_PORT_DIR = $(INTERMEDIATE)$(WRC_BASE)$(SEP)port$(SEP)$(CREATED) +WRC_BASE_PORT_DIR = $(INTERMEDIATE)$(WRC_BASE)$(SEP)port $(WRC_BASE_PORT_DIR): $(RMKDIR_TARGET) $(WRC_BASE_DIR) ${mkdir} $(INTERMEDIATE)$(WRC_BASE)$(SEP)port

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2005