Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 32603: - UGLY HACK dedicated to Timo Kreuzer: Please, fix this issue. Happens only in 2nd stage during shutdown.
by fireball＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: fireball Date: Fri Mar 7 18:13:02 2008 New Revision: 32603 URL: http://svn.reactos.org/svn/reactos?rev=3D32603&view=3Drev Log: - UGLY HACK dedicated to Timo Kreuzer: Please, fix this issue. Happens only= in 2nd stage during shutdown. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/gdiobj.c?rev=3D32603&r1=3D32602&r2=3D32603&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Fri Mar 7 18:13= :02 2008 @@ -1318,6 +1318,16 @@ { POBJ Object =3D Entry->KernelData; = + /* HACK: Introduced very recently, probably by Timo's chan= ges */ + if ((ULONG_PTR)Object < 0x80000000) + { + DPRINT1("KernelData is invalid (%p) for Entry %p!!!\n", + Object, Entry); + + /* Hopefully someone is going to solve this issue */ + return; + } + PrevThread =3D Object->Tid; if (Object->cExclusiveLock =3D=3D 0 || PrevThread =3D=3D T= hread) {

1 0

[janderwald] 32602: - load boot.ini into listbox
by janderwald＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: janderwald Date: Fri Mar 7 17:48:07 2008 New Revision: 32602 URL: http://svn.reactos.org/svn/reactos?rev=3D32602&view=3Drev Log: - load boot.ini into listbox Modified: trunk/reactos/base/applications/msconfig/freeldrpage.c Modified: trunk/reactos/base/applications/msconfig/freeldrpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msc= onfig/freeldrpage.c?rev=3D32602&r1=3D32601&r2=3D32602&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/applications/msconfig/freeldrpage.c (original) +++ trunk/reactos/base/applications/msconfig/freeldrpage.c Fri Mar 7 17:48= :07 2008 @@ -12,9 +12,103 @@ HWND hFreeLdrPage; HWND hFreeLdrDialog; = +typedef struct +{ + ULONG TimeOut; + WCHAR szDefaultOS[512]; + ULONG szDefaultPos; + ULONG OSConfigurationCount; + BOOL UseBootIni; +}FREELDR_SETTINGS; + +static FREELDR_SETTINGS Settings =3D { 0, {0}, 0 }; + + +BOOL +LoadBootIni(WCHAR * szDrive, HWND hDlg) +{ + WCHAR szBuffer[512]; + HWND hDlgCtrl; + FILE * file; + UINT length; + LRESULT pos; + + wcscpy(szBuffer, szDrive); + wcscat(szBuffer, L"boot.ini"); + = + file =3D _wfopen(szBuffer, L"rt"); + if (!file) + return FALSE; + = + hDlgCtrl =3D GetDlgItem(hDlg, IDC_LIST_BOX); + + while(!feof(file)) + { + if (fgetws(szBuffer, sizeof(szBuffer) / sizeof(WCHAR), file)) + { + length =3D wcslen(szBuffer); + while(szBuffer[length] < 14) //FIXME remove line feeds + szBuffer[length--] =3D 0; + + pos =3D SendMessageW(hDlgCtrl, LB_ADDSTRING, 0, (LPARAM)szBuff= er); + + + if (szBuffer[0] =3D=3D L'[') + continue; + + if (!wcsncmp(szBuffer, L"timeout=3D", 8)) + { + Settings.TimeOut =3D _wtoi(&szBuffer[8]); + continue; + } + + if (!wcsncmp(szBuffer, L"default=3D", 8)) + { + wcscpy(Settings.szDefaultOS, &szBuffer[8]); + continue; + } + if (pos !=3D LB_ERR) + SendMessage(hDlgCtrl, LB_SETITEMDATA, pos, 1); // indicate= that this item is an boot entry + Settings.OSConfigurationCount++; + } + } + + fclose(file); + Settings.UseBootIni =3D TRUE; + + pos =3D SendMessageW(hDlgCtrl, LB_FINDSTRING, 3, (LPARAM)Settings.szDef= aultOS); + if (pos !=3D LB_ERR) + { + Settings.szDefaultPos =3D pos; + SendMessage(hDlgCtrl, LB_SETCURSEL, pos, 0); + } + + SetDlgItemInt(hDlg, IDC_TXT_BOOT_TIMEOUT, Settings.TimeOut, FALSE); + if (Settings.OSConfigurationCount < 2) + { + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SET_DEFAULT_BOOT), FALSE); + EnableWindow(GetDlgItem(hDlg, IDC_BTN_MOVE_UP_BOOT_OPTION), FALSE); + EnableWindow(GetDlgItem(hDlg, IDC_BTN_MOVE_DOWN_BOOT_OPTION), FALS= E); + } + return TRUE; +} + + +BOOL +InitializeDialog(HWND hDlg) +{ + // FIXME + // find real boot drive and handle freeldr configuration ini + return LoadBootIni(L"C:\\", hDlg); +} + + + INT_PTR CALLBACK FreeLdrPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { + LRESULT pos; + UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(wParam); = @@ -22,7 +116,25 @@ case WM_INITDIALOG: hFreeLdrDialog =3D hDlg; SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNE= RZORDER | SWP_NOSIZE | SWP_NOZORDER); + InitializeDialog(hDlg); return TRUE; + case WM_COMMAND: + switch(HIWORD(wParam)) + { + case LBN_SELCHANGE: + pos =3D SendMessage((HWND)lParam, LB_GETCURSEL, 0, 0); + if (pos !=3D LB_ERR) + { + LPARAM res =3D SendMessage((HWND)lParam, LB_GETITEMDAT= A, pos, 0); + if (!res) //line is not a default one + SendMessage((HWND)lParam, LB_SETCURSEL, Settings.s= zDefaultPos, 0); + else + Settings.szDefaultPos =3D pos; + + + } + break; + } } return 0; }

1 0

[hpoussin] 32601: Precompiled headers can depend of generated files
by hpoussin＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: hpoussin Date: Fri Mar 7 16:06:06 2008 New Revision: 32601 URL: http://svn.reactos.org/svn/reactos?rev=3D32601&view=3Drev Log: Precompiled headers can depend of generated files Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/= mingw/modulehandler.cpp?rev=3D32601&r1=3D32600&r2=3D32601&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Mar 7 1= 6:06:06 2008 @@ -1820,9 +1820,10 @@ if ( rpcDependencies.size () > 0 ) dependencies +=3D " " + v2s ( backend, rpcDependencies, 5 ); fprintf ( fMakefile, - "%s: %s | %s\n", + "%s: %s ${%s_precondition} | %s\n", backend->GetFullName ( *pchFilename ).c_str(), dependencies.c_str(), + module.name.c_str (), backend->GetFullPath ( *pchFilename ).c_str() ); fprintf ( fMakefile, "\t$(ECHO_PCH)\n" ); fprintf ( fMakefile,

1 0

[hpoussin] 32600: .mc files shouldn't depend of the whole module precondition. This removes a circular dependency
by hpoussin＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: hpoussin Date: Fri Mar 7 15:44:18 2008 New Revision: 32600 URL: http://svn.reactos.org/svn/reactos?rev=3D32600&view=3Drev Log: .mc files shouldn't depend of the whole module precondition. This removes a circular dependency Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/= mingw/modulehandler.cpp?rev=3D32600&r1=3D32599&r2=3D32600&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Mar 7 1= 5:44:18 2008 @@ -1273,7 +1273,7 @@ "\t-@${rm} $(TEMPORARY)$(SEP)$(module_name).$(source_na= me_noext).res.tmp 2>$(NUL)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).coff", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule wmcRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t).rc $(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h= : $(WMC_TARGET) $(source) ${$(module_name)_precondition}\n" +Rule wmcRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t).rc $(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h= : $(WMC_TARGET) $(source)\n" "\t$(ECHO_WMC)\n" "\t$(Q)$(WMC_TARGET) -i -H $(INTERMEDIATE)$(SEP)include$(SE= P)reactos$(SEP)$(source_name_noext).h -o $(INTERMEDIATE)$(SEP)$(source_dir)= $(SEP)$(source_name_noext).rc $(source)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t).rc", "$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext= ).h", NULL );

1 0

[cfinck] 32599: Update two includes to not rely on target headers anymore
by cfinck＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: cfinck Date: Fri Mar 7 15:10:03 2008 New Revision: 32599 URL: http://svn.reactos.org/svn/reactos?rev=3D32599&view=3Drev Log: Update two includes to not rely on target headers anymore Modified: trunk/reactos/tools/widl/typelib_struct.h Modified: trunk/reactos/tools/widl/typelib_struct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib_st= ruct.h?rev=3D32599&r1=3D32598&r2=3D32599&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/widl/typelib_struct.h (original) +++ trunk/reactos/tools/widl/typelib_struct.h Fri Mar 7 15:10:03 2008 @@ -302,7 +302,7 @@ * */ = -#include "pshpack1.h" +#include <host/pshpack1.h> = typedef struct { /*00*/ DWORD SLTG_magic; /* 0x47544c53 =3D=3D "SLTG" */ @@ -599,7 +599,7 @@ WORD typeofarray */ = -#include "poppack.h" +#include <host/poppack.h> = /*---------------------------END------------------------------------------= --*/ #endif

1 0

[cfinck] 32598: - Add the "include" directory as an include to the cabman .rbuild file - Remove the "include/psdk" directory from widl, it isn't needed after our changes
by cfinck＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: cfinck Date: Fri Mar 7 15:07:33 2008 New Revision: 32598 URL: http://svn.reactos.org/svn/reactos?rev=3D32598&view=3Drev Log: - Add the "include" directory as an include to the cabman .rbuild file - Remove the "include/psdk" directory from widl, it isn't needed after our = changes Modified: trunk/reactos/tools/cabman/cabman.rbuild trunk/reactos/tools/widl/widl.rbuild Modified: trunk/reactos/tools/cabman/cabman.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabman.r= build?rev=3D32598&r1=3D32597&r2=3D32598&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/cabman/cabman.rbuild (original) +++ trunk/reactos/tools/cabman/cabman.rbuild Fri Mar 7 15:07:33 2008 @@ -1,6 +1,7 @@ <?xml version=3D"1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name=3D"cabman" type=3D"buildtool"> + <include base=3D"ReactOS">include</include> <include base=3D"zlibhost">.</include> <library>zlibhost</library> <file>cabinet.cxx</file> Modified: trunk/reactos/tools/widl/widl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.rbuil= d?rev=3D32598&r1=3D32597&r2=3D32598&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/widl/widl.rbuild (original) +++ trunk/reactos/tools/widl/widl.rbuild Fri Mar 7 15:07:33 2008 @@ -7,7 +7,6 @@ <include base=3D"ReactOS">include/reactos/wine</include> <include base=3D"ReactOS">include/reactos</include> <include base=3D"ReactOS">include</include> - <include base=3D"ReactOS">include/psdk</include> <include base=3D"ReactOS" root=3D"intermediate">include</include> <library>wpp</library> <file>client.c</file>

1 0

[hpoussin] 32597: Remove useless .mak files Remove Visual Studio project, it can now be generated from .rbuild file
by hpoussin＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: hpoussin Date: Fri Mar 7 14:02:42 2008 New Revision: 32597 URL: http://svn.reactos.org/svn/reactos?rev=3D32597&view=3Drev Log: Remove useless .mak files = Remove Visual Studio project, it can now be generated from .rbuild file Removed: trunk/reactos/tools/mkhive/mkhive.sln trunk/reactos/tools/mkhive/mkhive.vcproj trunk/reactos/tools/unicode/unicode.mak trunk/reactos/tools/wpp/wpp.mak Removed: trunk/reactos/tools/mkhive/mkhive.sln URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.s= ln?rev=3D32596&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/mkhive/mkhive.sln (original) +++ trunk/reactos/tools/mkhive/mkhive.sln (removed) @@ -1,20 +1,0 @@ -=C3=AF=C2=BB=C2=BF -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual C++ Express 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") =3D "mkhive", "mkhive.vc= proj", "{4D03FFD1-EB34-41A1-908B-F8F7350118A7}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) =3D preSolution - Debug|Win32 =3D Debug|Win32 - Release|Win32 =3D Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) =3D postSolution - {4D03FFD1-EB34-41A1-908B-F8F7350118A7}.Debug|Win32.ActiveCfg =3D Debug|W= in32 - {4D03FFD1-EB34-41A1-908B-F8F7350118A7}.Debug|Win32.Build.0 =3D Debug|Win= 32 - {4D03FFD1-EB34-41A1-908B-F8F7350118A7}.Release|Win32.ActiveCfg =3D Relea= se|Win32 - {4D03FFD1-EB34-41A1-908B-F8F7350118A7}.Release|Win32.Build.0 =3D Release= |Win32 - EndGlobalSection - GlobalSection(SolutionProperties) =3D preSolution - HideSolutionNode =3D FALSE - EndGlobalSection -EndGlobal Removed: trunk/reactos/tools/mkhive/mkhive.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.v= cproj?rev=3D32596&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/mkhive/mkhive.vcproj (original) +++ trunk/reactos/tools/mkhive/mkhive.vcproj (removed) @@ -1,234 +1,0 @@ -<?xml version=3D"1.0" encoding=3D"Windows-1252"?> -<VisualStudioProject - ProjectType=3D"Visual C++" - Version=3D"8,00" - Name=3D"mkhive" - ProjectGUID=3D"{4D03FFD1-EB34-41a1-908B-F8F7350118A7}" - RootNamespace=3D"mkhive" - Keyword=3D"Win32Proj" - > - <Platforms> - <Platform - Name=3D"Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name=3D"Debug|Win32" - OutputDirectory=3D"$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory=3D"$(ConfigurationName)" - ConfigurationType=3D"1" - CharacterSet=3D"0" - > - <Tool - Name=3D"VCPreBuildEventTool" - /> - <Tool - Name=3D"VCCustomBuildTool" - /> - <Tool - Name=3D"VCXMLDataGeneratorTool" - /> - <Tool - Name=3D"VCWebServiceProxyGeneratorTool" - /> - <Tool - Name=3D"VCMIDLTool" - /> - <Tool - Name=3D"VCCLCompilerTool" - UseUnicodeResponseFiles=3D"true" - Optimization=3D"0" - AdditionalIncludeDirectories=3D"../../include/ddk;../../include/psdk;.= ./../include/reactos;../../lib/cmlib;../../lib/inflib;../../lib/rtl" - PreprocessorDefinitions=3D"WIN32;_CRT_SECURE_NO_WARNINGS" - MinimalRebuild=3D"true" - BasicRuntimeChecks=3D"3" - RuntimeLibrary=3D"3" - UsePrecompiledHeader=3D"0" - WarningLevel=3D"3" - Detect64BitPortabilityProblems=3D"true" - DebugInformationFormat=3D"4" - /> - <Tool - Name=3D"VCManagedResourceCompilerTool" - /> - <Tool - Name=3D"VCResourceCompilerTool" - /> - <Tool - Name=3D"VCPreLinkEventTool" - /> - <Tool - Name=3D"VCLinkerTool" - AdditionalDependencies=3D"kernel32.lib ../../obj-i386/lib/cmlib_host/c= minit.o ../../obj-i386/lib/cmlib_host/hivebin.o ../../obj-i386/lib/cmlib_ho= st/hivecell.o ../../obj-i386/lib/cmlib_host/hiveinit.o ../../obj-i386/lib/c= mlib_host/hivesum.o ../../obj-i386/lib/cmlib_host/hivewrt.o ../../obj-i386/= lib/inflib_host/infcore.o ../../obj-i386/lib/inflib_host/infget.o ../../obj= -i386/lib/inflib_host/infhostgen.o ../../obj-i386/lib/inflib_host/infhostge= t.o ../../obj-i386/lib/inflib_host/infhostput.o ../../obj-i386/lib/inflib_h= ost/infput.o $(NOINHERIT)" - LinkIncremental=3D"2" - GenerateDebugInformation=3D"true" - SubSystem=3D"1" - TargetMachine=3D"1" - /> - <Tool - Name=3D"VCALinkTool" - /> - <Tool - Name=3D"VCManifestTool" - /> - <Tool - Name=3D"VCXDCMakeTool" - /> - <Tool - Name=3D"VCBscMakeTool" - /> - <Tool - Name=3D"VCFxCopTool" - /> - <Tool - Name=3D"VCAppVerifierTool" - /> - <Tool - Name=3D"VCWebDeploymentTool" - /> - <Tool - Name=3D"VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name=3D"Release|Win32" - OutputDirectory=3D"$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory=3D"$(ConfigurationName)" - ConfigurationType=3D"1" - CharacterSet=3D"0" - WholeProgramOptimization=3D"1" - > - <Tool - Name=3D"VCPreBuildEventTool" - /> - <Tool - Name=3D"VCCustomBuildTool" - /> - <Tool - Name=3D"VCXMLDataGeneratorTool" - /> - <Tool - Name=3D"VCWebServiceProxyGeneratorTool" - /> - <Tool - Name=3D"VCMIDLTool" - /> - <Tool - Name=3D"VCCLCompilerTool" - AdditionalIncludeDirectories=3D"../../include/ddk;../../include/psdk;.= ./../include/reactos;../../lib/cmlib;../../lib/inflib;../../lib/rtl" - PreprocessorDefinitions=3D"WIN32;_CRT_SECURE_NO_WARNINGS" - RuntimeLibrary=3D"2" - UsePrecompiledHeader=3D"0" - WarningLevel=3D"3" - Detect64BitPortabilityProblems=3D"true" - DebugInformationFormat=3D"0" - /> - <Tool - Name=3D"VCManagedResourceCompilerTool" - /> - <Tool - Name=3D"VCResourceCompilerTool" - /> - <Tool - Name=3D"VCPreLinkEventTool" - /> - <Tool - Name=3D"VCLinkerTool" - AdditionalDependencies=3D"kernel32.lib ../../obj-i386/lib/cmlib_host/c= minit.o ../../obj-i386/lib/cmlib_host/hivebin.o ../../obj-i386/lib/cmlib_ho= st/hivecell.o ../../obj-i386/lib/cmlib_host/hiveinit.o ../../obj-i386/lib/c= mlib_host/hivesum.o ../../obj-i386/lib/cmlib_host/hivewrt.o ../../obj-i386/= lib/inflib_host/infcore.o ../../obj-i386/lib/inflib_host/infget.o ../../obj= -i386/lib/inflib_host/infhostgen.o ../../obj-i386/lib/inflib_host/infhostge= t.o ../../obj-i386/lib/inflib_host/infhostput.o ../../obj-i386/lib/inflib_h= ost/infput.o $(NOINHERIT)" - LinkIncremental=3D"1" - GenerateDebugInformation=3D"true" - SubSystem=3D"1" - OptimizeReferences=3D"2" - EnableCOMDATFolding=3D"2" - TargetMachine=3D"1" - /> - <Tool - Name=3D"VCALinkTool" - /> - <Tool - Name=3D"VCManifestTool" - /> - <Tool - Name=3D"VCXDCMakeTool" - /> - <Tool - Name=3D"VCBscMakeTool" - /> - <Tool - Name=3D"VCFxCopTool" - /> - <Tool - Name=3D"VCAppVerifierTool" - /> - <Tool - Name=3D"VCWebDeploymentTool" - /> - <Tool - Name=3D"VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name=3D"Source Files" - Filter=3D"cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" - > - <File - RelativePath=3D".\binhive.c" - > - </File> - <File - RelativePath=3D".\cmi.c" - > - </File> - <File - RelativePath=3D".\mkhive.c" - > - </File> - <File - RelativePath=3D".\reginf.c" - > - </File> - <File - RelativePath=3D".\registry.c" - > - </File> - <File - RelativePath=3D".\rtl.c" - > - </File> - </Filter> - <Filter - Name=3D"Header Files" - Filter=3D"h;hpp;hxx;hm;inl;inc;xsd" - > - <File - RelativePath=3D".\binhive.h" - > - </File> - <File - RelativePath=3D".\cmi.h" - > - </File> - <File - RelativePath=3D".\mkhive.h" - > - </File> - <File - RelativePath=3D".\reginf.h" - > - </File> - <File - RelativePath=3D".\registry.h" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> Removed: trunk/reactos/tools/unicode/unicode.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/unicode= .mak?rev=3D32596&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/unicode/unicode.mak (original) +++ trunk/reactos/tools/unicode/unicode.mak (removed) @@ -1,385 +1,0 @@ -UNICODE_BASE =3D $(TOOLS_BASE_)unicode -UNICODE_BASE_ =3D $(UNICODE_BASE)$(SEP) -UNICODE_INT =3D $(INTERMEDIATE_)$(UNICODE_BASE) -UNICODE_INT_ =3D $(UNICODE_INT)$(SEP) -UNICODE_OUT =3D $(OUTPUT_)$(UNICODE_BASE) -UNICODE_OUT_ =3D $(UNICODE_OUT)$(SEP) - -$(UNICODE_INT): | $(TOOLS_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(UNICODE_OUT): | $(TOOLS_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -UNICODE_TARGET =3D \ - $(UNICODE_OUT_)libunicode.a - -UNICODE_CODEPAGES =3D \ - 037 \ - 424 \ - 437 \ - 500 \ - 737 \ - 775 \ - 850 \ - 852 \ - 855 \ - 856 \ - 857 \ - 860 \ - 861 \ - 862 \ - 863 \ - 864 \ - 865 \ - 866 \ - 869 \ - 874 \ - 875 \ - 878 \ - 932 \ - 936 \ - 949 \ - 950 \ - 1006 \ - 1026 \ - 1250 \ - 1251 \ - 1252 \ - 1253 \ - 1254 \ - 1255 \ - 1256 \ - 1257 \ - 1258 \ - 10000 \ - 10006 \ - 10007 \ - 10029 \ - 10079 \ - 10081 \ - 20866 \ - 20932 \ - 21866 \ - 28591 \ - 28592 \ - 28593 \ - 28594 \ - 28595 \ - 28596 \ - 28597 \ - 28598 \ - 28599 \ - 28600 \ - 28603 \ - 28604 \ - 28605 \ - 28606 - -UNICODE_SOURCES =3D $(addprefix $(UNICODE_BASE_), \ - casemap.c \ - compose.c \ - cptable.c \ - mbtowc.c \ - string.c \ - wctomb.c \ - wctype.c \ - $(UNICODE_CODEPAGES:%=3Dc_%.o) \ - utf8.c \ - ) - -UNICODE_OBJECTS =3D \ - $(addprefix $(INTERMEDIATE_), $(UNICODE_SOURCES:.c=3D.o)) - -UNICODE_HOST_CFLAGS =3D \ - -D__USE_W32API -DWINVER=3D0x501 -DWINE_UNICODE_API=3D \ - -I$(UNICODE_BASE) -Iinclude/reactos/wine -Iinclude -Iinclude/reactos \ - $(TOOLS_CFLAGS) - -.PHONY: unicode -unicode: $(UNICODE_TARGET) - -$(UNICODE_TARGET): $(UNICODE_OBJECTS) | $(UNICODE_OUT) - $(ECHO_AR) - ${host_ar} -rc $@ $(UNICODE_OBJECTS) - -$(UNICODE_INT_)casemap.o: $(UNICODE_BASE_)casemap.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)compose.o: $(UNICODE_BASE_)compose.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)cptable.o: $(UNICODE_BASE_)cptable.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)mbtowc.o: $(UNICODE_BASE_)mbtowc.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)string.o: $(UNICODE_BASE_)string.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)wctomb.o: $(UNICODE_BASE_)wctomb.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)wctype.o: $(UNICODE_BASE_)wctype.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_037.o: $(UNICODE_BASE_)c_037.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_424.o: $(UNICODE_BASE_)c_424.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_437.o: $(UNICODE_BASE_)c_437.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_500.o: $(UNICODE_BASE_)c_500.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_737.o: $(UNICODE_BASE_)c_737.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_775.o: $(UNICODE_BASE_)c_775.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_850.o: $(UNICODE_BASE_)c_850.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_852.o: $(UNICODE_BASE_)c_852.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_855.o: $(UNICODE_BASE_)c_855.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_856.o: $(UNICODE_BASE_)c_856.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_857.o: $(UNICODE_BASE_)c_857.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_860.o: $(UNICODE_BASE_)c_860.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_861.o: $(UNICODE_BASE_)c_861.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_862.o: $(UNICODE_BASE_)c_862.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_863.o: $(UNICODE_BASE_)c_863.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_864.o: $(UNICODE_BASE_)c_864.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_865.o: $(UNICODE_BASE_)c_865.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_866.o: $(UNICODE_BASE_)c_866.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_869.o: $(UNICODE_BASE_)c_869.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_874.o: $(UNICODE_BASE_)c_874.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_875.o: $(UNICODE_BASE_)c_875.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_878.o: $(UNICODE_BASE_)c_878.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_932.o: $(UNICODE_BASE_)c_932.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_936.o: $(UNICODE_BASE_)c_936.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_949.o: $(UNICODE_BASE_)c_949.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_950.o: $(UNICODE_BASE_)c_950.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_1006.o: $(UNICODE_BASE_)c_1006.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_1026.o: $(UNICODE_BASE_)c_1026.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_1250.o: $(UNICODE_BASE_)c_1250.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_1251.o: $(UNICODE_BASE_)c_1251.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_1252.o: $(UNICODE_BASE_)c_1252.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_1253.o: $(UNICODE_BASE_)c_1253.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_1254.o: $(UNICODE_BASE_)c_1254.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_1255.o: $(UNICODE_BASE_)c_1255.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_1256.o: $(UNICODE_BASE_)c_1256.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_1257.o: $(UNICODE_BASE_)c_1257.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_1258.o: $(UNICODE_BASE_)c_1258.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_10000.o: $(UNICODE_BASE_)c_10000.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_10006.o: $(UNICODE_BASE_)c_10006.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_10007.o: $(UNICODE_BASE_)c_10007.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_10029.o: $(UNICODE_BASE_)c_10029.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_10079.o: $(UNICODE_BASE_)c_10079.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_10081.o: $(UNICODE_BASE_)c_10081.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_20866.o: $(UNICODE_BASE_)c_20866.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_20932.o: $(UNICODE_BASE_)c_20932.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_21866.o: $(UNICODE_BASE_)c_21866.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_28591.o: $(UNICODE_BASE_)c_28591.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_28592.o: $(UNICODE_BASE_)c_28592.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_28593.o: $(UNICODE_BASE_)c_28593.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_28594.o: $(UNICODE_BASE_)c_28594.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_28595.o: $(UNICODE_BASE_)c_28595.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_28596.o: $(UNICODE_BASE_)c_28596.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_28597.o: $(UNICODE_BASE_)c_28597.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_28598.o: $(UNICODE_BASE_)c_28598.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_28599.o: $(UNICODE_BASE_)c_28599.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_28600.o: $(UNICODE_BASE_)c_28600.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_28603.o: $(UNICODE_BASE_)c_28603.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_28604.o: $(UNICODE_BASE_)c_28604.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_28605.o: $(UNICODE_BASE_)c_28605.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)c_28606.o: $(UNICODE_BASE_)c_28606.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -$(UNICODE_INT_)utf8.o: $(UNICODE_BASE_)utf8.c | $(UNICODE_INT) - $(ECHO_CC) - ${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@ - -.PHONY: unicode_clean -unicode_clean: - -@$(rm) $(UNICODE_TARGET) $(UNICODE_OBJECTS) 2>$(NUL) -clean: unicode_clean Removed: trunk/reactos/tools/wpp/wpp.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/wpp.mak?rev= =3D32596&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/wpp/wpp.mak (original) +++ trunk/reactos/tools/wpp/wpp.mak (removed) @@ -1,71 +1,0 @@ -WPP_BASE =3D $(TOOLS_BASE_)wpp -WPP_BASE_ =3D $(WPP_BASE)$(SEP) -WPP_INT =3D $(INTERMEDIATE_)$(WPP_BASE) -WPP_INT_ =3D $(WPP_INT)$(SEP) -WPP_OUT =3D $(OUTPUT_)$(WPP_BASE) -WPP_OUT_ =3D $(WPP_OUT)$(SEP) - -$(WPP_INT): | $(TOOLS_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(WPP_OUT): | $(TOOLS_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -WPP_TARGET =3D \ - $(WPP_OUT_)libwpp.a - -WPP_DEPENDS =3D $(BUILDNO_H) - -WPP_SOURCES =3D $(addprefix $(WPP_BASE_), \ - lex.yy.c \ - preproc.c \ - wpp.c \ - ppy.tab.c \ - ) - -WPP_OBJECTS =3D \ - $(addprefix $(INTERMEDIATE_), $(WPP_SOURCES:.c=3D.o)) - -WPP_HOST_CFLAGS =3D -D__USE_W32API -I$(WPP_BASE) -Iinclude/reactos/wine -I= include/reactos -Iinclude -Iinclude/psdk -I$(INTERMEDIATE_)include $(TOOLS_= CFLAGS) - -.PHONY: wpp -wpp: $(WPP_TARGET) - -$(WPP_TARGET): $(WPP_OBJECTS) | $(WPP_OUT) - $(ECHO_AR) - ${host_ar} -rc $(WPP_TARGET) $(WPP_OBJECTS) - -$(WPP_INT_)lex.yy.o: $(WPP_BASE_)lex.yy.c $(WPP_DEPENDS) | $(WPP_INT) - $(ECHO_CC) - ${host_gcc} $(WPP_HOST_CFLAGS) -c $< -o $@ - -$(WPP_INT_)preproc.o: $(WPP_BASE_)preproc.c $(WPP_DEPENDS) | $(WPP_INT) - $(ECHO_CC) - ${host_gcc} $(WPP_HOST_CFLAGS) -c $< -o $@ - -$(WPP_INT_)wpp.o: $(WPP_BASE_)wpp.c $(WPP_DEPENDS) | $(WPP_INT) - $(ECHO_CC) - ${host_gcc} $(WPP_HOST_CFLAGS) -c $< -o $@ - -$(WPP_INT_)ppy.tab.o: $(WPP_BASE_)ppy.tab.c $(WPP_DEPENDS) | $(WPP_INT) - $(ECHO_CC) - ${host_gcc} $(WPP_HOST_CFLAGS) -c $< -o $@ - -# -#$(WPP_BASE_)ppy.tab.c: $(WPP_BASE_)ppy.y -# bison -p ppy_ -d -o tools\wpp\ppy.tab.c tools\wpp\ppy.y -# - -# -#$(WPP_BASE_)lex.yy.c: $(WPP_BASE_)ppl.l -# flex -otools\wpp\lex.yy.c tools\wpp\ppl.l -# - -.PHONY: wpp_clean -wpp_clean: - -@$(rm) $(WPP_TARGET) $(WPP_OBJECTS) 2>$(NUL) -clean: wpp_clean

1 0

[hpoussin] 32596: Replace some .mak files by .rbuild files
by hpoussin＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: hpoussin Date: Fri Mar 7 14:00:41 2008 New Revision: 32596 URL: http://svn.reactos.org/svn/reactos?rev=3D32596&view=3Drev Log: Replace some .mak files by .rbuild files Added: trunk/reactos/tools/cabman/cabman.rbuild (with props) trunk/reactos/tools/mkhive/mkhive.rbuild (with props) trunk/reactos/tools/rgenstat/rgenstat.rbuild (with props) trunk/reactos/tools/sysreg/sysreg.rbuild (with props) trunk/reactos/tools/unicode/unicode.rbuild (with props) trunk/reactos/tools/widl/widl.rbuild (with props) trunk/reactos/tools/winebuild/winebuild.rbuild (with props) trunk/reactos/tools/wmc/wmc.rbuild (with props) trunk/reactos/tools/wpp/wpp.rbuild (with props) trunk/reactos/tools/wrc/wrc.rbuild (with props) Removed: trunk/reactos/lib/3rdparty/zlib/zlib.mak trunk/reactos/lib/cmlib/cmlib.mak trunk/reactos/tools/cabman/cabman.mak trunk/reactos/tools/cabman/cabman.sln trunk/reactos/tools/cabman/cabman.vcproj trunk/reactos/tools/mkhive/mkhive.mak trunk/reactos/tools/rgenstat/rgenstat.mak trunk/reactos/tools/sysreg/sysreg.mak trunk/reactos/tools/widl/widl.mak trunk/reactos/tools/winebuild/winebuild.mak trunk/reactos/tools/wmc/wmc.mak trunk/reactos/tools/wrc/wrc.mak Modified: trunk/reactos/lib/3rdparty/zlib/zlib.rbuild trunk/reactos/lib/cmlib/cmlib.rbuild trunk/reactos/lib/inflib/inflib.rbuild trunk/reactos/lib/lib.mak trunk/reactos/tools/tools.mak trunk/reactos/tools/tools.rbuild Removed: trunk/reactos/lib/3rdparty/zlib/zlib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/zli= b.mak?rev=3D32595&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/lib/3rdparty/zlib/zlib.mak (original) +++ trunk/reactos/lib/3rdparty/zlib/zlib.mak (removed) @@ -1,96 +1,0 @@ -ZLIB_BASE =3D $(LIB_BASE_)3rdparty$(SEP)zlib -ZLIB_BASE_ =3D $(ZLIB_BASE)$(SEP) -ZLIB_INT =3D $(INTERMEDIATE_)$(ZLIB_BASE) -ZLIB_INT_ =3D $(INTERMEDIATE_)$(ZLIB_BASE)$(SEP) -ZLIB_OUT =3D $(OUTPUT_)$(ZLIB_BASE) -ZLIB_OUT_ =3D $(OUTPUT_)$(ZLIB_BASE)$(SEP) - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(ZLIB_OUT): | $(OUTPUT_)$(LIB_BASE) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -ZLIB_HOST_TARGET =3D \ - $(ZLIB_OUT)$(SEP)zlib.host.a - -ZLIB_HOST_SOURCES =3D $(addprefix $(ZLIB_BASE_), \ - adler32.c \ - compress.c \ - crc32.c \ - gzio.c \ - uncompr.c \ - deflate.c \ - trees.c \ - zutil.c \ - inflate.c \ - infback.c \ - inftrees.c \ - inffast.c \ - ) - -ZLIB_HOST_OBJECTS =3D \ - $(addprefix $(INTERMEDIATE_), $(ZLIB_HOST_SOURCES:.c=3D.host.o)) - -ZLIB_HOST_CFLAGS =3D -O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversio= n \ - -Wstrict-prototypes -Wmissing-prototypes $(TOOLS_CPPFLAGS) - -$(ZLIB_HOST_TARGET): $(ZLIB_HOST_OBJECTS) | $(ZLIB_OUT) - $(ECHO_AR) - $(host_ar) -r $@ $(ZLIB_HOST_OBJECTS) - -$(ZLIB_INT_)adler32.host.o: $(ZLIB_BASE_)adler32.c | $(ZLIB_INT) - $(ECHO_CC) - ${host_gcc} $(ZLIB_HOST_CFLAGS) -c $< -o $@ - -$(ZLIB_INT_)compress.host.o: $(ZLIB_BASE_)compress.c | $(ZLIB_INT) - $(ECHO_CC) - ${host_gcc} $(ZLIB_HOST_CFLAGS) -c $< -o $@ - -$(ZLIB_INT_)crc32.host.o: $(ZLIB_BASE_)crc32.c | $(ZLIB_INT) - $(ECHO_CC) - ${host_gcc} $(ZLIB_HOST_CFLAGS) -c $< -o $@ - -$(ZLIB_INT_)gzio.host.o: $(ZLIB_BASE_)gzio.c | $(ZLIB_INT) - $(ECHO_CC) - ${host_gcc} $(ZLIB_HOST_CFLAGS) -c $< -o $@ - -$(ZLIB_INT_)uncompr.host.o: $(ZLIB_BASE_)uncompr.c | $(ZLIB_INT) - $(ECHO_CC) - ${host_gcc} $(ZLIB_HOST_CFLAGS) -c $< -o $@ - -$(ZLIB_INT_)deflate.host.o: $(ZLIB_BASE_)deflate.c | $(ZLIB_INT) - $(ECHO_CC) - ${host_gcc} $(ZLIB_HOST_CFLAGS) -c $< -o $@ - -$(ZLIB_INT_)trees.host.o: $(ZLIB_BASE_)trees.c | $(ZLIB_INT) - $(ECHO_CC) - ${host_gcc} $(ZLIB_HOST_CFLAGS) -c $< -o $@ - -$(ZLIB_INT_)zutil.host.o: $(ZLIB_BASE_)zutil.c | $(ZLIB_INT) - $(ECHO_CC) - ${host_gcc} $(ZLIB_HOST_CFLAGS) -c $< -o $@ - -$(ZLIB_INT_)inflate.host.o: $(ZLIB_BASE_)inflate.c | $(ZLIB_INT) - $(ECHO_CC) - ${host_gcc} $(ZLIB_HOST_CFLAGS) -c $< -o $@ - -$(ZLIB_INT_)infback.host.o: $(ZLIB_BASE_)infback.c | $(ZLIB_INT) - $(ECHO_CC) - ${host_gcc} $(ZLIB_HOST_CFLAGS) -c $< -o $@ - -$(ZLIB_INT_)inftrees.host.o: $(ZLIB_BASE_)inftrees.c | $(ZLIB_INT) - $(ECHO_CC) - ${host_gcc} $(ZLIB_HOST_CFLAGS) -c $< -o $@ - -$(ZLIB_INT_)inffast.host.o: $(ZLIB_BASE_)inffast.c | $(ZLIB_INT) - $(ECHO_CC) - ${host_gcc} $(ZLIB_HOST_CFLAGS) -c $< -o $@ - -.PHONY: zlib_host -zlib_host: $(ZLIB_HOST_TARGET) - -.PHONY: zlib_host_clean -zlib_host_clean: - -@$(rm) $(ZLIB_HOST_TARGET) $(ZLIB_HOST_OBJECTS) 2>$(NUL) -clean: zlib_host_clean Modified: trunk/reactos/lib/3rdparty/zlib/zlib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/zli= b.rbuild?rev=3D32596&r1=3D32595&r2=3D32596&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/lib/3rdparty/zlib/zlib.rbuild (original) +++ trunk/reactos/lib/3rdparty/zlib/zlib.rbuild Fri Mar 7 14:00:41 2008 @@ -1,5 +1,6 @@ <?xml version=3D"1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name=3D"zlib" type=3D"staticlibrary"> <include base=3D"zlib">.</include> <file>adler32.c</file> @@ -15,3 +16,19 @@ <file>inftrees.c</file> <file>inffast.c</file> </module> +<module name=3D"zlibhost" type=3D"hoststaticlibrary"> + <include base=3D"zlibhost">.</include> + <file>adler32.c</file> + <file>compress.c</file> + <file>crc32.c</file> + <file>gzio.c</file> + <file>uncompr.c</file> + <file>deflate.c</file> + <file>trees.c</file> + <file>zutil.c</file> + <file>inflate.c</file> + <file>infback.c</file> + <file>inftrees.c</file> + <file>inffast.c</file> +</module> +</group> Removed: trunk/reactos/lib/cmlib/cmlib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.mak?r= ev=3D32595&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/lib/cmlib/cmlib.mak (original) +++ trunk/reactos/lib/cmlib/cmlib.mak (removed) @@ -1,71 +1,0 @@ -CMLIB_BASE =3D $(LIB_BASE_)cmlib -CMLIB_BASE_ =3D $(CMLIB_BASE)$(SEP) -CMLIB_INT =3D $(INTERMEDIATE_)$(CMLIB_BASE)_host -CMLIB_INT_ =3D $(INTERMEDIATE_)$(CMLIB_BASE)_host$(SEP) -CMLIB_OUT =3D $(OUTPUT_)$(CMLIB_BASE)_host -CMLIB_OUT_ =3D $(OUTPUT_)$(CMLIB_BASE)_host$(SEP) - -$(CMLIB_INT): | $(LIB_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(CMLIB_OUT): | $(OUTPUT_)$(LIB_BASE) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -CMLIB_HOST_TARGET =3D \ - $(CMLIB_OUT)$(SEP)cmlib.a - -CMLIB_HOST_SOURCES =3D $(addprefix $(CMLIB_BASE_), \ - cminit.c \ - hivebin.c \ - hivecell.c \ - hiveinit.c \ - hivesum.c \ - hivewrt.c \ - ) - -CMLIB_HOST_OBJECTS =3D \ - $(subst $(CMLIB_BASE), $(CMLIB_INT), $(CMLIB_HOST_SOURCES:.c=3D.o)) - -CMLIB_HOST_CFLAGS =3D -O3 -Wall -Wwrite-strings -Wpointer-arith \ - -I$(CMLIB_BASE) -Iinclude/reactos -Iinclude \ - -DCMLIB_HOST $(HOST_CFLAGS) - -$(CMLIB_HOST_TARGET): $(CMLIB_HOST_OBJECTS) | $(CMLIB_OUT) - $(ECHO_AR) - $(host_ar) -r $@ $(CMLIB_HOST_OBJECTS) - -$(CMLIB_INT_)cminit.o: $(CMLIB_BASE_)cminit.c | $(CMLIB_INT) - $(ECHO_CC) - ${host_gcc} $(CMLIB_HOST_CFLAGS) -c $< -o $@ - -$(CMLIB_INT_)hivebin.o: $(CMLIB_BASE_)hivebin.c | $(CMLIB_INT) - $(ECHO_CC) - ${host_gcc} $(CMLIB_HOST_CFLAGS) -c $< -o $@ - -$(CMLIB_INT_)hivecell.o: $(CMLIB_BASE_)hivecell.c | $(CMLIB_INT) - $(ECHO_CC) - ${host_gcc} $(CMLIB_HOST_CFLAGS) -c $< -o $@ - -$(CMLIB_INT_)hiveinit.o: $(CMLIB_BASE_)hiveinit.c | $(CMLIB_INT) - $(ECHO_CC) - ${host_gcc} $(CMLIB_HOST_CFLAGS) -c $< -o $@ - -$(CMLIB_INT_)hivesum.o: $(CMLIB_BASE_)hivesum.c | $(CMLIB_INT) - $(ECHO_CC) - ${host_gcc} $(CMLIB_HOST_CFLAGS) -c $< -o $@ - -$(CMLIB_INT_)hivewrt.o: $(CMLIB_BASE_)hivewrt.c | $(CMLIB_INT) - $(ECHO_CC) - ${host_gcc} $(CMLIB_HOST_CFLAGS) -c $< -o $@ - -.PHONY: cmlib_host -cmlib_host: $(CMLIB_HOST_TARGET) - -.PHONY: cmlib_host_clean -cmlib_host_clean: - -@$(rm) $(CMLIB_HOST_TARGET) $(CMLIB_HOST_OBJECTS) 2>$(NUL) -clean: cmlib_host_clean Modified: trunk/reactos/lib/cmlib/cmlib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.rbuil= d?rev=3D32596&r1=3D32595&r2=3D32596&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/lib/cmlib/cmlib.rbuild (original) +++ trunk/reactos/lib/cmlib/cmlib.rbuild Fri Mar 7 14:00:41 2008 @@ -1,5 +1,6 @@ <?xml version=3D"1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<group> <module name=3D"cmlib" type=3D"staticlibrary"> <include base=3D"cmlib">.</include> <define name=3D"__NO_CTYPE_INLINES" /> @@ -14,3 +15,23 @@ <file>hivesum.c</file> <file>hivewrt.c</file> </module> +<module name=3D"cmlibhost" type=3D"hoststaticlibrary" allowwarnings=3D"tru= e"> + <include base=3D"cmlibhost">.</include> + <include base=3D"ReactOS">include/reactos</include> + <include base=3D"ReactOS">include</include> + <define name=3D"__NO_CTYPE_INLINES" /> + <define name=3D"_NTOSKRNL_" /> + <define name=3D"_NTSYSTEM_" /> + <define name=3D"NASSERT" /> + <compilerflag>-Wwrite-strings</compilerflag> + <compilerflag>-Wpointer-arith</compilerflag> + <define name=3D"CMLIB_HOST" /> + <pch>cmlib.h</pch> + <file>cminit.c</file> + <file>hivebin.c</file> + <file>hivecell.c</file> + <file>hiveinit.c</file> + <file>hivesum.c</file> + <file>hivewrt.c</file> +</module> +</group> Modified: trunk/reactos/lib/inflib/inflib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/inflib.rbu= ild?rev=3D32596&r1=3D32595&r2=3D32596&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/lib/inflib/inflib.rbuild (original) +++ trunk/reactos/lib/inflib/inflib.rbuild Fri Mar 7 14:00:41 2008 @@ -1,5 +1,6 @@ <?xml version=3D"1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<group> <module name=3D"inflib" type=3D"staticlibrary"> <include base=3D"inflib">.</include> <define name=3D"__NO_CTYPE_INLINES" /> @@ -11,3 +12,22 @@ <file>infrosget.c</file> <file>infrosput.c</file> </module> +<module name=3D"inflibhost" type=3D"hoststaticlibrary" allowwarnings=3D"tr= ue"> + <include base=3D"inflibhost">.</include> + <include base=3D"ReactOS">include/reactos</include> + <define name=3D"__NO_CTYPE_INLINES" /> + <compilerflag>-Wpointer-arith</compilerflag> + <compilerflag>-Wconversion</compilerflag> + <compilerflag>-Wstrict-prototypes</compilerflag> + <compilerflag>-Wmissing-prototypes</compilerflag> + <define name=3D"INFLIB_HOST" /> + <include base=3D"ReactOS">include</include> + <pch>inflib.h</pch> + <file>infcore.c</file> + <file>infget.c</file> + <file>infput.c</file> + <file>infhostgen.c</file> + <file>infhostget.c</file> + <file>infhostput.c</file> +</module> +</group> Modified: trunk/reactos/lib/lib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lib.mak?rev=3D325= 96&r1=3D32595&r2=3D32596&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/lib/lib.mak (original) +++ trunk/reactos/lib/lib.mak Fri Mar 7 14:00:41 2008 @@ -2,8 +2,6 @@ LIB_BASE_ =3D $(LIB_BASE)$(SEP) = include lib/inflib/inflib.mak -include lib/3rdparty/zlib/zlib.mak -include lib/cmlib/cmlib.mak ifeq ($(ARCH),powerpc) include lib/ppcmmu/ppcmmu.mak endif Removed: trunk/reactos/tools/cabman/cabman.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabman.m= ak?rev=3D32595&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/cabman/cabman.mak (original) +++ trunk/reactos/tools/cabman/cabman.mak (removed) @@ -1,68 +1,0 @@ -CABMAN_BASE =3D $(TOOLS_BASE_)cabman -CABMAN_BASE_ =3D $(CABMAN_BASE)$(SEP) -CABMAN_INT =3D $(INTERMEDIATE_)$(CABMAN_BASE) -CABMAN_INT_ =3D $(CABMAN_INT)$(SEP) -CABMAN_OUT =3D $(OUTPUT_)$(CABMAN_BASE) -CABMAN_OUT_ =3D $(CABMAN_OUT)$(SEP) - -$(CABMAN_INT): | $(TOOLS_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(CABMAN_OUT): | $(TOOLS_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -CABMAN_TARGET =3D \ - $(CABMAN_OUT_)cabman$(EXEPOSTFIX) - -CABMAN_SOURCES =3D $(addprefix $(CABMAN_BASE_), \ - cabinet.cxx \ - dfp.cxx \ - main.cxx \ - mszip.cxx \ - raw.cxx \ - ) - -CABMAN_OBJECTS =3D \ - $(addprefix $(INTERMEDIATE_), $(CABMAN_SOURCES:.cxx=3D.o)) - -CABMAN_HOST_CXXFLAGS =3D -Iinclude -Iinclude/reactos -Ilib/3rdparty/zlib $= (TOOLS_CPPFLAGS) - -CABMAN_HOST_LIBS =3D $(ZLIB_HOST_TARGET) - -CABMAN_HOST_LFLAGS =3D $(TOOLS_LFLAGS) $(CABMAN_HOST_LIBS) - -.PHONY: cabman -cabman: $(CABMAN_TARGET) - -$(CABMAN_TARGET): $(CABMAN_OBJECTS) $(CABMAN_HOST_LIBS) | $(CABMAN_OUT) - $(ECHO_LD) - ${host_gpp} $(CABMAN_OBJECTS) $(CABMAN_HOST_LFLAGS) -o $@ - -$(CABMAN_INT_)cabinet.o: $(CABMAN_BASE_)cabinet.cxx | $(CABMAN_INT) - $(ECHO_CC) - ${host_gpp} $(CABMAN_HOST_CXXFLAGS) -c $< -o $@ - -$(CABMAN_INT_)dfp.o: $(CABMAN_BASE_)dfp.cxx | $(CABMAN_INT) - $(ECHO_CC) - ${host_gpp} $(CABMAN_HOST_CXXFLAGS) -c $< -o $@ - -$(CABMAN_INT_)main.o: $(CABMAN_BASE_)main.cxx | $(CABMAN_INT) - $(ECHO_CC) - ${host_gpp} $(CABMAN_HOST_CXXFLAGS) -c $< -o $@ - -$(CABMAN_INT_)mszip.o: $(CABMAN_BASE_)mszip.cxx | $(CABMAN_INT) - $(ECHO_CC) - ${host_gpp} $(CABMAN_HOST_CXXFLAGS) -c $< -o $@ - -$(CABMAN_INT_)raw.o: $(CABMAN_BASE_)raw.cxx | $(CABMAN_INT) - $(ECHO_CC) - ${host_gpp} $(CABMAN_HOST_CXXFLAGS) -c $< -o $@ - -.PHONY: cabman_clean -cabman_clean: - -@$(rm) $(CABMAN_TARGET) $(CABMAN_OBJECTS) 2>$(NUL) -clean: cabman_clean Added: trunk/reactos/tools/cabman/cabman.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabman.r= build?rev=3D32596&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/cabman/cabman.rbuild (added) +++ trunk/reactos/tools/cabman/cabman.rbuild Fri Mar 7 14:00:41 2008 @@ -1,0 +1,11 @@ +<?xml version=3D"1.0"?> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<module name=3D"cabman" type=3D"buildtool"> + <include base=3D"zlibhost">.</include> + <library>zlibhost</library> + <file>cabinet.cxx</file> + <file>dfp.cxx</file> + <file>main.cxx</file> + <file>mszip.cxx</file> + <file>raw.cxx</file> +</module> Propchange: trunk/reactos/tools/cabman/cabman.rbuild ---------------------------------------------------------------------------= --- svn:eol-style =3D native Removed: trunk/reactos/tools/cabman/cabman.sln URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabman.s= ln?rev=3D32595&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/cabman/cabman.sln (original) +++ trunk/reactos/tools/cabman/cabman.sln (removed) @@ -1,20 +1,0 @@ -=C3=AF=C2=BB=C2=BF -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual C++ Express 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") =3D "cabman", "cabman.vc= proj", "{3A9CBD2C-BD87-4838-917E-F85C49BC3617}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) =3D preSolution - Debug|Win32 =3D Debug|Win32 - Release|Win32 =3D Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) =3D postSolution - {3A9CBD2C-BD87-4838-917E-F85C49BC3617}.Debug|Win32.ActiveCfg =3D Debug|W= in32 - {3A9CBD2C-BD87-4838-917E-F85C49BC3617}.Debug|Win32.Build.0 =3D Debug|Win= 32 - {3A9CBD2C-BD87-4838-917E-F85C49BC3617}.Release|Win32.ActiveCfg =3D Relea= se|Win32 - {3A9CBD2C-BD87-4838-917E-F85C49BC3617}.Release|Win32.Build.0 =3D Release= |Win32 - EndGlobalSection - GlobalSection(SolutionProperties) =3D preSolution - HideSolutionNode =3D FALSE - EndGlobalSection -EndGlobal Removed: trunk/reactos/tools/cabman/cabman.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabman.v= cproj?rev=3D32595&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/cabman/cabman.vcproj (original) +++ trunk/reactos/tools/cabman/cabman.vcproj (removed) @@ -1,232 +1,0 @@ -<?xml version=3D"1.0" encoding=3D"Windows-1252"?> -<VisualStudioProject - ProjectType=3D"Visual C++" - Version=3D"8,00" - Name=3D"cabman" - ProjectGUID=3D"{3A9CBD2C-BD87-4838-917E-F85C49BC3617}" - RootNamespace=3D"cabman" - Keyword=3D"Win32Proj" - > - <Platforms> - <Platform - Name=3D"Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name=3D"Debug|Win32" - OutputDirectory=3D"$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory=3D"$(ConfigurationName)" - ConfigurationType=3D"1" - CharacterSet=3D"0" - > - <Tool - Name=3D"VCPreBuildEventTool" - /> - <Tool - Name=3D"VCCustomBuildTool" - /> - <Tool - Name=3D"VCXMLDataGeneratorTool" - /> - <Tool - Name=3D"VCWebServiceProxyGeneratorTool" - /> - <Tool - Name=3D"VCMIDLTool" - /> - <Tool - Name=3D"VCCLCompilerTool" - UseUnicodeResponseFiles=3D"true" - Optimization=3D"0" - AdditionalIncludeDirectories=3D"../../include/reactos;../../lib/3rdpar= ty/zlib" - PreprocessorDefinitions=3D"WIN32;_CRT_SECURE_NO_WARNINGS" - MinimalRebuild=3D"true" - BasicRuntimeChecks=3D"3" - RuntimeLibrary=3D"3" - UsePrecompiledHeader=3D"0" - WarningLevel=3D"3" - Detect64BitPortabilityProblems=3D"false" - DebugInformationFormat=3D"4" - /> - <Tool - Name=3D"VCManagedResourceCompilerTool" - /> - <Tool - Name=3D"VCResourceCompilerTool" - /> - <Tool - Name=3D"VCPreLinkEventTool" - /> - <Tool - Name=3D"VCLinkerTool" - AdditionalDependencies=3D"kernel32.lib ../../obj-i386/lib/3rdparty/zli= b/zlib.a $(NOINHERIT)" - LinkIncremental=3D"2" - GenerateDebugInformation=3D"true" - SubSystem=3D"1" - TargetMachine=3D"1" - /> - <Tool - Name=3D"VCALinkTool" - /> - <Tool - Name=3D"VCManifestTool" - /> - <Tool - Name=3D"VCXDCMakeTool" - /> - <Tool - Name=3D"VCBscMakeTool" - /> - <Tool - Name=3D"VCFxCopTool" - /> - <Tool - Name=3D"VCAppVerifierTool" - /> - <Tool - Name=3D"VCWebDeploymentTool" - /> - <Tool - Name=3D"VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name=3D"Release|Win32" - OutputDirectory=3D"$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory=3D"$(ConfigurationName)" - ConfigurationType=3D"1" - CharacterSet=3D"0" - WholeProgramOptimization=3D"1" - > - <Tool - Name=3D"VCPreBuildEventTool" - /> - <Tool - Name=3D"VCCustomBuildTool" - /> - <Tool - Name=3D"VCXMLDataGeneratorTool" - /> - <Tool - Name=3D"VCWebServiceProxyGeneratorTool" - /> - <Tool - Name=3D"VCMIDLTool" - /> - <Tool - Name=3D"VCCLCompilerTool" - AdditionalIncludeDirectories=3D"../../include/reactos;../../lib/3rdpar= ty/zlib" - PreprocessorDefinitions=3D"WIN32;_CRT_SECURE_NO_WARNINGS" - RuntimeLibrary=3D"2" - UsePrecompiledHeader=3D"0" - WarningLevel=3D"3" - Detect64BitPortabilityProblems=3D"true" - DebugInformationFormat=3D"0" - /> - <Tool - Name=3D"VCManagedResourceCompilerTool" - /> - <Tool - Name=3D"VCResourceCompilerTool" - /> - <Tool - Name=3D"VCPreLinkEventTool" - /> - <Tool - Name=3D"VCLinkerTool" - AdditionalDependencies=3D"kernel32.lib ../../obj-i386/lib/3rdparty/zli= b/zlib.a $(NOINHERIT)" - LinkIncremental=3D"1" - GenerateDebugInformation=3D"true" - SubSystem=3D"1" - OptimizeReferences=3D"2" - EnableCOMDATFolding=3D"2" - TargetMachine=3D"1" - /> - <Tool - Name=3D"VCALinkTool" - /> - <Tool - Name=3D"VCManifestTool" - /> - <Tool - Name=3D"VCXDCMakeTool" - /> - <Tool - Name=3D"VCBscMakeTool" - /> - <Tool - Name=3D"VCFxCopTool" - /> - <Tool - Name=3D"VCAppVerifierTool" - /> - <Tool - Name=3D"VCWebDeploymentTool" - /> - <Tool - Name=3D"VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name=3D"Source Files" - Filter=3D"cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier=3D"{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" - > - <File - RelativePath=3D".\cabinet.cxx" - > - </File> - <File - RelativePath=3D".\dfp.cxx" - > - </File> - <File - RelativePath=3D".\main.cxx" - > - </File> - <File - RelativePath=3D".\mszip.cxx" - > - </File> - <File - RelativePath=3D".\raw.cxx" - > - </File> - </Filter> - <Filter - Name=3D"Header Files" - Filter=3D"h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier=3D"{93995380-89BD-4b04-88EB-625FBE52EBFB}" - > - <File - RelativePath=3D".\cabinet.h" - > - </File> - <File - RelativePath=3D".\cabman.h" - > - </File> - <File - RelativePath=3D".\dfp.h" - > - </File> - <File - RelativePath=3D".\mszip.h" - > - </File> - <File - RelativePath=3D".\raw.h" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> Removed: trunk/reactos/tools/mkhive/mkhive.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.m= ak?rev=3D32595&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/mkhive/mkhive.mak (original) +++ trunk/reactos/tools/mkhive/mkhive.mak (removed) @@ -1,72 +1,0 @@ -MKHIVE_BASE =3D $(TOOLS_BASE_)mkhive -MKHIVE_BASE_ =3D $(MKHIVE_BASE)$(SEP) -MKHIVE_INT =3D $(INTERMEDIATE_)$(MKHIVE_BASE) -MKHIVE_INT_ =3D $(MKHIVE_INT)$(SEP) -MKHIVE_OUT =3D $(OUTPUT_)$(MKHIVE_BASE) -MKHIVE_OUT_ =3D $(MKHIVE_OUT)$(SEP) - -$(MKHIVE_INT): | $(TOOLS_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(MKHIVE_OUT): | $(TOOLS_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -MKHIVE_TARGET =3D \ - $(MKHIVE_OUT_)mkhive$(EXEPOSTFIX) - -MKHIVE_SOURCES =3D $(addprefix $(MKHIVE_BASE_), \ - binhive.c \ - cmi.c \ - mkhive.c \ - reginf.c \ - registry.c \ - rtl.c \ - ) - -MKHIVE_OBJECTS =3D \ - $(addprefix $(INTERMEDIATE_), $(MKHIVE_SOURCES:.c=3D.o)) - -MKHIVE_HOST_CFLAGS =3D -fshort-wchar -I$(INFLIB_BASE) -I$(CMLIB_BASE) \ - -DMKHIVE_HOST -Iinclude/reactos -Iinclude -g3 $(HOST_CFLAGS) - -MKHIVE_HOST_LFLAGS =3D $(TOOLS_LFLAGS) -g3 - -.PHONY: mkhive -mkhive: $(MKHIVE_TARGET) - -$(MKHIVE_TARGET): $(MKHIVE_OBJECTS) $(INFLIB_HOST_OBJECTS) $(CMLIB_HOST_OB= JECTS) | $(MKHIVE_OUT) - $(ECHO_LD) - ${host_gcc} $(MKHIVE_OBJECTS) $(INFLIB_HOST_OBJECTS) $(CMLIB_HOST_OBJECTS= ) $(MKHIVE_HOST_LFLAGS) -o $@ - -$(MKHIVE_INT_)binhive.o: $(MKHIVE_BASE_)binhive.c | $(MKHIVE_INT) - $(ECHO_CC) - ${host_gcc} $(MKHIVE_HOST_CFLAGS) -c $< -o $@ - -$(MKHIVE_INT_)cmi.o: $(MKHIVE_BASE_)cmi.c | $(MKHIVE_INT) - $(ECHO_CC) - ${host_gcc} $(MKHIVE_HOST_CFLAGS) -c $< -o $@ - -$(MKHIVE_INT_)mkhive.o: $(MKHIVE_BASE_)mkhive.c | $(MKHIVE_INT) - $(ECHO_CC) - ${host_gcc} $(MKHIVE_HOST_CFLAGS) -c $< -o $@ - -$(MKHIVE_INT_)reginf.o: $(MKHIVE_BASE_)reginf.c | $(MKHIVE_INT) - $(ECHO_CC) - ${host_gcc} $(MKHIVE_HOST_CFLAGS) -c $< -o $@ - -$(MKHIVE_INT_)registry.o: $(MKHIVE_BASE_)registry.c | $(MKHIVE_INT) - $(ECHO_CC) - ${host_gcc} $(MKHIVE_HOST_CFLAGS) -c $< -o $@ - -$(MKHIVE_INT_)rtl.o: $(MKHIVE_BASE_)rtl.c | $(MKHIVE_INT) - $(ECHO_CC) - ${host_gcc} $(MKHIVE_HOST_CFLAGS) -Ilib/rtl -c $< -o $@ - -.PHONY: mkhive_clean -mkhive_clean: - -@$(rm) $(MKHIVE_TARGET) $(MKHIVE_OBJECTS) 2>$(NUL) -clean: mkhive_clean Added: trunk/reactos/tools/mkhive/mkhive.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.r= build?rev=3D32596&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/mkhive/mkhive.rbuild (added) +++ trunk/reactos/tools/mkhive/mkhive.rbuild Fri Mar 7 14:00:41 2008 @@ -1,0 +1,20 @@ +<?xml version=3D"1.0"?> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<module name=3D"mkhive" type=3D"buildtool" allowwarnings=3D"true"> + <include base=3D"ReactOS">include</include> + <include base=3D"ReactOS">include/reactos</include> + <include base=3D"inflibhost">.</include> + <include base=3D"cmlibhost">.</include> + <include base=3D"zlibhost">.</include> + <include base=3D"rtl">.</include> + <define name=3D"MKHIVE_HOST" /> + <compilerflag>-fshort-wchar</compilerflag> + <library>inflibhost</library> + <library>cmlibhost</library> + <file>binhive.c</file> + <file>cmi.c</file> + <file>mkhive.c</file> + <file>reginf.c</file> + <file>registry.c</file> + <file>rtl.c</file> +</module> Propchange: trunk/reactos/tools/mkhive/mkhive.rbuild ---------------------------------------------------------------------------= --- svn:eol-style =3D native Removed: trunk/reactos/tools/rgenstat/rgenstat.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rgenstat/rgenst= at.mak?rev=3D32595&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rgenstat/rgenstat.mak (original) +++ trunk/reactos/tools/rgenstat/rgenstat.mak (removed) @@ -1,51 +1,0 @@ -RGENSTAT_BASE =3D $(TOOLS_BASE_)rgenstat -RGENSTAT_BASE_ =3D $(RGENSTAT_BASE)$(SEP) -RGENSTAT_INT =3D $(INTERMEDIATE_)$(RGENSTAT_BASE) -RGENSTAT_INT_ =3D $(RGENSTAT_INT)$(SEP) -RGENSTAT_OUT =3D $(OUTPUT_)$(RGENSTAT_BASE) -RGENSTAT_OUT_ =3D $(RGENSTAT_OUT)$(SEP) - -$(RGENSTAT_INT): | $(TOOLS_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(RGENSTAT_OUT): | $(TOOLS_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -RGENSTAT_TARGET =3D \ - $(RGENSTAT_OUT_)rgenstat$(EXEPOSTFIX) - -RGENSTAT_SOURCES =3D $(addprefix $(RGENSTAT_BASE_), \ - rgenstat.c \ - llmosrt.c \ - ) - -RGENSTAT_OBJECTS =3D \ - $(addprefix $(INTERMEDIATE_), $(RGENSTAT_SOURCES:.c=3D.o)) - -RGENSTAT_HOST_CFLAGS =3D -g -Werror -Wall $(TOOLS_CFLAGS) - -RGENSTAT_HOST_LFLAGS =3D $(TOOLS_LFLAGS) -g - -$(RGENSTAT_TARGET): $(RGENSTAT_OBJECTS) | $(RGENSTAT_OUT) - $(ECHO_LD) - ${host_gcc} $(RGENSTAT_OBJECTS) $(RGENSTAT_HOST_LFLAGS) -o $@ - -$(RGENSTAT_INT_)rgenstat.o: $(RGENSTAT_BASE_)rgenstat.c | $(RGENSTAT_INT) - $(ECHO_CC) - ${host_gcc} $(RGENSTAT_HOST_CFLAGS) -c $< -o $@ - -$(RGENSTAT_INT_)llmosrt.o: $(RGENSTAT_BASE_)llmosrt.c | $(RGENSTAT_INT) - $(ECHO_CC) - ${host_gcc} $(RGENSTAT_HOST_CFLAGS) -c $< -o $@ - -.PHONY: rgenstat -rgenstat: $(RGENSTAT_TARGET) - -.PHONY: rgenstat_clean -rgenstat_clean: - -@$(rm) $(RGENSTAT_TARGET) $(RGENSTAT_OBJECTS) 2>$(NUL) -clean: rgenstat_clean Added: trunk/reactos/tools/rgenstat/rgenstat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rgenstat/rgenst= at.rbuild?rev=3D32596&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rgenstat/rgenstat.rbuild (added) +++ trunk/reactos/tools/rgenstat/rgenstat.rbuild Fri Mar 7 14:00:41 2008 @@ -1,0 +1,6 @@ +<?xml version=3D"1.0"?> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<module name=3D"rgenstat" type=3D"buildtool"> + <file>rgenstat.c</file> + <file>llmosrt.c</file> +</module> Propchange: trunk/reactos/tools/rgenstat/rgenstat.rbuild ---------------------------------------------------------------------------= --- svn:eol-style =3D native Removed: trunk/reactos/tools/sysreg/sysreg.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.m= ak?rev=3D32595&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/sysreg/sysreg.mak (original) +++ trunk/reactos/tools/sysreg/sysreg.mak (removed) @@ -1,90 +1,0 @@ -SYSREGBUILD_BASE =3D $(TOOLS_BASE)$(SEP)sysreg -SYSREGBUILD_BASE_ =3D $(SYSREGBUILD_BASE)$(SEP) -SYSREGBUILD_INT =3D $(INTERMEDIATE_)$(SYSREGBUILD_BASE) -SYSREGBUILD_INT_ =3D $(SYSREGBUILD_INT)$(SEP) -SYSREGBUILD_OUT =3D $(OUTPUT_)$(SYSREGBUILD_BASE) -SYSREGBUILD_OUT_ =3D $(SYSREGBUILD_OUT)$(SEP) - -$(SYSREGBUILD_INT): | $(TOOLS_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(SYSREGBUILD_OUT): | $(TOOLS_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -SYSREGBUILD_TARGET =3D \ - $(SYSREGBUILD_OUT_)sysreg$(EXEPOSTFIX) - -SYSREGBUILD_SOURCES =3D $(addprefix $(SYSREGBUILD_BASE_),\ - conf_parser.cpp \ - env_var.cpp \ - rosboot_test.cpp \ - namedpipe_reader.cpp \ - sysreg.cpp \ - file_reader.cpp \ - os_support.cpp \ - ) - -SYSREGBUILD_OBJECTS =3D \ - $(addprefix $(INTERMEDIATE_), $(SYSREGBUILD_SOURCES:.cpp=3D.o)) - - -ifeq ($(HOST),mingw32-linux) -SYSREGBUILD_HOST_CFLAGS =3D $(TOOLS_CPPFLAGS) -D__LINUX__ -Wall -else -SYSREGBUILD_HOST_CFLAGS =3D $(TOOLS_CPPFLAGS) -D__USE_W32API -Iinclude -Ii= nclude/reactos -Iinclude/psdk -Iinclude$(SEP)crt -Iinclude/reactos/libs -I$= (INTERMEDIATE_)$(SEP)include$(SEP)psdk -Wall -endif - -SYSREGBUILD_HOST_LFLAGS =3D $(TOOLS_LFLAGS) - -.PHONY: sysreg -sysreg: $(SYSREGBUILD_TARGET) -host_gpp +=3D -g - -$(SYSREGBUILD_TARGET): $(SYSREGBUILD_OBJECTS) | $(SYSREGBUILD_OUT) - $(ECHO_LD) - ${host_gpp} $(SYSREGBUILD_OBJECTS) $(SYSREGBUILD_HOST_LFLAGS) -o $@ - -$(SYSREGBUILD_INT_)conf_parser.o: $(SYSREGBUILD_BASE_)conf_parser.cpp | $(= SYSREGBUILD_INT) - $(ECHO_CC) - ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ - -$(SYSREGBUILD_INT_)env_var.o: $(SYSREGBUILD_BASE_)env_var.cpp | $(SYSREGBU= ILD_INT) - $(ECHO_CC) - ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ - -$(SYSREGBUILD_INT_)pipe_reader.o: $(SYSREGBUILD_BASE_)pipe_reader.cpp | $(= SYSREGBUILD_INT) - $(ECHO_CC) - ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ - = -$(SYSREGBUILD_INT_)namedpipe_reader.o: $(SYSREGBUILD_BASE_)namedpipe_reade= r.cpp | $(SYSREGBUILD_INT) - $(ECHO_CC) - ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ - -$(SYSREGBUILD_INT_)rosboot_test.o: $(SYSREGBUILD_BASE_)rosboot_test.cpp | = $(SYSREGBUILD_INT) - $(ECHO_CC) - ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ - -$(SYSREGBUILD_INT_)sym_file.o: $(SYSREGBUILD_BASE_)sym_file.cpp | $(SYSREG= BUILD_INT) - $(ECHO_CC) - ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ - -$(SYSREGBUILD_INT_)sysreg.o: $(SYSREGBUILD_BASE_)sysreg.cpp | $(SYSREGBUIL= D_INT) - $(ECHO_CC) - ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ - -$(SYSREGBUILD_INT_)file_reader.o: $(SYSREGBUILD_BASE_)file_reader.cpp | $(= SYSREGBUILD_INT) - $(ECHO_CC) - ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ - -$(SYSREGBUILD_INT_)os_support.o: $(SYSREGBUILD_BASE_)os_support.cpp | $(SY= SREGBUILD_INT) - $(ECHO_CC) - ${host_gpp} $(SYSREGBUILD_HOST_CFLAGS) -c $< -o $@ - -.PHONY: sysregbuild_clean -sysreg_clean: - -@$(rm) $(SYSREGBUILD_TARGET) $(SYSREGBUILD_OBJECTS) 2>$(NUL) -clean: sysreg_clean Added: trunk/reactos/tools/sysreg/sysreg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.r= build?rev=3D32596&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/sysreg/sysreg.rbuild (added) +++ trunk/reactos/tools/sysreg/sysreg.rbuild Fri Mar 7 14:00:41 2008 @@ -1,0 +1,22 @@ +<?xml version=3D"1.0"?> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<module name=3D"sysreg" type=3D"buildtool"> + <if property=3D"HOST" value=3D"mingw32-linux"> + <define name=3D"__LINUX__" /> + </if> +  + <file>conf_parser.cpp</file> + <file>env_var.cpp</file> + <file>rosboot_test.cpp</file> + <file>namedpipe_reader.cpp</file> + <file>sysreg.cpp</file> + <file>file_reader.cpp</file> + <file>os_support.cpp</file> +</module> Propchange: trunk/reactos/tools/sysreg/sysreg.rbuild ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev= =3D32596&r1=3D32595&r2=3D32596&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/tools.mak (original) +++ trunk/reactos/tools/tools.mak Fri Mar 7 14:00:41 2008 @@ -42,22 +42,12 @@ = include tools/bin2c.mak include tools/buildno/buildno.mak -include tools/cabman/cabman.mak include tools/gendib/gendib.mak ifeq ($(ARCH),powerpc) include tools/ofw_interface/ofw_interface.mak endif -include tools/mkhive/mkhive.mak include tools/nci/nci.mak include tools/pefixup.mak include tools/raddr2line.mak include tools/rbuild/rbuild.mak -include tools/rgenstat/rgenstat.mak include tools/rsym.mak -include tools/sysreg/sysreg.mak -include tools/unicode/unicode.mak -include tools/wpp/wpp.mak -include tools/widl/widl.mak -include tools/winebuild/winebuild.mak -include tools/wmc/wmc.mak -include tools/wrc/wrc.mak Modified: trunk/reactos/tools/tools.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.rbuild?re= v=3D32596&r1=3D32595&r2=3D32596&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/tools.rbuild (original) +++ trunk/reactos/tools/tools.rbuild Fri Mar 7 14:00:41 2008 @@ -1,7 +1,37 @@ <?xml version=3D"1.0"?> <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> <group xmlns:xi=3D"http://www.w3.org/2001/XInclude"> +<directory name=3D"cabman"> + <xi:include href=3D"cabman/cabman.rbuild" /> +</directory> <directory name=3D"cdmake"> <xi:include href=3D"cdmake/cdmake.rbuild" /> </directory> +<directory name=3D"mkhive"> + <xi:include href=3D"mkhive/mkhive.rbuild" /> +</directory> +<directory name=3D"rgenstat"> + <xi:include href=3D"rgenstat/rgenstat.rbuild" /> +</directory> +<directory name=3D"sysreg"> + <xi:include href=3D"sysreg/sysreg.rbuild" /> +</directory> +<directory name=3D"unicode"> + <xi:include href=3D"unicode/unicode.rbuild" /> +</directory> +<directory name=3D"widl"> + <xi:include href=3D"widl/widl.rbuild" /> +</directory> +<directory name=3D"winebuild"> + <xi:include href=3D"winebuild/winebuild.rbuild" /> +</directory> +<directory name=3D"wmc"> + <xi:include href=3D"wmc/wmc.rbuild" /> +</directory> +<directory name=3D"wpp"> + <xi:include href=3D"wpp/wpp.rbuild" /> +</directory> +<directory name=3D"wrc"> + <xi:include href=3D"wrc/wrc.rbuild" /> +</directory> </group> Added: trunk/reactos/tools/unicode/unicode.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/unicode= .rbuild?rev=3D32596&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/unicode/unicode.rbuild (added) +++ trunk/reactos/tools/unicode/unicode.rbuild Fri Mar 7 14:00:41 2008 @@ -1,0 +1,76 @@ +<?xml version=3D"1.0"?> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<module name=3D"unicode" type=3D"hoststaticlibrary"> + <define name=3D"WINE_UNICODE_API">" "</define> + <include base=3D"ReactOS">include/reactos/wine</include> + <include base=3D"ReactOS">include/reactos</include> + <include base=3D"ReactOS">include</include> + <file>casemap.c</file> + <file>compose.c</file> + <file>cptable.c</file> + <file>mbtowc.c</file> + <file>string.c</file> + <file>wctomb.c</file> + <file>wctype.c</file> + <file>utf8.c</file> + <file>c_037.c</file> + <file>c_424.c</file> + <file>c_437.c</file> + <file>c_500.c</file> + <file>c_737.c</file> + <file>c_775.c</file> + <file>c_850.c</file> + <file>c_852.c</file> + <file>c_855.c</file> + <file>c_856.c</file> + <file>c_857.c</file> + <file>c_860.c</file> + <file>c_861.c</file> + <file>c_862.c</file> + <file>c_863.c</file> + <file>c_864.c</file> + <file>c_865.c</file> + <file>c_866.c</file> + <file>c_869.c</file> + <file>c_874.c</file> + <file>c_875.c</file> + <file>c_878.c</file> + <file>c_932.c</file> + <file>c_936.c</file> + <file>c_949.c</file> + <file>c_950.c</file> + <file>c_1006.c</file> + <file>c_1026.c</file> + <file>c_1250.c</file> + <file>c_1251.c</file> + <file>c_1252.c</file> + <file>c_1253.c</file> + <file>c_1254.c</file> + <file>c_1255.c</file> + <file>c_1256.c</file> + <file>c_1257.c</file> + <file>c_1258.c</file> + <file>c_10000.c</file> + <file>c_10006.c</file> + <file>c_10007.c</file> + <file>c_10029.c</file> + <file>c_10079.c</file> + <file>c_10081.c</file> + <file>c_20866.c</file> + <file>c_20932.c</file> + <file>c_21866.c</file> + <file>c_28591.c</file> + <file>c_28592.c</file> + <file>c_28593.c</file> + <file>c_28594.c</file> + <file>c_28595.c</file> + <file>c_28596.c</file> + <file>c_28597.c</file> + <file>c_28598.c</file> + <file>c_28599.c</file> + <file>c_28600.c</file> + <file>c_28603.c</file> + <file>c_28604.c</file> + <file>c_28605.c</file> + <file>c_28606.c</file> +</module> Propchange: trunk/reactos/tools/unicode/unicode.rbuild ---------------------------------------------------------------------------= --- svn:eol-style =3D native Removed: trunk/reactos/tools/widl/widl.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.mak?r= ev=3D32595&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/widl/widl.mak (original) +++ trunk/reactos/tools/widl/widl.mak (removed) @@ -1,131 +1,0 @@ -WIDL_BASE =3D $(TOOLS_BASE)$(SEP)widl -WIDL_BASE_ =3D $(WIDL_BASE)$(SEP) -WIDL_INT =3D $(INTERMEDIATE_)$(WIDL_BASE) -WIDL_INT_ =3D $(WIDL_INT)$(SEP) -WIDL_OUT =3D $(OUTPUT_)$(WIDL_BASE) -WIDL_OUT_ =3D $(WIDL_OUT)$(SEP) - -$(WIDL_INT): | $(TOOLS_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(WIDL_OUT): | $(TOOLS_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -WIDL_PORT_BASE =3D $(WIDL_BASE)$(SEP)port -WIDL_PORT_BASE_ =3D $(WIDL_PORT_BASE)$(SEP) -WIDL_PORT_INT =3D $(INTERMEDIATE_)$(WIDL_PORT_BASE) -WIDL_PORT_INT_ =3D $(WIDL_PORT_INT)$(SEP) -WIDL_PORT_OUT =3D $(OUTPUT_)$(WIDL_PORT_BASE) -WIDL_PORT_OUT_ =3D $(WIDL_PORT_OUT)$(SEP) - -$(WIDL_PORT_INT): | $(WIDL_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(WIDL_PORT_OUT): | $(WIDL_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -WIDL_TARGET =3D \ - $(WIDL_OUT_)widl$(EXEPOSTFIX) - -WIDL_DEPENDS =3D $(BUILDNO_H) - -WIDL_SOURCES =3D $(addprefix $(WIDL_BASE_), \ - client.c \ - hash.c \ - header.c \ - proxy.c \ - server.c \ - typegen.c \ - typelib.c \ - utils.c \ - widl.c \ - write_msft.c \ - parser.yy.c \ - parser.tab.c \ - port$(SEP)mkstemps.c \ - ) - -WIDL_OBJECTS =3D \ - $(addprefix $(INTERMEDIATE_), $(WIDL_SOURCES:.c=3D.o)) - -WIDL_HOST_CFLAGS =3D $(TOOLS_CFLAGS) \ - -DINT16=3DSHORT -D__USE_W32API -DYYDEBUG=3D1 -D__REACTOS__=3D1 \ - -I$(WIDL_BASE) -I$(WPP_BASE) \ - -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk \ - -I$(INTERMEDIATE_)include - -WIDL_HOST_LFLAGS =3D $(TOOLS_LFLAGS) - -WIDL_LIBS =3D $(WPP_TARGET) - -.PHONY: widl -widl: $(WIDL_TARGET) - -$(WIDL_TARGET): $(WIDL_OBJECTS) $(WIDL_LIBS) | $(WIDL_OUT) - $(ECHO_LD) - ${host_gcc} $(WIDL_OBJECTS) $(WIDL_LIBS) $(WIDL_HOST_LFLAGS) -o $@ - -$(WIDL_INT_)client.o: $(WIDL_BASE_)client.c $(WIDL_DEPENDS) | $(WIDL_INT) - $(ECHO_CC) - ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ - -$(WIDL_INT_)hash.o: $(WIDL_BASE_)hash.c $(WIDL_DEPENDS) | $(WIDL_INT) - $(ECHO_CC) - ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ - -$(WIDL_INT_)header.o: $(WIDL_BASE_)header.c $(WIDL_DEPENDS) | $(WIDL_INT) - $(ECHO_CC) - ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ - -$(WIDL_INT_)proxy.o: $(WIDL_BASE_)proxy.c $(WIDL_DEPENDS) | $(WIDL_INT) - $(ECHO_CC) - ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ - -$(WIDL_INT_)server.o: $(WIDL_BASE_)server.c $(WIDL_DEPENDS) | $(WIDL_INT) - $(ECHO_CC) - ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ - -$(WIDL_INT_)typegen.o: $(WIDL_BASE_)typegen.c $(WIDL_DEPENDS) | $(WIDL_INT) - $(ECHO_CC) - ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ - -$(WIDL_INT_)typelib.o: $(WIDL_BASE_)typelib.c $(WIDL_DEPENDS) | $(WIDL_INT) - $(ECHO_CC) - ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ - -$(WIDL_INT_)utils.o: $(WIDL_BASE_)utils.c $(WIDL_DEPENDS) | $(WIDL_INT) - $(ECHO_CC) - ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ - -$(WIDL_INT_)widl.o: $(WIDL_BASE_)widl.c $(WIDL_DEPENDS) | $(WIDL_INT) - $(ECHO_CC) - ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ - -$(WIDL_INT_)write_msft.o: $(WIDL_BASE_)write_msft.c $(WIDL_DEPENDS) | $(WI= DL_INT) - $(ECHO_CC) - ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ - -$(WIDL_INT_)parser.yy.o: $(WIDL_BASE_)parser.yy.c $(WIDL_DEPENDS) | $(WIDL= _INT) - $(ECHO_CC) - ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ - -$(WIDL_INT_)parser.tab.o: $(WIDL_BASE_)parser.tab.c $(WIDL_DEPENDS) | $(WI= DL_INT) - $(ECHO_CC) - ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ - -$(WIDL_PORT_INT_)mkstemps.o: $(WIDL_PORT_BASE_)mkstemps.c $(WIDL_DEPENDS) = | $(WIDL_PORT_INT) - $(ECHO_CC) - ${host_gcc} $(WIDL_HOST_CFLAGS) -c $< -o $@ - -.PHONY: widl_clean -widl_clean: - -@$(rm) $(WIDL_TARGET) $(WIDL_OBJECTS) 2>$(NUL) -clean: widl_clean Added: trunk/reactos/tools/widl/widl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.rbuil= d?rev=3D32596&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/widl/widl.rbuild (added) +++ trunk/reactos/tools/widl/widl.rbuild Fri Mar 7 14:00:41 2008 @@ -1,0 +1,28 @@ +<?xml version=3D"1.0"?> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<module name=3D"widl" type=3D"buildtool" allowwarnings=3D"true"> + <define name=3D"INT16">SHORT</define> + <define name=3D"YYDEBUG">1</define> + <include base=3D"wpp">.</include> + <include base=3D"ReactOS">include/reactos/wine</include> + <include base=3D"ReactOS">include/reactos</include> + <include base=3D"ReactOS">include</include> + <include base=3D"ReactOS">include/psdk</include> + <include base=3D"ReactOS" root=3D"intermediate">include</include> + <library>wpp</library> + <file>client.c</file> + <file>hash.c</file> + <file>header.c</file> + <file>proxy.c</file> + <file>server.c</file> + <file>typegen.c</file> + <file>typelib.c</file> + <file>utils.c</file> + <file>widl.c</file> + <file>write_msft.c</file> + <file>parser.yy.c</file> + <file>parser.tab.c</file> + <directory name=3D"port"> + <file>mkstemps.c</file> + </directory> +</module> Propchange: trunk/reactos/tools/widl/widl.rbuild ---------------------------------------------------------------------------= --- svn:eol-style =3D native Removed: trunk/reactos/tools/winebuild/winebuild.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/wineb= uild.mak?rev=3D32595&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/winebuild/winebuild.mak (original) +++ trunk/reactos/tools/winebuild/winebuild.mak (removed) @@ -1,85 +1,0 @@ -WINEBUILD_BASE =3D $(TOOLS_BASE)$(SEP)winebuild -WINEBUILD_BASE_ =3D $(WINEBUILD_BASE)$(SEP) -WINEBUILD_INT =3D $(INTERMEDIATE_)$(WINEBUILD_BASE) -WINEBUILD_INT_ =3D $(WINEBUILD_INT)$(SEP) -WINEBUILD_OUT =3D $(OUTPUT_)$(WINEBUILD_BASE) -WINEBUILD_OUT_ =3D $(WINEBUILD_OUT)$(SEP) - -$(WINEBUILD_INT): | $(TOOLS_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(WINEBUILD_OUT): | $(TOOLS_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -WINEBUILD_TARGET =3D \ - $(WINEBUILD_OUT_)winebuild$(EXEPOSTFIX) - -WINEBUILD_DEPENDS =3D $(BUILDNO_H) - -WINEBUILD_SOURCES =3D $(addprefix $(WINEBUILD_BASE_), \ - import.c \ - main.c \ - parser.c \ - res16.c \ - res32.c \ - spec32.c \ - utils.c \ - mkstemps.c \ - ) - -WINEBUILD_OBJECTS =3D \ - $(addprefix $(INTERMEDIATE_), $(WINEBUILD_SOURCES:.c=3D.o)) - -WINEBUILD_HOST_CFLAGS =3D $(TOOLS_CFLAGS) -D__USE_W32API \ - -Iinclude/reactos/wine -Iinclude -Iinclude/reactos= \ - -I$(INTERMEDIATE_)include - -WINEBUILD_HOST_LFLAGS =3D $(TOOLS_LFLAGS) - -.PHONY: winebuild -winebuild: $(WINEBUILD_TARGET) - -$(WINEBUILD_TARGET): $(WINEBUILD_OBJECTS) | $(WINEBUILD_OUT) - $(ECHO_LD) - ${host_gcc} $(WINEBUILD_OBJECTS) $(WINEBUILD_HOST_LFLAGS) -o $@ - -$(WINEBUILD_INT_)import.o: $(WINEBUILD_BASE_)import.c $(WINEBUILD_DEPENDS)= | $(WINEBUILD_INT) - $(ECHO_CC) - ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ - -$(WINEBUILD_INT_)main.o: $(WINEBUILD_BASE_)main.c $(WINEBUILD_DEPENDS) | $= (WINEBUILD_INT) - $(ECHO_CC) - ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ - -$(WINEBUILD_INT_)parser.o: $(WINEBUILD_BASE_)parser.c $(WINEBUILD_DEPENDS)= | $(WINEBUILD_INT) - $(ECHO_CC) - ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ - -$(WINEBUILD_INT_)res16.o: $(WINEBUILD_BASE_)res16.c $(WINEBUILD_DEPENDS | = $(WINEBUILD_INT) - $(ECHO_CC) - ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ - -$(WINEBUILD_INT_)res32.o: $(WINEBUILD_BASE_)res32.c $(WINEBUILD_DEPENDS) |= $(WINEBUILD_INT) - $(ECHO_CC) - ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ - -$(WINEBUILD_INT_)spec32.o: $(WINEBUILD_BASE_)spec32.c $(WINEBUILD_DEPENDS)= | $(WINEBUILD_INT) - $(ECHO_CC) - ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ - -$(WINEBUILD_INT_)utils.o: $(WINEBUILD_BASE_)utils.c $(WINEBUILD_DEPENDS) |= $(WINEBUILD_INT) - $(ECHO_CC) - ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ - -$(WINEBUILD_INT_)mkstemps.o: $(WINEBUILD_BASE_)mkstemps.c $(WINEBUILD_DEPE= NDS) | $(WINEBUILD_INT) - $(ECHO_CC) - ${host_gcc} $(WINEBUILD_HOST_CFLAGS) -c $< -o $@ - -.PHONY: winebuild_clean -winebuild_clean: - -@$(rm) $(WINEBUILD_TARGET) $(WINEBUILD_OBJECTS) 2>$(NUL) -clean: winebuild_clean Added: trunk/reactos/tools/winebuild/winebuild.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/wineb= uild.rbuild?rev=3D32596&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/winebuild/winebuild.rbuild (added) +++ trunk/reactos/tools/winebuild/winebuild.rbuild Fri Mar 7 14:00:41 2008 @@ -1,0 +1,16 @@ +<?xml version=3D"1.0"?> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<module name=3D"winebuild" type=3D"buildtool"> + <include base=3D"ReactOS">include/reactos/wine</include> + <include base=3D"ReactOS">include/reactos</include> + <include base=3D"ReactOS">include</include> + <include base=3D"ReactOS" root=3D"intermediate">include</include> + <file>import.c</file> + <file>main.c</file> + <file>parser.c</file> + <file>res16.c</file> + <file>res32.c</file> + <file>spec32.c</file> + <file>utils.c</file> + <file>mkstemps.c</file> +</module> Propchange: trunk/reactos/tools/winebuild/winebuild.rbuild ---------------------------------------------------------------------------= --- svn:eol-style =3D native Removed: trunk/reactos/tools/wmc/wmc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmc.mak?rev= =3D32595&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/wmc/wmc.mak (original) +++ trunk/reactos/tools/wmc/wmc.mak (removed) @@ -1,78 +1,0 @@ -WMC_BASE =3D $(TOOLS_BASE_)wmc -WMC_BASE_ =3D $(WMC_BASE)$(SEP) -WMC_INT =3D $(INTERMEDIATE_)$(WMC_BASE) -WMC_INT_ =3D $(WMC_INT)$(SEP) -WMC_OUT =3D $(OUTPUT_)$(WMC_BASE) -WMC_OUT_ =3D $(WMC_OUT)$(SEP) - -$(WMC_INT): | $(TOOLS_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(WMC_OUT): | $(TOOLS_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -WMC_TARGET =3D \ - $(WMC_OUT_)wmc$(EXEPOSTFIX) - -WMC_DEPENDS =3D $(BUILDNO_H) - -WMC_SOURCES =3D $(addprefix $(WMC_BASE_), \ - lang.c \ - mcl.c \ - utils.c \ - wmc.c \ - write.c \ - mcy.tab.c \ - ) - -WMC_OBJECTS =3D \ - $(addprefix $(INTERMEDIATE_), $(WMC_SOURCES:.c=3D.o)) - -WMC_HOST_CFLAGS =3D -I$(WMC_BASE) $(TOOLS_CFLAGS) \ - -D__USE_W32API -DWINE_UNICODE_API=3D -I$(UNICODE_BASE) \ - -Iinclude/reactos/wine -Iinclude/reactos -Iinclude \ - -I$(INTERMEDIATE_)/include - -WMC_HOST_LFLAGS =3D $(TOOLS_LFLAGS) - -WMC_LIBS =3D $(UNICODE_TARGET) - -.PHONY: wmc -wmc: $(WMC_TARGET) - -$(WMC_TARGET): $(WMC_OBJECTS) $(WMC_LIBS) | $(WMC_OUT) - $(ECHO_LD) - ${host_gcc} $(WMC_OBJECTS) $(WMC_LIBS) $(WMC_HOST_LFLAGS) -o $@ - -$(WMC_INT_)lang.o: $(WMC_BASE_)lang.c $(WMC_DEPENDS) | $(WMC_INT) - $(ECHO_CC) - ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ - -$(WMC_INT_)mcl.o: $(WMC_BASE_)mcl.c $(WMC_DEPENDS) | $(WMC_INT) - $(ECHO_CC) - ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ - -$(WMC_INT_)utils.o: $(WMC_BASE_)utils.c $(WMC_DEPENDS) | $(WMC_INT) - $(ECHO_CC) - ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ - -$(WMC_INT_)wmc.o: $(WMC_BASE_)wmc.c $(WMC_DEPENDS) | $(WMC_INT) - $(ECHO_CC) - ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ - -$(WMC_INT_)write.o: $(WMC_BASE_)write.c $(WMC_DEPENDS) | $(WMC_INT) - $(ECHO_CC) - ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ - -$(WMC_INT_)mcy.tab.o: $(WMC_BASE_)mcy.tab.c $(WMC_DEPENDS) | $(WMC_INT) - $(ECHO_CC) - ${host_gcc} $(WMC_HOST_CFLAGS) -c $< -o $@ - -.PHONY: wmc_clean -wmc_clean: - -@$(rm) $(WMC_TARGET) $(WMC_OBJECTS) 2>$(NUL) -clean: wmc_clean Added: trunk/reactos/tools/wmc/wmc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmc.rbuild?= rev=3D32596&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/wmc/wmc.rbuild (added) +++ trunk/reactos/tools/wmc/wmc.rbuild Fri Mar 7 14:00:41 2008 @@ -1,0 +1,17 @@ +<?xml version=3D"1.0"?> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<module name=3D"wmc" type=3D"buildtool" allowwarnings=3D"true"> + <define name=3D"WINE_UNICODE_API">" "</define> + <include base=3D"unicode">.</include> + <include base=3D"ReactOS">include/reactos/wine</include> + <include base=3D"ReactOS">include/reactos</include> + <include base=3D"ReactOS">include</include> + <include base=3D"ReactOS" root=3D"intermediate">include</include> + <library>unicode</library> + <file>lang.c</file> + <file>mcl.c</file> + <file>utils.c</file> + <file>wmc.c</file> + <file>write.c</file> + <file>mcy.tab.c</file> +</module> Propchange: trunk/reactos/tools/wmc/wmc.rbuild ---------------------------------------------------------------------------= --- svn:eol-style =3D native Added: trunk/reactos/tools/wpp/wpp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/wpp.rbuild?= rev=3D32596&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/wpp/wpp.rbuild (added) +++ trunk/reactos/tools/wpp/wpp.rbuild Fri Mar 7 14:00:41 2008 @@ -1,0 +1,12 @@ +<?xml version=3D"1.0"?> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<module name=3D"wpp" type=3D"hoststaticlibrary" allowwarnings=3D"true"> + <include base=3D"ReactOS">include/reactos/wine</include> + <include base=3D"ReactOS">include/reactos</include> + <include base=3D"ReactOS">include</include> + <include base=3D"ReactOS" root=3D"intermediate">include</include> + <file>lex.yy.c</file> + <file>preproc.c</file> + <file>wpp.c</file> + <file>ppy.tab.c</file> +</module> Propchange: trunk/reactos/tools/wpp/wpp.rbuild ---------------------------------------------------------------------------= --- svn:eol-style =3D native Removed: trunk/reactos/tools/wrc/wrc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrc.mak?rev= =3D32595&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/wrc/wrc.mak (original) +++ trunk/reactos/tools/wrc/wrc.mak (removed) @@ -1,121 +1,0 @@ -WRC_BASE =3D $(TOOLS_BASE_)wrc -WRC_BASE_ =3D $(WRC_BASE)$(SEP) -WRC_INT =3D $(INTERMEDIATE_)$(WRC_BASE) -WRC_INT_ =3D $(WRC_INT)$(SEP) -WRC_OUT =3D $(OUTPUT_)$(WRC_BASE) -WRC_OUT_ =3D $(WRC_OUT)$(SEP) - -$(WRC_INT): | $(TOOLS_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(WRC_OUT): | $(TOOLS_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -WRC_PORT_BASE =3D $(WRC_BASE)$(SEP)port -WRC_PORT_BASE_ =3D $(WRC_PORT_BASE)$(SEP) -WRC_PORT_INT =3D $(INTERMEDIATE_)$(WRC_PORT_BASE) -WRC_PORT_INT_ =3D $(WRC_PORT_INT)$(SEP) -WRC_PORT_OUT =3D $(OUTPUT_)$(WRC_PORT_BASE) -WRC_PORT_OUT_ =3D $(WRC_PORT_OUT)$(SEP) - -$(WRC_PORT_INT): | $(WRC_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(WRC_PORT_OUT): | $(WRC_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -WRC_TARGET =3D \ - $(WRC_OUT_)wrc$(EXEPOSTFIX) - -WRC_DEPENDS =3D $(BUILDNO_H) - -WRC_SOURCES =3D $(addprefix $(WRC_BASE_), \ - dumpres.c \ - genres.c \ - newstruc.c \ - readres.c \ - translation.c \ - utils.c \ - wrc.c \ - writeres.c \ - parser.tab.c \ - lex.yy.c \ - port$(SEP)mkstemps.c \ - ) - -WRC_OBJECTS =3D \ - $(addprefix $(INTERMEDIATE_), $(WRC_SOURCES:.c=3D.o)) - -WRC_HOST_CFLAGS =3D -I$(WRC_BASE) $(TOOLS_CFLAGS) \ - -D__USE_W32API -DWINE_UNICODE_API=3D \ - -I$(UNICODE_BASE) -I$(WPP_BASE) \ - -Iinclude/reactos/wine -Iinclude/reactos -Iinclude \ - -I$(INTERMEDIATE_)include - -WRC_HOST_LFLAGS =3D $(TOOLS_LFLAGS) - -WRC_LIBS =3D $(UNICODE_TARGET) $(WPP_TARGET) - -.PHONY: wrc -wrc: $(WRC_TARGET) - -$(WRC_TARGET): $(WRC_OBJECTS) $(WRC_LIBS) | $(WRC_OUT) - $(ECHO_LD) - ${host_gcc} $(WRC_OBJECTS) $(WRC_LIBS) $(WRC_HOST_LFLAGS) -o $@ - -$(WRC_INT_)dumpres.o: $(WRC_BASE_)dumpres.c $(WRC_DEPENDS) | $(WRC_INT) - $(ECHO_CC) - ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ - -$(WRC_INT_)genres.o: $(WRC_BASE_)genres.c $(WRC_DEPENDS) | $(WRC_INT) - $(ECHO_CC) - ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ - -$(WRC_INT_)newstruc.o: $(WRC_BASE_)newstruc.c $(WRC_DEPENDS) | $(WRC_INT) - $(ECHO_CC) - ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ - -$(WRC_INT_)readres.o: $(WRC_BASE_)readres.c $(WRC_DEPENDS) | $(WRC_INT) - $(ECHO_CC) - ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ - -$(WRC_INT_)translation.o: $(WRC_BASE_)translation.c $(WRC_DEPENDS) | $(WRC= _INT) - $(ECHO_CC) - ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ - -$(WRC_INT_)utils.o: $(WRC_BASE_)utils.c $(WRC_DEPENDS) | $(WRC_INT) - $(ECHO_CC) - ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ - -$(WRC_INT_)wrc.o: $(WRC_BASE_)wrc.c $(WRC_DEPENDS) | $(WRC_INT) - $(ECHO_CC) - ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ - -$(WRC_INT_)writeres.o: $(WRC_BASE_)writeres.c $(WRC_DEPENDS) | $(WRC_INT) - $(ECHO_CC) - ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ - -$(WRC_INT_)parser.tab.o: $(WRC_BASE_)parser.tab.c $(WRC_DEPENDS) | $(WRC_I= NT) - $(ECHO_CC) - ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ - -$(WRC_INT_)lex.yy.o: $(WRC_BASE_)lex.yy.c $(WRC_DEPENDS) | $(WRC_INT) - $(ECHO_CC) - ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ - -$(WRC_PORT_INT_)mkstemps.o: $(WRC_PORT_BASE_)mkstemps.c $(WRC_DEPENDS) | $= (WRC_PORT_INT) - $(ECHO_CC) - ${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@ - -.PHONY: wrc_clean -wrc_clean: - -@$(rm) $(WRC_TARGET) $(WRC_OBJECTS) 2>$(NUL) -clean: wrc_clean Added: trunk/reactos/tools/wrc/wrc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrc.rbuild?= rev=3D32596&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/wrc/wrc.rbuild (added) +++ trunk/reactos/tools/wrc/wrc.rbuild Fri Mar 7 14:00:41 2008 @@ -1,0 +1,26 @@ +<?xml version=3D"1.0"?> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<module name=3D"wrc" type=3D"buildtool" allowwarnings=3D"true"> + <define name=3D"WINE_UNICODE_API">" "</define> + <include base=3D"unicode" /> + <include base=3D"wpp" /> + <include base=3D"ReactOS">include/reactos/wine</include> + <include base=3D"ReactOS">include/reactos</include> + <include base=3D"ReactOS">include</include> + <include base=3D"ReactOS" root=3D"intermediate">include</include> + <library>unicode</library> + <library>wpp</library> + <file>dumpres.c</file> + <file>genres.c</file> + <file>newstruc.c</file> + <file>readres.c</file> + <file>translation.c</file> + <file>utils.c</file> + <file>wrc.c</file> + <file>writeres.c</file> + <file>parser.tab.c</file> + <file>lex.yy.c</file> + <directory name=3D"port"> + <file>mkstemps.c</file> + </directory> +</module> Propchange: trunk/reactos/tools/wrc/wrc.rbuild ---------------------------------------------------------------------------= --- svn:eol-style =3D native

1 0

[hpoussin] 32595: Move precondition to rules
by hpoussin＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: hpoussin Date: Fri Mar 7 13:56:05 2008 New Revision: 32595 URL: http://svn.reactos.org/svn/reactos?rev=3D32595&view=3Drev Log: Move precondition to rules Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/rbuild.mak Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/= mingw/modulehandler.cpp?rev=3D32595&r1=3D32594&r2=3D32595&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Mar 7 1= 3:56:05 2008 @@ -1250,21 +1250,21 @@ Rule arRule2 ( "\t$(ECHO_AR)\n" "\t${ar} -rc $@ $($(module_name)_OBJS)\n", NULL ); -Rule gasRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(sour= ce_dir)\n" +Rule gasRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o: $(source) ${$(module_name)_precondition}$(dependencies= ) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_GAS)\n" "\t${gcc} -x assembler-with-cpp -c $< -o $@ -D__ASM__ $($(m= odule_name)_CFLAGS)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule bootRule ( "$(module_output): $(source)$(dependencies) | $(OUTPUT)$(S= EP)$(source_dir)\n" +Rule bootRule ( "$(module_output): $(source) ${$(module_name)_precondition= }$(dependencies) | $(OUTPUT)$(SEP)$(source_dir)\n" "\t$(ECHO_NASM)\n" "\t$(Q)${nasm} -f win32 $< -o $@ $($(module_name)_NASMFLAG= S)\n", "$(OUTPUT)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule nasmRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noe= xt)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(sou= rce_dir)\n" +Rule nasmRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noe= xt)_$(module_name).o: $(source) ${$(module_name)_precondition}$(dependencie= s) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_NASM)\n" "\t$(Q)${nasm} -f win32 $< -o $@ $($(module_name)_NASMFLAG= S)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noe= xt)_$(module_name).o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule windresRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).coff: $(source)$(dependencies) $(WRC_TARGET) | $(INTE= RMEDIATE)$(SEP)$(source_dir) $(TEMPORARY)\n" +Rule windresRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).coff: $(source) ${$(module_name)_precondition}$(depen= dencies) $(WRC_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir) $(TEMPORARY)\n" "\t$(ECHO_WRC)\n" "\t${gcc} -xc -E -DRC_INVOKED ${$(module_name)_RCFLAGS}= $(source) > $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).rci.tmp\= n" "\t$(Q)$(WRC_TARGET) ${$(module_name)_RCFLAGS} $(TEMPOR= ARY)$(SEP)$(module_name).$(source_name_noext).rci.tmp $(TEMPORARY)$(SEP)$(m= odule_name).$(source_name_noext).res.tmp\n" @@ -1273,11 +1273,11 @@ "\t-@${rm} $(TEMPORARY)$(SEP)$(module_name).$(source_na= me_noext).res.tmp 2>$(NUL)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).coff", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule wmcRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t).rc $(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h= : $(WMC_TARGET) $(source)\n" +Rule wmcRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t).rc $(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h= : $(WMC_TARGET) $(source) ${$(module_name)_precondition}\n" "\t$(ECHO_WMC)\n" "\t$(Q)$(WMC_TARGET) -i -H $(INTERMEDIATE)$(SEP)include$(SE= P)reactos$(SEP)$(source_name_noext).h -o $(INTERMEDIATE)$(SEP)$(source_dir)= $(SEP)$(source_name_noext).rc $(source)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t).rc", "$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext= ).h", NULL ); -Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERME= DIATE)$(SEP)$(source_dir)\n" +Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).spec.def: $(source) ${$(module_name)_precondition}$(dependencies) = $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WINEBLD)\n" "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(IN= TERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E= $(source_path)$(SEP)$(source_name_noext).spec\n" "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_na= me_noext).stubs.c: $(source_path)$(SEP)$(source_name_noext).spec $(WINEBUIL= D_TARGET)\n" @@ -1290,12 +1290,12 @@ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).stubs.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext).stubs.o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule widlHeaderRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext).h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP= )$(source_dir)\n" +Rule widlHeaderRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext).h: $(source) ${$(module_name)_precondition}$(dependencies) $(WIDL= _TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h= -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).h $(source= )\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext).h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule widlServerRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_s.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_= s.h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(sourc= e_dir)\n" +Rule widlServerRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_s.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_= s.h: $(source) ${$(module_name)_precondition}$(dependencies) $(WIDL_TARGET)= | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h= -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h -s -S = $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c $(source)\= n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_s.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)= _s.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h$(depe= ndencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" @@ -1305,7 +1305,7 @@ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_s.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_s.o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule widlClientRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_= c.h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(sourc= e_dir)\n" +Rule widlClientRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_= c.h: $(source) ${$(module_name)_precondition}$(dependencies) $(WIDL_TARGET)= | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h= -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h -c -C = $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c $(source)\= n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_c.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)= _c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h$(depe= ndencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" @@ -1315,7 +1315,7 @@ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_c.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_na= me_noext)_c.o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule widlProxyRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext)_p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p= .h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source= _dir)\n" +Rule widlProxyRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext)_p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p= .h: $(source) ${$(module_name)_precondition}$(dependencies) $(WIDL_TARGET) = | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h = -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h -p -P $= (INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(source)\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext)_p.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_= p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h$(depen= dencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" @@ -1325,23 +1325,23 @@ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext)_p.c", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_nam= e_noext)_p.o", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule widlTlbRule ( "$(OUTPUT)$(SEP)$(source_dir)$(SEP)$(module_name).tlb: = $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir= )\n" +Rule widlTlbRule ( "$(OUTPUT)$(SEP)$(source_dir)$(SEP)$(module_name).tlb: = $(source) ${$(module_name)_precondition}$(dependencies) $(WIDL_TARGET) | $(= INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -t -T= $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).tlb $(source)= \n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule gccRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(sour= ce_dir)\n" +Rule gccRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o: $(source) ${$(module_name)_precondition}$(dependencies= ) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" "\t${gcc} -c $< -o $@ $($(module_name)_CFLAGS)$(compiler_fl= ags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o", NULL ); -Rule gccHostRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(= source_dir)\n" +Rule gccHostRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).o: $(source) ${$(module_name)_precondition}$(dependen= cies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" "\t${host_gcc} -c $< -o $@ $($(module_name)_CFLAGS)$(co= mpiler_flags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).o", NULL ); -Rule gppRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(sour= ce_dir)\n" +Rule gppRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o: $(source) ${$(module_name)_precondition}$(dependencies= ) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" "\t${gpp} -c $< -o $@ $($(module_name)_CFLAGS)$(compiler_fl= ags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t)_$(module_name).o", NULL ); -Rule gppHostRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(= source_dir)\n" +Rule gppHostRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).o: $(source) ${$(module_name)_precondition}$(dependen= cies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" "\t${host_gpp} -c $< -o $@ $($(module_name)_CFLAGS)$(co= mpiler_flags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).o", NULL ); @@ -2276,18 +2276,14 @@ string_list& dependencies ) const { /* Avoid circular dependency */ - if ( module.type !=3D BuildTool - && module.name !=3D "zlib" - && module.name !=3D "hostzlib" ) - - dependencies.push_back ( "$(INIT)" ); - - if ( module.type !=3D BuildTool - && module.name !=3D "psdk" ) - - dependencies.push_back ( "$(PSDK_TARGET) $(psdk_HEADERS)" ); - - /* Check if any dependent library relays on the generated headers */ + if ( module.host =3D=3D HostTrue ) + return; + + dependencies.push_back ( "$(INIT)" ); + if ( module.name !=3D "psdk" ) + dependencies.push_back ( "$(PSDK_TARGET) $(psdk_HEADERS)" ); + + /* Check if any dependent library relies on the generated headers */ for ( size_t i =3D 0; i < module.project.modules.size (); i++ ) { const Module& m =3D *module.project.modules[i]; @@ -2329,13 +2325,6 @@ fprintf ( fMakefile, "\n\n" ); } = - for ( size_t i =3D 0; i < sourceFilenames.size(); i++ ) - { - fprintf ( fMakefile, - "%s: ${%s}\n", - backend->GetFullName ( sourceFilenames[i] ).c_str (), - preconditionDependenciesName.c_str ()); - } fprintf ( fMakefile, "\n" ); } = Modified: trunk/reactos/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.m= ak?rev=3D32595&r1=3D32594&r2=3D32595&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/rbuild.mak (original) +++ trunk/reactos/tools/rbuild/rbuild.mak Fri Mar 7 13:56:05 2008 @@ -269,9 +269,6 @@ xmlnode.cpp \ ) = -RBUILD_SPECIAL_OBJECTS =3D \ - $(addprefix $(INTERMEDIATE_), $(RBUILD_SPECIAL_SOURCES:.cpp=3D.o)) - RBUILD_OBJECTS =3D \ $(addprefix $(INTERMEDIATE_), $(RBUILD_SOURCES:.cpp=3D.o)) =

1 0

[hpoussin] 32594: Don't mix host and targets include files Add HostStaticLibrary type
by hpoussin＠svn.reactos.org 09 Mar '08

09 Mar '08

Author: hpoussin Date: Fri Mar 7 10:17:12 2008 New Revision: 32594 URL: http://svn.reactos.org/svn/reactos?rev=3D32594&view=3Drev Log: Don't mix host and targets include files Add HostStaticLibrary type Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h trunk/reactos/tools/rbuild/bootstrap.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/= codeblocks/codeblocks.cpp?rev=3D32594&r1=3D32593&r2=3D32594&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp (original) +++ trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Fri Mar 7= 10:17:12 2008 @@ -37,6 +37,7 @@ #undef OUT #endif//OUT = +#define IsStaticLibrary( module ) ( ( module.type =3D=3D StaticLibrary ) |= | ( module.type =3D=3D HostStaticLibrary ) ) = static class CBFactory : public Backend::Factory { @@ -497,7 +498,7 @@ if ( !module.allowWarnings ) compiler_flags.push_back ( "-Werror" ); = - if ( module.type =3D=3D StaticLibrary && module.isStartupLib ) + if ( IsStaticLibrary ( module ) && module.isStartupLib ) compiler_flags.push_back ( "-Wno-main" ); = = @@ -524,7 +525,7 @@ = if ( configuration.UseConfigurationInPath ) { - if ( module.type =3D=3D StaticLibrary ||module.type =3D=3D ObjectLibrar= y ) + if ( IsStaticLibrary ( module ) ||module.type =3D=3D ObjectLibrary ) fprintf ( OUT, "\t\t\t\t<Option output=3D\"%s\\%s%s\\%s%s\" prefix_aut= o=3D\"0\" extension_auto=3D\"0\" />\r\n", intdir.c_str (), module.output->r= elative_path.c_str (), cfg.name.c_str(), module.name.c_str(), module_type.c= _str()); else fprintf ( OUT, "\t\t\t\t<Option output=3D\"%s\\%s%s\\%s%s\" prefix_aut= o=3D\"0\" extension_auto=3D\"0\" />\r\n", outdir.c_str (), module.output->r= elative_path.c_str (), cfg.name.c_str(), module.name.c_str(), module_type.c= _str()); @@ -532,7 +533,7 @@ } else { - if ( module.type =3D=3D StaticLibrary || module.type =3D=3D ObjectLibra= ry ) + if ( IsStaticLibrary ( module ) || module.type =3D=3D ObjectLibrary ) fprintf ( OUT, "\t\t\t\t<Option output=3D\"%s\\%s\\%s%s\" prefix_auto= =3D\"0\" extension_auto=3D\"0\" />\r\n", intdir.c_str (), module.output->re= lative_path.c_str (), module.name.c_str(), module_type.c_str() ); else fprintf ( OUT, "\t\t\t\t<Option output=3D\"%s\\%s\\%s%s\" prefix_auto= =3D\"0\" extension_auto=3D\"0\" />\r\n", outdir.c_str (), module.output->re= lative_path.c_str (), module.name.c_str(), module_type.c_str() ); @@ -672,7 +673,7 @@ fprintf ( OUT, "\t\t\t\t<ExtraCommands>\r\n" ); = #if 0 - if ( module.type =3D=3D StaticLibrary && module.importLibrary ) + if ( IsStaticLibrary ( module ) && module.importLibrary ) fprintf ( OUT, "\t\t\t\t\t<Add after=3D\"dlltool --dllname %s --def %s = --output-lib $exe_output; %s -U\" />\r\n", module.importLibrary->dllname.c_= str (), module.importLibrary->definition.c_str(), module.mangledSymbols ? "= " : "--kill-at" ); else if ( module.importLibrary !=3D NULL ) fprintf ( OUT, "\t\t\t\t\t<Add after=3D\"dlltool --dllname %s --def %s = --output-lib "$(TARGET_OBJECT_DIR)lib$(TARGET_OUTPUT_BASENAME).a"= %s\" />\r\n", module.GetTargetName ().c_str(), module.importLibrary->defin= ition.c_str(), module.mangledSymbols ? "" : "--kill-at" ); Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/= mingw/modulehandler.cpp?rev=3D32594&r1=3D32593&r2=3D32594&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Mar 7 1= 0:17:12 2008 @@ -30,6 +30,7 @@ using std::vector; = #define CLEAN_FILE(f) clean_files.push_back ( (f).name.length () > 0 ? bac= kend->GetFullName ( f ) : backend->GetFullPath ( f ) ); +#define IsStaticLibrary( module ) ( ( module.type =3D=3D StaticLibrary ) |= | ( module.type =3D=3D HostStaticLibrary ) ) = MingwBackend* MingwModuleHandler::backend =3D NULL; @@ -169,6 +170,9 @@ break; case StaticLibrary: handler =3D new MingwStaticLibraryModuleHandler ( module ); + break; + case HostStaticLibrary: + handler =3D new MingwHostStaticLibraryModuleHandler ( module ); break; case ObjectLibrary: handler =3D new MingwObjectLibraryModuleHandler ( module ); @@ -359,7 +363,7 @@ const FileLocation* MingwModuleHandler::GetModuleArchiveFilename () const { - if ( module.type =3D=3D StaticLibrary ) + if ( IsStaticLibrary ( module ) ) return GetTargetFilename ( module, NULL ); return new FileLocation ( IntermediateDirectory, module.output->relative_path, @@ -1842,7 +1846,7 @@ = arRule1.Execute ( fMakefile, backend, module, archiveFilename, clean_file= s ); = - if ( module.type =3D=3D StaticLibrary && module.importLibrary ) + if ( IsStaticLibrary ( module ) && module.importLibrary ) { const FileLocation *definitionFilename =3D GetDefinitionFilename (); = @@ -2016,11 +2020,14 @@ &module.linkerFlags, used_defs ); = - GenerateMacros ( - "+=3D", - module.project.non_if_data, - NULL, - used_defs ); + if ( module.host =3D=3D HostFalse ) + { + GenerateMacros ( + "+=3D", + module.project.non_if_data, + NULL, + used_defs ); + } = vector<FileLocation> s; if ( module.importLibrary ) @@ -2048,7 +2055,12 @@ fprintf ( fMakefile, "\n" ); } = - string globalCflags =3D "-g"; + string globalCflags =3D ""; + if ( module.host =3D=3D HostFalse ) + globalCflags +=3D " $(PROJECT_CFLAGS)"; + else + globalCflags +=3D " -Wall -Wpointer-arith -D__REACTOS__"; + globalCflags +=3D " -g"; if ( backend->usePipe ) globalCflags +=3D " -pipe"; if ( !module.allowWarnings ) @@ -2058,7 +2070,7 @@ if ( module.cplusplus ) globalCflags +=3D " $(HOST_CPPFLAGS)"; else - globalCflags +=3D " $(HOST_CFLAGS)"; + globalCflags +=3D " -Wno-strict-aliasing $(HOST_CFLAGS)"; } else { @@ -2077,25 +2089,35 @@ = fprintf ( fMakefile, - "%s +=3D $(PROJECT_CFLAGS) %s\n", + "%s +=3D%s\n", cflagsMacro.c_str (), globalCflags.c_str () ); = - fprintf ( - fMakefile, - "%s +=3D $(PROJECT_RCFLAGS)\n", - windresflagsMacro.c_str () ); - - fprintf ( - fMakefile, - "%s +=3D $(PROJECT_WIDLFLAGS) -I%s\n", - widlflagsMacro.c_str (), - module.output->relative_path.c_str () ); - - fprintf ( - fMakefile, - "%s_LFLAGS +=3D $(PROJECT_LFLAGS) -g\n", - module.name.c_str () ); + if ( module.host =3D=3D HostFalse ) + { + fprintf ( + fMakefile, + "%s +=3D $(PROJECT_RCFLAGS)\n", + windresflagsMacro.c_str () ); + + fprintf ( + fMakefile, + "%s +=3D $(PROJECT_WIDLFLAGS) -I%s\n", + widlflagsMacro.c_str (), + module.output->relative_path.c_str () ); + + fprintf ( + fMakefile, + "%s_LFLAGS +=3D $(PROJECT_LFLAGS) -g\n", + module.name.c_str () ); + } + else + { + fprintf ( + fMakefile, + "%s_LFLAGS +=3D $(HOST_LFLAGS)\n", + module.name.c_str () ); + } = fprintf ( fMakefile, @@ -2130,7 +2152,7 @@ linkerflags.c_str () ); } = - if ( module.type =3D=3D StaticLibrary && module.isStartupLib ) + if ( IsStaticLibrary ( module ) && module.isStartupLib ) { fprintf ( fMakefile, "%s +=3D -Wno-main\n\n", @@ -2596,6 +2618,26 @@ } = = +MingwHostStaticLibraryModuleHandler::MingwHostStaticLibraryModuleHandler ( + const Module& module_ ) + + : MingwModuleHandler ( module_ ) +{ +} + +void +MingwHostStaticLibraryModuleHandler::Process () +{ + GenerateHostStaticLibraryModuleTarget (); +} + +void +MingwHostStaticLibraryModuleHandler::GenerateHostStaticLibraryModuleTarget= () +{ + GenerateRules (); +} + + MingwObjectLibraryModuleHandler::MingwObjectLibraryModuleHandler ( const Module& module_ ) = Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/= mingw/modulehandler.h?rev=3D32594&r1=3D32593&r2=3D32594&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Fri Mar 7 10:= 17:12 2008 @@ -226,6 +226,17 @@ }; = = +class MingwHostStaticLibraryModuleHandler : public MingwModuleHandler +{ +public: + MingwHostStaticLibraryModuleHandler ( const Module& module ); + virtual HostType DefaultHost() { return HostTrue; } + virtual void Process (); +private: + void GenerateHostStaticLibraryModuleTarget (); +}; + + class MingwObjectLibraryModuleHandler : public MingwModuleHandler { public: Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/bootstra= p.cpp?rev=3D32594&r1=3D32593&r2=3D32594&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/bootstrap.cpp (original) +++ trunk/reactos/tools/rbuild/bootstrap.cpp Fri Mar 7 10:17:12 2008 @@ -57,6 +57,7 @@ return true; case BuildTool: case StaticLibrary: + case HostStaticLibrary: case ObjectLibrary: case Iso: case LiveIso: Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.c= pp?rev=3D32594&r1=3D32593&r2=3D32594&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Fri Mar 7 10:17:12 2008 @@ -880,6 +880,8 @@ return BuildTool; if ( attribute.value =3D=3D "staticlibrary" ) return StaticLibrary; + if ( attribute.value =3D=3D "hoststaticlibrary" ) + return HostStaticLibrary; if ( attribute.value =3D=3D "objectlibrary" ) return ObjectLibrary; if ( attribute.value =3D=3D "kernel" ) @@ -965,6 +967,7 @@ case ElfExecutable: return OutputDirectory; case StaticLibrary: + case HostStaticLibrary: case ObjectLibrary: case RpcServer: case RpcClient: @@ -990,6 +993,7 @@ return ExePostfix; case BootProgram: case StaticLibrary: + case HostStaticLibrary: return ".a"; case ObjectLibrary: return ".o"; @@ -1067,6 +1071,7 @@ return "WinMainCRTStartup"; case BuildTool: case StaticLibrary: + case HostStaticLibrary: case ObjectLibrary: case BootLoader: case BootSector: @@ -1115,6 +1120,7 @@ return "0xe00000"; case BuildTool: case StaticLibrary: + case HostStaticLibrary: case ObjectLibrary: case BootLoader: case BootSector: @@ -1140,7 +1146,7 @@ bool Module::HasImportLibrary () const { - return importLibrary !=3D NULL && type !=3D StaticLibrary; + return importLibrary !=3D NULL && type !=3D StaticLibrary && type !=3D Ho= stStaticLibrary; } = bool @@ -1162,6 +1168,7 @@ case Win32GUI: case BuildTool: case StaticLibrary: + case HostStaticLibrary: case ObjectLibrary: case BootLoader: case BootSector: @@ -1613,7 +1620,7 @@ = if ( dllname ) this->dllname =3D dllname->value; - else if ( module.type =3D=3D StaticLibrary ) + else if ( module.type =3D=3D StaticLibrary || module.type =3D=3D HostStat= icLibrary ) throw XMLInvalidBuildFileException ( node.location, "<importlibrary> dllname attribute required." ); Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h= ?rev=3D32594&r1=3D32593&r2=3D32594&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Fri Mar 7 10:17:12 2008 @@ -300,6 +300,7 @@ EmbeddedTypeLib =3D 26, ElfExecutable =3D 27, RpcProxy, + HostStaticLibrary, TypeDontCare, }; =

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