Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 29766: Fix a typo in RosBE.cmd Make sure that loading chdefdir more than once does not overwrite the Backup.
by dreimer＠svn.reactos.org 22 Oct '07

22 Oct '07

Author: dreimer Date: Mon Oct 22 11:52:42 2007 New Revision: 29766 URL: http://svn.reactos.org/svn/reactos?rev=29766&view=rev Log: Fix a typo in RosBE.cmd Make sure that loading chdefdir more than once does not overwrite the Backup. Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/chdefdir.cmd Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Mon Oct 22 11:52:42 2007 @@ -105,7 +105,7 @@ set _ROSBE_GCCVERSION=4.1.3 set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_MINGWPATH%\libexec\gcc\mingw32\4.1.3;%PATH% set _ROSBE_MINGWMAKE=%_ROSBE_MINGWPATH%\bin\mingw32-make.exe - if defined _ROSBE_OLDEMODE ( + if defined _ROSBE_OLDMODE ( set C_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\lib\gcc\mingw32\4.1.3\include set CPLUS_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\include\c++\4.1.3;%_ROSBE_MINGWPATH%\include\c++\4.1.3\mingw32;%_ROSBE_MINGWPATH%\lib\gcc\mingw32\4.1.3\include ) Modified: trunk/tools/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/chdefdir.… ============================================================================== --- trunk/tools/RosBE-Windows/Root/chdefdir.cmd (original) +++ trunk/tools/RosBE-Windows/Root/chdefdir.cmd Mon Oct 22 11:52:42 2007 @@ -10,8 +10,16 @@ title Change the Default Dir... -set _ROSBE_ROSSOURCEDIRBCK=%_ROSBE_ROSSOURCEDIR% +:: +:: Create a Backup Variable to revert to Default if wanted. +:: +if not defined _ROSBE_ROSSOURCEDIRBCK ( + set _ROSBE_ROSSOURCEDIRBCK=%_ROSBE_ROSSOURCEDIR% +) +:: +:: Parse the commands. +:: if /i "%1" == "" ( goto :INTERACTIVE )

1 0

[weiden] 29765: Process window messages while the (un)installer is running and disable it
by weiden＠svn.reactos.org 22 Oct '07

22 Oct '07

Author: weiden Date: Mon Oct 22 07:38:51 2007 New Revision: 29765 URL: http://svn.reactos.org/svn/reactos?rev=29765&view=rev Log: Process window messages while the (un)installer is running and disable it Modified: trunk/reactos/dll/cpl/appwiz/remove.c Modified: trunk/reactos/dll/cpl/appwiz/remove.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/remove.c?re… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/remove.c (original) +++ trunk/reactos/dll/cpl/appwiz/remove.c Mon Oct 22 07:38:51 2007 @@ -106,10 +106,11 @@ PROCESS_INFORMATION pi; INT nIndex; HKEY hKey; - DWORD dwType; + DWORD dwType, dwRet; TCHAR pszUninstallString[MAX_PATH]; DWORD dwSize; TCHAR Buf[256],Title[256]; + MSG msg; nIndex = (INT)SendMessage(GetDlgItem(hwndDlg, Control),LVM_GETNEXTITEM,-1,LVNI_FOCUSED); if (nIndex != -1) @@ -136,10 +137,28 @@ si.wShowWindow = SW_SHOW; if (CreateProcess(NULL,pszUninstallString,NULL,NULL,FALSE,0,NULL,NULL,&si,&pi)) { - ButtonStatus(hwndDlg, FALSE, RemBtn, InfoBtn); - WaitForSingleObject(pi.hProcess, INFINITE); + CloseHandle(pi.hThread); + EnableWindow(GetParent(hwndDlg), FALSE); + ButtonStatus(hwndDlg, FALSE, RemBtn, InfoBtn); + + for (;;) + { + dwRet = MsgWaitForMultipleObjects(1, &pi.hProcess, FALSE, INFINITE, QS_ALLEVENTS); + if (dwRet == WAIT_OBJECT_0 + 1) + { + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + else if (dwRet == WAIT_OBJECT_0 || dwRet == WAIT_FAILED) + break; + + } CloseHandle(pi.hProcess); - CloseHandle(pi.hThread); + EnableWindow(GetParent(hwndDlg), TRUE); + // Update software list (void)ListView_DeleteAllItems(GetDlgItem(hwndDlg, Control)); FillSoftwareList(hwndDlg, isUpdate, Control);

1 0

[peterw] 29764: - Fix a typo and do a bit of cleanup.
by peterw＠svn.reactos.org 22 Oct '07

22 Oct '07

Author: peterw Date: Mon Oct 22 07:22:05 2007 New Revision: 29764 URL: http://svn.reactos.org/svn/reactos?rev=29764&view=rev Log: - Fix a typo and do a bit of cleanup. Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/chdefdir.cmd trunk/tools/RosBE-Windows/Root/scut.cmd Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Mon Oct 22 07:22:05 2007 @@ -15,7 +15,7 @@ :: the options utility. :: color 0A -set _ROSBE_VERSION=0.X.X.X +set _ROSBE_VERSION=1.0 set _ROSBE_BASEDIR=%~dp0 for /f "usebackq" %%i in (`"echo %_ROSBE_BASEDIR%|%_ROSBE_BASEDIR%Tools\sed s/.$//g"`) do set _ROSBE_BASEDIR=%%i set _ROSBE_ROSSOURCEDIR=%CD% @@ -115,7 +115,7 @@ echo ******************************************************************************* echo * * - echo * ReactOS Build Environment %_ROSBE_VERSION%-4.1.3-20070703 (prerelease) * + echo * ReactOS Build Environment %_ROSBE_VERSION%-4.1.3-20070703 (prerelease) * echo * * echo ******************************************************************************* echo. Modified: trunk/tools/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/chdefdir.… ============================================================================== --- trunk/tools/RosBE-Windows/Root/chdefdir.cmd (original) +++ trunk/tools/RosBE-Windows/Root/chdefdir.cmd Mon Oct 22 07:22:05 2007 @@ -1,6 +1,6 @@ :: :: PROJECT: RosBE - ReactOS Build Environment for Windows -:: LICENSE: GPL - See COPYING in the top level directory +:: LICENSE: GPL - See LICENSE.txt in the top level directory :: FILE: Root/chdefdir.cmd :: PURPOSE: Tool to change the Default Work Dir in RosBE. :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> Modified: trunk/tools/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/scut.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/scut.cmd (original) +++ trunk/tools/RosBE-Windows/Root/scut.cmd Mon Oct 22 07:22:05 2007 @@ -13,22 +13,22 @@ :: :: Receive the first Parameter and decide what to do. :: -if /I "%1"=="" ( +if /i "%1"=="" ( goto :DEF ) -if /I "%1"=="add" ( +if /i "%1"=="add" ( goto :ADD ) -if /I "%1"=="rem" ( +if /i "%1"=="rem" ( goto :REM ) -if /I "%1"=="edit" ( +if /i "%1"=="edit" ( goto :EDIT ) -if /I "%1"=="def" ( +if /i "%1"=="def" ( goto :DEF2 ) -if /I "%1"=="run" ( +if /i "%1"=="run" ( for /f "usebackq tokens=1-2 delims=," %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( if %%i == Base ( echo Active Shortcut: %%j @@ -53,7 +53,7 @@ :: :DEF echo Choose your Source Folder: -set /P XY= +set /p XY= :RUN for /f "usebackq tokens=1-2 delims=, skip=1" %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( if %%i == %XY% ( @@ -83,10 +83,10 @@ :ADD1 echo Choose your Shortcut: -set /P CUT= +set /p CUT= :ADD2 echo Choose your Source Folder: -set /P DIR= +set /p DIR= :ADD23 for /f "usebackq tokens=1-2 delims=, skip=1" %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( if %%i == %CUT% ( @@ -108,7 +108,7 @@ goto :REM1 ) echo Choose your Shortcut: -set /P CUTREM= +set /p CUTREM= :REM1 set _ROSBE_REM=0 for /f "usebackq tokens=1-2 delims=," %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( @@ -137,7 +137,7 @@ goto :DEF1 ) echo Choose your new Default Shortcut: -set /P DIR= +set /p DIR= :DEF1 call "%_ROSBE_BASEDIR%\scut.cmd" edit Base %DIR% @@ -160,10 +160,10 @@ :EDIT1 echo Choose your Shortcut: -set /P CUT= +set /p CUT= :EDIT2 echo Choose your Source Folder: -set /P DIR= +set /p DIR= :EDIT23 set _ROSBE_EDIT=0 for /f "usebackq tokens=1-2 delims=," %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do (

1 0

[janderwald] 29763: - load dynamic shell extensions with IContextMenu interface
by janderwald＠svn.reactos.org 22 Oct '07

22 Oct '07

Author: janderwald Date: Mon Oct 22 04:36:10 2007 New Revision: 29763 URL: http://svn.reactos.org/svn/reactos?rev=29763&view=rev Log: - load dynamic shell extensions with IContextMenu interface Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Mon Oct 22 04:36:10 2007 @@ -23,7 +23,7 @@ #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT - +//#define YDEBUG #include "winerror.h" #include "wine/debug.h" @@ -32,6 +32,7 @@ #include "pidl.h" #include "undocshell.h" #include "shlobj.h" +#include "objbase.h" #include "shell32_main.h" #include "shellfolder.h" @@ -242,12 +243,19 @@ } VOID -SH_LoadContextMenuHandlers(ItemCmImpl *This, IDataObject * pDataObj) +SH_LoadContextMenuHandlers(ItemCmImpl *This, IDataObject * pDataObj, HMENU hMenu, UINT indexMenu ) { UINT i; WCHAR buffer[111]; char ebuf[10]; HRESULT hr; + IContextMenu * cmenu; + HRESULT hResult; + UINT idCmdFirst = 0x5000; + UINT idCmdLast = 0xFFF0; + static const WCHAR szAny[] = { '*',0}; + + SH_EnumerateDynamicContextHandlerForKey(szAny, This, pDataObj); for (i = 0; i < This->cidl; i++) { @@ -265,13 +273,26 @@ } } - if (_ILGetExtension(This->apidl[i], ebuf, sizeof(ebuf) / sizeof(char))) + if (_ILGetExtension(This->apidl[i], &ebuf[1], sizeof(ebuf) / sizeof(char))) { + ebuf[0] = L'.'; buffer[0] = L'\0'; if (MultiByteToWideChar(CP_ACP, 0, ebuf, -1, buffer, 111)) SH_EnumerateDynamicContextHandlerForKey(buffer, This, pDataObj); } } + + TRACE("SH_LoadContextMenuHandlers num extensions %u\n", This->ecount); + + for (i = 0; i < This->ecount; i++) + { + cmenu = This->ecmenu[i]; + TRACE("Invoking menu %p\n", cmenu); + hResult = cmenu->lpVtbl->QueryContextMenu(hMenu, indexMenu, idCmdFirst, idCmdLast, idCmdLast, CMF_NORMAL); + TRACE("result %x\n",hResult); + } + + } @@ -331,14 +352,13 @@ lastindex = FCIDM_SHVIEWLAST; } -#if 0 pDataObj = IDataObject_Constructor(NULL, This->pidl, This->apidl, This->cidl); if (pDataObj) { - SH_LoadContextMenuHandlers(This, pDataObj); - pDataObj->Release (); - } -#endif + SH_LoadContextMenuHandlers(This, pDataObj, hmenu, indexMenu); + IDataObject_Release(pDataObj); + } + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, lastindex); } @@ -679,16 +699,18 @@ }; HRESULT -SH_LoadDynamicContextMenuHandler(HKEY hKey, LPCWSTR szClass, IContextMenu** ppv, IDataObject * pDataObj) +SH_LoadDynamicContextMenuHandler(HKEY hKey, const CLSID * szClass, IContextMenu** ppv, IDataObject * pDataObj) { HRESULT hr; IContextMenu * cmobj; IShellExtInit *shext; - hr = SHCoCreateInstance(szClass, NULL, NULL, &IID_IContextMenu, (void**)&cmobj); + TRACE("SH_LoadDynamicContextMenuHandler entered with %s\n",wine_dbgstr_guid(szClass)); + + hr = SHCoCreateInstance(NULL, szClass, NULL, &IID_IContextMenu, (void**)&cmobj); if (hr != S_OK) { - TRACE("SHCoCreateInstance failed\n"); + TRACE("SHCoCreateInstance failed %x\n", GetLastError()); return hr; } @@ -716,20 +738,23 @@ } UINT -SH_EnumerateDynamicContextHandlerForKey(LPWSTR szFileClass, ItemCmImpl *This, IDataObject * pDataObj) +SH_EnumerateDynamicContextHandlerForKey(const LPWSTR szFileClass, ItemCmImpl *This, IDataObject * pDataObj) { HKEY hKey; - WCHAR szKey[MAX_PATH]; - WCHAR szName[MAX_PATH]; + WCHAR szKey[MAX_PATH] = {0}; + WCHAR szName[MAX_PATH] = {0}; DWORD dwIndex, dwName; LONG res; HRESULT hResult; IContextMenu * cmobj; UINT index; + CLSID clsid; static const WCHAR szShellEx[] = { '\\','s','h','e','l','l','e','x','\\','C','o','n','t','e','x','t','M','e','n','u','H','a','n','d','l','e','r','s',0 }; wcscpy(szKey, szFileClass); wcscat(szKey, szShellEx); + + TRACE("SH_EnumerateDynamicContextHandlerForKey key %s\n", debugstr_w(szFileClass)); if (RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &hKey) != ERROR_SUCCESS) { @@ -745,7 +770,20 @@ res = RegEnumKeyExW(hKey, dwIndex, szName, &dwName, NULL, NULL, NULL, NULL); if (res == ERROR_SUCCESS) { - hResult = SH_LoadDynamicContextMenuHandler(hKey, szName, &cmobj, pDataObj); + hResult = CLSIDFromString(szName, &clsid); + if (hResult != NOERROR) + { + dwName = MAX_PATH; + if (RegGetValueW(hKey, szName, NULL, RRF_RT_REG_SZ, NULL, szKey, &dwName) == ERROR_SUCCESS) + { + hResult = CLSIDFromString(szKey, &clsid); + } + } + TRACE("hResult %x szKey %s name %s\n",hResult, debugstr_w(szKey), debugstr_w(szName)); + if (hResult == S_OK) + { + hResult = SH_LoadDynamicContextMenuHandler(hKey, &clsid, &cmobj, pDataObj); + } if (hResult == S_OK) { if (This->ecount + 1 > This->esize)

1 0

[dreimer] 29762: Started to Update the Documentation. Some more fixes to changelog. Sorted and fixed parts of the help. Added echo Messages which tell a sucessful process.
by dreimer＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: dreimer Date: Mon Oct 22 03:53:42 2007 New Revision: 29762 URL: http://svn.reactos.org/svn/reactos?rev=29762&view=rev Log: Started to Update the Documentation. Some more fixes to changelog. Sorted and fixed parts of the help. Added echo Messages which tell a sucessful process. Modified: trunk/tools/RosBE-Windows/Documentation/files/adv.html trunk/tools/RosBE-Windows/Documentation/files/basic.html trunk/tools/RosBE-Windows/Documentation/files/credits.html trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/scut.cmd Modified: trunk/tools/RosBE-Windows/Documentation/files/adv.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/files/adv.html (original) +++ trunk/tools/RosBE-Windows/Documentation/files/adv.html Mon Oct 22 03:53:42 2007 @@ -7,6 +7,6 @@ <meta name="description" content="Lists the Advanced Features of RosBE"> </head> <body> -SVN 1.4.4 is included in RosBE. Manual can be found here: +SVN 1.4.5 is included in RosBE. Manual can be found here: </body> </html> Modified: trunk/tools/RosBE-Windows/Documentation/files/basic.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/files/basic.html (original) +++ trunk/tools/RosBE-Windows/Documentation/files/basic.html Mon Oct 22 03:53:42 2007 @@ -1,181 +1,138 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html> <head> - <meta http-equiv="content-type" content="text/html; charset=utf-8"> - <title>Basic Features</title> - <meta content="Daniel Reimer" name="author"> - <meta content="Lists the Basic Features of RosBE" name="description"> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Basic Features</title> + <meta content="Daniel Reimer" name="author"> + <meta content="Lists the Basic Features of RosBE" name="description"> </head> <body> - <dl> - <dt>make</dt> - <dd>Usage: make [OPTIONS1] [OPTIONS2]</dd> - <dd> - The command to build the ReactOS Source Tree in the Default - directory. - Without options it does a standard build of ReactOS. OPTIONS1 are - the standard ReactOS build options ie. - <dd> - <ul> - <li>bootcd</li> - <li>livecd</li> - <li>etc.</li> - </ul> - - <ul> - <li><dfn>strip</dfn> as optional second parameter sets stripping to - enabled and thus reduces File Size by ~30% and Minimum - needed RAM to use ReactOS to ~24 MB. ISOs built with this - command are NOT usable to file bugs in any way! - </li> - </ul> - </dd> - - - <dt>makex</dt> - <dd>Usage: makex [OPTIONS1] [OPTIONS2]</dd> - <dd> - Same as 'make' but automatically determines the number of CPU Cores - in your system and uses "make -j x" with the appropriate number to - threaden the build process for a massive speedup on Multi Core - Systems. - NOTE: The number makex uses can be modified by editing - Build-Multi.cmd located in the RosBE directory, instructions for - doing so are contained within the file. This Command is incompatible - to Windows Vista right now due to a bug in GCC 4.X.X. - </dd> - - - <dt>clean</dt> - <dd>Usage: clean [logs]</dd> - <dd> - Fully cleans the ReactOS source directory and does a better job than - "make clean" does. - It deletes files, which are being generated into the Source Tree - while compiling. After using this Command the tree is completely - cleaned up and 1:1 like a fresh loaded one. - </dd> - <dd> - <ul> - <li> - <dfn>logs</dfn> - Removes all build logs in the RosBE-Logs - directory. - </li> - </ul> - </dd> - - - <dt>help</dt> - <dd>Usage: help [COMMAND]</dd> - <dd> - Shows help for the specified command or lists all available - commands. - </dd> - - - <dt>ssvn</dt> - <dd>Usage: ssvn [OPTIONS]</dd> - <dd> - This is the simple to use sSVN, written for newbies. It only - Creates, Updates or cleans up your ReactOS Source Tree or shows the - Revision Number of the Offline Tree and Online HEAD Revision to see - if its up to date. No need for any additional parameters, just - "ssvn update" and your Tree is fully updated. - </dd> - <dd> - <ul> - <li> - <dfn>update</dfn> - - Updates to HEAD Revision or to a specific one when second - parameter specifies one. - </li> - <li> - <dfn>create</dfn> - - Creates a new ReactOS Source Tree and got some Security - Features. It checks if the folder is empty, contains a - Source Tree or any other files and Cancels if continuing is - unsecure. - </li> - <li> - <dfn>cleanup</dfn> - - Cleans up and fixes errors in the Source Tree. It is - mainly needed if the "ssvn update" or "ssvn create" command - got aborted in any way or show problems like error messages - etc. - </li> - <li> - <dfn>status</dfn> - - Shows Actual offline Revision Number and online HEAD - Revision Number to see if its up to date. - </li> - </ul> - </dd> - - - <dt>chdefdir</dt> - <dd>Usage: chdefdir [OPTIONS]</dd> - <dd> - Reconfigures the Default Source Folder for one Session. This is - useful for switching between branches or different ReactOS Source - Trees. Exiting RosBE sets back to the Default. - </dd> - <dd> - <ul> - <li> - <dfn>default</dfn> - - Sets back to the Default Source Folder without a restart - of RosBE. - </li> - </ul> - </dd> - - - <dt>config</dt> - <dd>Usage: config [OPTIONS]</dd> - <dd> - This Command creates a Configuration File, which tells RosBE how to - build the Tree. There are many things you can modify in the build - process and this tool can edit all for you. ISOs made with a non - default are NOT usable to file bugs in any way! - </dd> - <dd> - <ul> - <li> - <dfn>delete</dfn> - - Deletes the created configuration File and so sets back to - default settings. - </li> - </ul> - </dd> - - - <dt>raddr2line</dt> - <dd>Usage: raddr2line [OPTIONS]</dd> - <dd> - This Command translates program addresses of BSODs into file names - and line numbers of the Code it was built of to assist Developers to - find specific Bugs in ReactOS. This Tool is mainly a Dev Tool. - Newbies normally only need it if a devs wants them to try out - something. - </dd> - <dd> - <ul> - <li> - <dfn>first parameter</dfn> - - has to be the Executable to be analyzed. - </li> - <li> - <dfn>second parameter</dfn> - - has to be the address to be translated. If you don't set - the needed Parameters, you will be asked for them. - </li> - </ul> - </dd> - - - <dt>basedir</dt> - <dd>Usage: basedir</dd> - <dd>Switches back to the ReactOS source directory.</dd> - </dl> +<dl> + <dt>make</dt> + <dd>Usage: make [OPTIONS] + </dd> + <dd> The command to build the ReactOS Source Tree in the Default +directory. +Without options it does a standard build of ReactOS. OPTIONS are the +standard ReactOS build options ie. </dd> + <dd> + <ul> + <li>bootcd</li> + <li>livecd</li> + <li>etc.</li> + </ul> + </dd> + <dt>makex</dt> + <dd>Usage: makex [OPTIONS] + </dd> + <dd> Same as 'make' but automatically determines the number of CPU +Cores in your system and uses "make -j x" with the appropriate number +to threaden the build process for a massive speedup on Multi Core +Systems. +NOTE: The number makex uses can be modified by editing Build-Multi.cmd +located in the RosBE directory, instructions for doing so are contained +within the file.</dd> + <dt>basedir</dt> + <dd>Usage: basedir</dd> + <dd>Switches back to the ReactOS source directory.</dd> + <dt>chdefdir</dt> + <dd>Usage: chdefdir [OPTIONS]</dd> + <dd> Reconfigures the Default Source Folder for one Session. This is +useful for switching between branches or different ReactOS Source +Trees. Exiting RosBE sets back to the Default. </dd> + <dd> + <ul> + <li> <dfn>default</dfn> - Sets back to the Default Source Folder +without a restart of RosBE.</li> + </ul> + </dd> + <dt>clean</dt> + <dd>Usage: clean [logs]</dd> + <dd> Fully cleans the ReactOS source directory and does a better job +than "make clean" does. +It deletes files, which are being generated into the Source Tree while +compiling. After using this Command the tree is completely cleaned up +and 1:1 like a fresh loaded one. </dd> + <dd> + <ul> + <li> <dfn>logs</dfn> - Removes all build logs in the RosBE-Logs +directory. </li> + </ul> + </dd> + <dt>config</dt> + <dd>Usage: config [OPTIONS]</dd> + <dd> This Command creates a Configuration File, which tells RosBE how +to build the Tree. There are many things you can modify in the build +process and this tool can edit all for you. ISOs made with a non +default are NOT usable to file bugs in any way! </dd> + <dd> + <ul> + <li> <dfn>delete</dfn> - Deletes the created configuration File +and so sets back to default settings. </li> + </ul> + </dd> + <dt>help</dt> + <dd>Usage: help [COMMAND]</dd> + <dd> Shows help for the specified command or lists all available +commands.</dd> + <dt>options</dt> + <dd>Usage: options</dd> + <dd> Starts the RosBE Configuration Program. + </dd> + <dt>raddr2line</dt> + <dd>Usage: raddr2line [OPTIONS]</dd> + <dd> This Command translates program addresses of BSODs into file +names and line numbers of the Code it was built of to assist Developers +to find specific Bugs in ReactOS. This Tool is mainly a Dev Tool. +Newbies normally only need it if a devs wants them to try out +something. </dd> + <dd> + <ul> + <li> <dfn>first parameter</dfn> - has to be the Executable to be +analyzed. </li> + <li> <dfn>second parameter</dfn> - has to be the address to be +translated. If you don't set the needed Parameters, you will be asked +for them. </li> + </ul> + </dd> + <dt>scut</dt> + <dd>Usage: scut [OPTIONS]</dd> + <dd>Defines, Edits, Removes, Switches and Defaults to Shortcutted +Source Directories. scut started without a parameter or with the name +of a Shortcut as parameter sets this Shortcut active. </dd> + <dd> + <ul> + <li> <dfn>add</dfn> - Adds a Shortcut to a sourcecode. </li> + <li> <dfn>rem</dfn> - Deletes a specific shortcut. </li> + <li> <dfn>edit</dfn> - Lets you edit a specific shortcut. </li> + <li> <dfn>def</dfn> - Chooses Default Shortcut which is enabled +one every start of RosBE. "Default" is the Source Directory as you know +it from previous Versions. </li> + </ul> + </dd> + <dt>ssvn</dt> + <dd>Usage: ssvn [OPTIONS]</dd> + <dd> This is the simple to use sSVN, written for newbies. It only +Creates, Updates or cleans up your ReactOS Source Tree or shows the +Revision Number of the Offline Tree and Online HEAD Revision to see if +its up to date. No need for any additional parameters, just "ssvn +update" and your Tree is fully updated. </dd> + <dd> + <ul> + <li> <dfn>update</dfn> - Updates to HEAD Revision or to a +specific one when second parameter specifies one. </li> + <li> <dfn>create</dfn> - Creates a new ReactOS Source Tree and +got some Security Features. It checks if the folder is empty, contains +a Source Tree or any other files and Cancels if continuing is unsecure. + </li> + <li> <dfn>cleanup</dfn> - Cleans up and fixes errors in the +Source Tree. It is mainly needed if the "ssvn update" or "ssvn create" +command got aborted in any way or show problems like error messages +etc. </li> + <li> <dfn>status</dfn> - Shows Actual offline Revision Number +and online HEAD Revision Number to see if its up to date. </li> + </ul> + </dd> +</dl> </body> </html> Modified: trunk/tools/RosBE-Windows/Documentation/files/credits.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/files/credits.html (original) +++ trunk/tools/RosBE-Windows/Documentation/files/credits.html Mon Oct 22 03:53:42 2007 @@ -17,7 +17,7 @@ <li> Originally Coded by Peter "dralnix" Ward ( <a href="mailto:dralnix@gmail.com">dralnix(a)gmail.com</a> - ) until Version 0.3.5B2 + ) until Version 0.3.5B2 and continuing with Version 1.0 </li> <li> Work continued by Daniel "EmuandCo" Reimer ( Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Mon Oct 22 03:53:42 2007 @@ -1,4 +1,4 @@ -*** XXX XXth, 200X - RosBE 0.X.X.X Released +*** XXX XXth, 200X - RosBE 1.0 Released - Updated RosBE Configuration Tool. (Pierre Schweitzer) - Added French translation. @@ -7,7 +7,7 @@ - Added support for WinXP style. - Added the support of C99. - Fixed warnings. - - Small Modification by me: added -s and went from -O3 to -O2 in Makefile. + - Small Modification by Daniel Reimer: added -s and went from -O3 to -O2 in Makefile. - Correct Button States and Whitespace changes. - Save button is disabled until a parameter is changed - Definitively fixed resources IDs @@ -20,25 +20,30 @@ - Added checks to avoid buffers overflow. - Added a very simple makefile for the RosBE tools. (Peter Ward) +- Updated: GCC 4.1.3 Build 20071015 with recent patches + to get makex run under Vista. (Peter Ward, TODO: name of tamlin) +- Updated: Binutils 2.18.50 Build 20071015. - Fix a warning in echoh.c. (Peter Ward) - Fix options.exe compile with RosBE 0.3.8.1 (Peter Ward) - Merge the three build.cmd files into one. (Peter Ward) - Heaviliy cleaning up the .cmd files. (Peter Ward) -- remove typos. (Peter Ward) +- Remove typos. (Peter Ward) - Make variable names more consistent. (Peter Ward) - Merged the NSIS files back together. (Peter Ward) - Renamed options.cmd -> rosbe-options.cmd. (Peter Ward) - Completely rewrote scut to work without *nix tools and added a edit function (Parter Ward, Daniel Reimer) - Updated to NASM 0.99.05 (Daniel Reimer) +- Downgraded sed to prevent a EOL style destruction. (Daniel Reimer) - Make helpfile entries dependant on the installed optional files. (Daniel Reimer) - Readd chdefdir due to popular Demand. (Daniel Reimer) - Make options.exe startable from cmd window. After exiting rosbe resets to use the new settings. (Daniel Reimer) - Added ccache 2.4 to RosBE. (Daniel Reimer) - Remove trailing Spaces. (Daniel Reimer) -- Modify options.exe to enable and disable strpping and ccache. (Daniel Reimer) +- Modify options.exe to enable and disable stripping and ccache. This gives back the possibility to give more + than one command to make (Daniel Reimer) - Fixed German RC File of Options.exe (Daniel Reimer) - +- Added the command "oldmode" to still use the HOST headers, not the target ones in SVN Tree. (Daniel Reimer) - Fixed Russian RC File of options.exe (towerr) *** Sep 24th, 2007 - RosBE 0.3.8.1 Released Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Help.cmd Mon Oct 22 03:53:42 2007 @@ -30,14 +30,14 @@ echo basedir - Switch back to the ReactOS source directory. echo. - if exist "%_ROSBE_BASEDIR%\scut.cmd" ( - echo scut - Define, Edit, Remove, Switch and Default to - echo Shortcutted Source-Directories. - ) - if exist "%_ROSBE_BASEDIR%\chdefdir.cmd" ( echo chdefdir [OPTIONS] - Reconfigures the Default Source Folder for one echo Session. + ) + + if exist "%_ROSBE_BASEDIR%\clean.cmd" ( + echo clean [logs] - Fully clean the ReactOS source directory and/or + echo the RosBE build logs. ) if exist "%_ROSBE_BASEDIR%\config.cmd" ( @@ -45,23 +45,23 @@ echo. ) - if exist "%_ROSBE_BASEDIR%\clean.cmd" ( - echo clean [logs] - Fully clean the ReactOS source directory and/or - echo the RosBE build logs. - ) - echo help [COMMAND] - Display the available commands or help on a echo specific command. if exist "%_ROSBE_BASEDIR%\options.cmd" ( - echo options - Starts options.exe and reboots to make the - echo changes effective at the end. + echo options - Starts options.exe and restarts RosBE to make + echo the changes effective at the end. ) if exist "%_ROSBE_BASEDIR%\reladdr2line.cmd" ( echo raddr2line [OPTIONS] - Translates program addresses into file names and echo line numbers to assist Developers to find echo specific Bugs in ReactOS. + ) + + if exist "%_ROSBE_BASEDIR%\scut.cmd" ( + echo scut [OPTIONS] - Define, Edit, Remove, Switch and Default to + echo Shortcutted Source-Directories. ) if exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( @@ -149,7 +149,7 @@ ) if "%1" == "options" ( echo Usage: options - echo Starts RosBE Configurator and reboots RosBE afterwards to make the + echo Starts RosBE Configurator and restarts RosBE afterwards to make the echo changes effective at the end. goto :EOF ) Modified: trunk/tools/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/scut.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/scut.cmd (original) +++ trunk/tools/RosBE-Windows/Root/scut.cmd Mon Oct 22 03:53:42 2007 @@ -90,11 +90,13 @@ :ADD23 for /f "usebackq tokens=1-2 delims=, skip=1" %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( if %%i == %CUT% ( - echo ERROR: A Shortcut with the name %CUT% does already exist. + echo A Shortcut with the name %CUT% does already exist. Editing the existing one. + call "%_ROSBE_BASEDIR%\scut.cmd" edit %CUT% %DIR% goto :END ) ) echo %CUT%,%DIR%>> "%_ROSBE_BASEDIR%\srclist.txt" +echo Shortcut %CUT% successfully added. goto :END :: @@ -120,6 +122,8 @@ ren "%_ROSBE_BASEDIR%\srclist2.txt" srclist.txt if %_ROSBE_REM% == 0 ( echo ERROR: The Shortcut %CUTREM% does not exist. +) else ( + echo Shortcut %CUTREM% successfully deleted. ) goto :END @@ -182,6 +186,8 @@ ren "%_ROSBE_BASEDIR%\temporaryfile.tmp" srclist.txt if %_ROSBE_EDIT% == 0 ( echo ERROR: The Shortcut %CUT% does not exist. +) else ( + echo Shortcut %CUT% successfully edited. ) :END

1 0

[greatlrd] 29761: start adding dxg.sys
by greatlrd＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: greatlrd Date: Mon Oct 22 03:38:13 2007 New Revision: 29761 URL: http://svn.reactos.org/svn/reactos?rev=29761&view=rev Log: start adding dxg.sys Added: branches/reactx/reactos/drivers/directx/directory.rbuild (with props) branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild (with props) branches/reactx/reactos/drivers/directx/dxg/dxg.rc (with props) branches/reactx/reactos/drivers/directx/dxg/main.c (with props) Added: branches/reactx/reactos/drivers/directx/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/directory.rbuild (added) +++ branches/reactx/reactos/drivers/directx/directory.rbuild Mon Oct 22 03:38:13 2007 @@ -1,0 +1,7 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> +<directory name="dxg"> + <xi:include href="dxg/dxg.rbuild" /> +</directory> +</group> Propchange: branches/reactx/reactos/drivers/directx/directory.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild (added) +++ branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild Mon Oct 22 03:38:13 2007 @@ -1,0 +1,8 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="dxg" type="kernelmodedriver" installbase="system32/drivers" installname="dxg.sys"> + <include base="dxg.sys">.</include> + <define name="__USE_W32API" /> + <file>main.c</file> + <file>dxg.rc</file> +</module> Propchange: branches/reactx/reactos/drivers/directx/dxg/dxg.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/reactx/reactos/drivers/directx/dxg/dxg.rc URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/dxg.rc (added) +++ branches/reactx/reactos/drivers/directx/dxg/dxg.rc Mon Oct 22 03:38:13 2007 @@ -1,0 +1,7 @@ +/* $Id: vbemp.rc 21844 2006-05-07 19:34:23Z ion $ */ + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "DXG DirectX interface Device Driver\0" +#define REACTOS_STR_INTERNAL_NAME "dxg\0" +#define REACTOS_STR_ORIGINAL_FILENAME "dxg.sys\0" +#include <reactos/version.rc> Propchange: branches/reactx/reactos/drivers/directx/dxg/dxg.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/reactx/reactos/drivers/directx/dxg/main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/… ============================================================================== --- branches/reactx/reactos/drivers/directx/dxg/main.c (added) +++ branches/reactx/reactos/drivers/directx/dxg/main.c Mon Oct 22 03:38:13 2007 @@ -1,0 +1,28 @@ + +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Native driver for dxg implementation + * FILE: drivers/directx/dxg/main.c + * PROGRAMER: Magnus olsen (magnus(a)greatlord.com) + * REVISION HISTORY: + * 15/10-2007 Magnus Olsen + */ + +#include <ntddk.h> + +NTSTATUS +GsDriverEntry(IN PVOID Context1, + IN PVOID Context2) +{ + /* NOTE : in windows it does a secure cookies check */ + return DriverEntry(Context1, Context2); +} + + +NTSTATUS +DriverEntry(IN PVOID Context1, + IN PVOID Context2) +{ + return 0; +} Propchange: branches/reactx/reactos/drivers/directx/dxg/main.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[peterw] 29760: - Updated patches to the latest ones.
by peterw＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: peterw Date: Mon Oct 22 03:12:07 2007 New Revision: 29760 URL: http://svn.reactos.org/svn/reactos?rev=29760&view=rev Log: - Updated patches to the latest ones. Added: trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129382-prerelease-w3seek.patch (with props) trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129382-virtual-stdcall-bug27067.patch (with props) trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129490-CreateFileMapping-Vista-bug30335.patch (with props) trunk/tools/RosBE-Windows/Patches/binutils-2.18.50.10-15-2007-snapshot-hpoussin.patch (with props) Removed: trunk/tools/RosBE-Windows/Patches/ld.patch trunk/tools/RosBE-Windows/Patches/mingw-lazy-port-gcc-4_1-branch.patch Added: trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129382-prerelease-w3seek.patch URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Patches/GCC-v4… ============================================================================== --- trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129382-prerelease-w3seek.patch (added) +++ trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129382-prerelease-w3seek.patch Mon Oct 22 03:12:07 2007 @@ -1,0 +1,81 @@ +Index: libstdc++-v3/config/os/mingw32/os_defines.h +=================================================================== +--- libstdc++-v3/config/os/mingw32/os_defines.h (revision 129382) ++++ libstdc++-v3/config/os/mingw32/os_defines.h (working copy) +@@ -45,6 +45,13 @@ + #undef NOMINMAX + #define NOMINMAX 1 + ++// mingw32 local hack: Override _GLIBCXX_USE_WCHAR_T for wstring ++#define _GLIBCXX_USE_WSTRING 1 ++ ++// mingw32 local hack: Cast long double to doubles to workaround ++// printf bug. ++#define _GLIBCXX_NO_LONG_DOUBLE_IO 0 ++ + // See libstdc++/20806. + #define _GLIBCXX_HAVE_DOS_BASED_FILESYSTEM 1 + +Index: libstdc++-v3/include/bits/char_traits.h +=================================================================== +--- libstdc++-v3/include/bits/char_traits.h (revision 129382) ++++ libstdc++-v3/include/bits/char_traits.h (working copy) +@@ -295,7 +295,7 @@ + }; + + +-#ifdef _GLIBCXX_USE_WCHAR_T ++#if defined (_GLIBCXX_USE_WCHAR_T) || defined (_GLIBCXX_USE_WSTRING) + /// @brief 21.1.3.2 char_traits specializations + template<> + struct char_traits<wchar_t> +@@ -303,8 +303,10 @@ + typedef wchar_t char_type; + typedef wint_t int_type; + typedef streamoff off_type; ++#if defined (_GLIBCXX_USE_WCHAR_T) + typedef wstreampos pos_type; + typedef mbstate_t state_type; ++#endif + + static void + assign(char_type& __c1, const char_type& __c2) +Index: libstdc++-v3/include/bits/stringfwd.h +=================================================================== +--- libstdc++-v3/include/bits/stringfwd.h (revision 129382) ++++ libstdc++-v3/include/bits/stringfwd.h (working copy) +@@ -59,7 +59,7 @@ + + typedef basic_string<char> string; + +-#ifdef _GLIBCXX_USE_WCHAR_T ++#if defined (_GLIBCXX_USE_WCHAR_T) || defined (_GLIBCXX_USE_WSTRING) + template<> struct char_traits<wchar_t>; + + typedef basic_string<wchar_t> wstring; +Index: libstdc++-v3/include/c_std/std_cwchar.h +=================================================================== +--- libstdc++-v3/include/c_std/std_cwchar.h (revision 129382) ++++ libstdc++-v3/include/c_std/std_cwchar.h (working copy) +@@ -138,7 +138,7 @@ + #undef wprintf + #undef wscanf + +-#if _GLIBCXX_USE_WCHAR_T ++#if _GLIBCXX_USE_WCHAR_T || _GLIBCXX_USE_WSTRING + namespace std + { + using ::wint_t; +Index: libstdc++-v3/include/c_std/std_cwctype.h +=================================================================== +--- libstdc++-v3/include/c_std/std_cwctype.h (revision 129382) ++++ libstdc++-v3/include/c_std/std_cwctype.h (working copy) +@@ -75,7 +75,7 @@ + #undef wctrans + #undef wctype + +-#if _GLIBCXX_USE_WCHAR_T ++#if _GLIBCXX_USE_WCHAR_T || _GLIBCXX_USE_WSTRING + namespace std + { + using ::wint_t; // cwchar Propchange: trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129382-prerelease-w3seek.patch ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129382-virtual-stdcall-bug27067.patch URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Patches/GCC-v4… ============================================================================== --- trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129382-virtual-stdcall-bug27067.patch (added) +++ trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129382-virtual-stdcall-bug27067.patch Mon Oct 22 03:12:07 2007 @@ -1,0 +1,137 @@ +Index: gcc/target.h +=================================================================== +--- gcc/target.h (revision 129382) ++++ gcc/target.h (working copy) +@@ -186,6 +186,13 @@ + /* Output a DTP-relative reference to a TLS symbol. */ + void (*output_dwarf_dtprel) (FILE *file, int size, rtx x); + ++/* This target hook allows the operating system to modify the extern ++ assembler name ++ of a DECL. For example, windows targets use this to decorate stdcall and ++ fastcall functions ++ with a a trailing '@n'. */ ++ void (*change_extern_name) (tree decl); ++ + } asm_out; + + /* Functions relating to instruction scheduling. */ +Index: gcc/cp/method.c +=================================================================== +--- gcc/cp/method.c (revision 129382) ++++ gcc/cp/method.c (working copy) +@@ -350,6 +350,8 @@ + this translation unit. */ + TREE_ADDRESSABLE (function) = 1; + mark_used (function); ++ /* The DECL_ASSEMBLER_NAME of the thunked function may need modification. */ ++ targetm.asm_out.change_extern_name (function); + if (!emit_p) + return; + +Index: gcc/target-def.h +=================================================================== +--- gcc/target-def.h (revision 129382) ++++ gcc/target-def.h (working copy) +@@ -205,6 +205,10 @@ + #define TARGET_ASM_OUTPUT_DWARF_DTPREL NULL + #endif + ++#ifndef TARGET_ASM_CHANGE_EXTERN_NAME ++#define TARGET_ASM_CHANGE_EXTERN_NAME hook_void_tree ++#endif ++ + #define TARGET_ASM_ALIGNED_INT_OP \ + {TARGET_ASM_ALIGNED_HI_OP, \ + TARGET_ASM_ALIGNED_SI_OP, \ +@@ -248,7 +252,8 @@ + TARGET_ASM_FILE_END, \ + TARGET_ASM_EXTERNAL_LIBCALL, \ + TARGET_ASM_MARK_DECL_PRESERVED, \ +- TARGET_ASM_OUTPUT_DWARF_DTPREL} ++ TARGET_ASM_OUTPUT_DWARF_DTPREL, \ ++ TARGET_ASM_CHANGE_EXTERN_NAME} + + /* Scheduler hooks. All of these default to null pointers, which + haifa-sched.c looks for and handles. */ +Index: gcc/config/i386/cygming.h +=================================================================== +--- gcc/config/i386/cygming.h (revision 129382) ++++ gcc/config/i386/cygming.h (working copy) +@@ -335,6 +335,7 @@ + extern void i386_pe_file_end (void); + extern int i386_pe_dllexport_name_p (const char *); + extern int i386_pe_dllimport_name_p (const char *); ++extern void i386_pe_decorate_assembler_name (tree); + + /* For Win32 ABI compatibility */ + #undef DEFAULT_PCC_STRUCT_RETURN +@@ -412,6 +413,7 @@ + + #define TARGET_VALID_DLLIMPORT_ATTRIBUTE_P i386_pe_valid_dllimport_attribute_p + #define TARGET_CXX_ADJUST_CLASS_AT_DEFINITION i386_pe_adjust_class_at_definition ++#define TARGET_ASM_CHANGE_EXTERN_NAME i386_pe_decorate_assembler_name + + #undef TREE + +Index: gcc/config/i386/winnt.c +=================================================================== +--- gcc/config/i386/winnt.c (revision 129382) ++++ gcc/config/i386/winnt.c (working copy) +@@ -335,33 +335,38 @@ + } + + void +-i386_pe_encode_section_info (tree decl, rtx rtl, int first) ++i386_pe_decorate_assembler_name (tree decl) + { +- default_encode_section_info (decl, rtl, first); ++ tree type_attributes = TYPE_ATTRIBUTES (TREE_TYPE (decl)); ++ tree newid = NULL_TREE; + +- if (first && TREE_CODE (decl) == FUNCTION_DECL) +- { +- tree type_attributes = TYPE_ATTRIBUTES (TREE_TYPE (decl)); +- tree newid = NULL_TREE; ++ if (lookup_attribute ("stdcall", type_attributes)) ++ newid = gen_stdcall_or_fastcall_suffix (decl, false); ++ else if (lookup_attribute ("fastcall", type_attributes)) ++ newid = gen_stdcall_or_fastcall_suffix (decl, true); ++ if (newid != NULL_TREE) ++ { ++ rtx rtlname = XEXP (DECL_RTL (decl), 0); ++ if (GET_CODE (rtlname) == MEM) ++ rtlname = XEXP (rtlname, 0); ++ XSTR (rtlname, 0) = IDENTIFIER_POINTER (newid); + +- if (lookup_attribute ("stdcall", type_attributes)) +- newid = gen_stdcall_or_fastcall_suffix (decl, false); +- else if (lookup_attribute ("fastcall", type_attributes)) +- newid = gen_stdcall_or_fastcall_suffix (decl, true); +- if (newid != NULL_TREE) +- { +- rtx rtlname = XEXP (rtl, 0); +- if (GET_CODE (rtlname) == MEM) +- rtlname = XEXP (rtlname, 0); +- XSTR (rtlname, 0) = IDENTIFIER_POINTER (newid); +- /* These attributes must be present on first declaration, ++ /* These attributes must be present on first declaration, + change_decl_assembler_name will warn if they are added + later and the decl has been referenced, but duplicate_decls + should catch the mismatch before this is called. */ + change_decl_assembler_name (decl, newid); +- } + } ++ } + ++void ++i386_pe_encode_section_info (tree decl, rtx rtl, int first) ++{ ++ default_encode_section_info (decl, rtl, first); ++ ++ if (first && TREE_CODE (decl) == FUNCTION_DECL) ++ i386_pe_decorate_assembler_name (decl); ++ + /* Mark the decl so we can tell from the rtl whether the object is + dllexport'd or dllimport'd. tree.c: merge_dllimport_decl_attributes + handles dllexport/dllimport override semantics. */ Propchange: trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129382-virtual-stdcall-bug27067.patch ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129490-CreateFileMapping-Vista-bug30335.patch URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Patches/GCC-v4… ============================================================================== --- trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129490-CreateFileMapping-Vista-bug30335.patch (added) +++ trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129490-CreateFileMapping-Vista-bug30335.patch Mon Oct 22 03:12:07 2007 @@ -1,0 +1,98 @@ +Index: gcc/config/i386/host-mingw32.c +=================================================================== +--- gcc/config/i386/host-mingw32.c (revision 129490) ++++ gcc/config/i386/host-mingw32.c (working copy) +@@ -28,6 +28,8 @@ + + + #define WIN32_LEAN_AND_MEAN /* Not so important if we have windows.h.gch. */ ++#include <tchar.h> ++#include <stdlib.h> + #include <windows.h> + + static void * mingw32_gt_pch_get_address (size_t, int); +@@ -47,7 +49,7 @@ + static const size_t pch_VA_max_size = 128 * 1024 * 1024; + + /* Granularity for reserving address space. */ +-static const size_t va_granularity = 0x10000; ++static size_t va_granularity = 0x10000; + + /* Print out the GetLastError() translation. */ + static inline void +@@ -70,7 +72,9 @@ + /* Granularity for reserving address space. */ + static size_t mingw32_gt_pch_alloc_granularity (void) + { +- return va_granularity; ++ SYSTEM_INFO SysInfo; ++ GetSystemInfo(&SysInfo); ++ return (va_granularity = (size_t)SysInfo.dwAllocationGranularity); + } + + /* Identify an address that's likely to be free in a subsequent invocation +@@ -116,6 +120,9 @@ + { + void * mmap_addr; + static HANDLE mmap_handle; ++ TCHAR szMappingName[26]; ++ OSVERSIONINFO version_info; ++ int i = 0; + + if (size == 0) + return 0; +@@ -125,16 +132,49 @@ + if ((offset & (va_granularity - 1)) != 0 || size > pch_VA_max_size) + return -1; + +- mmap_handle = CreateFileMapping ((HANDLE) _get_osfhandle (fd), +- NULL, PAGE_WRITECOPY | SEC_COMMIT, +- 0, 0, NULL); ++ /* Determine the version of Windows we are running on. */ ++ version_info.dwOSVersionInfoSize = sizeof (version_info); ++ GetVersionEx (&version_info); ++ ++ srand(1); ++ while (1) ++ { ++ /* Generate a unique mapping name. This is neccessary to avoid ++ needing the SeCreateGlobalPrivilege privilege in certain cases. ++ However, the documentation for CreateFileMapping says that on NT4 ++ and earlier, backslashes are invalid in object name. So, we need ++ to check if we are on Windows2000 or higher. */ ++ _stprintf(szMappingName, _T("Local\\MinGWGCCPCH%08X"), rand()); ++ mmap_handle = CreateFileMapping ((HANDLE) _get_osfhandle (fd), ++ NULL, PAGE_WRITECOPY | SEC_COMMIT, ++ 0, 0, (version_info.dwMajorVersion > ++ 4 ? szMappingName : NULL)); ++ if (mmap_handle != NULL && GetLastError() == ERROR_ALREADY_EXISTS) ++ CloseHandle(mmap_handle); ++ else ++ break; ++ } ++ + if (mmap_handle == NULL) + { + w32_error (__FUNCTION__, __FILE__, __LINE__, "CreateFileMapping"); + return -1; + } +- mmap_addr = MapViewOfFileEx (mmap_handle, FILE_MAP_COPY, 0, offset, +- size, addr); ++ /* wait/retry a couple of times if needed. ++ Fixes a race when running multiple gcc's (-j) */ ++ for(i = 0; i < 5; i++) ++ { ++ mmap_addr = MapViewOfFileEx (mmap_handle, FILE_MAP_COPY, 0, offset, ++ size, addr); ++ if (mmap_addr != addr) ++ { ++ Sleep(500); ++ } ++ else ++ { ++ break; ++ } ++ } + if (mmap_addr != addr) + { + w32_error (__FUNCTION__, __FILE__, __LINE__, "MapViewOfFileEx"); Propchange: trunk/tools/RosBE-Windows/Patches/GCC-v4.1-r129490-CreateFileMapping-Vista-bug30335.patch ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE-Windows/Patches/binutils-2.18.50.10-15-2007-snapshot-hpoussin.patch URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Patches/binuti… ============================================================================== --- trunk/tools/RosBE-Windows/Patches/binutils-2.18.50.10-15-2007-snapshot-hpoussin.patch (added) +++ trunk/tools/RosBE-Windows/Patches/binutils-2.18.50.10-15-2007-snapshot-hpoussin.patch Mon Oct 22 03:12:07 2007 @@ -1,0 +1,15 @@ +--- ld/pe-dll.c Mon Aug 06 08:32:08 2007 ++++ ld/pe-dll.c Tue Oct 16 18:47:02 2007 +@@ -598,10 +598,9 @@ + } + } + +- /* If we are not building a DLL, when there are no exports ++ /* If there are no exports + we do not build an export table at all. */ +- if (!pe_dll_export_everything && pe_def_file->num_exports == 0 +- && info->executable) ++ if (!pe_dll_export_everything && pe_def_file->num_exports == 0) + return; + + /* Now, maybe export everything else the default way. */ Propchange: trunk/tools/RosBE-Windows/Patches/binutils-2.18.50.10-15-2007-snapshot-hpoussin.patch ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/tools/RosBE-Windows/Patches/ld.patch URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Patches/ld.pat… ============================================================================== --- trunk/tools/RosBE-Windows/Patches/ld.patch (original) +++ trunk/tools/RosBE-Windows/Patches/ld.patch (removed) @@ -1,15 +1,0 @@ ---- ld/pe-dll.c Thu Jul 19 13:12:24 2007 -+++ ld/pe-dll.c Fri Aug 3 09:53:58 2007 -@@ -524,10 +524,9 @@ - } - } - -- /* If we are not building a DLL, when there are no exports -+ /* If there are no exports - we do not build an export table at all. */ -- if (!pe_dll_export_everything && pe_def_file->num_exports == 0 -- && info->executable) -+ if (!pe_dll_export_everything && pe_def_file->num_exports == 0) - return; - - /* Now, maybe export everything else the default way. */ Removed: trunk/tools/RosBE-Windows/Patches/mingw-lazy-port-gcc-4_1-branch.patch URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Patches/mingw-… ============================================================================== --- trunk/tools/RosBE-Windows/Patches/mingw-lazy-port-gcc-4_1-branch.patch (original) +++ trunk/tools/RosBE-Windows/Patches/mingw-lazy-port-gcc-4_1-branch.patch (removed) @@ -1,278 +1,0 @@ -Index: gcc/config/i386/cygming.h -=================================================================== ---- gcc/config/i386/cygming.h (revision 125623) -+++ gcc/config/i386/cygming.h (working copy) -@@ -335,6 +335,7 @@ - extern void i386_pe_file_end (void); - extern int i386_pe_dllexport_name_p (const char *); - extern int i386_pe_dllimport_name_p (const char *); -+extern void i386_pe_decorate_assembler_name (tree); - - /* For Win32 ABI compatibility */ - #undef DEFAULT_PCC_STRUCT_RETURN -@@ -412,6 +413,7 @@ - - #define TARGET_VALID_DLLIMPORT_ATTRIBUTE_P i386_pe_valid_dllimport_attribute_p - #define TARGET_CXX_ADJUST_CLASS_AT_DEFINITION i386_pe_adjust_class_at_definition -+#define TARGET_ASM_CHANGE_EXTERN_NAME i386_pe_decorate_assembler_name - - #undef TREE - -Index: gcc/config/i386/host-mingw32.c -=================================================================== ---- gcc/config/i386/host-mingw32.c (revision 125623) -+++ gcc/config/i386/host-mingw32.c (working copy) -@@ -28,6 +28,8 @@ - - - #define WIN32_LEAN_AND_MEAN /* Not so important if we have windows.h.gch. */ -+#include <tchar.h> -+#include <stdlib.h> - #include <windows.h> - - static void * mingw32_gt_pch_get_address (size_t, int); -@@ -47,7 +49,7 @@ - static const size_t pch_VA_max_size = 128 * 1024 * 1024; - - /* Granularity for reserving address space. */ --static const size_t va_granularity = 0x10000; -+static size_t va_granularity = 0x10000; - - /* Print out the GetLastError() translation. */ - static inline void -@@ -70,7 +72,9 @@ - /* Granularity for reserving address space. */ - static size_t mingw32_gt_pch_alloc_granularity (void) - { -- return va_granularity; -+ SYSTEM_INFO SysInfo; -+ GetSystemInfo(&SysInfo); -+ return (va_granularity = (size_t)SysInfo.dwAllocationGranularity); - } - - /* Identify an address that's likely to be free in a subsequent invocation -@@ -125,9 +129,23 @@ - if ((offset & (va_granularity - 1)) != 0 || size > pch_VA_max_size) - return -1; - -- mmap_handle = CreateFileMapping ((HANDLE) _get_osfhandle (fd), -- NULL, PAGE_WRITECOPY | SEC_COMMIT, -- 0, 0, NULL); -+ srand(1); -+ while (1) -+ { -+ TCHAR szMappingName[26]; -+ -+ /* Generate a unique mapping name. This is neccessary to avoid -+ needing the SeCreateGlobalPrivilege privilege in certain cases */ -+ _stprintf(szMappingName, _T("Local\\MinGWGCCPCH%08X"), rand()); -+ mmap_handle = CreateFileMapping ((HANDLE) _get_osfhandle (fd), -+ NULL, PAGE_WRITECOPY | SEC_COMMIT, -+ 0, 0, szMappingName); -+ if (mmap_handle != NULL && GetLastError() == ERROR_ALREADY_EXISTS) -+ CloseHandle(mmap_handle); -+ else -+ break; -+ } -+ - if (mmap_handle == NULL) - { - w32_error (__FUNCTION__, __FILE__, __LINE__, "CreateFileMapping"); -Index: gcc/config/i386/winnt.c -=================================================================== ---- gcc/config/i386/winnt.c (revision 125623) -+++ gcc/config/i386/winnt.c (working copy) -@@ -335,33 +335,38 @@ - } - - void --i386_pe_encode_section_info (tree decl, rtx rtl, int first) -+i386_pe_decorate_assembler_name (tree decl) - { -- default_encode_section_info (decl, rtl, first); -+ tree type_attributes = TYPE_ATTRIBUTES (TREE_TYPE (decl)); -+ tree newid = NULL_TREE; - -- if (first && TREE_CODE (decl) == FUNCTION_DECL) -- { -- tree type_attributes = TYPE_ATTRIBUTES (TREE_TYPE (decl)); -- tree newid = NULL_TREE; -+ if (lookup_attribute ("stdcall", type_attributes)) -+ newid = gen_stdcall_or_fastcall_suffix (decl, false); -+ else if (lookup_attribute ("fastcall", type_attributes)) -+ newid = gen_stdcall_or_fastcall_suffix (decl, true); -+ if (newid != NULL_TREE) -+ { -+ rtx rtlname = XEXP (DECL_RTL (decl), 0); -+ if (GET_CODE (rtlname) == MEM) -+ rtlname = XEXP (rtlname, 0); -+ XSTR (rtlname, 0) = IDENTIFIER_POINTER (newid); - -- if (lookup_attribute ("stdcall", type_attributes)) -- newid = gen_stdcall_or_fastcall_suffix (decl, false); -- else if (lookup_attribute ("fastcall", type_attributes)) -- newid = gen_stdcall_or_fastcall_suffix (decl, true); -- if (newid != NULL_TREE) -- { -- rtx rtlname = XEXP (rtl, 0); -- if (GET_CODE (rtlname) == MEM) -- rtlname = XEXP (rtlname, 0); -- XSTR (rtlname, 0) = IDENTIFIER_POINTER (newid); -- /* These attributes must be present on first declaration, -+ /* These attributes must be present on first declaration, - change_decl_assembler_name will warn if they are added - later and the decl has been referenced, but duplicate_decls - should catch the mismatch before this is called. */ - change_decl_assembler_name (decl, newid); -- } - } -+ } - -+void -+i386_pe_encode_section_info (tree decl, rtx rtl, int first) -+{ -+ default_encode_section_info (decl, rtl, first); -+ -+ if (first && TREE_CODE (decl) == FUNCTION_DECL) -+ i386_pe_decorate_assembler_name (decl); -+ - /* Mark the decl so we can tell from the rtl whether the object is - dllexport'd or dllimport'd. tree.c: merge_dllimport_decl_attributes - handles dllexport/dllimport override semantics. */ -Index: gcc/cp/method.c -=================================================================== ---- gcc/cp/method.c (revision 125623) -+++ gcc/cp/method.c (working copy) -@@ -350,6 +350,8 @@ - this translation unit. */ - TREE_ADDRESSABLE (function) = 1; - mark_used (function); -+ /* The DECL_ASSEMBLER_NAME of the thunked function may need modification. */ -+ targetm.asm_out.change_extern_name (function); - if (!emit_p) - return; - -Index: gcc/target-def.h -=================================================================== ---- gcc/target-def.h (revision 125623) -+++ gcc/target-def.h (working copy) -@@ -205,6 +205,10 @@ - #define TARGET_ASM_OUTPUT_DWARF_DTPREL NULL - #endif - -+#ifndef TARGET_ASM_CHANGE_EXTERN_NAME -+#define TARGET_ASM_CHANGE_EXTERN_NAME hook_void_tree -+#endif -+ - #define TARGET_ASM_ALIGNED_INT_OP \ - {TARGET_ASM_ALIGNED_HI_OP, \ - TARGET_ASM_ALIGNED_SI_OP, \ -@@ -248,7 +252,8 @@ - TARGET_ASM_FILE_END, \ - TARGET_ASM_EXTERNAL_LIBCALL, \ - TARGET_ASM_MARK_DECL_PRESERVED, \ -- TARGET_ASM_OUTPUT_DWARF_DTPREL} -+ TARGET_ASM_OUTPUT_DWARF_DTPREL, \ -+ TARGET_ASM_CHANGE_EXTERN_NAME} - - /* Scheduler hooks. All of these default to null pointers, which - haifa-sched.c looks for and handles. */ -Index: gcc/target.h -=================================================================== ---- gcc/target.h (revision 125623) -+++ gcc/target.h (working copy) -@@ -186,6 +186,13 @@ - /* Output a DTP-relative reference to a TLS symbol. */ - void (*output_dwarf_dtprel) (FILE *file, int size, rtx x); - -+/* This target hook allows the operating system to modify the extern -+ assembler name -+ of a DECL. For example, windows targets use this to decorate stdcall and -+ fastcall functions -+ with a a trailing '@n'. */ -+ void (*change_extern_name) (tree decl); -+ - } asm_out; - - /* Functions relating to instruction scheduling. */ -Index: libstdc++-v3/config/os/mingw32/os_defines.h -=================================================================== ---- libstdc++-v3/config/os/mingw32/os_defines.h (revision 125623) -+++ libstdc++-v3/config/os/mingw32/os_defines.h (working copy) -@@ -45,6 +45,13 @@ - #undef NOMINMAX - #define NOMINMAX 1 - -+// mingw32 local hack: Override _GLIBCXX_USE_WCHAR_T for wstring -+#define _GLIBCXX_USE_WSTRING 1 -+ -+// mingw32 local hack: Cast long double to doubles to workaround -+// printf bug. -+#define _GLIBCXX_NO_LONG_DOUBLE_IO 0 -+ - // See libstdc++/20806. - #define _GLIBCXX_HAVE_DOS_BASED_FILESYSTEM 1 - -Index: libstdc++-v3/include/bits/char_traits.h -=================================================================== ---- libstdc++-v3/include/bits/char_traits.h (revision 125623) -+++ libstdc++-v3/include/bits/char_traits.h (working copy) -@@ -295,7 +295,7 @@ - }; - - --#ifdef _GLIBCXX_USE_WCHAR_T -+#if defined (_GLIBCXX_USE_WCHAR_T) || defined (_GLIBCXX_USE_WSTRING) - /// @brief 21.1.3.2 char_traits specializations - template<> - struct char_traits<wchar_t> -@@ -303,8 +303,10 @@ - typedef wchar_t char_type; - typedef wint_t int_type; - typedef streamoff off_type; -+#if defined (_GLIBCXX_USE_WCHAR_T) - typedef wstreampos pos_type; - typedef mbstate_t state_type; -+#endif - - static void - assign(char_type& __c1, const char_type& __c2) -Index: libstdc++-v3/include/bits/stringfwd.h -=================================================================== ---- libstdc++-v3/include/bits/stringfwd.h (revision 125623) -+++ libstdc++-v3/include/bits/stringfwd.h (working copy) -@@ -59,7 +59,7 @@ - - typedef basic_string<char> string; - --#ifdef _GLIBCXX_USE_WCHAR_T -+#if defined (_GLIBCXX_USE_WCHAR_T) || defined (_GLIBCXX_USE_WSTRING) - template<> struct char_traits<wchar_t>; - - typedef basic_string<wchar_t> wstring; -Index: libstdc++-v3/include/c_std/std_cwchar.h -=================================================================== ---- libstdc++-v3/include/c_std/std_cwchar.h (revision 125623) -+++ libstdc++-v3/include/c_std/std_cwchar.h (working copy) -@@ -138,7 +138,7 @@ - #undef wprintf - #undef wscanf - --#if _GLIBCXX_USE_WCHAR_T -+#if _GLIBCXX_USE_WCHAR_T || _GLIBCXX_USE_WSTRING - namespace std - { - using ::wint_t; -Index: libstdc++-v3/include/c_std/std_cwctype.h -=================================================================== ---- libstdc++-v3/include/c_std/std_cwctype.h (revision 125623) -+++ libstdc++-v3/include/c_std/std_cwctype.h (working copy) -@@ -75,7 +75,7 @@ - #undef wctrans - #undef wctype - --#if _GLIBCXX_USE_WCHAR_T -+#if _GLIBCXX_USE_WCHAR_T || _GLIBCXX_USE_WSTRING - namespace std - { - using ::wint_t; // cwchar

1 0

[dreimer] 29759: Fixed chdefdir. Now it should work. Updated options. It now checks if the .exe exists. If not, it throws an error. Updated echo Messages a bit.
by dreimer＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: dreimer Date: Mon Oct 22 03:11:16 2007 New Revision: 29759 URL: http://svn.reactos.org/svn/reactos?rev=29759&view=rev Log: Fixed chdefdir. Now it should work. Updated options. It now checks if the .exe exists. If not, it throws an error. Updated echo Messages a bit. Modified: trunk/tools/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/chdefdir.cmd trunk/tools/RosBE-Windows/Root/options.cmd trunk/tools/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE-Windows/Root/scut.cmd Modified: trunk/tools/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Clean.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Clean.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Clean.cmd Mon Oct 22 03:11:16 2007 @@ -101,7 +101,7 @@ echo Done cleaning ReactOS source directory. ) else ( - echo There is nothing to clean. + echo ERROR: There is nothing to clean. ) title ReactOS Build Environment %_ROSBE_VERSION% goto :EOC @@ -117,7 +117,7 @@ echo Done cleaning build logs. ) else ( - echo There are no logs to clean. + echo ERROR: There are no logs to clean. ) goto :EOC ) Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Mon Oct 22 03:11:16 2007 @@ -47,7 +47,7 @@ del "%_ROSBE_BASEDIR%\*.rbuild" del "config.rbuild" copy "config.template.rbuild" "%_ROSBE_BASEDIR%\config.rbuild" - echo Updated. + echo Successfully Updated. goto :NOK ) if not "%1" == "" ( @@ -102,10 +102,10 @@ :: :: Start with reading settings from config.rbuild and let the user edit them. :: -echo Sub-architecture to build for. +echo Sub-Architecture to build for. echo Default is: none echo. -echo Right now +echo Right now: grep \"SARCH\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 set /P X="(), (xbox)" sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%X%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%X%\"/g" "%_ROSBE_BASEDIR%\config.rbuild" > "%_ROSBE_BASEDIR%\config2.rbuild" @@ -118,7 +118,7 @@ echo See GCC manual for more CPU names and which CPUs GCC can optimize for. echo Default is: pentium echo. -echo Right now +echo Right now: grep \"OARCH\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 set /P XX= if "%XX%" == "" ( @@ -134,7 +134,7 @@ echo official release builds and debug builds. echo warning : 2,3,4,5 is not tested on ReactOS. Change at own risk. echo. -echo Right now +echo Right now: grep \"OPTIMIZE\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 set /P Y="(0), (1), (2), (3), (4), (5)" if "%Y%" == "" ( @@ -146,7 +146,7 @@ echo Whether to compile for an uniprocessor or multiprocessor machine. echo Default is: 0 echo. -echo Right now +echo Right now: grep \"MP\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 set /P Z="(0), (1)" if "%Z%" == "" ( @@ -158,7 +158,7 @@ echo Whether to compile in the integrated kernel debugger. echo Default is: 0 echo. -echo Right now +echo Right now: grep \"KDBG\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 set /P A="(0), (1)" if "%A%" == "" ( @@ -171,7 +171,7 @@ echo performed. echo Default is: 1 echo. -echo Right now +echo Right now: grep \"DBG\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 set /P B="(0), (1)" if "%B%" == "" ( @@ -184,7 +184,7 @@ echo don't enable this. echo Default is: 0 echo. -echo Right now +echo Right now: grep \"GDB\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 set /P C="(0), (1)" if "%C%" == "" ( @@ -199,7 +199,7 @@ echo from the patent owner). echo Default is: 0 echo. -echo Right now +echo Right now: grep \"NSWPAT\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 set /P D="(0), (1)" if "%D%" == "" ( @@ -216,7 +216,7 @@ echo unless you know what you're doing. echo Default is: 0 echo. -echo Right now +echo Right now: grep \"_WINKD_\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 set /P F="(0), (1)" if "%F%" == "" ( Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Mon Oct 22 03:11:16 2007 @@ -57,7 +57,7 @@ :EndCommandParse :: -:: Load the Base Directory from the Shortcut-XML and set it as new +:: Load the Base Directory from the Shortcut-txt and set it as new :: Source Directory and add PATH for Tools Folder. :: set PATH=%_ROSBE_BASEDIR%\Tools;%PATH% @@ -85,7 +85,7 @@ doskey /macrofile="%_ROSBE_BASEDIR%\RosBE.mac" :: -:: Look if the Source Folder is empty. If so, ask for using "svn create". +:: Look if the Source Folder is empty. If so, ask for using "ssvn create". :: dir /b "%_ROSBE_ROSSOURCEDIR%" 2>nul|findstr "." >nul if errorlevel 1 ( Modified: trunk/tools/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/chdefdir.… ============================================================================== --- trunk/tools/RosBE-Windows/Root/chdefdir.cmd (original) +++ trunk/tools/RosBE-Windows/Root/chdefdir.cmd Mon Oct 22 03:11:16 2007 @@ -10,11 +10,13 @@ title Change the Default Dir... +set _ROSBE_ROSSOURCEDIRBCK=%_ROSBE_ROSSOURCEDIR% + if /i "%1" == "" ( goto :INTERACTIVE ) if /i "%1" == "default" ( - set _ROSBE_ROSSOURCEDIR=%_ROSBE_ROSSOURCEDIR% + set _ROSBE_ROSSOURCEDIR=%_ROSBE_ROSSOURCEDIRBCK% ) else ( set _ROSBE_ROSSOURCEDIR=%1 ) Modified: trunk/tools/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/options.c… ============================================================================== --- trunk/tools/RosBE-Windows/Root/options.cmd (original) +++ trunk/tools/RosBE-Windows/Root/options.cmd Mon Oct 22 03:11:16 2007 @@ -10,7 +10,15 @@ title Options -"%_ROSBE_BASEDIR%\options.exe" -echo Press any Button to reset RosBE with the new Settings. -pause -"%_ROSBE_BASEDIR%\RosBE.cmd" +:: +:: Run options.exe +:: +if exist "%_ROSBE_BASEDIR%\options.exe" ( + "%_ROSBE_BASEDIR%\options.exe" + echo Press any Button to reset RosBE with the new Settings. + pause + "%_ROSBE_BASEDIR%\RosBE.cmd" +) else ( + echo ERROR: options.exe was not found. + title ReactOS Build Environment %_ROSBE_VERSION% +) Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Mon Oct 22 03:11:16 2007 @@ -39,14 +39,14 @@ if "%1" == "create" ( title Creating... if exist ".svn\." ( - echo Folder already cotains a Reposority. Exiting + echo ERROR: Folder already cotains a Reposority. Exiting goto :ExitSVN ) dir /b 2>nul|findstr "." >nul if errorlevel 1 ( svn checkout svn://svn.reactos.org/reactos/trunk/reactos ) else ( - echo Folder is not empty. Continuing is dangerous and can cause errors. ABORTED + echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED ) goto :ExitSVN ) Modified: trunk/tools/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/scut.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/scut.cmd (original) +++ trunk/tools/RosBE-Windows/Root/scut.cmd Mon Oct 22 03:11:16 2007 @@ -31,7 +31,7 @@ if /I "%1"=="run" ( for /f "usebackq tokens=1-2 delims=," %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( if %%i == Base ( - echo Used Shortcut: %%j + echo Active Shortcut: %%j echo. :: : Set new source directory, if needed. @@ -49,7 +49,7 @@ goto :END :: -:: Load Shortcut from XML and set it active. +:: Load Shortcut from txt and set it active. :: :DEF echo Choose your Source Folder: @@ -61,11 +61,11 @@ goto :END ) ) -echo ERROR: This Shortcut (%XY%) does not exist. +echo ERROR: The Shortcut %XY% does not exist. goto :END :: -:: Add new Shortcut to XML. +:: Add new Shortcut to txt. :: :ADD if not "%2" == "" ( @@ -90,7 +90,7 @@ :ADD23 for /f "usebackq tokens=1-2 delims=, skip=1" %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( if %%i == %CUT% ( - echo ERROR: A Shortcut with the name %CUT% does already exists. + echo ERROR: A Shortcut with the name %CUT% does already exist. goto :END ) ) @@ -98,7 +98,7 @@ goto :END :: -:: Remove Shortcut from XML. +:: Remove Shortcut from txt. :: :REM if not "%2" == "" ( @@ -137,6 +137,9 @@ :DEF1 call "%_ROSBE_BASEDIR%\scut.cmd" edit Base %DIR% +:: +:: Edit a existing Shortcut. +:: :EDIT if not "%2" == "" ( if not "%3" == "" (

1 0

[peterw] 29758: - Remove unneeded file.
by peterw＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: peterw Date: Mon Oct 22 02:41:18 2007 New Revision: 29758 URL: http://svn.reactos.org/svn/reactos?rev=29758&view=rev Log: - Remove unneeded file. Removed: trunk/tools/RosBE-Windows/Root/srclist.xml Removed: trunk/tools/RosBE-Windows/Root/srclist.xml URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/srclist.x… ============================================================================== --- trunk/tools/RosBE-Windows/Root/srclist.xml (original) +++ trunk/tools/RosBE-Windows/Root/srclist.xml (removed) @@ -1,13 +1,0 @@ -<?xml version="1.0"?> -<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - - -<property base="Default" -<property name="main" value="C:\RosBE\Source" />

1 0

[dreimer] 29757: - Updated ChangeLog.txt and readme.txt - Completely rewrote scut to work without grep sed cut and co and added a edit function. thx to Peter Ward for his help. - Updated help. - Successfully removed two of three workarounds in cutz.cmd.
by dreimer＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: dreimer Date: Mon Oct 22 02:37:16 2007 New Revision: 29757 URL: http://svn.reactos.org/svn/reactos?rev=29757&view=rev Log: - Updated ChangeLog.txt and readme.txt - Completely rewrote scut to work without grep sed cut and co and added a edit function. thx to Peter Ward for his help. - Updated help. - Successfully removed two of three workarounds in cutz.cmd. Added: trunk/tools/RosBE-Windows/Root/srclist.txt (with props) Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/README.txt trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/chdefdir.cmd trunk/tools/RosBE-Windows/Root/scut.cmd trunk/tools/RosBE-Windows/Tools/cutz.cmd Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Mon Oct 22 02:37:16 2007 @@ -1,6 +1,6 @@ *** XXX XXth, 200X - RosBE 0.X.X.X Released -- Updated RosBE COnfiguration Tool. (Pierre Schweitzer) +- Updated RosBE Configuration Tool. (Pierre Schweitzer) - Added French translation. - Added the possibility to choose MingW directory. - Added check to see if MingW dir is right (look up gcc) @@ -14,7 +14,32 @@ - Added check to test if log dir exists and if it doesn't, it's created - Added check to avoid writing in a non-existant file - Updated todo list + - Reorganized resources + - Added a basic font preview + - Continue dralnix code cleanup. + - Added checks to avoid buffers overflow. + +- Added a very simple makefile for the RosBE tools. (Peter Ward) +- Fix a warning in echoh.c. (Peter Ward) +- Fix options.exe compile with RosBE 0.3.8.1 (Peter Ward) +- Merge the three build.cmd files into one. (Peter Ward) +- Heaviliy cleaning up the .cmd files. (Peter Ward) +- remove typos. (Peter Ward) +- Make variable names more consistent. (Peter Ward) +- Merged the NSIS files back together. (Peter Ward) +- Renamed options.cmd -> rosbe-options.cmd. (Peter Ward) +- Completely rewrote scut to work without *nix tools + and added a edit function (Parter Ward, Daniel Reimer) +- Updated to NASM 0.99.05 (Daniel Reimer) +- Make helpfile entries dependant on the installed optional files. (Daniel Reimer) +- Readd chdefdir due to popular Demand. (Daniel Reimer) +- Make options.exe startable from cmd window. After exiting rosbe resets to use the new settings. (Daniel Reimer) - Added ccache 2.4 to RosBE. (Daniel Reimer) +- Remove trailing Spaces. (Daniel Reimer) +- Modify options.exe to enable and disable strpping and ccache. (Daniel Reimer) +- Fixed German RC File of Options.exe (Daniel Reimer) + +- Fixed Russian RC File of options.exe (towerr) *** Sep 24th, 2007 - RosBE 0.3.8.1 Released Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Help.cmd Mon Oct 22 02:37:16 2007 @@ -31,8 +31,8 @@ echo. if exist "%_ROSBE_BASEDIR%\scut.cmd" ( - echo scut - Define, Remove, Switch and Default to Shortcutted - echo Source-Directories. + echo scut - Define, Edit, Remove, Switch and Default to + echo Shortcutted Source-Directories. ) if exist "%_ROSBE_BASEDIR%\chdefdir.cmd" ( @@ -155,14 +155,16 @@ ) if "%1" == "scut" ( echo Usage: scut [OPTIONS] - echo Defines, Removes, Switches and Defaults to Shortcutted Source Directories. - echo scut started without a parameter or with the name of a Shortcut as - echo parameter sets this Shortcut active. + echo Defines, Edits, Removes, Switches and Defaults to Shortcutted Source + echo Directories. scut started without a parameter or with the name of a + echo Shortcut as parameter sets this Shortcut active. echo. echo add - Adds a Shortcut. echo (Optional: "Shortcut" "Directory" as second and third parameter) - echo remove - Removes a shortcut. + echo rem - Removes a shortcut. echo (Optional: "Shortcut" as second parameter) + echo edit - Edits a shortcut. + echo (Optional: "Shortcut" "Directory" as second and third parameter) echo def - Chooses Default Shortcut which is enabled on echo every start of RosBE. "Default" is the Source echo Directory as you know it from previous Versions Modified: trunk/tools/RosBE-Windows/Root/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/README.tx… ============================================================================== --- trunk/tools/RosBE-Windows/Root/README.txt (original) +++ trunk/tools/RosBE-Windows/Root/README.txt Mon Oct 22 02:37:16 2007 @@ -11,12 +11,12 @@ The ReactOS Build Environment v0.X.X.X contains the following packages: -binutils-2.17.50-20070806 +binutils-2.18.50-20071015 mingw-runtime-3.13 w32api-3.10 mingw32-make-3.81-2 -nasm-0.99.04-win32 -mingw-4.1.3-20070829-prerelease +nasm-0.99.05-win32 +mingw-4.1.3-20071015-prerelease - Patched to fix a GCC bug concerning decorating virtual methods with stdcall in C++, see GCC issue: Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Mon Oct 22 02:37:16 2007 @@ -30,8 +30,8 @@ :: Check if the user has used the options utility and :: if so, load their options. :: -if exist %_ROSBE_BASEDIR%\rosbe-options.cmd ( - call %_ROSBE_BASEDIR%\rosbe-options.cmd +if exist "%_ROSBE_BASEDIR%\rosbe-options.cmd" ( + call "%_ROSBE_BASEDIR%\rosbe-options.cmd" ) title ReactOS Build Environment %_ROSBE_VERSION% @@ -61,9 +61,7 @@ :: Source Directory and add PATH for Tools Folder. :: set PATH=%_ROSBE_BASEDIR%\Tools;%PATH% -for /f "usebackq" %%i in (`"grep base= "%_ROSBE_BASEDIR%\srclist.xml"|cutz main"`) do set scut=%%i -echo Used Shortcut: %scut% -echo. +if exist "%_ROSBE_BASEDIR%\scut.cmd" (call "%_ROSBE_BASEDIR%\scut.cmd" run) :: :: Display the current version of GCC, NASM, ld and make. @@ -85,13 +83,6 @@ :: Load the doskey macros that serve as our commands. :: doskey /macrofile="%_ROSBE_BASEDIR%\RosBE.mac" - -:: -:: Set new source directory, if needed. -:: -if not "%scut%" == "Default" ( - call %_ROSBE_BASEDIR%\scut %scut% -) :: :: Look if the Source Folder is empty. If so, ask for using "svn create". Modified: trunk/tools/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/chdefdir.… ============================================================================== --- trunk/tools/RosBE-Windows/Root/chdefdir.cmd (original) +++ trunk/tools/RosBE-Windows/Root/chdefdir.cmd Mon Oct 22 02:37:16 2007 @@ -12,8 +12,8 @@ if /i "%1" == "" ( goto :INTERACTIVE -) -if /i "%1" == "default" ( +) +if /i "%1" == "default" ( set _ROSBE_ROSSOURCEDIR=%_ROSBE_ROSSOURCEDIR% ) else ( set _ROSBE_ROSSOURCEDIR=%1 @@ -26,8 +26,8 @@ if /i "%XY%" == "" ( goto :END -) -if /i "%XY%"=="default" ( +) +if /i "%XY%"=="default" ( set _ROSBE_ROSSOURCEDIR=%_ROSBE_ROSSOURCEDIR% ) else ( set _ROSBE_ROSSOURCEDIR=%XY% Modified: trunk/tools/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/scut.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/scut.cmd (original) +++ trunk/tools/RosBE-Windows/Root/scut.cmd Mon Oct 22 02:37:16 2007 @@ -22,8 +22,26 @@ if /I "%1"=="rem" ( goto :REM ) +if /I "%1"=="edit" ( + goto :EDIT +) if /I "%1"=="def" ( goto :DEF2 +) +if /I "%1"=="run" ( + for /f "usebackq tokens=1-2 delims=," %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( + if %%i == Base ( + echo Used Shortcut: %%j + echo. + :: + : Set new source directory, if needed. + :: + if not "%%j" == "Default" ( + call "%_ROSBE_BASEDIR%\scut.cmd" %%j + ) + ) + ) + goto :END ) else ( set XY=%1 goto :RUN @@ -37,18 +55,14 @@ echo Choose your Source Folder: set /P XY= :RUN -grep name=\"%XY%\" "%_ROSBE_BASEDIR%\srclist.xml"|cutz dir > "%_ROSBE_BASEDIR%\aaa.tmp" -test -s "%_ROSBE_BASEDIR%\aaa.tmp" -if errorlevel 1 ( - echo Shortcut with that name does not exist. - del "%_ROSBE_BASEDIR%\aaa.tmp" - goto :END -) else ( - set /P dir=<"%_ROSBE_BASEDIR%\aaa.tmp" - call cd /D %dir% - del "%_ROSBE_BASEDIR%\aaa.tmp" - goto :END +for /f "usebackq tokens=1-2 delims=, skip=1" %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( + if %%i == %XY% ( + cd /d %%j + goto :END + ) ) +echo ERROR: This Shortcut (%XY%) does not exist. +goto :END :: :: Add new Shortcut to XML. @@ -74,11 +88,13 @@ echo Choose your Source Folder: set /P DIR= :ADD23 -echo ^<property name="%CUT%" value="%DIR%" /^> > "%_ROSBE_BASEDIR%\aaa.tmp" -copy "%_ROSBE_BASEDIR%\srclist.xml" + "%_ROSBE_BASEDIR%\aaa.tmp" "%_ROSBE_BASEDIR%\srclist2.xml" -del "%_ROSBE_BASEDIR%\srclist.xml" -ren "%_ROSBE_BASEDIR%\srclist2.xml" srclist.xml -del "%_ROSBE_BASEDIR%\aaa.tmp" +for /f "usebackq tokens=1-2 delims=, skip=1" %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( + if %%i == %CUT% ( + echo ERROR: A Shortcut with the name %CUT% does already exists. + goto :END + ) +) +echo %CUT%,%DIR%>> "%_ROSBE_BASEDIR%\srclist.txt" goto :END :: @@ -92,47 +108,78 @@ echo Choose your Shortcut: set /P CUTREM= :REM1 -grep name=\"%CUTREM%\" "%_ROSBE_BASEDIR%\srclist.xml"|cutz dir > "%_ROSBE_BASEDIR%\aaa.tmp" -test -s "%_ROSBE_BASEDIR%\aaa.tmp" -if errorlevel 1 ( - echo Shortcut with that name does not exist. - del "%_ROSBE_BASEDIR%\aaa.tmp" - goto :END -) else ( - grep -v name=\"%CUTREM%\" "%_ROSBE_BASEDIR%\srclist.xml" > "%_ROSBE_BASEDIR%\srclist2.xml" - del "%_ROSBE_BASEDIR%\srclist.xml" - ren "%_ROSBE_BASEDIR%\srclist2.xml" srclist.xml - del "%_ROSBE_BASEDIR%\aaa.tmp" - goto :END +set _ROSBE_REM=0 +for /f "usebackq tokens=1-2 delims=," %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( + if not %%i == %CUTREM% ( + echo %%i,%%j>> "%_ROSBE_BASEDIR%\srclist2.txt" + ) else ( + set _ROSBE_REM=1 + ) ) +del "%_ROSBE_BASEDIR%\srclist.txt" +ren "%_ROSBE_BASEDIR%\srclist2.txt" srclist.txt +if %_ROSBE_REM% == 0 ( + echo ERROR: The Shortcut %CUTREM% does not exist. +) +goto :END + :: :: Set Default Shortcut. :: :DEF2 if not "%2" == "" ( - set DEF=%2 + set DIR=%2 goto :DEF1 ) echo Choose your new Default Shortcut: -set /P DEF= +set /P DIR= :DEF1 -grep name=\"%DEF%\" "%_ROSBE_BASEDIR%\srclist.xml"|cutz dir > "%_ROSBE_BASEDIR%\aaa.tmp" -test -s "%_ROSBE_BASEDIR%\aaa.tmp" -if errorlevel 1 ( - echo Shortcut with that name does not exist. - del "%_ROSBE_BASEDIR%\aaa.tmp" - goto :END +call "%_ROSBE_BASEDIR%\scut.cmd" edit Base %DIR% + +:EDIT +if not "%2" == "" ( + if not "%3" == "" ( + set CUT=%2 + set DIR=%3 + goto :EDIT23 + ) else ( + set CUT=%2 + goto :EDIT2 + ) ) else ( - sed "s/base=\".*\"/base=\"%DEF%\"/g" "%_ROSBE_BASEDIR%\srclist.xml" > "%_ROSBE_BASEDIR%\srclist2.xml" - del "%_ROSBE_BASEDIR%\srclist.xml" - ren "%_ROSBE_BASEDIR%\srclist2.xml" srclist.xml - del "%_ROSBE_BASEDIR%\aaa.tmp" - goto :PREEND + goto :EDIT1 ) -:PREEND -call "%_ROSBE_BASEDIR%\RosBE.cmd" +:EDIT1 +echo Choose your Shortcut: +set /P CUT= +:EDIT2 +echo Choose your Source Folder: +set /P DIR= +:EDIT23 +set _ROSBE_EDIT=0 +for /f "usebackq tokens=1-2 delims=," %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do ( + if %%i == %CUT% ( + set _ROSBE_EDIT=1 + if exist "%_ROSBE_BASEDIR%\temporaryfile.tmp" ( + echo %%i,%DIR%>> "%_ROSBE_BASEDIR%\temporaryfile.tmp" + ) else ( + echo %%i,%DIR%> "%_ROSBE_BASEDIR%\temporaryfile.tmp" + ) + ) else ( + if exist "%_ROSBE_BASEDIR%\temporaryfile.tmp" ( + echo %%i,%%j>> "%_ROSBE_BASEDIR%\temporaryfile.tmp" + ) else ( + echo %%i,%%j> "%_ROSBE_BASEDIR%\temporaryfile.tmp" + ) + ) +) +del "%_ROSBE_BASEDIR%\srclist.txt" +ren "%_ROSBE_BASEDIR%\temporaryfile.tmp" srclist.txt +if %_ROSBE_EDIT% == 0 ( + echo ERROR: The Shortcut %CUT% does not exist. +) :END title ReactOS Build Environment %_ROSBE_VERSION% Added: trunk/tools/RosBE-Windows/Root/srclist.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/srclist.t… ============================================================================== --- trunk/tools/RosBE-Windows/Root/srclist.txt (added) +++ trunk/tools/RosBE-Windows/Root/srclist.txt Mon Oct 22 02:37:16 2007 @@ -1,0 +1,2 @@ +Base,Default +Default,C:\RosBE\Source Propchange: trunk/tools/RosBE-Windows/Root/srclist.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE-Windows/Tools/cutz.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/cutz.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/cutz.cmd (original) +++ trunk/tools/RosBE-Windows/Tools/cutz.cmd Mon Oct 22 02:37:16 2007 @@ -7,12 +7,6 @@ :: :: @echo off -if "%1" == "dir" ( - cut -d "\"" -f 4 -) if "%1" == "svn" ( cut -d " " -f 2 ) -if "%1" == "main" ( - cut -d """ -f 2 -)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs