Ros-diffs May 2009

ros-diffs@reactos.org

27 participants
504 discussions

[janderwald] 40886: - Use ExInterlockedList * functions for speed and stability - Increment reference count on the correct miniport adapter from IPortDMus
by janderwald＠svn.reactos.org 11 May '09

11 May '09

Author: janderwald Date: Mon May 11 21:22:27 2009 New Revision: 40886 URL: http://svn.reactos.org/svn/reactos?rev=40886&view=rev Log: - Use ExInterlockedList * functions for speed and stability - Increment reference count on the correct miniport adapter from IPortDMus Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] Mon May 11 21:22:27 2009 @@ -231,6 +231,7 @@ IN PVOID Tag); STDMETHOD_(BOOL, HasLastMappingFailed)(THIS); + STDMETHOD_(VOID, PrintQueueStatus)(THIS); }; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] Mon May 11 21:22:27 2009 @@ -11,12 +11,13 @@ typedef struct _IRP_MAPPING_ { LIST_ENTRY Entry; - KSSTREAM_HEADER *Header; + PVOID Buffer; + ULONG BufferSize; + ULONG OriginalBufferSize; + PVOID OriginalBuffer; PIRP Irp; - ULONG References; - ULONG NumTags; - PVOID * Tag; + PVOID Tag; }IRP_MAPPING, *PIRP_MAPPING; typedef struct @@ -34,6 +35,7 @@ KSPIN_LOCK Lock; LIST_ENTRY ListHead; + LIST_ENTRY FreeHead; ULONG OutOfMapping; ULONG MaxFrameSize; @@ -49,18 +51,15 @@ if (CurMapping->Irp) { - CurMapping->Irp->IoStatus.Information = CurMapping->Header->FrameExtent; + CurMapping->Irp->IoStatus.Information = CurMapping->OriginalBufferSize; CurMapping->Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(CurMapping->Irp, IO_SOUND_INCREMENT); } - if (CurMapping->Tag) - { - FreeItem(CurMapping->Tag, TAG_PORTCLASS); - } - - ExFreePool(CurMapping->Header->Data); - ExFreePool(CurMapping->Header); + if (CurMapping->OriginalBuffer) + { + ExFreePool(CurMapping->OriginalBuffer); + } ExFreePool(CurMapping); } @@ -128,6 +127,7 @@ This->MaxFrameSize = FrameSize; InitializeListHead(&This->ListHead); + InitializeListHead(&This->FreeHead); KeInitializeSpinLock(&This->Lock); return STATUS_SUCCESS; @@ -141,58 +141,76 @@ IN ULONG BufferSize, IN PIRP Irp) { - PIRP_MAPPING Mapping; - IIrpQueueImpl * This = (IIrpQueueImpl*)iface; - - Mapping = AllocateItem(NonPagedPool, sizeof(IRP_MAPPING), TAG_PORTCLASS); - if (!Mapping) - return STATUS_UNSUCCESSFUL; - - Mapping->Header = (KSSTREAM_HEADER*)Buffer; - Mapping->Irp = Irp; + PIRP_MAPPING Mapping = NULL; + KSSTREAM_HEADER * Header = (KSSTREAM_HEADER*)Buffer; + ULONG Index, NumMappings, Offset; + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + if (This->MaxFrameSize) { - if (This->MaxFrameSize > Mapping->Header->DataUsed) + if (This->MaxFrameSize > Header->DataUsed) { /* small mapping */ - Mapping->NumTags = 1; + NumMappings = 1; } else { - ULONG Rest = Mapping->Header->DataUsed % This->MaxFrameSize; - - Mapping->NumTags = Mapping->Header->DataUsed / This->MaxFrameSize; + ULONG Rest = Header->DataUsed % This->MaxFrameSize; + + NumMappings = Header->DataUsed / This->MaxFrameSize; if (Rest) { - Mapping->NumTags++; + NumMappings++; } } } else { /* no framesize restriction */ - Mapping->NumTags = 1; - } - - Mapping->Tag = AllocateItem(NonPagedPool, sizeof(PVOID) * Mapping->NumTags, TAG_PORTCLASS); - if (!Mapping->Tag) - { - FreeItem(Mapping, TAG_PORTCLASS); - return STATUS_UNSUCCESSFUL; - } - ASSERT(Mapping->NumTags < 32); - Mapping->References = (1 << Mapping->NumTags) - 1; - - This->NumDataAvailable += Mapping->Header->DataUsed; - - DPRINT("IIrpQueue_fnAddMapping NumMappings %u SizeOfMapping %lu NumDataAvailable %lu Mapping %p NumTags %u References %x FrameSize %u\n", This->NumMappings, Mapping->Header->DataUsed, This->NumDataAvailable, Mapping, Mapping->NumTags, Mapping->References, This->MaxFrameSize); - - KeAcquireSpinLockAtDpcLevel(&This->Lock); - InsertTailList(&This->ListHead, &Mapping->Entry); - KeReleaseSpinLockFromDpcLevel(&This->Lock); - - (void)InterlockedIncrement((volatile long*)&This->NumMappings); + NumMappings = 1; + } + + for(Index = 0; Index < NumMappings; Index++) + { + Mapping = AllocateItem(NonPagedPool, sizeof(IRP_MAPPING), TAG_PORTCLASS); + if (!Mapping) + { + DPRINT("OutOfMemory\n"); + return STATUS_UNSUCCESSFUL; + } + + if (Index) + Offset = Index * This->MaxFrameSize; + else + Offset = 0; + + Mapping->Buffer = (PVOID)UlongToPtr(PtrToUlong(Header->Data) + Offset); + + if (This->MaxFrameSize) + Mapping->BufferSize = min(Header->DataUsed - Offset, This->MaxFrameSize); + else + Mapping->BufferSize = Header->DataUsed; + + Mapping->OriginalBufferSize = Header->FrameExtent; + Mapping->OriginalBuffer = NULL; + Mapping->Irp = NULL; + Mapping->Tag = NULL; + + This->NumDataAvailable += Mapping->BufferSize; + + if (Index == NumMappings - 1) + { + /* last mapping should free the irp if provided */ + Mapping->OriginalBuffer = Header->Data; + Mapping->Irp = Irp; + } + + ExInterlockedInsertTailList(&This->ListHead, &Mapping->Entry, &This->Lock); + (void)InterlockedIncrement((volatile long*)&This->NumMappings); + + DPRINT("IIrpQueue_fnAddMapping NumMappings %u SizeOfMapping %lu NumDataAvailable %lu Mapping %p FrameSize %u\n", This->NumMappings, Mapping->BufferSize, This->NumDataAvailable, Mapping, This->MaxFrameSize); + } if (Irp) { @@ -216,23 +234,20 @@ IIrpQueueImpl * This = (IIrpQueueImpl*)iface; PLIST_ENTRY CurEntry; - KeAcquireSpinLockAtDpcLevel(&This->Lock); - - - CurEntry = This->ListHead.Flink; - CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); - if (CurEntry == &This->ListHead) - { - KeReleaseSpinLockFromDpcLevel(&This->Lock); + CurEntry = ExInterlockedRemoveHeadList(&This->ListHead, &This->Lock); + if (!CurEntry) + { + This->StartStream = FALSE; This->OutOfMapping = TRUE; return STATUS_UNSUCCESSFUL; } - *Buffer = (PUCHAR)CurMapping->Header->Data + This->CurrentOffset; - *BufferSize = CurMapping->Header->DataUsed - This->CurrentOffset; + CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); + *Buffer = (PUCHAR)CurMapping->Buffer + This->CurrentOffset; + *BufferSize = CurMapping->BufferSize - This->CurrentOffset; + ExInterlockedInsertHeadList(&This->ListHead, &CurMapping->Entry, &This->Lock); This->OutOfMapping = FALSE; - KeReleaseSpinLockFromDpcLevel(&This->Lock); return STATUS_SUCCESS; } @@ -248,24 +263,22 @@ PIRP_MAPPING CurMapping; IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + CurEntry = ExInterlockedRemoveHeadList(&This->ListHead, &This->Lock); + CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); + This->CurrentOffset += BytesWritten; This->NumDataAvailable -= BytesWritten; - CurEntry = This->ListHead.Flink; - CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); - - if (CurMapping->Header->DataUsed <= This->CurrentOffset) + if (CurMapping->BufferSize <= This->CurrentOffset) { This->CurrentOffset = 0; - - KeAcquireSpinLockAtDpcLevel(&This->Lock); - RemoveHeadList(&This->ListHead); - KeReleaseSpinLockFromDpcLevel(&This->Lock); - InterlockedDecrement(&This->NumMappings); FreeMappingRoutine(CurMapping); } - + else + { + ExInterlockedInsertHeadList(&This->ListHead, &CurMapping->Entry, &This->Lock); + } } ULONG @@ -331,51 +344,6 @@ This->StartStream = FALSE; } - -VOID -GetMapping( - IIrpQueueImpl * This, - IN ULONG Index, - IN PVOID Tag, - IN PIRP_MAPPING CurMapping, - OUT PPHYSICAL_ADDRESS PhysicalAddress, - OUT PVOID *VirtualAddress, - OUT PULONG ByteCount, - OUT PULONG Flags) -{ - ULONG Offset; - - /* calculate the offset */ - if (Index) - Offset = Index * This->MaxFrameSize; - else - Offset = 0; - - ASSERT(CurMapping->Header->DataUsed > Offset); - - *VirtualAddress = (PUCHAR)CurMapping->Header->Data + Offset; - *PhysicalAddress = MmGetPhysicalAddress(*VirtualAddress); - /* FIXME alignment */ - *ByteCount = min(CurMapping->Header->DataUsed - Offset, This->MaxFrameSize); - - /* reset out of mapping indicator */ - This->OutOfMapping = FALSE; - - /* decrement available byte counter */ - This->NumDataAvailable -= *ByteCount; - - /* store the tag */ - CurMapping->Tag[Index] = Tag; - - if (Index + 1 == CurMapping->NumTags) - { - /* indicate end of packet */ - *Flags = 1; - } - - DPRINT("IIrpQueue_fnGetMappingWithTag Tag %p Mapping %p Index %u NumTags %u\n", Tag, CurMapping, Index, CurMapping->NumTags); -} - NTSTATUS NTAPI @@ -389,45 +357,47 @@ { PIRP_MAPPING CurMapping; PLIST_ENTRY CurEntry; - ULONG Index; - ULONG Value; IIrpQueueImpl * This = (IIrpQueueImpl*)iface; *Flags = 0; ASSERT(Tag != NULL); - KeAcquireSpinLockAtDpcLevel(&This->Lock); - - CurEntry = This->ListHead.Flink; - if (CurEntry == &This->ListHead) - { - KeReleaseSpinLockFromDpcLevel(&This->Lock); + + CurEntry = ExInterlockedRemoveHeadList(&This->ListHead, &This->Lock); + if (!CurEntry) + { This->OutOfMapping = TRUE; This->StartStream = FALSE; return STATUS_UNSUCCESSFUL; } - while (CurEntry != &This->ListHead) - { - CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); - for(Index = 0; Index < CurMapping->NumTags; Index++) - { - Value = CurMapping->References & ( 1 << Index); - if (CurMapping->Tag[Index] == NULL && Value) - { - /* found a free mapping within audio irp */ - GetMapping(This, Index, Tag, CurMapping, PhysicalAddress, VirtualAddress, ByteCount, Flags); - KeReleaseSpinLockFromDpcLevel(&This->Lock); - return STATUS_SUCCESS; - } - } - CurEntry = CurEntry->Flink; - } - KeReleaseSpinLockFromDpcLevel(&This->Lock); - This->OutOfMapping = TRUE; - This->StartStream = FALSE; - DPRINT("No Mapping available\n"); - return STATUS_UNSUCCESSFUL; + CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); + + *PhysicalAddress = MmGetPhysicalAddress(CurMapping->Buffer); + *VirtualAddress = CurMapping->Buffer; + *ByteCount = CurMapping->BufferSize; + + InterlockedDecrement(&This->NumMappings); + This->NumDataAvailable -= CurMapping->BufferSize; + + if (CurMapping->OriginalBuffer) + { + /* last partial buffer */ + *Flags = 1; + + /* store tag */ + CurMapping->Tag = Tag; + + /* insert into list to free later */ + ExInterlockedInsertTailList(&This->FreeHead, &CurMapping->Entry, &This->Lock); + } + else + { + /* we can free this entry now */ + FreeItem(CurMapping, TAG_PORTCLASS); + } + DPRINT("IIrpQueue_fnGetMappingWithTag Tag %p\n", Tag); + return STATUS_SUCCESS; } NTSTATUS @@ -438,62 +408,28 @@ { PIRP_MAPPING CurMapping = NULL; PLIST_ENTRY CurEntry; - ULONG Index = 0; - ULONG Found; - IIrpQueueImpl * This = (IIrpQueueImpl*)iface; - - KeAcquireSpinLockAtDpcLevel(&This->Lock); - - CurEntry = This->ListHead.Flink; - if (CurEntry == &This->ListHead) - { - KeReleaseSpinLockFromDpcLevel(&This->Lock); - return STATUS_UNSUCCESSFUL; - } - - Found = FALSE; - while (CurEntry != &This->ListHead) - { - CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); - for(Index = 0; Index < CurMapping->NumTags; Index++) - { - if (CurMapping->Tag[Index] == Tag) - { - Found = TRUE; - CurMapping->Tag[Index] = NULL; - break; - } - } - if (Found) - break; - - CurEntry = CurEntry->Flink; - } - - if (!Found) - { - DPRINT1("Tag %p not found\n", Tag); - ASSERT(Found); - } - DPRINT("References %x\n", CurMapping->References); - CurMapping->References &= ~(1 << Index); - - if (CurMapping->References) - { - /* released mapping is not the last mapping of the irp */ - DPRINT1("IIrpQueue_fnReleaseMappingWithTag Tag %p Index %u NumTags %u Refs %x\n", Tag, Index, CurMapping->NumTags, CurMapping->References); - KeReleaseSpinLockFromDpcLevel(&This->Lock); + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + + DPRINT("IIrpQueue_fnReleaseMappingWithTag Tag %p\n", Tag); + + CurEntry = ExInterlockedRemoveHeadList(&This->FreeHead, &This->Lock); + if (!CurMapping) + { return STATUS_SUCCESS; } - RemoveEntryList(&CurMapping->Entry); + CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); + if (CurMapping->Tag != Tag) + { + /* the released mapping is not the last one */ + ExInterlockedInsertHeadList(&This->FreeHead, &CurMapping->Entry, &This->Lock); + return STATUS_SUCCESS; + } /* last mapping of the irp, free irp */ - DPRINT("Freeing mapping %p\n", CurMapping); - InterlockedDecrement(&This->NumMappings); + DPRINT("IIrpQueue_fnReleaseMappingWithTag Tag %p Mapping %p FREED\n", Tag, CurMapping); + FreeMappingRoutine(CurMapping); - KeReleaseSpinLockFromDpcLevel(&This->Lock); - return STATUS_SUCCESS; } @@ -505,6 +441,32 @@ IIrpQueueImpl * This = (IIrpQueueImpl*)iface; return This->OutOfMapping; } + +VOID +NTAPI +IIrpQueue_fnPrintQueueStatus( + IN IIrpQueue *iface) +{ + PIRP_MAPPING CurMapping = NULL; + PLIST_ENTRY CurEntry; + + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + KeAcquireSpinLockAtDpcLevel(&This->Lock); + + CurEntry = This->ListHead.Flink; + DPRINT("IIrpQueue_fnPrintQueueStatus % u ===============\n", This->NumMappings); + + while (CurEntry != &This->ListHead) + { + CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); + DPRINT("Mapping %p Size %u Original %p\n", CurMapping, CurMapping->BufferSize, CurMapping->OriginalBuffer); + CurEntry = CurEntry->Flink; + } + + KeReleaseSpinLockFromDpcLevel(&This->Lock); + DPRINT("IIrpQueue_fnPrintQueueStatus ===============\n"); +} + static IIrpQueueVtbl vt_IIrpQueue = { @@ -522,7 +484,8 @@ IIrpQueue_fnUpdateFormat, IIrpQueue_fnGetMappingWithTag, IIrpQueue_fnReleaseMappingWithTag, - IIrpQueue_fnHasLastMappingFailed + IIrpQueue_fnHasLastMappingFailed, + IIrpQueue_fnPrintQueueStatus }; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c [iso-8859-1] Mon May 11 21:22:27 2009 @@ -207,6 +207,10 @@ Miniport->lpVtbl->Release(Miniport); return Status; } + + /* increment reference on miniport adapter */ + Miniport->lpVtbl->AddRef(Miniport); + } else { @@ -226,6 +230,9 @@ MidiMiniport->lpVtbl->Release(MidiMiniport); return Status; } + + /* increment reference on miniport adapter */ + MidiMiniport->lpVtbl->AddRef(MidiMiniport); } /* create the subdevice descriptor */ @@ -265,10 +272,6 @@ This->pDeviceObject = DeviceObject; This->bInitialized = TRUE; - /* increment reference on miniport adapter */ - Miniport->lpVtbl->AddRef(Miniport); - - /* check if it supports IPinCount interface */ Status = UnknownMiniport->lpVtbl->QueryInterface(UnknownMiniport, &IID_IPinCount, (PVOID*)&PinCount); if (NT_SUCCESS(Status)) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] Mon May 11 21:22:27 2009 @@ -504,7 +504,6 @@ PIO_STACK_LOCATION IoStack; ISubdevice * SubDevice; PPCLASS_DEVICE_EXTENSION DeviceExt; - SUBDEVICE_ENTRY * Entry; IIrpTarget *Filter; PKSOBJECT_CREATE_ITEM CreateItem; PPIN_WORKER_CONTEXT Context; @@ -526,13 +525,6 @@ { DPRINT1("PcCreateItemDispatch SubDevice %p DeviceExt %p\n", SubDevice, DeviceExt); return STATUS_UNSUCCESSFUL; - } - - Entry = AllocateItem(NonPagedPool, sizeof(SUBDEVICE_ENTRY), TAG_PORTCLASS); - if (!Entry) - { - DPRINT1("PcCreateItemDispatch no memory\n"); - return STATUS_INSUFFICIENT_RESOURCES; } #if KS_IMPLEMENTED

1 0

[dreimer] 40885: Some more cleanup. As in Batch with setlocal all variables are only available inside the script file, not globally. So I removed the Var nulling. Fixed a lil bug in rosbe.ps1 Still tbd: Find out why it sometimes fails with buildno.h not found. Get a proper tee-object for logging
by dreimer＠svn.reactos.org 11 May '09

11 May '09

Author: dreimer Date: Mon May 11 18:38:35 2009 New Revision: 40885 URL: http://svn.reactos.org/svn/reactos?rev=40885&view=rev Log: Some more cleanup. As in Batch with setlocal all variables are only available inside the script file, not globally. So I removed the Var nulling. Fixed a lil bug in rosbe.ps1 Still tbd: Find out why it sometimes fails with buildno.h not found. Get a proper tee-object for logging Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Mon May 11 18:38:35 2009 @@ -89,7 +89,8 @@ if ($_ROSBE_WRITELOG -eq 1) { $sw.Start() - IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)" 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_TARGET_GCCVERSION-$DATENAME-$TIMENAME.txt" + $file = "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_TARGET_GCCVERSION-$DATENAME-$TIMENAME.txt" + IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)" | tee-object $file $sw.Stop() } else { $sw.Start() @@ -101,23 +102,3 @@ # Highlight the fact that building has ended. "$_ROSBE_BASEDIR\Tools\flash.exe" $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" - -# -# Unload all used Vars. -# -$ENV:ROS_BUILDNOSTRIP = $null -$ENV:ROS_LEAN_AND_MEAN = $null -$ENV:CCACHE_DIR = $null -$ENV:HOST_CC = $null -$ENV:HOST_CPP = $null -$ENV:TARGET_CC = $null -$ENV:TARGET_CPP = $null -$ENV:ROS_INTERMEDIATE = $null -$ENV:ROS_OUTPUT = $null -$ENV:ROS_TEMPORARY = $null -$TIMERAW = $null -$DATENAME = $null -$TIMENAME = $null -$CPUCOUNT = $null -$sw = $null -$_ROSBE_CCACHE = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Mon May 11 18:38:35 2009 @@ -67,14 +67,6 @@ function end { $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" - - # - # Unload all used Vars. - # - $OBJCLEANPATH = $null - $OUTCLEANPATH = $null - $MAKEFILE = $null - exit } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] Mon May 11 18:38:35 2009 @@ -249,32 +249,4 @@ $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" -# -# Unload all used Vars. -# -$YESNO = $null -$BUILD_MP = $null -$BUILD_MP_CH = $null -$TUNE = $null -$TUNE_CH = $null -$SARCH_CH = $null -$OARCH_CH = $null -$OPTIMIZE_CH = $null -$KDBG_CH = $null -$DBG_CH = $null -$GDB_CH = $null -$NSWPAT_CH = $null -$WINKD_CH = $null -$ELF_CH = $null -$SARCH = $null -$OARCH = $null -$OPTIMIZE = $null -$KDBG = $null -$DBG = $null -$GDB = $null -$NSWPAT = $null -$WINKD = $null -$ELF = $null -$XML = $null - settitle Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Mon May 11 18:38:35 2009 @@ -41,8 +41,8 @@ $global:_ROSBE_OBJPATH = $null $global:_ROSBE_OUTPATH = $null $global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\i386" -$global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\i386" -$global:_ROSBE_ORIGINALPATH = "$ENV:PATH" +$global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\$ENV:ROS_ARCH" +$global:_ROSBE_ORIGINALPATH = "$_ROSBE_HOST_MINGWPATH\bin;$ENV:PATH" $global:_ROSBE_MINGWMAKE = "$_ROSBE_HOST_MINGWPATH\bin\mingw32-make.exe" # Get the number of CPUs in the system so we know how many jobs to execute. @@ -144,7 +144,7 @@ & "$_ROSBE_BASEDIR\rosbe-gcc-env.ps1" -clear +clear-host "*******************************************************************************" "* *" "* ReactOS Build Environment $_ROSBE_VERSION *" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] Mon May 11 18:38:35 2009 @@ -29,8 +29,3 @@ chdefgcc $ENV:ROS_ARCH target $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" - -# -# Unload all used Vars. -# -$ARCH = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 [iso-8859-1] Mon May 11 18:38:35 2009 @@ -30,8 +30,3 @@ $global:_ROSBE_ROSSOURCEDIR = "$pwd" $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" - -# -# Unload all used Vars. -# -$SOURCEDIR = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] Mon May 11 18:38:35 2009 @@ -63,9 +63,3 @@ "ERROR: You specified wrong parameters." settitle } - -# -# Unload all used Vars. -# -$TOOLPATH = $null -$TOOLMODE = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] Mon May 11 18:38:35 2009 @@ -32,6 +32,3 @@ } $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" - -$options = $null -$cfgfile = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] Mon May 11 18:38:35 2009 @@ -46,11 +46,3 @@ } $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" - -# -# Unload all used Vars. -# -$FILEPATH = $null -$ADDRESS = $null -$baseaddr = $null -$relbase = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Mon May 11 18:38:35 2009 @@ -97,14 +97,3 @@ } $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" - -# -# Unload all used Vars. -# -$OFFSVN = $null -$ONSVN = $null -$UP = $null -$CL = $null -$dir = dir -$temparg = $null -$_ROSBE_SSVN_JOB = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 [iso-8859-1] Mon May 11 18:38:35 2009 @@ -34,8 +34,3 @@ else {parse($args)} $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" - -# -# Unload all used Vars. -# -$OUT = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] Mon May 11 18:38:35 2009 @@ -149,13 +149,4 @@ "Unknown parameter specified. Try 'help update'." } -$arg1 = $null -$arg2 = $null -$_ROSBE_UPDFINISH = $null -$_ROSBE_OPATH = $null -$_ROSBE_UPDDATE = $null -$_ROSBE_UPDATES = $null -$_ROSBE_UPDDATE2 = $null -$_ROSBE_MULTIUPD = $null -$_ROSBE_STATCOUNT = $null EOC

1 0

[dreimer] 40884: Nitty gritty more fixes I found. Just cosmetical.
by dreimer＠svn.reactos.org 11 May '09

11 May '09

Author: dreimer Date: Mon May 11 05:19:58 2009 New Revision: 40884 URL: http://svn.reactos.org/svn/reactos?rev=40884&view=rev Log: Nitty gritty more fixes I found. Just cosmetical. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Mon May 11 05:19:58 2009 @@ -73,10 +73,10 @@ if ($args[0] -eq "multi") { $args.setvalue($null, 0) $MAKE_JOBS = "$_ROSBE_MAKEX_JOBS" - $TITLE_COMMAND = "makex $args[2]" + $TITLE_COMMAND = "makex $($args)" } else { $MAKE_JOBS = 1 - $TITLE_COMMAND = "make $args[1]" + $TITLE_COMMAND = "make $($args)" } $host.ui.RawUI.WindowTitle = "'$TITLE_COMMAND' build started: $TIMERAW ($ENV:ROS_ARCH)" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Mon May 11 05:19:58 2009 @@ -25,7 +25,7 @@ if ("$ENV:ROS_ARCH" -eq "") { $ENV:ROS_ARCH = "i386" } else { - $ENV:ROS_ARCH = "$args[1]" + $ENV:ROS_ARCH = "$($args)" } $global:0 = $myInvocation.MyCommand.Definition

1 0

[dreimer] 40883: This fixes the worst errors. Now the Scripts build ROS again. I could need a tester.
by dreimer＠svn.reactos.org 11 May '09

11 May '09

Author: dreimer Date: Mon May 11 04:53:37 2009 New Revision: 40883 URL: http://svn.reactos.org/svn/reactos?rev=40883&view=rev Log: This fixes the worst errors. Now the Scripts build ROS again. I could need a tester. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Mon May 11 04:53:37 2009 @@ -63,7 +63,6 @@ $ENV:TARGET_CPP = "$_ROSBE_CCACHE" + "g++" $ENV:TARGET_CC = "$_ROSBE_CCACHE" + "$ROS_PREFIX" + "gcc" $ENV:TARGET_CPP = "$_ROSBE_CCACHE" + "$ROS_PREFIX" + "g++" -} # Get the current date and time for use in in our build log's file name. $TIMERAW = get-date -f t Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Mon May 11 04:53:37 2009 @@ -23,9 +23,9 @@ # Set defaults to work with and override them if edited by # the options utility. if ("$ENV:ROS_ARCH" -eq "") { - set $ENV:ROS_ARCH = "i386" + $ENV:ROS_ARCH = "i386" } else { - set $ENV:ROS_ARCH = "$args[1]" + $ENV:ROS_ARCH = "$args[1]" } $global:0 = $myInvocation.MyCommand.Definition @@ -144,7 +144,7 @@ & "$_ROSBE_BASEDIR\rosbe-gcc-env.ps1" -clear-screen +clear "*******************************************************************************" "* *" "* ReactOS Build Environment $_ROSBE_VERSION *" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Mon May 11 04:53:37 2009 @@ -15,8 +15,8 @@ } $ENV:PATH = "$_ROSBE_TARGET_MINGWPATH\bin;$_ROSBE_ORIGINALPATH" - -& "$ENV:ROS_PREFIXgcc" -v 2> gcctvers.tmp +$TARGETGCC = "$ENV:ROS_PREFIX" + "gcc" +& $TARGETGCC -v 2> gcctvers.tmp $global:_ROSBE_TARGET_GCCVERSION = (select-string -path .\gcctvers.tmp "gcc version") -replace ".*version ((\d|\.)+).*",'$1' $global:_ROSBE_TARGET_GCCTARGET = (select-string -path .\gcctvers.tmp "target=") -replace ".*--target=(.+?)\b.*",'$1' gcc -v 2> gcchvers.tmp

1 0

[dreimer] 40882: First run through the PS1 Scripts to get them in sync to Colin's fixes again. Not tested yet.
by dreimer＠svn.reactos.org 11 May '09

11 May '09

Author: dreimer Date: Mon May 11 04:40:11 2009 New Revision: 40882 URL: http://svn.reactos.org/svn/reactos?rev=40882&view=rev Log: First run through the PS1 Scripts to get them in sync to Colin's fixes again. Not tested yet. Removed: trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -7,10 +7,8 @@ # # -# # Check if config.template.rbuild is newer than config.rbuild, if it is then # abort the build and inform the user. -# if (Test-Path ".\config.rbuild") { if ((gi .\config.template.rbuild).LastWriteTime -gt (gi .\config.rbuild).LastWriteTime) { "" @@ -22,9 +20,7 @@ } } -# # Check if strip, no Debug Symbols or ccache are being used and set the appropriate options. -# if ($_ROSBE_NOSTRIP -ne $null) { if ($_ROSBE_NOSTRIP -eq 1) { $ENV:ROS_BUILDNOSTRIP = "yes" @@ -39,162 +35,73 @@ $ENV:ROS_LEAN_AND_MEAN = "no" } } -# Small Security Check to prevent useless apps. -if ($ENV:ROS_LEAN_AND_MEAN -eq "yes") { - if ($ENV:ROS_BUILDNOSTRIP -eq "yes") { - clear-host - "Selecting Stripping and removing Debug Symbols together will most likely cause useless apps. Please deselect one of them." - exit - } -} -if ($_ROSBE_USECCACHE -ne $null) { - if ($_ROSBE_USECCACHE -eq 1) { - $ENV:CCACHE_DIR = "$APPDATA\RosBE\.ccache" - $_ROSBE_CCACHE = "ccache " - } - $ENV:HOST_CC = "$_ROSBE_CCACHE" + "gcc" - $ENV:HOST_CPP = "$_ROSBE_CCACHE" + "g++" - - # - #Target defaults to host(i386) - # - - $ENV:TARGET_CC = "$_ROSBE_CCACHE" + "gcc" - $ENV:TARGET_CPP = "$_ROSBE_CCACHE" + "g++" - if ($ENV:ROS_ARCH -ne $null) { - $ENV:TARGET_CC = "$_ROSBE_CCACHE" + "$ROS_ARCH-pc-mingw32-gcc" - $ENV:TARGET_CPP = "$_ROSBE_CCACHE" + "$ROS_ARCH-pc-mingw32-g++" - } -} - -# # Check if the user has chosen to use a different object or output path and set # it accordingly. -# if ($_ROSBE_OBJPATH -ne $null) { if (Test-Path "$_ROSBE_OBJPATH") { "WARNING: The Object-Path specified doesn't seem to exist. Creating..." - if (Test-Path "makefile*.auto") { - "WARNING: makefile.auto exists. Deleting..." - clean - } } $ENV:ROS_INTERMEDIATE = "$_ROSBE_OBJPATH" + $ENV:ROS_TEMPORARY = "$_ROSBE_OBJPATH" } if ($_ROSBE_OUTPATH -ne $null) { if (Test-Path "$_ROSBE_OUTPATH") { "WARNING: The Output-Path specified doesn't seem to exist. Creating..." - if (Test-Path "makefile*.auto") { - "WARNING: makefile.auto exists. Deleting..." - clean - } } $ENV:ROS_OUTPUT = "$_ROSBE_OUTPATH" - $ENV:ROS_TEMPORARY = "$_ROSBE_OUTPATH" } -# +if ($_ROSBE_USECCACHE -eq 1) { + $_ROSBE_CCACHE = "ccache " +} else { + $_ROSBE_CCACHE = $null +} + $ENV:HOST_CC = "$_ROSBE_CCACHE" + "gcc" + $ENV:HOST_CPP = "$_ROSBE_CCACHE" + "g++" + $ENV:TARGET_CC = "$_ROSBE_CCACHE" + "gcc" + $ENV:TARGET_CPP = "$_ROSBE_CCACHE" + "g++" + $ENV:TARGET_CC = "$_ROSBE_CCACHE" + "$ROS_PREFIX" + "gcc" + $ENV:TARGET_CPP = "$_ROSBE_CCACHE" + "$ROS_PREFIX" + "g++" +} + # Get the current date and time for use in in our build log's file name. -# $TIMERAW = get-date -f t $DATENAME = get-date -f dyMMyyyy $TIMENAME = get-date -f HHmm -# -# Check if writing logs is enabled, if so check if our log directory exists, if -# it doesn't, create it. -# -if ($_ROSBE_WRITELOG -eq 1) { - if (!(Test-Path "$_ROSBE_LOGDIR")) { - $null = (New-Item -path "$_ROSBE_ROSSOURCEDIR" -name "RosBE-Logs" -type directory) - } +# Check whether we were called as "makex" or "make" +if ($args[0] -eq "multi") { + $args.setvalue($null, 0) + $MAKE_JOBS = "$_ROSBE_MAKEX_JOBS" + $TITLE_COMMAND = "makex $args[2]" +} else { + $MAKE_JOBS = 1 + $TITLE_COMMAND = "make $args[1]" } -function BUILD { - if ($_ROSBE_SHOWTIME -eq 1) { - [System.Diagnostics.Stopwatch] $sw; - $sw = New-Object System.Diagnostics.StopWatch - if ($_ROSBE_WRITELOG -eq 1) { - if (!(Test-Path "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt")) { - $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) - } - $sw.Start() - IEX "&'$_ROSBE_MINGWMAKE' $($args)" 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" - $sw.Stop() - write-host "Total Build Time:" $sw.Elapsed.ToString() - } else { - $sw.Start() - IEX "&'$_ROSBE_MINGWMAKE' $($args)" - $sw.Stop() - write-host "Total Build Time:" $sw.Elapsed.ToString() - } - } else { - if ($_ROSBE_WRITELOG -eq 1) { - if (!(Test-Path "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt")) { - $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) - } - IEX "&'$_ROSBE_MINGWMAKE' $($args)" 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" - } else { - IEX "&'$_ROSBE_MINGWMAKE' $($args)" - } - } +$host.ui.RawUI.WindowTitle = "'$TITLE_COMMAND' build started: $TIMERAW ($ENV:ROS_ARCH)" + +# Do the actual building +if ($_ROSBE_SHOWTIME -eq 1) { + [System.Diagnostics.Stopwatch] $sw; + $sw = New-Object System.Diagnostics.StopWatch } -function BUILDMULTI { - # - # Get the number of CPUs in the system so we know how many jobs to execute. - $CPUCOUNT = (gwmi win32_processor).numberofcores + 1 +if ($_ROSBE_WRITELOG -eq 1) { + $sw.Start() + IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)" 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_TARGET_GCCVERSION-$DATENAME-$TIMENAME.txt" + $sw.Stop() +} else { + $sw.Start() + IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)" + $sw.Stop() +} +write-host "Total Build Time:" $sw.Elapsed.ToString() - if ($_ROSBE_SHOWTIME -eq 1) { - [System.Diagnostics.Stopwatch] $sw; - $sw = New-Object System.Diagnostics.StopWatch - if ($_ROSBE_WRITELOG -eq 1) { - if (!(Test-Path "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt")) { - $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) - } - $sw.Start() - IEX "&'$_ROSBE_MINGWMAKE' -j $CPUCOUNT $($args)" 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" - $sw.Stop() - write-host "Total Build Time:" $sw.Elapsed.ToString() - } else { - $sw.Start() - IEX "&'$_ROSBE_MINGWMAKE' -j $CPUCOUNT $($args)" - $sw.Stop() - write-host "Total Build Time:" $sw.Elapsed.ToString() - } - } else { - if ($_ROSBE_WRITELOG -eq 1) { - if (!(Test-Path "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt")) { - $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) - } - IEX "&'$_ROSBE_MINGWMAKE' -j $CPUCOUNT $($args)" 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" - } else { - IEX "&'$_ROSBE_MINGWMAKE' -j $CPUCOUNT $($args)" - } - } -} - -# -# Check if we are using -j or not. -# -if ($args[0] -eq "multi") { - $args.setvalue($null, 0) - $host.ui.RawUI.WindowTitle = "''makex $($args)'' parallel build started: $TIMERAW $ENV:ROS_ARCH" - BUILDMULTI $args -} else { - $host.ui.RawUI.WindowTitle = "''make $($args)'' build started: $TIMERAW $ENV:ROS_ARCH" - BUILD $args -} - -# # Highlight the fact that building has ended. -# "$_ROSBE_BASEDIR\Tools\flash.exe" - -if ($_ROSBE_VERSION -ne $null) { - $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" -} +$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" # # Unload all used Vars. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -10,9 +10,7 @@ $host.ui.RawUI.WindowTitle = "Cleaning..." function remlog { - # # Check if we have any logs to clean, if so, clean them. - # if (Test-Path "$_ROSBE_LOGDIR") { "Cleaning build logs..." $null = (Remove-Item -path "$_ROSBE_LOGDIR\*.txt" -force) @@ -23,55 +21,43 @@ } function rembin { - # # Check if we have something to clean, if so, clean it. - # - # # Apply modified obj and out paths for deletion. - # - - if ($ENV:ROS_ARCH -eq $null) { - $ENV:ROS_ARCH = "i386" - } if ($_ROSBE_OBJPATH -eq $null) { - $_ROSBE_OBJCLEANPATH = "$_ROSBE_ROSSOURCEDIR\obj-$ENV:ROS_ARCH" + $OBJCLEANPATH = "$_ROSBE_ROSSOURCEDIR\obj-$ENV:ROS_ARCH" } else { - $_ROSBE_OBJCLEANPATH = "$_ROSBE_OBJPATH" + $OBJCLEANPATH = "$_ROSBE_OBJPATH" } if ($_ROSBE_OUTPATH -eq $null) { - $_ROSBE_OUTCLEANPATH = "$_ROSBE_ROSSOURCEDIR\output-$ENV:ROS_ARCH" + $OUTCLEANPATH = "$_ROSBE_ROSSOURCEDIR\output-$ENV:ROS_ARCH" } else { - $_ROSBE_OUTCLEANPATH = "$_ROSBE_OUTPATH" + $OUTCLEANPATH = "$_ROSBE_OUTPATH" } if ($ENV:ROS_ARCH -eq "i386") { - $_ROSBE_MAKEFILE = "$_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto" + $MAKEFILE = "$_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto" } else { - $_ROSBE_MAKEFILE = "$_ROSBE_ROSSOURCEDIR\makefile.auto" + $MAKEFILE = "$_ROSBE_ROSSOURCEDIR\makefile.auto" } - if (Test-Path "$_ROSBE_MAKEFILE") { - $null = (Remove-Item "$_ROSBE_MAKEFILE" -force) + if (Test-Path "$MAKEFILE") { + $null = (Remove-Item "$MAKEFILE" -force) } - if (Test-Path "$_ROSBE_OBJCLEANPATH\.") { + if (Test-Path "$OBJCLEANPATH\.") { "Cleaning ReactOS $ENV:ROS_ARCH source directory..." - if (Test-Path "$_ROSBE_OBJCLEANPATH\.") { - $null = (Remove-Item "$_ROSBE_OBJCLEANPATH" -recurse -force) + if (Test-Path "$OBJCLEANPATH\.") { + $null = (Remove-Item "$OBJCLEANPATH" -recurse -force) } - if (Test-Path "$_ROSBE_OUTCLEANPATH\.") { - $null = (Remove-Item "$_ROSBE_OUTCLEANPATH" -recurse -force) + if (Test-Path "$OUTCLEANPATH\.") { + $null = (Remove-Item "$OUTCLEANPATH" -recurse -force) } "Done cleaning ReactOS $ENV:ROS_ARCH source directory." } else { "ERROR: There is no $ENV:ROS_ARCH compiler output to clean." - } - - if ($ENV:ROS_ARCH -eq "i386") { - $ENV:ROS_ARCH = $null } if (Test-Path "$_ROSBE_ROSSOURCEDIR\reactos") { @@ -85,9 +71,9 @@ # # Unload all used Vars. # - $_ROSBE_OBJCLEANPATH = $null - $_ROSBE_OUTCLEANPATH = $null - $_ROSBE_MAKEFILE = $null + $OBJCLEANPATH = $null + $OUTCLEANPATH = $null + $MAKEFILE = $null exit } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -10,15 +10,11 @@ $host.ui.RawUI.WindowTitle = "ReactOS Build Configurator" function settitle { - if ($_ROSBE_VERSION -ne $null) { - $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" - } + $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" exit } -# # Receive the first Parameter and decide what to do. -# if ($args[0] -eq "delete") { "config.rbuild will be permanently deleted. All your settings will be gone." "Continue?" @@ -57,16 +53,12 @@ settitle } -# # Check if config.rbuild already exists. If not, get a working copy. -# if (!(Test-Path "$ENV:APPDATA\RosBE\config.rbuild")) { copy-item ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config.rbuild" } -# # Help prevent non-useful bug reports/questions. -# "" "*** Configurations other than release/debug are not useful for ***" "*** posting bug reports, and generally not very useful for ***" @@ -77,10 +69,8 @@ $YESNO = Read-Host "(yes), (no)" if (($YESNO -ne "yes") -and ($YESNO -ne "y")) {settitle} -# # Check if config.template.rbuild is newer than config.rbuild, if it is then # inform the user and offer an update. -# if (Test-Path ".\config.rbuild") { if ((gi .\config.template.rbuild).LastWriteTime -gt (gi .\config.rbuild).LastWriteTime) { "" @@ -95,14 +85,10 @@ } } -# # Prepare XML Parser. -# [xml] $XML = get-content "$ENV:APPDATA\RosBE\config.rbuild" -# # Start with reading settings from config.rbuild and let the user edit them. -# "Sub-Architecture to build for." "Default is: none" "" @@ -246,9 +232,7 @@ } clear-host -# # Generate a config.rbuild, copy it to the Source Tree and delete temp files. -# $xml.group.property | ? { $_.Name -eq "SARCH" } | % { $_.Value = "$SARCH_CH"} $xml.group.property | ? { $_.Name -eq "OARCH" } | % { $_.Value = "$OARCH_CH"} $xml.group.property | ? { $_.Name -eq "TUNE" } | % { $_.Value = "$TUNE_CH"} @@ -263,9 +247,7 @@ $xml.save("$ENV:APPDATA\RosBE\config.rbuild") copy-item "$ENV:APPDATA\RosBE\config.rbuild" ".\config.rbuild" -if ($_ROSBE_VERSION -ne $null) { - $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" -} +$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" # # Unload all used Vars. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -7,9 +7,9 @@ # # -# # Check if we are displaying help on all commands, if so, display it. -# +# Otherwise check if we are displaying help on individual commands, if so, +# display the help for that command. if ("$args" -eq "") { "" "Available Commands:" @@ -73,13 +73,7 @@ "" exit -} - -# -# Now check if we are displaying help on individual commands, if so, -# display the help for that command. -# -if ("$args" -eq "make") { +} elseif ("$args" -eq "make") { " Usage: make [OPTIONS]" " Make does a standard build of ReactOS. OPTIONS are the standard ReactOS build" " options:" @@ -100,9 +94,7 @@ " and generates a new makefile. This will take a while." " ""module""-depends - Does a dependency check for one module with the" " appropiate name." - exit -} -if ("$args" -eq "makex") { +} elseif ("$args" -eq "makex") { " Usage: makex [OPTIONS]" " Same as 'make' but automatically determines the number of CPU Cores in the" " system and uses ""make -j x"" with the appropriate number. OPTIONS are the" @@ -127,42 +119,32 @@ " NOTE: The number makex uses can be modified by editing Build.cmd" " located in the RosBE directory, instructions for doing so are" " contained within the file." - exit -} -if ("$args" -eq "basedir") { +} elseif ("$args" -eq "basedir") { " Usage: basedir" " Switches back to the ReactOS source directory." - exit -} -if (Test-Path "$_ROSBE_BASEDIR\charch.ps1") { - if ("$args" -eq "charch") { +} elseif ("$args" -eq "charch") { + if (Test-Path "$_ROSBE_BASEDIR\charch.ps1") { " Usage: charch [OPTIONS]" " Change the Architecture to build ReactOS for, for the current RosBE session." " Possible Architectures are: i386, ppc, arm, amd64." "" - exit - } -} -if (Test-Path "$_ROSBE_BASEDIR\chdefdir.ps1") { - if ("$args" -eq "chdefdir") { + } +} elseif ("$args" -eq "chdefdir") { + if (Test-Path "$_ROSBE_BASEDIR\chdefdir.ps1") { " Usage: chdefdir [OPTIONS]" " Change the ReactOS source directory for the current RosBE session." "" " previous - Switch to the previous ReactOS source directory." - exit - } -} -if (Test-Path "$_ROSBE_BASEDIR\chdefgcc.ps1") { - if ("$args" -eq "chdefgcc") { + } +} elseif ("$args" -eq "chdefgcc") { + if (Test-Path "$_ROSBE_BASEDIR\chdefgcc.ps1") { " Usage: chdefgcc [PATH]" " Change the MinGW/GCC directory for the current RosBE session." "" " ""Path"" - Path to set the Host or Target GCC to." " ""Type"" - Set it to ""target"" or ""host""" - exit - } -} -if ("$args" -eq "clean") { + } +} elseif ("$args" -eq "clean") { " Usage: clean [logs]" " Fully clean the ReactOS source directory." "" @@ -170,10 +152,8 @@ " logs - Removes all build logs in the RosBE-Logs directory." " All other commands will be parsed as ""make COMMAND_clean"" and cleans the" " specific command." - exit -} -if (Test-Path "$_ROSBE_BASEDIR\Config.ps1") { - if ("$args" -eq "config") { +} elseif ("$args" -eq "config") { + if (Test-Path "$_ROSBE_BASEDIR\Config.ps1") { " Usage: config [OPTIONS]" " Creates a configuration file, which tells RosBE how to build the tree." "" @@ -181,16 +161,12 @@ " default settings." " update - Deletes the old created configuration file and updates it with a" " new, default one." - exit - } -} -if ("$args" -eq "help") { + } +} elseif ("$args" -eq "help") { " Usage: help [COMMAND]" " Shows help for the specified command or lists all available commands." - exit -} -if (Test-Path "$_ROSBE_BASEDIR\reladdr2line.ps1") { - if ("$args" -eq "raddr2line") { +} elseif ("$args" -eq "raddr2line") { + if (Test-Path "$_ROSBE_BASEDIR\reladdr2line.ps1") { " Usage: raddr2line [FILE] [ADDRESS]" " Translates program addresses into file names and line numbers to assist" " developers with finding specific bugs in ReactOS. If either of the options" @@ -202,17 +178,13 @@ " sub-directories are searched." " ADDRESS - The address to be translated." "" - exit - } -} -if (Test-Path "$_ROSBE_BASEDIR\scut.ps1") { - if ("$args" -eq "scut") { + } +} elseif ("$args" -eq "scut") { + if (Test-Path "$_ROSBE_BASEDIR\scut.ps1") { IEX "&'$_ROSBE_BASEDIR\Tools\scut.exe' --help" - exit - } -} -if (Test-Path "$_ROSBE_BASEDIR\sSVN.ps1") { - if ("$args" -eq "ssvn") { + } +} elseif ("$args" -eq "ssvn") { + if (Test-Path "$_ROSBE_BASEDIR\sSVN.ps1") { " Usage: ssvn [OPTIONS]" " Creates, updates or cleans up your ReactOS source tree or shows the revision" " number of the local and online trees." @@ -222,19 +194,15 @@ " create - Creates a new ReactOS source tree." " cleanup - Cleans up and fixes errors in the source tree." " status - Show the current local and online revision numbers." - exit - } -} -if (Test-Path "$_ROSBE_BASEDIR\options.ps1") { - if ("$args" -eq "options") { + } +} elseif ("$args" -eq "options") { + if (Test-Path "$_ROSBE_BASEDIR\options.ps1") { " Usage: options" " Starts the RosBE configurator and sets the changes active in the current." " RosBE session." - exit - } -} -if (Test-Path "$_ROSBE_BASEDIR\update.ps1") { - if ("$args" -eq "update") { + } +} elseif ("$args" -eq "update") { + if (Test-Path "$_ROSBE_BASEDIR\update.ps1") { " Usage: update [OPTIONS]" " Updates all files of RosBE to the most recent files." "" @@ -243,10 +211,7 @@ " nr X - Re/Installs Update Nr X." " reset - Removes the Updates Cache. Not recommended." " status - Shows the recent status of available, non installed updates." - exit - } + } +} else { + " Unknown command specified. No help available for $args." } -if ("$args" -ne $null) { - " Unknown command specified. No help available for $args." - exit -} Removed: trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 (removed) @@ -1,41 +1,0 @@ -# -# PROJECT: RosBE - ReactOS Build Environment for Windows -# LICENSE: GNU General Public License v2. (see LICENSE.txt) -# FILE: Root/MinGW.ps1 -# PURPOSE: This script provides/sets up a standard MinGW build environment. -# COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> -# -# - -if ($args -ne "") { - cls - "Unknown parameter specified. Exiting." - exit -} - -(Get-Host).UI.RawUI.ForegroundColor = "Green" -(Get-Host).UI.RawUI.BackgroundColor = "Black" -clear-host -$ENV:PATH = "$ENV:SystemRoot\system32;$ENV:SystemRoot" -$global:0 = $myInvocation.MyCommand.Definition -$global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0) -$global:_ROSBE_MODE = "MinGW" -$global:_ROSBE_ORIGINALPATH = "$ENV:PATH" -$global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\i386" -$global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\i386" - -& "$_ROSBE_BASEDIR\rosbe-gcc-env.ps1" -& "$_ROSBE_BASEDIR\version.ps1" - -# -# Get the number of CPUs in the system so we know how many jobs to execute. -$CPUCOUNT = (gwmi win32_processor).numberofcores + 1 - -if (Test-Path "$_ROSBE_BASEDIR\chdefgcc.ps1") { - set-alias CHDEFGCC "$_ROSBE_BASEDIR\chdefgcc.ps1" -scope Global -} -set-alias MAKE "$_ROSBE_BASEDIR\Build.ps1" -scope Global -function global:MAKEX {IEX "&'$_ROSBE_BASEDIR\Build.ps1' multi"} -if (Test-Path "$_ROSBE_BASEDIR\scut.ps1") { - set-alias SCUT "$_ROSBE_BASEDIR\scut.ps1" -scope Global -} Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -8,32 +8,51 @@ # # -# +$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" + # Set defaults to work with and override them if edited by the options utility. -# (Get-Host).UI.RawUI.ForegroundColor = "Green" (Get-Host).UI.RawUI.BackgroundColor = "Black" clear-host +# For NT4 compatibility if ($ENV:APPDATA.Length -lt 1) { $ENV:APPDATA = $ENV:USERPROFILE } -$global:_ROSBE_VERSION = "1.4.2" + +# Set defaults to work with and override them if edited by +# the options utility. +if ("$ENV:ROS_ARCH" -eq "") { + set $ENV:ROS_ARCH = "i386" +} else { + set $ENV:ROS_ARCH = "$args[1]" +} + $global:0 = $myInvocation.MyCommand.Definition $global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0) -$global:_ROSBE_MODE = "RosBE" +$global:_ROSBE_VERSION = "1.4.2" $global:_ROSBE_ROSSOURCEDIR = "$pwd" -$global:_ROSBE_ORIGINALPATH = "$ENV:PATH" $global:_ROSBE_SHOWTIME = 1 $global:_ROSBE_WRITELOG = 1 $global:_ROSBE_USECCACHE = 0 $global:_ROSBE_STRIP = 0 $global:_ROSBE_NOSTRIP = 0 +$global:_ROSBE_LOGDIR = "$pwd\RosBE-Logs" +$global:_ROSBE_OBJPATH = $null +$global:_ROSBE_OUTPATH = $null $global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\i386" $global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\i386" -$global:_ROSBE_LOGDIR = "$_ROSBE_ROSSOURCEDIR\RosBE-Logs" -$global:_ROSBE_OBJPATH = $null -$global:_ROSBE_OUTPATH = $null +$global:_ROSBE_ORIGINALPATH = "$ENV:PATH" +$global:_ROSBE_MINGWMAKE = "$_ROSBE_HOST_MINGWPATH\bin\mingw32-make.exe" + +# Get the number of CPUs in the system so we know how many jobs to execute. +# To modify the number used, see the cpucount usage for getting to know about the possible options +$_ROSBE_MAKEX_JOBS = (gwmi win32_processor).numberofcores + 1 + +$ENV:CCACHE_DIR = "$ENV:APPDATA\RosBE\.ccache" +$ENV:C_INCLUDE_PATH = $null +$ENV:CPLUS_INCLUDE_PATH = $null +$ENV:LIBRARY_PATH = $null function global:Get-WebFile { param( @@ -46,28 +65,8 @@ $local:ErrorActionPreference = "Continue" } -# -# Display the banner and set up the environment for the GCC 4.x.x build -# environment. -# -function RosBE { - "*******************************************************************************" - "* *" - "* ReactOS Build Environment $_ROSBE_VERSION *" - "* *" - "*******************************************************************************" - "" - # - # Set the correct path for the build tools and set the MinGW make. - # - & "$_ROSBE_BASEDIR\rosbe-gcc-env.ps1" -} - -# # Load the doskey macros and delete any macros for components # that are not actually present. -# - function LoadAliases { function global:BASEDIR { set-location "$_ROSBE_ROSSOURCEDIR" @@ -118,68 +117,55 @@ } } -# # Check if RosBE data directory exists, if not, create it. -# if (!(Test-Path "$ENV:APPDATA\RosBE")) { New-Item -path "$ENV:APPDATA" -name "RosBE" -type directory } -# -# Check if the user has used the options utility and if so, load their options. -# +# Load the user's options if any if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options.ps1") { & "$ENV:APPDATA\RosBE\rosbe-options.ps1" } -# arch specific settings. if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options-$args.ps1") { & "$ENV:APPDATA\RosBE\rosbe-options-$args.ps1" } -$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" - -# -# Check if we are using oldmode or if any unknown parameters were specified. -# -if ($args.count -gt 0) { - if ($args -eq "oldmode") { - clear-host - $_ROSBE_MODE = "MinGW" - } else { - clear-host - $_ROSBE_ARCH = $args +# Check if writing logs is enabled, if so check if our log directory +# exists, if it doesn't, create it. +if ($_ROSBE_WRITELOG -eq 1) { + if (!(Test-Path "$_ROSBE_LOGDIR")) { + New-Item -path "$_ROSBE_LOGDIR" -type directory } } -RosBE -# -# Load the base directory from srclist.txt and set it as the new source -# directory. -# +# Load the doskey macros that serve as our commands. +LoadAliases + +& "$_ROSBE_BASEDIR\rosbe-gcc-env.ps1" + +clear-screen +"*******************************************************************************" +"* *" +"* ReactOS Build Environment $_ROSBE_VERSION *" +"* *" +"*******************************************************************************" +"" + +# Load the base directory from srclist.txt and set it as the +# new source directory. if (Test-Path "$_ROSBE_BASEDIR\scut.ps1") { & "$_ROSBE_BASEDIR\scut.ps1" } -# # Tell how to display the available commands. -# "" "For a list of all included commands, type: ""help""" "-------------------------------------------------" "" -# IEX "'$_ROSBE_BASEDIR\sSVN.ps1' status" -# "" -# -# Load the doskey macros that serve as our commands. -# -LoadAliases - -# -# Look if the ReactOS source directory is empty. If so, inform the user and -# mention 'ssvn create' (only if ssvn is installed). -# +# Look if the ReactOS source directory is empty. If so, +# inform the user and mention 'ssvn create' (only if ssvn is installed). if (!(Test-Path "$_ROSBE_BASEDIR\sSVN.ps1")) { if ((get-childitem $_ROSBE_ROSSOURCEDIR).Count -le 0) { "No ReactOS source detected. Please use ""ssvn create"" to download it." Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -8,47 +8,29 @@ $host.ui.RawUI.WindowTitle = "Change the Architecture to build for..." -# -# Parse the command line arguments. -# ROSBE_ARCH: Default is i386, can be set to amd64, ppc or arm. -# - -# -# Refresh all needed Params by recalling the main Path setting CMD File. -# -function SYSPARAM { - - # arch specific settings. - if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options-$_ROSBE_ARCH.ps1") { - IEX "& '$ENV:APPDATA\RosBE\rosbe-options-$_ROSBE_ARCH.ps1'" - } - - IEX "& '$_ROSBE_BASEDIR\rosbe-gcc-env.ps1'" - version -} if ($args.count -eq 0) { - # - # If Parameters were set, parse them, if not, ask the user to add them. - # - $_1 = Read-Host "Please enter a Architecture you want to build ReactOS for: " - if ($_1.length -eq 0) { + # Parse the command line arguments. + $ARCH = Read-Host "Please enter a Architecture you want to build ReactOS for: " + if ($ARCH.length -eq 0) { "ERROR: You must enter a Architecture." } } else { - $_1 = $args + $ARCH = $args } -if ($_1 -eq "i386") { - $_ROSBE_ARCH = $null -} else { - $_ROSBE_ARCH = $_1 + +# Modify ROS_ARCH for the current environment +$ENV:ROS_ARCH = $ARCH + +# Refresh all needed Params by recalling the main Path setting CMD File. +if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options-$_ROSBE_ARCH.ps1") { + IEX "& '$ENV:APPDATA\RosBE\rosbe-options-$_ROSBE_ARCH.ps1'" } -SYSPARAM -if ($_ROSBE_VERSION -ne $null) { - $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" -} +chdefgcc $ENV:ROS_ARCH target + +$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" # # Unload all used Vars. # -$_1 = $null +$ARCH = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -10,36 +10,28 @@ $host.ui.RawUI.WindowTitle = "Change the current working ReactOS source directory..." -# # Parse the command line arguments. -# if ($args.count -eq 0) { - # - # If Parameters were set, parse them, if not, ask the user to add them. - # - $_1 = Read-Host "Please enter a ReactOS source directory, or 'previous': " - if ($_1.length -eq 0) { + $SOURCEDIR = Read-Host "Please enter a ReactOS source directory, or 'previous': " + if ($SOURCEDIR.length -eq 0) { "ERROR: You must enter a ReactOS source directory, or 'previous'." } } else { - $_1 = $args + $SOURCEDIR = $args } -if ($_1 -eq "previous") { +if ($SOURCEDIR -eq "previous") { pop-location } else { - if (!(Test-Path "$_1\.")) { + if (!(Test-Path "$SOURCEDIR\.")) { "ERROR: The path specified doesn't seem to exist." - } - push-location "$_1" + push-location "$SOURCEDIR" } + $global:_ROSBE_ROSSOURCEDIR = "$pwd" - -if ($_ROSBE_VERSION -ne $null) { - $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" -} +$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" # # Unload all used Vars. # -$_1 = $null +$SOURCEDIR = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -6,61 +6,57 @@ # COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> # -if ($_ROSBE_MODE -eq "RosBE") { - $host.ui.RawUI.WindowTitle = "Change the current MinGW/GCC Host/Target directory..." -} +$host.ui.RawUI.WindowTitle = "Change the current MinGW/GCC Host/Target directory..." function settitle { - if ($_ROSBE_VERSION -ne $null) { - $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" - } + $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" exit } function EOA { - IEX "&'$_ROSBE_BASEDIR\rosbe-gcc-env.cmd' chdefgcc" + IEX "&'$_ROSBE_BASEDIR\rosbe-gcc-env.cmd'" + version settitle - version } -# -# Parse the command line arguments. -# -$_1 = $args[0] -$_2 = $args[1] -if ($_1 -eq $null) { - $_1 = Read-Host "Please enter a MinGW/GCC directory (don't use quotes): " - if ($_1.length -eq 0) { +# Parse the command line arguments. Ask the user if certain parameters are missing. +$TOOLPATH = $args[0] +$TOOLMODE = $args[1] +if ($TOOLPATH -eq $null) { + $TOOLPATH = Read-Host "Please enter a MinGW/GCC directory (don't use quotes): " + if ($TOOLPATH.length -eq 0) { "ERROR: You must enter a MinGW/GCC directory." settitle } } -if ($_2 -eq $null) { - $_2 = Read-Host "Please specify, if this will be the Target or Host GCC: " - if ($_2.length -eq 0) { +if ($TOOLMODE -eq $null) { + $TOOLMODE = Read-Host "Please specify, if this will be the Target or Host GCC: " + if ($TOOLMODE.length -eq 0) { "ERROR: You must enter ""target"" or ""host""." settitle } } -if (Test-Path "$_ROSBE_BASEDIR\$_1\.") { - $_1 = "$_ROSBE_BASEDIR\$_1" -} elseif (!(Test-Path "$_1\.")) { + +# Verify the entered values +if (Test-Path "$_ROSBE_BASEDIR\$TOOLPATH\.") { + $TOOLPATH = "$_ROSBE_BASEDIR\$TOOLPATH" +} elseif (!(Test-Path "$TOOLPATH\.")) { "ERROR: The path specified doesn't seem to exist." settitle } -if (!(Test-Path "$_1\bin\*gcc.exe")) { +if (!(Test-Path "$TOOLPATH\bin\*gcc.exe")) { "ERROR: No MinGW/GCC found in the specified path." settitle } -if ($_2 -eq "target") { - $_ROSBE_TARGET_MINGWPATH = $_1 +# Set the values +if ($TOOLMODE -eq "target") { + $_ROSBE_TARGET_MINGWPATH = $TOOLPATH "Target Location: $_ROSBE_TARGET_MINGWPATH" EOA -} -if ($_2 -eq "host") { - $_ROSBE_HOST_MINGWPATH = $_1 +} elseif ($TOOLMODE -eq "host") { + $_ROSBE_HOST_MINGWPATH = $TOOLPATH "Host Location: $_ROSBE_HOST_MINGWPATH" EOA } else { @@ -71,5 +67,5 @@ # # Unload all used Vars. # -$_1 = $null -$_2 = $null +$TOOLPATH = $null +$TOOLMODE = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -18,9 +18,7 @@ $cfgfile="$ENV:APPDATA\RosBE\rosbe-options.cmd" } -# # Run options.exe -# if (Test-Path "$options") { Push-Location "$_ROSBE_BASEDIR" @@ -33,9 +31,7 @@ "ERROR: options executable was not found." } -if ($_ROSBE_VERSION -ne $null) { - $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" -} +$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" $options = $null $cfgfile = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -9,69 +9,48 @@ $host.ui.RawUI.WindowTitle = "reladdr2line..." -# -# Check if the user supplied a path, if they didn't look for -# the specified file in the current directory and any -# sub-directories. -# -function CHECKPATH { - if ($_1.Contains("\")) { - $_1 = get-childitem "$_1\*" -name -recurse 2>NUL | select-string "$_1" +# Receive all parameters. +$FILEPATH = $args[0] +$ADDRESS = $args[1] +if ($args.length -lt 1) { + if ($FILEPATH -eq $null) { + $FILEPATH = Read-Host "Please enter the path/file to be examined: " + if ($FILEPATH.Contains("\")) { + $FILEPATH = get-childitem "$FILEPATH\*" -name -recurse 2>NUL | select-string "$FILEPATH" + } + } +} +elseif ($args.length -lt 2) { + if ($ADDRESS -eq $null) { + $ADDRESS = Read-Host "Please enter the address you would like to analyze: " } } -# -# Receive the Parameters and decide what to do. -# -$_1 = $args[0] -$_2 = $args[1] -if ($args.length -gt 2) { - "ERROR: Too many parameters specified." -} -elseif ($args.length -lt 1) { - if ($_1 -eq $null) { - $_1 = Read-Host "Please enter the path/file to be examined: " - CHECKPATH - } -} -elseif ($args.length -lt 2) { - if ($_2 -eq $null) { - $_2 = Read-Host "Please enter the address you would like to analyze: " - } -} - -# -# First get the ImageBase of the File. If its smaller than the given -# Parameter, everything is ok, because it was already added onto the -# adress and can be given directly to raddr2line. If not, add it and -# give the result to raddr2line. -# -if ($_1 -eq $null) { +# Check if parameters were really given +if ($FILEPATH -eq $null) { "ERROR: You must specify a path/file to examine." } -if ($_2 -eq $null) { +if ($ADDRESS -eq $null) { "ERROR: You must specify a address to analyze." } -$baseaddr = (objdump -p $_1 | select-string "ImageBase").tostring().split() +$baseaddr = (objdump -p $FILEPATH | select-string "ImageBase").tostring().split() $baseaddr = "0x" + ($baseaddr.get($baseaddr.length - 1)) -if ($baseaddr -lt $_2) { - IEX "& '$_ROSBE_BASEDIR\Tools\raddr2line.exe' '$_1' '$_2'" +if ($baseaddr -lt $ADDRESS) { + IEX "& '$_ROSBE_BASEDIR\Tools\raddr2line.exe' '$FILEPATH' '$ADDRESS'" } else { - $baseaddr = ($baseaddr | % {[Convert]::ToInt32($_,16)}) + ($_2 | % {[Convert]::ToInt32($_,16)}) + $baseaddr = ($baseaddr | % {[Convert]::ToInt32($_,16)}) + ($ADDRESS | % {[Convert]::ToInt32($_,16)}) $relbase = "0x" + ("{0:X}" -f $baseaddr) - IEX "& '$_ROSBE_BASEDIR\Tools\raddr2line.exe' '$_1' '$relbase'" + IEX "& '$_ROSBE_BASEDIR\Tools\raddr2line.exe' '$FILEPATH' '$relbase'" } -if ($_ROSBE_VERSION -ne $null) { - $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" -} +$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" # # Unload all used Vars. # -$_1 = $null -$_2 = $null +$FILEPATH = $null +$ADDRESS = $null $baseaddr = $null $relbase = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -7,105 +7,24 @@ # # -# -# Check if we are running within the RosBE, and if not initialize GCC for the -# current directory. -# -if ($_ROSBE_HOST_MINGWPATH -eq $null) { - $_ROSBE_MODE = "MinGW" - $_ROSBE_HOST_MINGWPATH = "$pwd" - $_ROSBE_ORIGINALPATH = "$ENV:PATH" +# Check if we're switching to the AMD64 architecture +if ("$ENV:ROS_ARCH" -eq "amd64") { + $ENV:ROS_PREFIX = "x86_64-pc-mingw32-" +} else { + $ENV:ROS_PREFIX = $null } +$ENV:PATH = "$_ROSBE_TARGET_MINGWPATH\bin;$_ROSBE_ORIGINALPATH" -# -# Set the Arch Variables -# - -$ENV:ROS_ARCH = $null -$ENV:ROS_PREFIX = $null -$_ROSBE_OBJPATH = "$_ROSBE_i386_OBJPATH" -$_ROSBE_OUTPATH = "$_ROSBE_i386_OUTPATH" - - -if ($_ROSBE_ARCH -ne $null) { - $ENV:ROS_ARCH = $_ROSBE_ARCH - $ENV:ROS_PREFIX = "$_ROSBE_ARCH-pc-mingw32" - $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\$_ROSBE_ARCH" - - # HAXX - if ($_ROSBE_ARCH -eq "arm") { - $_ROSBE_OBJPATH = "$_ROSBE_ARM_OBJPATH" - $_ROSBE_OUTPATH = "$_ROSBE_ARM_OUTPATH" - } - if ($_ROSBE_ARCH -eq "ppc") { - $_ROSBE_OBJPATH = "$_ROSBE_PPC_OBJPATH" - $_ROSBE_OUTPATH = "$_ROSBE_PPC_OUTPATH" - } - if ($_ROSBE_ARCH -eq "amd64") { - $_ROSBE_OBJPATH = "$_ROSBE_AMD64_OBJPATH" - $_ROSBE_OUTPATH = "$_ROSBE_AMD64_OUTPATH" - $ENV:ROS_PREFIX = "x86_64-pc-mingw32" - $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\x86_64" - } - - # Check if existant arch - - if (Test-Path "$_ROSBE_TARGET_MINGWPATH\.") { - "Unsupported arch specified. Fallback to Default." - pause - $_ROSBE_OBJPATH = "$_ROSBE_i386_OBJPATH" - $_ROSBE_OUTPATH = "$_ROSBE_i386_OUTPATH" - $ENV:ROS_ARCH = $null - $ENV:ROS_PREFIX = $null - $_ROSBE_TARGET_MINGWPATH = $null - } -} - -# -# Set up the GCC 4.x.x build environment. -# -$ENV:PATH = "$_ROSBE_HOST_MINGWPATH\bin;$_ROSBE_TARGET_MINGWPATH\bin;$_ROSBE_ORIGINALPATH" -$global:_ROSBE_MINGWMAKE = "$_ROSBE_HOST_MINGWPATH\bin\mingw32-make.exe" - -if ($ENV:ROS_ARCH -ne $null) { - & "$ENV:ROS_PREFIX-gcc" -v 2> gcctvers.tmp - $global:_ROSBE_GCCVERSION = (select-string -path .\gcctvers.tmp "gcc version") -replace ".*version ((\d|\.)+).*",'$1' - $global:_ROSBE_GCCTARGET = (select-string -path .\gcctvers.tmp "target=") -replace ".*--target=(.+?)\b.*",'$1' -} else { - gcc -v 2> gcctvers.tmp - $global:_ROSBE_GCCVERSION = (select-string -path .\gcctvers.tmp "gcc version") -replace ".*version ((\d|\.)+).*",'$1' - $global:_ROSBE_GCCTARGET = (select-string -path .\gcctvers.tmp "target=") -replace ".*--target=(.+?)\b.*",'$1' -} +& "$ENV:ROS_PREFIXgcc" -v 2> gcctvers.tmp +$global:_ROSBE_TARGET_GCCVERSION = (select-string -path .\gcctvers.tmp "gcc version") -replace ".*version ((\d|\.)+).*",'$1' +$global:_ROSBE_TARGET_GCCTARGET = (select-string -path .\gcctvers.tmp "target=") -replace ".*--target=(.+?)\b.*",'$1' gcc -v 2> gcchvers.tmp $global:_ROSBE_HOST_GCCVERSION = (select-string -path .\gcchvers.tmp "gcc version") -replace ".*version ((\d|\.)+).*",'$1' $global:_ROSBE_HOST_GCCTARGET = (select-string -path .\gcchvers.tmp "target=") -replace ".*--target=(.+?)\b.*",'$1' remove-item gcchvers.tmp -if ($_ROSBE_MODE -eq "MinGW") { - $ENV:C_INCLUDE_PATH = "$_ROSBE_HOST_MINGWPATH\include;$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include" - $ENV:CPLUS_INCLUDE_PATH = "$_ROSBE_HOST_MINGWPATH\include;$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_GCCVERSION;$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET;$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include" - $ENV:ROSBE_HOST_CFLAGS = $null - $ENV:ROSBE_HOST_CXXFLAGS = $null - $ENV:ROSBE_TARGET_CFLAGS = $null - $ENV:ROSBE_TARGET_CXXFLAGS = $null -} else { - $ENV:C_INCLUDE_PATH = $null - $ENV:CPLUS_INCLUDE_PATH = $null - $ENV:ROSBE_HOST_CFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\include"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" - $ENV:ROSBE_HOST_CXXFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\include"" -I""$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_HOST_GCCVERSION"" -I""$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_HOST_GCCVERSION\$_ROSBE_HOST_GCCTARGET"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" - $ENV:ROSBE_TARGET_CFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include""" - $ENV:ROSBE_TARGET_CXXFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_GCCVERSION"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include""" -} -if ($_ROSBE_HOST_GCCVERSION -eq "3.4.5") { - $ENV:PATH = "$_ROSBE_BASEDIR\3.4.5\bin;$_ROSBE_BASEDIR\3.4.5\libexec\gcc\mingw32\3.4.5;$ENV:PATH" - $_ROSBE_MINGWMAKE = "$_ROSBE_BASEDIR\3.4.5\bin\mingw32-make.exe" - # Set all paths (needed by Windows Vista) - $ENV:C_INCLUDE_PATH = "$_ROSBE_BASEDIR\3.4.5\include;$_ROSBE_BASEDIR\3.4.5\lib\gcc\mingw32\3.4.5\include" - $ENV:CPLUS_INCLUDE_PATH = "$_ROSBE_BASEDIR\3.4.5\include;$_ROSBE_BASEDIR\3.4.5\include\c++\3.4.5;$_ROSBE_BASEDIR\3.4.5\include\c++\3.4.5\mingw32;$_ROSBE_BASEDIR\3.4.5\lib\gcc\mingw32\3.4.5\include" - $ENV:LIBRARY_PATH = "$_ROSBE_BASEDIR\3.4.5\lib;$_ROSBE_BASEDIR\3.4.5\lib\gcc\mingw32\3.4.5" - $ENV:ROSBE_HOST_CFLAGS = $null - $ENV:ROSBE_HOST_CXXFLAGS = $null - $ENV:ROSBE_TARGET_CFLAGS = $null - $ENV:ROSBE_TARGET_CXXFLAGS = $null -} +$ENV:ROSBE_HOST_CFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\include"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" +$ENV:ROSBE_HOST_CXXFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\include"" -I""$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_HOST_GCCVERSION"" -I""$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_HOST_GCCVERSION\$_ROSBE_HOST_GCCTARGET"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" +$ENV:ROSBE_TARGET_CFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include""" +$ENV:ROSBE_TARGET_CXXFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_GCCVERSION"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include""" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -47,16 +47,12 @@ } } -# # Receive the first parameter and decide what to do. -# if ($args[0] -eq $null) { "No parameter specified. Try 'help [COMMAND]'." } -# # These two are directly parsed to svn. -# elseif ($args[0] -eq "update") { $host.ui.RawUI.WindowTitle = "SVN Updating..." "This might take a while, so please be patient." @@ -71,9 +67,7 @@ IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' cleanup" } -# # Check if the folder is empty. If not, output an error. -# elseif ($args[0] -eq "create") { $host.ui.RawUI.WindowTitle = "SVN Creating..." if (Test-Path ".svn\.") { @@ -88,10 +82,8 @@ } } -# # Output the revision of the local and online trees and tell the user if # its up to date or not. -# elseif ($args[0] -eq "status") { $host.ui.RawUI.WindowTitle = "SVN Status" "This might take a while, so please be patient." @@ -104,9 +96,7 @@ "Unknown parameter specified. Try 'help ssvn'." } -if ($_ROSBE_VERSION -ne $null) { - $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" -} +$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" # # Unload all used Vars. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -33,9 +33,7 @@ elseif ($args[0] -eq "--help") {paramcall($args)} else {parse($args)} -if ($_ROSBE_VERSION -ne $null) { - $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" -} +$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" # # Unload all used Vars. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -7,16 +7,11 @@ # # -# -# Set Title -# $host.ui.RawUI.WindowTitle = "Updating..." function EOC { set-location "$_ROSBE_OPATH" - if ($_ROSBE_VERSION -ne $null) { - $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" - } + $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" exit } @@ -64,14 +59,10 @@ } } -# # The Update Server. -# -$_ROSBE_URL = "http://danielreimer.5x.to/rosbe" +$_ROSBE_URL = "http://dreimer.dr.funpic.org/rosbe" -# # Save the recent dir to cd back there at the end. -# $_ROSBE_OPATH = "$pwd" if (!(Test-Path "$_ROSBE_BASEDIR\Tools\7z.exe")) { @@ -82,9 +73,7 @@ set-location $_ROSBE_BASEDIR -# # First check for a new Updater. -# rename-item update.ps1 update2.ps1 get-webfile $_ROSBE_URL/update.ps1 $PWD\update.ps1 if ((gi .\update.ps1).LastWriteTime -gt (gi .\update2.ps1).LastWriteTime) { @@ -96,15 +85,15 @@ remove-item update.ps1 -force rename-item update2.ps1 update.ps1 } -# # Get to the Updates Subfolder. -# if (!(Test-Path "$ENV:APPDATA\RosBE\Updates")) {New-Item -path "$ENV:APPDATA\RosBE" -name "Updates" -type directory} set-location "$ENV:APPDATA\RosBE\Updates" -# # Parse the args. -# + +$arg1 = $args[0] +$arg2 = $args[1] + if ("$args" -eq "") { $_ROSBE_MULTIUPD = 1 $_ROSBE_STATCOUNT = 1 @@ -112,27 +101,17 @@ UPDCHECK $_ROSBE_STATCOUNT += 1 } - EOC -} -if ("$args" -eq "reset") { +} elseif ("$args" -eq "reset") { remove-item "$ENV:APPDATA\RosBE\Updates\*.*" -force -recurse -EA SilentlyContinue remove-item "$ENV:APPDATA\RosBE\Updates\tmp\*.*" -force -recurse -EA SilentlyContinue - EOC -} -$arg1 = $args[0] -$arg2 = $args[1] -if ("$arg1" -eq "nr") { +} elseif ("$arg1" -eq "nr") { $_ROSBE_STATCOUNT = $arg2 UPDCHECK - EOC -} -if ("$arg1" -eq "delete") { +} elseif ("$arg1" -eq "delete") { $_ROSBE_STATCOUNT = $arg2 remove-item "$ENV:APPDATA\RosBE\Updates\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.*" -force -recurse -EA SilentlyContinue remove-item "$ENV:APPDATA\RosBE\Updates\tmp\$_ROSBE_VERSION-$_ROSBE_STATCOUNT.*" -force -recurse -EA SilentlyContinue - EOC -} -if ("$arg1" -eq "info") { +} elseif ("$arg1" -eq "info") { $_ROSBE_STATCOUNT = $arg2 set-location tmp if (!(Test-path "$_ROSBE_VERSION-$_ROSBE_STATCOUNT.txt")) { @@ -145,11 +124,7 @@ } set-location .. remove-item "tmp\*.*" -force -EA SilentlyContinue - EOC -} -$arg1 = $null -$arg2 = $null -if ("$args" -eq "status") { +} elseif ("$args" -eq "status") { $_ROSBE_STATCOUNT = 1 if (!(test-path "tmp")) {New-Item -name "tmp" -type directory} copy-item *.txt .\tmp\. @@ -170,13 +145,12 @@ } else { "RosBE is up to Date." } - EOC -} -if ("$args" -ne "") { +} else { "Unknown parameter specified. Try 'help update'." - EOC } +$arg1 = $null +$arg2 = $null $_ROSBE_UPDFINISH = $null $_ROSBE_OPATH = $null $_ROSBE_UPDDATE = $null @@ -184,3 +158,4 @@ $_ROSBE_UPDDATE2 = $null $_ROSBE_MULTIUPD = $null $_ROSBE_STATCOUNT = $null +EOC Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 [iso-8859-1] Mon May 11 04:40:11 2009 @@ -8,40 +8,24 @@ (get-WmiObject Win32_OperatingSystem).caption +# GCC (select-string -path .\gcctvers.tmp "gcc version") -replace ".*: (.+?)\b",'$1' | % { $str = $_ -replace '^.*14:',''} $str "gcc target - $_ROSBE_GCCTARGET" remove-item gcctvers.tmp -if ($ENV:ROS_ARCH -ne $null) { - & "$_ROSBE_TARGET_MINGWPATH\bin\$ENV:ROS_PREFIX-ld" -v -} else { - & ld -v -} +# LD +& "$_ROSBE_TARGET_MINGWPATH\bin\$ENV:ROS_PREFIXld" -v + +# NASM or YASM if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\nasm.exe") { & nasm -v } else { - if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\yasm.exe") { - & yasm --version | select-string "yasm 0" - } else { - if ($_ROSBE_MODE -eq "RosBE") { - "ERROR: NASM or YASM is required to build ReactOS, none was found in the current MinGW/GCC." - } - } + & yasm --version | select-string "yasm 0" } -if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\bison.exe") { - & bison '--version' | select-string "GNU Bison" -} else { - if ($_ROSBE_MODE -eq "RosBE") { - "WARNING: Bison will soon be required to build ReactOS, none was found in the current MinGW/GCC." - } -} -if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\flex.exe") { - $fver = (& flex '--version') -replace ".*version ((\d|\.)+).*",'$1' - "flex $fver" -} else { - if ($_ROSBE_MODE -eq "RosBE") { - "WARNING: Flex will soon be required to build ReactOS, none was found in the current MinGW/GCC." - } -} + +# Bison, Flex and Make +& bison '--version' | select-string "GNU Bison" +$fver = (& flex '--version') -replace ".*version ((\d|\.)+).*",'$1' +"flex $fver" & mingw32-make -v | & find "GNU Make"

1 0

[cgutman] 40881: - Don't cast NDIS_SPIN_LOCK directly to KSPIN_LOCK
by cgutman＠svn.reactos.org 10 May '09

10 May '09

Author: cgutman Date: Mon May 11 03:55:45 2009 New Revision: 40881 URL: http://svn.reactos.org/svn/reactos?rev=40881&view=rev Log: - Don't cast NDIS_SPIN_LOCK directly to KSPIN_LOCK Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] Mon May 11 03:55:45 2009 @@ -17,7 +17,7 @@ IN ULONG Increment, IN PNDIS_SPIN_LOCK SpinLock) { - ExInterlockedAddUlong ( Addend, Increment, (PKSPIN_LOCK)SpinLock ); + ExInterlockedAddUlong ( Addend, Increment, &SpinLock->SpinLock ); } @@ -32,7 +32,7 @@ IN PLIST_ENTRY ListEntry, IN PNDIS_SPIN_LOCK SpinLock) { - return ExInterlockedInsertHeadList ( ListHead, ListEntry, (PKSPIN_LOCK)SpinLock ); + return ExInterlockedInsertHeadList ( ListHead, ListEntry, &SpinLock->SpinLock ); } @@ -47,7 +47,7 @@ IN PLIST_ENTRY ListEntry, IN PNDIS_SPIN_LOCK SpinLock) { - return ExInterlockedInsertTailList ( ListHead, ListEntry, (PKSPIN_LOCK)SpinLock ); + return ExInterlockedInsertTailList ( ListHead, ListEntry, &SpinLock->SpinLock ); } @@ -61,7 +61,7 @@ IN PLIST_ENTRY ListHead, IN PNDIS_SPIN_LOCK SpinLock) { - return ExInterlockedRemoveHeadList ( ListHead, (PKSPIN_LOCK)SpinLock ); + return ExInterlockedRemoveHeadList ( ListHead, &SpinLock->SpinLock ); } typedef struct _NDIS_HANDLE_OBJECT

1 0

[cgutman] 40880: - Allocate space for the packet extension located at NdisPacketOobOffset + sizeof(NDIS_PACKET_OOB_DATA) - Fixes more packet corruption
by cgutman＠svn.reactos.org 10 May '09

10 May '09

Author: cgutman Date: Mon May 11 01:43:55 2009 New Revision: 40880 URL: http://svn.reactos.org/svn/reactos?rev=40880&view=rev Log: - Allocate space for the packet extension located at NdisPacketOobOffset + sizeof(NDIS_PACKET_OOB_DATA) - Fixes more packet corruption Modified: trunk/reactos/drivers/network/ndis/ndis/buffer.c Modified: trunk/reactos/drivers/network/ndis/ndis/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/buffer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/buffer.c [iso-8859-1] Mon May 11 01:43:55 2009 @@ -428,7 +428,9 @@ Temp->Private.Pool = Pool; Temp->Private.ValidCounts = TRUE; Temp->Private.NdisPacketFlags = fPACKET_ALLOCATED_BY_NDIS; - Temp->Private.NdisPacketOobOffset = Pool->PacketLength - sizeof(NDIS_PACKET_OOB_DATA); + Temp->Private.NdisPacketOobOffset = Pool->PacketLength - + (sizeof(NDIS_PACKET_OOB_DATA) + + sizeof(NDIS_PACKET_EXTENSION)); *Packet = Temp; *Status = NDIS_STATUS_SUCCESS; @@ -507,7 +509,8 @@ NumberOfDescriptors = 0xffff; } - Length = sizeof(NDIS_PACKET) + sizeof(NDIS_PACKET_OOB_DATA) + ProtocolReservedLength; + Length = sizeof(NDIS_PACKET) + sizeof(NDIS_PACKET_OOB_DATA) + + sizeof(NDIS_PACKET_EXTENSION) + ProtocolReservedLength; Size = sizeof(NDISI_PACKET_POOL) + Length * NumberOfDescriptors; Pool = ExAllocatePool(NonPagedPool, Size); @@ -712,7 +715,9 @@ Temp->Private.Pool = Pool; Temp->Private.ValidCounts = TRUE; Temp->Private.NdisPacketFlags = fPACKET_ALLOCATED_BY_NDIS; - Temp->Private.NdisPacketOobOffset = Pool->PacketLength - sizeof(NDIS_PACKET_OOB_DATA); + Temp->Private.NdisPacketOobOffset = Pool->PacketLength - + (sizeof(NDIS_PACKET_OOB_DATA) + + sizeof(NDIS_PACKET_EXTENSION)); *Packet = Temp; *Status = NDIS_STATUS_SUCCESS; @@ -762,7 +767,9 @@ Temp->Private.Pool = Pool; Temp->Private.ValidCounts = TRUE; Temp->Private.NdisPacketFlags = fPACKET_ALLOCATED_BY_NDIS; - Temp->Private.NdisPacketOobOffset = Pool->PacketLength - sizeof(NDIS_PACKET_OOB_DATA); + Temp->Private.NdisPacketOobOffset = Pool->PacketLength - + (sizeof(NDIS_PACKET_OOB_DATA) + + sizeof(NDIS_PACKET_EXTENSION)); *Packet = Temp; *Status = NDIS_STATUS_SUCCESS;

1 0

[dgoette] 412: now unload rich text editors, when loading a new entry table in general
by dgoette＠svn.reactos.org 10 May '09

10 May '09

Author: dgoette Date: Sun May 10 23:58:22 2009 New Revision: 412 URL: http://svn.reactos.org/svn/reactos?rev=412&view=rev Log: now unload rich text editors, when loading a new entry table in general Modified: branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js Modified: branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/js/cms_website.js [iso-8859-1] Sun May 10 23:58:22 2009 @@ -1468,6 +1468,9 @@ // page table main case 'ptm': buildEntryTable(http_request, objid); + + // stop richt text editors + rtestop(); break; // main edit frame @@ -1530,6 +1533,7 @@ http_request.setRequestHeader("Content-length", parameters.length); http_request.setRequestHeader("If-Modified-Since", "Sat, 1 Jan 2000 00:00:00 GMT"); // Bypass the IE Cache http_request.setRequestHeader("Connection", "close"); + http_request.setRequestHeader("Accept-Charset","UTF-8"); http_request.send(parameters); } else { @@ -1811,9 +1815,6 @@ window.clearTimeout(autosave_timer); autosave_cache = ''; - - // stop richt text editors - rtestop(); if (document.getElementById('smenutab'+objid.substring(8)).className !== 'lmItemTopSelected') { highlightTab(objid);

1 0

[dgoette] 411: add missing style class
by dgoette＠svn.reactos.org 10 May '09

10 May '09

Author: dgoette Date: Sun May 10 23:32:03 2009 New Revision: 411 URL: http://svn.reactos.org/svn/reactos?rev=411&view=rev Log: add missing style class Modified: branches/danny-web/www/www.reactos.org/style.css Modified: branches/danny-web/www/www.reactos.org/style.css URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/s… ============================================================================== --- branches/danny-web/www/www.reactos.org/style.css [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/style.css [iso-8859-1] Sun May 10 23:32:03 2009 @@ -442,3 +442,13 @@ font-size: 10px; color: #367d10; } + + +/* Quotes */ +.catchyquotes { + font-family: Georgia, "Times New Roman", Times, serif; + font-style: italic; + font-size: 24px; +} + +

1 0

[dreimer] 40879: Get the installer in sync with Colin's recent changes. TBD: Sync the PS Scripts too.
by dreimer＠svn.reactos.org 10 May '09

10 May '09

Author: dreimer Date: Sun May 10 23:26:40 2009 New Revision: 40879 URL: http://svn.reactos.org/svn/reactos?rev=40879&view=rev Log: Get the installer in sync with Colin's recent changes. TBD: Sync the PS Scripts too. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Sun May 10 23:26:40 2009 @@ -120,8 +120,8 @@ File /r Root\changelog.txt File /r Root\LICENSE.txt ${If} $R4 = '6.1' - File /r Components\Powershell\MinGW.ps1 File /r Components\Powershell\Build.ps1 + File /r Components\Powershell\charch.ps1 File /r Components\Powershell\chdefgcc.ps1 File /r Components\Powershell\Clean.ps1 File /r Components\Powershell\Help.ps1 @@ -130,9 +130,8 @@ File /r Components\Powershell\version.ps1 WriteRegStr HKLM "Software\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" "ExecutionPolicy" "RemoteSigned" ${else} - File /r Root\MinGW.cmd - File /r Root\MinGW.mac File /r Root\Build.cmd + File /r Root\charch.cmd File /r Root\chdefgcc.cmd File /r Root\Clean.cmd File /r Root\Help.cmd @@ -140,6 +139,7 @@ File /r Root\RosBE.mac File /r Root\rosbe-gcc-env.cmd File /r Root\TimeDate.cmd + File /r Root\TranslateOptions.cmd File /r Root\version.cmd SetOutPath "$INSTDIR\Tools" SetOverwrite try @@ -296,8 +296,6 @@ ${If} $R4 = '6.1' SetOutPath "$INSTDIR" SetOverwrite try - File /r Root\MinGW.cmd - File /r Root\MinGW.mac File /r Root\Build.cmd File /r Root\chdefgcc.cmd File /r Root\Clean.cmd @@ -306,6 +304,7 @@ File /r Root\RosBE.mac File /r Root\rosbe-gcc-env.cmd File /r Root\TimeDate.cmd + File /r Root\TranslateOptions.cmd File /r Root\version.cmd File /r Root\charch.cmd File /r Root\chdefdir.cmd @@ -327,7 +326,6 @@ SetOutPath "$INSTDIR" SetOverwrite try File /r Components\Powershell\Build.ps1 - File /r Components\Powershell\MinGW.ps1 File /r Components\Powershell\RosBE.ps1 File /r Components\Powershell\rosbe-gcc-env.ps1 File /r Components\Powershell\Help.ps1 @@ -360,17 +358,11 @@ CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" - SetOutPath $PROFILE - IfFileExists "$INSTDIR\MinGW.cmd" 0 +2 - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" - IfFileExists "$INSTDIR\MinGW.ps1" 0 +2 - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Standard MinGW Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\MinGW.ps1'" "$INSTDIR\mingw.ico" - - SetOutPath $INSTDIR - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall RosBE.lnk" \ - "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" - CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Readme.lnk" \ - "$INSTDIR\README.pdf" + SetOutPath $INSTDIR + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall RosBE.lnk" \ + "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" + CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Readme.lnk" \ + "$INSTDIR\README.pdf" !insertmacro MUI_STARTMENU_WRITE_END SectionEnd @@ -386,12 +378,6 @@ CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 CreateShortCut "$DESKTOP\ReactOS Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" - - SetOutPath $PROFILE - IfFileExists "$INSTDIR\MinGW.cmd" 0 +2 - CreateShortCut "$DESKTOP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" - IfFileExists "$INSTDIR\MinGW.ps1" 0 +2 - CreateShortCut "$DESKTOP\Standard MinGW Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\MinGW.ps1'" "$INSTDIR\mingw.ico" SectionEnd Section /o "Quick Launch Shortcuts" SEC14 @@ -406,12 +392,6 @@ CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" - - SetOutPath $PROFILE - IfFileExists "$INSTDIR\MinGW.cmd" 0 +2 - CreateShortCut "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" - IfFileExists "$INSTDIR\MinGW.ps1" 0 +2 - CreateShortCut "$QUICKLAUNCH\Standard MinGW Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\MinGW.ps1'" "$INSTDIR\mingw.ico" SectionEnd Section -Post SEC15 @@ -452,12 +432,8 @@ IDNO +9 Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment.lnk" Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment.lnk" - Delete /REBOOTOK "$DESKTOP\Standard MinGW Build Environment.lnk" - Delete /REBOOTOK "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment - Powershell.lnk" Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment - Powershell.lnk" - Delete /REBOOTOK "$DESKTOP\Standard MinGW Build Environment - Powershell.lnk" - Delete /REBOOTOK "$QUICKLAUNCH\Standard MinGW Build Environment - Powershell.lnk" FunctionEnd Section Uninstall @@ -482,8 +458,6 @@ Delete /REBOOTOK "$INSTDIR\Config.ps1" Delete /REBOOTOK "$INSTDIR\Help.cmd" Delete /REBOOTOK "$INSTDIR\Help.ps1" - Delete /REBOOTOK "$INSTDIR\MinGW.cmd" - Delete /REBOOTOK "$INSTDIR\MinGW.ps1" Delete /REBOOTOK "$INSTDIR\options.cmd" Delete /REBOOTOK "$INSTDIR\options.ps1" Delete /REBOOTOK "$INSTDIR\reladdr2line.cmd" @@ -497,13 +471,13 @@ Delete /REBOOTOK "$INSTDIR\sSVN.cmd" Delete /REBOOTOK "$INSTDIR\sSVN.ps1" Delete /REBOOTOK "$INSTDIR\TimeDate.cmd" + Delete /REBOOTOK "$INSTDIR\TranslateOptions.cmd" Delete /REBOOTOK "$INSTDIR\update.cmd" Delete /REBOOTOK "$INSTDIR\update.ps1" Delete /REBOOTOK "$INSTDIR\README.pdf" Delete /REBOOTOK "$INSTDIR\rosbe.ico" Delete /REBOOTOK "$INSTDIR\mingw.ico" Delete /REBOOTOK "$INSTDIR\uninstall.ico" - Delete /REBOOTOK "$INSTDIR\MinGW.mac" Delete /REBOOTOK "$INSTDIR\RosBE.mac" Delete /REBOOTOK "$INSTDIR\ChangeLog.txt" Delete /REBOOTOK "$INSTDIR\LICENSE.txt" Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Sun May 10 23:26:40 2009 @@ -126,9 +126,9 @@ SectionEnd Section -MinGWGCCNASM SEC02 - SetOutPath "$INSTDIR\x86_64" + SetOutPath "$INSTDIR\amd64" SetOverwrite try - File /r Components\x86_64\*.* + File /r Components\amd64\*.* SectionEnd Section -StartMenuShortcuts SEC03

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
51
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 May 2009