ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
March 2008
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
22 participants
269 discussions
Start a n
N
ew thread
[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
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>
16 years, 9 months
1
0
0
0
[hpoussin] 32597: Remove useless .mak files Remove Visual Studio project, it can now be generated from .rbuild file
by hpoussin@svn.reactos.org
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
16 years, 9 months
1
0
0
0
[hpoussin] 32596: Replace some .mak files by .rbuild files
by hpoussin@svn.reactos.org
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> + <!--ifnot property=3D"HOST" value=3D"mingw32-linux"> + <include base=3D"ReactOS">include</include> + <include base=3D"ReactOS">include/reactos</include> + <include base=3D"ReactOS">include/psdk</include> + <include base=3D"ReactOS">include/crt</include> + <include base=3D"ReactOS">include/reactos/libs</include> + <include base=3D"ReactOS" root=3D"intermediate">include/psdk</include> + </ifnot--> + <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
16 years, 9 months
1
0
0
0
[hpoussin] 32595: Move precondition to rules
by hpoussin@svn.reactos.org
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)) =
16 years, 9 months
1
0
0
0
[hpoussin] 32594: Don't mix host and targets include files Add HostStaticLibrary type
by hpoussin@svn.reactos.org
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, }; =
16 years, 9 months
1
0
0
0
[hpoussin] 32593: Prevent some FileLocation copies (in LinkerScript and PchFile classes)
by hpoussin@svn.reactos.org
Author: hpoussin Date: Fri Mar 7 09:16:26 2008 New Revision: 32593 URL:
http://svn.reactos.org/svn/reactos?rev=3D32593&view=3Drev
Log: Prevent some FileLocation copies (in LinkerScript and PchFile classes) Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp trunk/reactos/tools/rbuild/linkerscript.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/automati=
cdependency.cpp?rev=3D32593&r1=3D32592&r2=3D32593&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/automaticdependency.cpp (original) +++ trunk/reactos/tools/rbuild/automaticdependency.cpp Fri Mar 7 09:16:26 = 2008 @@ -301,7 +301,7 @@ = if ( module.pch !=3D NULL ) { - const FileLocation& pch =3D module.pch->file; + const FileLocation& pch =3D *module.pch->file; File *file =3D new File ( pch.directory, pch.relative_path, pch.name , f= alse, "", true ); files.push_back ( file ); } 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=3D32593&r1=3D32592&r2=3D32593&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= 09:16:26 2008 @@ -399,7 +399,7 @@ if ( module.pch !=3D NULL ) { string pch_path =3D Path::RelativeFromDirectory ( - module.pch->file.name, + module.pch->file->name, module.output->relative_path ); = header_files.push_back ( pch_path ); 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=3D32593&r1=3D32592&r2=3D32593&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 0= 9:16:26 2008 @@ -1236,8 +1236,8 @@ if ( !module.pch || !use_pch ) return NULL; return new FileLocation ( IntermediateDirectory, - module.pch->file.relative_path, - ReplaceExtension ( module.pch->file.name, "_" += module.name + ".gch" ) ); + module.pch->file->relative_path, + ReplaceExtension ( module.pch->file->name, "_" = + module.name + ".gch" ) ); } = Rule arRule1 ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t).a: $($(module_name)_OBJS) | $(INTERMEDIATE)$(SEP)$(source_dir)\n", @@ -1649,7 +1649,7 @@ = string linkerScriptArgument; if ( module.linkerScript !=3D NULL ) - linkerScriptArgument =3D ssprintf ( " -Wl,-T,%s", backend->GetFullName (= module.linkerScript->file ).c_str () ); + linkerScriptArgument =3D ssprintf ( " -Wl,-T,%s", backend->GetFullName (= *module.linkerScript->file ).c_str () ); else linkerScriptArgument =3D ""; = @@ -1807,7 +1807,7 @@ string cc =3D ( module.host =3D=3D HostTrue ? "${host_gcc}" : "${gcc}" ); string cppc =3D ( module.host =3D=3D HostTrue ? "${host_gpp}" : "${gpp}"= ); = - const FileLocation& baseHeaderFile =3D module.pch->file; + const FileLocation& baseHeaderFile =3D *module.pch->file; CLEAN_FILE ( *pchFilename ); string dependencies =3D backend->GetFullName ( baseHeaderFile ); /* WIDL generated headers may be used */ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/=
msvc/vcprojmaker.cpp?rev=3D32593&r1=3D32592&r2=3D32593&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/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Fri Mar 7 09:1= 6:26 2008 @@ -427,7 +427,7 @@ { fprintf ( OUT, "\t\t\t\tUsePrecompiledHeader=3D\"2\"\r\n" ); string pch_path =3D Path::RelativeFromDirectory ( - module.pch->file.name, + module.pch->file->name, module.output->relative_path ); string::size_type pos =3D pch_path.find_last_of ("/"); if ( pos !=3D string::npos ) Modified: trunk/reactos/tools/rbuild/linkerscript.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/linkersc=
ript.cpp?rev=3D32593&r1=3D32592&r2=3D32593&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/linkerscript.cpp (original) +++ trunk/reactos/tools/rbuild/linkerscript.cpp Fri Mar 7 09:16:26 2008 @@ -22,13 +22,14 @@ = LinkerScript::LinkerScript ( const XMLElement& node_, const Module& module_, - const FileLocation& file_ ) + const FileLocation *file_ ) : node(node_), module(module_), file(file_) { } = LinkerScript::~LinkerScript () { + delete file; } = void Modified: trunk/reactos/tools/rbuild/module.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.c=
pp?rev=3D32593&r1=3D32592&r2=3D32593&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 09:16:26 2008 @@ -779,14 +779,14 @@ if ( pos =3D=3D string::npos ) { linkerScript =3D new LinkerScript ( - e, *this, FileLocation ( SourceDirectory, relative_path, e.value, &e )= ); + e, *this, new FileLocation ( SourceDirectory, relative_path, e.value, = &e ) ); } else { string dir =3D e.value.substr ( 0, pos ); string name =3D e.value.substr ( pos + 1); linkerScript =3D new LinkerScript ( - e, *this, FileLocation ( SourceDirectory, relative_path + sSep + dir, = name, &e ) ); + e, *this, new FileLocation ( SourceDirectory, relative_path + sSep + d= ir, name, &e ) ); } subs_invalid =3D true; } @@ -824,14 +824,14 @@ if ( pos =3D=3D string::npos ) { pch =3D new PchFile ( - e, *this, FileLocation ( SourceDirectory, relative_path, e.value, &e )= ); + e, *this, new FileLocation ( SourceDirectory, relative_path, e.value, = &e ) ); } else { string dir =3D e.value.substr ( 0, pos ); string name =3D e.value.substr ( pos + 1); pch =3D new PchFile ( - e, *this, FileLocation ( SourceDirectory, relative_path + sSep + dir, = name, &e ) ); + e, *this, new FileLocation ( SourceDirectory, relative_path + sSep + d= ir, name, &e ) ); } subs_invalid =3D true; } @@ -1704,9 +1704,14 @@ PchFile::PchFile ( const XMLElement& node_, const Module& module_, - const FileLocation& file_ ) + const FileLocation *file_ ) : node(node_), module(module_), file(file_) { +} + +PchFile::~PchFile() +{ + delete file; } = void Modified: trunk/reactos/tools/rbuild/rbuild.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h=
?rev=3D32593&r1=3D32592&r2=3D32593&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 09:16:26 2008 @@ -639,11 +639,11 @@ public: const XMLElement& node; const Module& module; - FileLocation file; + const FileLocation *file; = LinkerScript ( const XMLElement& node, const Module& module, - const FileLocation& file ); + const FileLocation *file ); ~LinkerScript (); void ProcessXML(); }; @@ -843,12 +843,13 @@ public: const XMLElement& node; const Module& module; - FileLocation file; + const FileLocation *file; = PchFile ( const XMLElement& node, const Module& module, - const FileLocation& file ); + const FileLocation *file ); + ~PchFile(); void ProcessXML(); }; =
16 years, 9 months
1
0
0
0
[hpoussin] 32592: Use a .rbuild file instead of a .make file to describe cdmake compilation
by hpoussin@svn.reactos.org
Author: hpoussin Date: Fri Mar 7 09:15:23 2008 New Revision: 32592 URL:
http://svn.reactos.org/svn/reactos?rev=3D32592&view=3Drev
Log: Use a .rbuild file instead of a .make file to describe cdmake compilation Added: trunk/reactos/tools/cdmake/cdmake.rbuild (with props) trunk/reactos/tools/tools.rbuild (with props) Removed: trunk/reactos/tools/cdmake/cdmake.mak Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/tools/rbuild/directory.cpp trunk/reactos/tools/tools.mak Modified: trunk/reactos/ReactOS-generic.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuil=
d?rev=3D32592&r1=3D32591&r2=3D32592&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/ReactOS-generic.rbuild (original) +++ trunk/reactos/ReactOS-generic.rbuild Fri Mar 7 09:15:23 2008 @@ -63,5 +63,8 @@ <directory name=3D"subsystems"> <xi:include href=3D"subsystems/subsystems.rbuild" /> </directory> + <directory name=3D"tools"> + <xi:include href=3D"tools/tools.rbuild" /> + </directory> = </group> Removed: trunk/reactos/tools/cdmake/cdmake.mak URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.m=
ak?rev=3D32591&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/cdmake/cdmake.mak (original) +++ trunk/reactos/tools/cdmake/cdmake.mak (removed) @@ -1,51 +1,0 @@ -CDMAKE_BASE =3D $(TOOLS_BASE_)cdmake -CDMAKE_BASE_ =3D $(CDMAKE_BASE)$(SEP) -CDMAKE_INT =3D $(INTERMEDIATE_)$(CDMAKE_BASE) -CDMAKE_INT_ =3D $(CDMAKE_INT)$(SEP) -CDMAKE_OUT =3D $(OUTPUT_)$(CDMAKE_BASE) -CDMAKE_OUT_ =3D $(CDMAKE_OUT)$(SEP) - -$(CDMAKE_INT): | $(TOOLS_INT) - $(ECHO_MKDIR) - ${mkdir} $@ - -ifneq ($(INTERMEDIATE),$(OUTPUT)) -$(CDMAKE_OUT): | $(TOOLS_OUT) - $(ECHO_MKDIR) - ${mkdir} $@ -endif - -CDMAKE_TARGET =3D \ - $(CDMAKE_OUT_)cdmake$(EXEPOSTFIX) - -CDMAKE_SOURCES =3D $(addprefix $(CDMAKE_BASE_), \ - cdmake.c \ - llmosrt.c \ - ) - -CDMAKE_OBJECTS =3D \ - $(addprefix $(INTERMEDIATE_), $(CDMAKE_SOURCES:.c=3D.o)) - -CDMAKE_HOST_CFLAGS =3D -Iinclude $(TOOLS_CFLAGS) - -CDMAKE_HOST_LFLAGS =3D $(TOOLS_LFLAGS) - -.PHONY: cdmake -cdmake: $(CDMAKE_TARGET) - -$(CDMAKE_TARGET): $(CDMAKE_OBJECTS) | $(CDMAKE_OUT) - $(ECHO_LD) - ${host_gcc} $(CDMAKE_OBJECTS) $(CDMAKE_HOST_LFLAGS) -o $@ - -$(CDMAKE_INT_)cdmake.o: $(CDMAKE_BASE_)cdmake.c | $(CDMAKE_INT) - $(ECHO_CC) - ${host_gcc} $(CDMAKE_HOST_CFLAGS) -c $< -o $@ - -$(CDMAKE_INT_)llmosrt.o: $(CDMAKE_BASE_)llmosrt.c | $(CDMAKE_INT) - $(ECHO_CC) - ${host_gcc} $(CDMAKE_HOST_CFLAGS) -c $< -o $@ - -.PHONY: cdmake_clean -cdmake_clean: - -@$(rm) $(CDMAKE_TARGET) $(CDMAKE_OBJECTS) 2>$(NUL) -clean: cdmake_clean Added: trunk/reactos/tools/cdmake/cdmake.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.r=
build?rev=3D32592&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/cdmake/cdmake.rbuild (added) +++ trunk/reactos/tools/cdmake/cdmake.rbuild Fri Mar 7 09:15:23 2008 @@ -1,0 +1,6 @@ +<?xml version=3D"1.0"?> +<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> +<module name=3D"cdmake" type=3D"buildtool"> + <file>cdmake.c</file> + <file>llmosrt.c</file> +</module> Propchange: trunk/reactos/tools/cdmake/cdmake.rbuild ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/reactos/tools/rbuild/directory.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/director=
y.cpp?rev=3D32592&r1=3D32591&r2=3D32592&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/directory.cpp (original) +++ trunk/reactos/tools/rbuild/directory.cpp Fri Mar 7 09:15:23 2008 @@ -211,18 +211,22 @@ = if ( escapedName.size() > 0 ) { - fprintf ( f, - "%s%c%s: | %s\n", - parent.c_str (), - cSep, - escapedName.c_str (), - parent.c_str () ); - - fprintf ( f, - "\t$(ECHO_MKDIR)\n" ); - - fprintf ( f, - "\t${mkdir} $@\n" ); + if ( ! (escapedName =3D=3D "tools" && + ( parent =3D=3D "$(OUTPUT)" || parent =3D=3D "$(INTERMEDIATE)" ) ) ) + { + fprintf ( f, + "%s%c%s: | %s\n", + parent.c_str (), + cSep, + escapedName.c_str (), + parent.c_str () ); + + fprintf ( f, + "\t$(ECHO_MKDIR)\n" ); + + fprintf ( f, + "\t${mkdir} $@\n" ); + } = path =3D parent + sSep + escapedName; } Modified: trunk/reactos/tools/tools.mak URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=
=3D32592&r1=3D32591&r2=3D32592&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 09:15:23 2008 @@ -43,7 +43,6 @@ include tools/bin2c.mak include tools/buildno/buildno.mak include tools/cabman/cabman.mak -include tools/cdmake/cdmake.mak include tools/gendib/gendib.mak ifeq ($(ARCH),powerpc) include tools/ofw_interface/ofw_interface.mak Added: trunk/reactos/tools/tools.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.rbuild?re=
v=3D32592&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/tools.rbuild (added) +++ trunk/reactos/tools/tools.rbuild Fri Mar 7 09:15:23 2008 @@ -1,0 +1,7 @@ +<?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"cdmake"> + <xi:include href=3D"cdmake/cdmake.rbuild" /> +</directory> +</group> Propchange: trunk/reactos/tools/tools.rbuild ---------------------------------------------------------------------------= --- svn:eol-style =3D native
16 years, 9 months
1
0
0
0
[arty] 32591: Fix us back up to use PE-COFF again. This is getting ridiculous, but I now really understand everything, and freeldr moved the image mapping code to a common area.
by arty@svn.reactos.org
Author: arty Date: Fri Mar 7 07:53:55 2008 New Revision: 32591 URL:
http://svn.reactos.org/svn/reactos?rev=3D32591&view=3Drev
Log: Fix us back up to use PE-COFF again. This is getting ridiculous, but I now really understand everything, and freeldr moved the image mapping code to a common area. Added: trunk/tools/RosBE/RosBE-PPC/elfpe/coff.cpp (with props) trunk/tools/RosBE/RosBE-PPC/elfpe/coff.h (with props) trunk/tools/RosBE/RosBE-PPC/elfpe/exports.cpp (with props) trunk/tools/RosBE/RosBE-PPC/elfpe/exports.h (with props) trunk/tools/RosBE/RosBE-PPC/elfpe/imports.cpp (with props) trunk/tools/RosBE/RosBE-PPC/elfpe/imports.h (with props) trunk/tools/RosBE/RosBE-PPC/elfpe/reloc.cpp (with props) trunk/tools/RosBE/RosBE-PPC/elfpe/reloc.h (with props) trunk/tools/RosBE/RosBE-PPC/elfpe/section.h (with props) Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/Makefile trunk/tools/RosBE/RosBE-PPC/elfpe/elfpe.cpp trunk/tools/RosBE/RosBE-PPC/elfpe/header.cpp trunk/tools/RosBE/RosBE-PPC/elfpe/header.h trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.cpp trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.h trunk/tools/RosBE/RosBE-PPC/elfpe/util.cpp trunk/tools/RosBE/RosBE-PPC/elfpe/util.h Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/Makefile URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/M=
akefile?rev=3D32591&r1=3D32590&r2=3D32591&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/tools/RosBE/RosBE-PPC/elfpe/Makefile (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/Makefile Fri Mar 7 07:53:55 2008 @@ -1,6 +1,6 @@ elfpe: argparse.cpp argparse.h header.cpp header.h \ objectfile.cpp objectfile.h util.cpp util.h pedef.h \ - elfpe.cpp + elfpe.cpp reloc.cpp coff.cpp exports.cpp imports.cpp g++ -g -o $@ $^ -lelf = clean: Added: trunk/tools/RosBE/RosBE-PPC/elfpe/coff.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/c=
off.cpp?rev=3D32591&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/tools/RosBE/RosBE-PPC/elfpe/coff.cpp (added) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/coff.cpp Fri Mar 7 07:53:55 2008 @@ -1,0 +1,42 @@ +#include "coff.h" + +PECoffExecutable::PECoffExecutable +(const ElfObjectFile &elf, const std::string &file, uint32_t filealign) + : elf(elf), tempFile(file), filealign(filealign) +{ + int i; + FILE *f =3D fopen(tempFile.c_str(), "wb"); + if (!f) return; + + // Write PE Header + const ElfObjectFile::Section §ion =3D *elf.getNamedSection(".pehea= der"); + fwrite(section.getSectionData(), 1, section.logicalSize(), f); + = + // Write out sections + uint32_t physSize; + uint32_t bytes =3D 0; + + for (i =3D 1; i < elf.getNumSections(); i++) + { + const ElfObjectFile::Section §ion =3D elf.getSection(i); + if (section.getName() =3D=3D ".peheader") continue; + if (section.getType() !=3D SHT_NOBITS && section.getFlags() & SHF_ALLOC) + { + physSize =3D roundup(section.logicalSize(), filealign); +#if 0 + printf("P %08x:%08x %s\n", = + (int)ftell(f), + section.logicalSize(), = + section.getName().c_str()); +#endif + bytes =3D fwrite(section.getSectionData(), 1, section.logicalSize(), = f); + while(bytes++ < physSize) fputc(0, f); + } + } + fclose(f); +} + +void PECoffExecutable::Write(const std::string &resultFile) +{ + rename(tempFile.c_str(), resultFile.c_str()); +} Propchange: trunk/tools/RosBE/RosBE-PPC/elfpe/coff.cpp ---------------------------------------------------------------------------= --- svn:eol-style =3D native Propchange: trunk/tools/RosBE/RosBE-PPC/elfpe/coff.cpp ---------------------------------------------------------------------------= --- svn:executable =3D * Added: trunk/tools/RosBE/RosBE-PPC/elfpe/coff.h URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/c=
off.h?rev=3D32591&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/tools/RosBE/RosBE-PPC/elfpe/coff.h (added) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/coff.h Fri Mar 7 07:53:55 2008 @@ -1,0 +1,22 @@ +#ifndef COMPDVR_COFF_H +#define COMPDVR_COFF_H + +#include <vector> +#include <utility> +#include "pedef.h" +#include "util.h" +#include "objectfile.h" +#include "section.h" + +class PECoffExecutable { +public: + PECoffExecutable(const ElfObjectFile &elf, const std::string &tmpFile,= uint32_t filealign); + void Write(const std::string &resultFile); + +private: + const ElfObjectFile &elf; + std::string tempFile; + uint32_t filealign; +}; + +#endif//COMPDVR_COFF_H Propchange: trunk/tools/RosBE/RosBE-PPC/elfpe/coff.h ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/elfpe.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/e=
lfpe.cpp?rev=3D32591&r1=3D32590&r2=3D32591&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/tools/RosBE/RosBE-PPC/elfpe/elfpe.cpp (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/elfpe.cpp Fri Mar 7 07:53:55 2008 @@ -12,8 +12,13 @@ #include "objectfile.h" #include "header.h" #include "argparse.h" +#include "reloc.h" +#include "coff.h" +#include "exports.h" +#include "imports.h" = #define TYPE_PEHEADER (SHT_LOOS + 1) +#define TYPE_PERELOC (SHT_LOOS + 2) = int execute_command( bool verbose, const std::vector<std::string> &args ) { @@ -55,6 +60,26 @@ } } args.insert(args.begin(), the_definition + "=3D" + body); +} + +std::vector<uint8_t> = +ProcessRelocSections +(const ElfObjectFile &eof, = + uint32_t imageBase, + const std::vector<section_mapping_t> &rvas) +{ + std::vector<uint8_t> relocData; + uint32_t relocAddr =3D (uint32_t)-1; + int i, j; + for (i =3D 1; i < eof.getNumSections(); i++) + { + const ElfObjectFile::Section §ion =3D eof.getSection(i); + if (section.getType() =3D=3D SHT_REL || + section.getType() =3D=3D SHT_RELA) + SingleRelocSection(eof, section, rvas, relocData, imageBase, r= elocAddr); + } + AddReloc(relocData, 0, relocAddr, 0, 0); + return relocData; } = int main( int argc, char **argv ) { @@ -100,6 +125,11 @@ if(entry_point.size() && entry_point[0] =3D=3D '_') { entry_point =3D entry_point.substr(1); + } + size_t at =3D entry_point.find('@'); + if (at !=3D std::string::npos) + { + entry_point =3D entry_point.substr(0, at); } if( !compile_only ) { @@ -142,7 +172,7 @@ if( verbose ) gcc_args_str.insert(gcc_args_str.begin(),"-v"); if (!compile_only) { - if( is_dll ) gcc_args_str.insert(gcc_args_str.begin(), "-Wl,-r"); + //gcc_args_str.insert(gcc_args_str.begin(), "-Wl,-r"); gcc_args_str.insert(gcc_args_str.begin(), "-Wl,-q"); gcc_args_str.insert(gcc_args_str.begin(), "-Wl,-d"); gcc_args_str.insert(gcc_args_str.begin(), "-Wl,--start-group"); @@ -160,30 +190,56 @@ } if (!compile_only) gcc_args_str.insert(gcc_args_str.end(), "-Wl,--end-= group"); = + std::vector<section_mapping_t> sectionRvas; if ( !(status =3D execute_command( verbose, gcc_args_str )) && !compil= e_only && mkheader ) { /* Ok fixup the elf object file */ ElfObjectFile eof(output_file); + if(!eof) exit(1); = + = + uint32_t imageSize; const ElfObjectFile::Symbol *entry_sym; - - if(!eof) exit(1); - entry_sym =3D eof.getNamedSymbol(entry_point); - + = + /* This computes the section RVAs */ ElfPeHeader header - (strtoul(image_base.c_str(), 0, 0), - strtoul(section_align.c_str(), 0, 0), - strtoul(file_align.c_str(), 0, 0), - entry_sym, - 0x10000, - 0x100000, - 0x10000, - 0x100000, - atoi(subsystem.c_str()), - is_dll, - &eof); - - eof.addSection(".peheader", header.getData(), TYPE_PEHEADER); + (strtoul(image_base.c_str(), 0, 0), + strtoul(section_align.c_str(), 0, 0), + strtoul(file_align.c_str(), 0, 0), + entry_sym, + 0x10000, + 0x100000, + 0x10000, + 0x100000, + atoi(subsystem.c_str()), + is_dll, + &eof); + = + // Get base section layout + imageSize =3D header.getSectionRvas(sectionRvas); + + // Add relocation info + std::vector<uint8_t> relocSection =3D = + ProcessRelocSections + (eof, strtoul(image_base.c_str(), 0, 0), sectionRvas); + eof.addSection(".reloc", relocSection, SHT_PROGBITS); + eof.update(); + + // Recompute RVAs after adding reloc section + imageSize =3D header.getSectionRvas(sectionRvas); + header.createHeaderSection(sectionRvas, imageSize); + eof.addSection(".peheader", header.getData(), SHT_PROGBITS); + eof.update(); + + // Fixup exports + ExportFixup(eof, sectionRvas); + + // Fixup imports + ImportFixup(eof, sectionRvas); + eof.update(); + + PECoffExecutable cof(eof, output_file + ".tmp", strtoul(file_align= .c_str(), 0, 0)); + cof.Write(output_file); } = return status; Added: trunk/tools/RosBE/RosBE-PPC/elfpe/exports.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/e=
xports.cpp?rev=3D32591&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/tools/RosBE/RosBE-PPC/elfpe/exports.cpp (added) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/exports.cpp Fri Mar 7 07:53:55 2008 @@ -1,0 +1,46 @@ +#include "exports.h" +#include "objectfile.h" +#include "section.h" + +void ExportFixup +(ElfObjectFile &eof, + const std::vector<section_mapping_t> &mapping) +{ + const ElfObjectFile::Section *exportSect =3D eof.getNamedSection(".eda= ta"); + if (!exportSect) return; + uint8_t *exportTable =3D exportSect->getSectionData(); + // Fixup the words of the export directory + uint8_t *exportTarget =3D exportTable; + uint32_t exportRva =3D FindRVA(mapping, exportSect->getNumber()); + + uint32_t nameRva, ordinalBase, numberOfAddress, numberOfNames, address= Rva, + namePtrRva, ordinalTableRva; + int i; + + le32write_postinc(exportTarget, be32read(exportTarget)); + le32write_postinc(exportTarget, be32read(exportTarget)); + le16write_postinc(exportTarget, be16read(exportTarget)); + le16write_postinc(exportTarget, be16read(exportTarget)); + le32write_postinc(exportTarget, (nameRva =3D be32read(exportTarget))); + le32write_postinc(exportTarget, (ordinalBase =3D be32read(exportTarget= ))); + le32write_postinc(exportTarget, (numberOfAddress =3D be32read(exportTa= rget))); + le32write_postinc(exportTarget, (numberOfNames =3D be32read(exportTarg= et))); + le32write_postinc(exportTarget, (addressRva =3D be32read(exportTarget)= )); + le32write_postinc(exportTarget, (namePtrRva =3D be32read(exportTarget)= )); + le32write_postinc(exportTarget, (ordinalTableRva =3D be32read(exportTa= rget))); + = + // Address Table + exportTarget =3D exportTable + addressRva - exportRva; + for (i =3D 0; i < numberOfAddress; i++) + le32write_postinc(exportTarget, be32read(exportTarget)); + = + // Name table + exportTarget =3D exportTable + namePtrRva - exportRva; + for (i =3D 0; i < numberOfNames; i++) + le32write_postinc(exportTarget, be32read(exportTarget)); + + // Ordinal table + exportTarget =3D exportTable + ordinalTableRva - exportRva; + for (i =3D 0; i < numberOfAddress; i++) + le16write_postinc(exportTarget, be16read(exportTarget)); +} Propchange: trunk/tools/RosBE/RosBE-PPC/elfpe/exports.cpp ---------------------------------------------------------------------------= --- svn:eol-style =3D native Added: trunk/tools/RosBE/RosBE-PPC/elfpe/exports.h URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/e=
xports.h?rev=3D32591&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/tools/RosBE/RosBE-PPC/elfpe/exports.h (added) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/exports.h Fri Mar 7 07:53:55 2008 @@ -1,0 +1,14 @@ +#ifndef COMPDVR_EXPORTS_H +#define COMPDVR_EXPORTS_H + +#include <vector> +#include <utility> +#include "pedef.h" +#include "util.h" +#include "objectfile.h" +#include "section.h" + +void ExportFixup +(ElfObjectFile &eof, const std::vector<section_mapping_t> &mapping); + +#endif//COMPDVR_EXPORTS_H Propchange: trunk/tools/RosBE/RosBE-PPC/elfpe/exports.h ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/header.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/h=
eader.cpp?rev=3D32591&r1=3D32590&r2=3D32591&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/tools/RosBE/RosBE-PPC/elfpe/header.cpp (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/header.cpp Fri Mar 7 07:53:55 2008 @@ -16,6 +16,7 @@ ElfObjectFile *eof) : imagebase(imagebase), sectionalign(sectionalign), + filealign(filealign), stackreserve(stackreserve), stackcommit(stackcommit), heapreserve(heapreserve), @@ -25,19 +26,15 @@ eof(eof) { data.resize(computeSize()); - createHeaderSection(); } = int ElfPeHeader::computeSize() const { - return sectionalign; /* We'll compute it for real later */ -} - -void ElfPeHeader::createHeaderSection() -{ - std::vector<section_mapping_t> sectionRvaSet; - uint32_t imageSize =3D getSectionRvas(sectionRvaSet); - + return roundup(0x80 + 0x200, filealign); /* We'll compute it for real = later */ +} + +void ElfPeHeader::createHeaderSection(const std::vector<section_mapping_t>= §ionRvaSet, uint32_t imageSize) +{ data[0] =3D 'M'; data[1] =3D 'Z'; uint8_t *dataptr =3D &data[0x3c]; uint32_t coffHeaderSize, optHeaderSizeMember; @@ -88,7 +85,7 @@ le32pwrite_postinc(dataptr, getResourceInfo(sectionRvaSet)); le32pwrite_postinc(dataptr, getExceptionInfo()); le32pwrite_postinc(dataptr, getSecurityInfo()); - le32pwrite_postinc(dataptr, getRelocInfo()); + le32pwrite_postinc(dataptr, getRelocInfo(sectionRvaSet)); le32pwrite_postinc(dataptr, getDebugInfo()); le32pwrite_postinc(dataptr, getDescrInfo()); le32pwrite_postinc(dataptr, getMachInfo()); @@ -101,28 +98,37 @@ // size, but leaving out the other info. We write the section name // truncated into the name field and leave the section id in the // physical address bit + + uint32_t paddr =3D computeSize(); for (int i =3D 0; i < sectionRvaSet.size(); i++) { section_mapping_t mapping =3D sectionRvaSet[i]; const ElfObjectFile::Section *section =3D mapping.section; std::string name =3D section->getName(); uint32_t size =3D section->logicalSize(); + uint32_t psize =3D = + section->getType() =3D=3D SHT_NOBITS ? 0 : roundup(size, filealign); uint32_t rva =3D mapping.rva; for (int j =3D 0; j < 8; j++) { *dataptr++ =3D j < name.size() ? name[j] : '\000'; } + +#if 0 + printf("V %08x:%08x P %08x:%08x %s\n", + rva, size, paddr, psize, name.c_str()); +#endif + le32write_postinc(dataptr, size); le32write_postinc(dataptr, rva); - le32write_postinc(dataptr, size); - // Note: we put the index in the offset slot so we can find the - // real offset later in the loader - le32write_postinc(dataptr, sectionRvaSet[i].index); + le32write_postinc(dataptr, psize); + le32write_postinc(dataptr, paddr); le32write_postinc(dataptr, 0); le32write_postinc(dataptr, 0); le32write_postinc(dataptr, 0); // XXX Figure out the real flags le32write_postinc(dataptr, IMAGE_SCN_CNT_CODE); + paddr +=3D psize; } } = @@ -132,14 +138,17 @@ { uint32_t start =3D computeSize(); uint32_t limit =3D start; - for(int i =3D 0; i < eof->getNumSections(); i++) { + + rvas.clear(); + + for(int i =3D 1; i < eof->getNumSections(); i++) { { const ElfObjectFile::Section § =3D eof->getSection(i); if(sect.getFlags() & SHF_ALLOC) { limit =3D roundup(start + sect.logicalSize(), sectionalign); #if 0 - fprintf(stderr, "rva[%02d:%s] =3D (%x %x %d)\n", - rvas.size(), sect.getName().c_str(), §, start, i); + fprintf(stderr, "rva[%02d:-%20s] =3D (%08x %08x %08x %d)\n", + rvas.size(), sect.getName().c_str(), start, sect.getStartRva(), sect.lo= gicalSize(), i); #endif rvas.push_back(section_mapping_t(§, start, i)); } @@ -198,9 +207,9 @@ return std::make_pair(0,0); } = -u32pair_t ElfPeHeader::getRelocInfo() const -{ - return std::make_pair(0,0); +u32pair_t ElfPeHeader::getRelocInfo(const std::vector<section_mapping_t> &= mapping) const +{ + return getNamedSectionInfo(eof, mapping, ".reloc"); } = u32pair_t ElfPeHeader::getDebugInfo() const Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/header.h URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/h=
eader.h?rev=3D32591&r1=3D32590&r2=3D32591&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/tools/RosBE/RosBE-PPC/elfpe/header.h (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/header.h Fri Mar 7 07:53:55 2008 @@ -6,18 +6,7 @@ #include "pedef.h" #include "util.h" #include "objectfile.h" - -typedef struct section_mapping_t { - const ElfObjectFile::Section *section; - uint32_t rva; - int index; - - section_mapping_t - (const ElfObjectFile::Section *sect, uint32_t rva, int index) : - section(sect), rva(rva), index(index) { } - section_mapping_t(const section_mapping_t &other) : - section(other.section), rva(other.rva), index(other.index) { } -} section_mapping_t; +#include "section.h" = class ElfPeHeader { public: @@ -34,10 +23,10 @@ bool dll, ElfObjectFile *eof); const ElfObjectFile::secdata_t &getData() const; + uint32_t getSectionRvas(std::vector<section_mapping_t> &rvas) const; + void createHeaderSection(const std::vector<section_mapping_t> &rvas, u= int32_t imageSize); = private: - void createHeaderSection(); - uint32_t getSectionRvas(std::vector<section_mapping_t> &rvas) const; uint32_t getEntryPoint(const std::vector<section_mapping_t> &rvas, con= st ElfObjectFile::Symbol *entry) const; int computeSize() const; int getExeFlags() const { return 0; } @@ -47,7 +36,7 @@ u32pair_t getResourceInfo(const std::vector<section_mapping_t> &rvas) = const; u32pair_t getExceptionInfo() const; u32pair_t getSecurityInfo() const; - u32pair_t getRelocInfo() const; + u32pair_t getRelocInfo(const std::vector<section_mapping_t> &rvas) con= st; u32pair_t getDebugInfo() const; u32pair_t getDescrInfo() const; u32pair_t getMachInfo() const; Added: trunk/tools/RosBE/RosBE-PPC/elfpe/imports.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/i=
mports.cpp?rev=3D32591&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/tools/RosBE/RosBE-PPC/elfpe/imports.cpp (added) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/imports.cpp Fri Mar 7 07:53:55 2008 @@ -1,0 +1,43 @@ +#include "imports.h" +#include "objectfile.h" +#include "section.h" + +void ImportFixup +(ElfObjectFile &eof, + const std::vector<section_mapping_t> &mapping) +{ + const ElfObjectFile::Section *importSect =3D eof.getNamedSection(".ida= ta"); + if (!importSect) return; + uint8_t *importTable =3D importSect->getSectionData(); + uint8_t *importTarget =3D importTable, *tableAddr, *hintName; + uint32_t importRva =3D FindRVA(mapping, importSect->getNumber()); + uint32_t tableRva, iatRva, hintNameEntry; + + do + { + le32write_postinc(importTarget, (tableRva =3D be32read(importTarge= t))); + le32write_postinc(importTarget, be32read(importTarget)); + le32write_postinc(importTarget, be32read(importTarget)); + le32write_postinc(importTarget, be32read(importTarget)); + le32write_postinc(importTarget, (iatRva =3D be32read(importTarget)= )); + + if (!tableRva) return; + + // Rewrite the import lookup table + tableAddr =3D importTable + tableRva - importRva; + while (hintNameEntry =3D be32read(tableAddr)) + { + le32write_postinc(tableAddr, hintNameEntry); + // Rewrite the hint/name element + //hintName =3D importTable + hintNameEntry - importRva; + //le16write(hintName, be16read(hintName)); + } + + // Do the second address table + tableAddr =3D importTable + iatRva - importRva; + while (hintNameEntry =3D be32read(tableAddr)) + { + le32write_postinc(tableAddr, hintNameEntry); + } + } while(1); +} Propchange: trunk/tools/RosBE/RosBE-PPC/elfpe/imports.cpp ---------------------------------------------------------------------------= --- svn:eol-style =3D native Added: trunk/tools/RosBE/RosBE-PPC/elfpe/imports.h URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/i=
mports.h?rev=3D32591&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/tools/RosBE/RosBE-PPC/elfpe/imports.h (added) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/imports.h Fri Mar 7 07:53:55 2008 @@ -1,0 +1,14 @@ +#ifndef COMPDVR_IMPORTS_H +#define COMPDVR_IMPORTS_H + +#include <vector> +#include <utility> +#include "pedef.h" +#include "util.h" +#include "objectfile.h" +#include "section.h" + +void ImportFixup +(ElfObjectFile &eof, const std::vector<section_mapping_t> &mapping); + +#endif//COMPDVR_IMPORTS_H Propchange: trunk/tools/RosBE/RosBE-PPC/elfpe/imports.h ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/o=
bjectfile.cpp?rev=3D32591&r1=3D32590&r2=3D32591&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/tools/RosBE/RosBE-PPC/elfpe/objectfile.cpp (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.cpp Fri Mar 7 07:53:55 20= 08 @@ -3,43 +3,71 @@ #include "util.h" #include "objectfile.h" = -ElfObjectFile::ElfObjectFile(const std::string &filename) : fd(-1) +ElfObjectFile::ElfObjectFile(const std::string &filename) : fd(-1), filena= me(filename) { - Elf_Scn *s =3D 0; + init(); +} + +void ElfObjectFile::init() +{ Elf32_Ehdr *ehdr; - Section *sect; + elfHeader =3D NULL; + lastStr =3D NULL; + fd =3D open(filename.c_str(), O_RDWR, 0); if(fd >=3D 0) { - if(elf_version(EV_CURRENT) =3D=3D EV_NONE) { - // Old version - return; - } - elfHeader =3D elf_begin(fd, ELF_C_RDWR, (Elf*)0); - if(elf_kind(elfHeader) !=3D ELF_K_ELF) { - // Didn't get an elf object file + if(elf_version(EV_CURRENT) =3D=3D EV_NONE) { + // Old version + return; + } + elfHeader =3D elf_begin(fd, ELF_C_RDWR, (Elf*)0); + if(elf_kind(elfHeader) !=3D ELF_K_ELF) { + // Didn't get an elf object file elfHeader =3D NULL; - return; - } - ehdr =3D elf32_getehdr(elfHeader); - shnum =3D ehdr->e_shnum; - phnum =3D ehdr->e_phnum; - shstrndx =3D ehdr->e_shstrndx; - /* Populate section table */ - for(size_t i =3D 0; i < shnum; i++) - { - s =3D elf_nextscn(elfHeader, s); - if(!s) break; - sect =3D new Section(*this, i, s); - sections.push_back(sect); - sections_by_name.insert(std::make_pair(sect->getName(), sect)); - } + return; + } = - populateSymbolTable(); + ehdr =3D elf32_getehdr(elfHeader); + phnum =3D ehdr->e_phnum; + shstrndx =3D ehdr->e_shstrndx; + + populateSections(); + populateSymbolTable(); + } +} + +void ElfObjectFile::populateSections() +{ + Section *sect; + Elf32_Ehdr *ehdr; + Elf_Scn *s =3D 0; + + ehdr =3D elf32_getehdr(elfHeader); + shnum =3D ehdr->e_shnum; + = + /* ABS section */ + sections.clear(); + sections_by_name.clear(); + sections.push_back(new Section(*this, 0, NULL)); + = + /* Populate section table */ + for(size_t i =3D 1; i < shnum; i++) + { + s =3D elf_nextscn(elfHeader, s); + if(!s) break; + sect =3D new Section(*this, i, s); + sections.push_back(sect); + sections_by_name.insert(std::make_pair(sect->getName(), sect)); } } = ElfObjectFile::~ElfObjectFile() +{ + finalize(); +} + +void ElfObjectFile::finalize() { if(elfHeader) elf_end(elfHeader); if(fd >=3D 0) close(fd); @@ -55,7 +83,10 @@ Elf32_Sym *sym; Symbol *ourSym; = - for( i =3D 0; i < getNumSections(); i++ ) { + symbols.clear(); + symbols_by_name.clear(); + + for( i =3D 1; i < getNumSections(); i++ ) { type =3D getSection(i).getType(); link =3D getSection(i).getLink(); if( (type =3D=3D SHT_SYMTAB) || (type =3D=3D SHT_DYNSYM) ) { @@ -85,7 +116,7 @@ /* Create data for the new section */ Elf_Data *edata =3D elf_newdata(newsect), *strdata =3D elf_getdata(str= sect, 0), *newstrdata =3D elf_newdata(strsect); - edata->d_align =3D 0x1000; + edata->d_align =3D 1; edata->d_size =3D data.size(); edata->d_off =3D 0; edata->d_type =3D ELF_T_BYTE; @@ -93,10 +124,12 @@ edata->d_buf =3D malloc(edata->d_size); memcpy(edata->d_buf, &data[0], edata->d_size); /* Add the name of the new section to the string table */ - newstrdata->d_off =3D strdata->d_off + strdata->d_size; + if (!lastStr) lastStr =3D strdata; + newstrdata->d_off =3D lastStr->d_off + lastStr->d_size; newstrdata->d_size =3D name.size() + 1; newstrdata->d_align =3D 1; newstrdata->d_buf =3D (void *)name.c_str(); + lastStr =3D newstrdata; /* Finish the section */ shdr->sh_name =3D newstrdata->d_off; shdr->sh_type =3D type; Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.h URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/o=
bjectfile.h?rev=3D32591&r1=3D32590&r2=3D32591&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/tools/RosBE/RosBE-PPC/elfpe/objectfile.h (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/objectfile.h Fri Mar 7 07:53:55 2008 @@ -78,11 +78,15 @@ = uint8_t *getSectionData() const { if(!have_data) { - data =3D *elf_getdata(section, NULL); + data =3D *elf_getdata(section, NULL); have_data =3D true; } return (uint8_t *)data.d_buf; } + + void setDirty() const { + elf_flagscn(section, ELF_C_SET, ELF_F_DIRTY); + } = private: const ElfObjectFile *obj; @@ -109,18 +113,30 @@ const Section *getNamedSection(const std::string &name) const; const Symbol &getSymbol(int n) const { return *symbols[n]; } const Symbol *getNamedSymbol(const std::string &symname) const; + void update() = + { = + elf_flagelf(elfHeader, ELF_C_SET, ELF_F_DIRTY); + elf_update(elfHeader, ELF_C_WRITE); = + finalize(); + init(); + } = private: int fd; int shnum, phnum; int shstrndx; Elf *elfHeader; + Elf_Data *lastStr; + std::string filename; std::vector<Section*> sections; std::map<std::string, const Section *> sections_by_name; std::vector<Symbol*> symbols; std::map<std::string, const Symbol *> symbols_by_name; = + void init(); + void finalize(); void populateSymbolTable(); + void populateSections(); }; = #endif//COMPDVR_ELFOBJECT_H Added: trunk/tools/RosBE/RosBE-PPC/elfpe/reloc.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/r=
eloc.cpp?rev=3D32591&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/tools/RosBE/RosBE-PPC/elfpe/reloc.cpp (added) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/reloc.cpp Fri Mar 7 07:53:55 2008 @@ -1,0 +1,192 @@ +#include "objectfile.h" +#include "reloc.h" +#include "section.h" +#include "util.h" +#include <assert.h> + +void AddReloc +(std::vector<uint8_t> &reloc, = + uint32_t imageBase, + uint32_t &relocAddrOff, + uint32_t newReloc, int type) +{ + size_t oldsize =3D reloc.size(), oddsize =3D oldsize & sizeof(uint16_t= ); + uint8_t *relptr; + if (relocAddrOff =3D=3D (uint32_t)-1) + { + reloc.resize(sizeof(uint32_t) * 2 + sizeof(uint16_t)); + relocAddrOff =3D 0; + *GetRelocTarget(reloc, relocAddrOff) =3D newReloc & ~0xfff; + relptr =3D &reloc[2 * sizeof(uint32_t)]; + } + else if (type !=3D -1 && ((newReloc & ~0xfff) !=3D *GetRelocTarget(rel= oc, relocAddrOff))) + { + reloc.resize(reloc.size() + 2 * sizeof(uint32_t) + sizeof(uint16_t= ) + oddsize); + relptr =3D &reloc[oldsize + oddsize]; + uint8_t *oldptr =3D (uint8_t*)GetRelocTarget(reloc, relocAddrOff); + le32write_postinc(oldptr, *GetRelocTarget(reloc, relocAddrOff) - imageBas= e); + le32write_postinc(oldptr, relptr - &reloc[0] - relocAddrOff); + relocAddrOff =3D relptr - &reloc[0]; + *GetRelocTarget(reloc, relocAddrOff) =3D newReloc & ~0xfff; + relptr +=3D sizeof(uint32_t); + le32write_postinc(relptr, 0); + } + else + { + reloc.resize(reloc.size() + sizeof(uint16_t)); + relptr =3D &reloc[oldsize]; + } + + le16write(relptr, type << 12 | newReloc & 0xfff); +} + +#define ADDR24_MASK 0xfc000003 + +void SingleReloc +(const ElfObjectFile &eof, + uint8_t *relptr, int relocsize, = + const std::vector<section_mapping_t> &rvas, + const ElfObjectFile::Section &symbols, + const ElfObjectFile::Section &target, + std::vector<uint8_t> &relocSect, + uint32_t imageBase, + uint32_t &relocAddr) +{ + int j; + Elf32_Rela reloc =3D { 0 }; + Elf32_Sym symbol; + uint8_t *symptr; + uint32_t S,A,P; + = + /* Get the reloc */ + memcpy(&reloc, relptr, relocsize); +#if 0 + printf("RELOC: offset %08x info %08x addend %08x [%02x %06x]\n", = + reloc.r_offset, reloc.r_info, reloc.r_addend, + ELF32_R_TYPE(reloc.r_info), ELF32_R_SYM(reloc.r_info)); +#endif + = + /* Get the symbol */ + symptr =3D &symbols.getSectionData() + [ELF32_R_SYM(reloc.r_info) * sizeof(symbol)]; + memcpy(&symbol, symptr, sizeof(symbol)); + + /* Compute addends */ + S =3D symbol.st_value - = + eof.getSection(symbol.st_shndx).getStartRva() + = + FindRVA(rvas, symbol.st_shndx) + = + imageBase; + A =3D reloc.r_addend; + P =3D reloc.r_offset + FindRVA(rvas, target.getNumber()) - target.getS= tartRva(); + //printf("start of target elf section %08x\n", target.getStartRva()); + +#if 0 + printf("SYMBOL: value %08x size %08x info %02x other %02x shndx %08x t= otal %08x\n", + symbol.st_value, + symbol.st_size, + symbol.st_info, + symbol.st_other, + symbol.st_shndx, + S); +#endif + + uint8_t *Target =3D TargetPtr(rvas, target, P); + uint8_t *tword =3D TargetPtr(rvas, target, P & ~3); + uint8_t oldBytes[sizeof(uint32_t)]; + memcpy(oldBytes, tword, sizeof(oldBytes)); + = + P +=3D imageBase; + + switch (ELF32_R_TYPE(reloc.r_info)) + { + case R_PPC_NONE: + break; + case R_PPC_ADDR32: + //printf("ADDR32 S %08x A %08x P %08x\n", S, A, P); + be32write(Target, S + A); + AddReloc(relocSect, imageBase, relocAddr, P, 3); + break; + case R_PPC_REL32: + //printf("REL32 S %08x A %08x P %08x\n", S, A, P); + be32write(Target, S + A - P); + break; + case R_PPC_UADDR32: /* Special: Treat as RVA */ + //printf("UADDR32 S %08x A %08x P %08x\n", S, A, P); + be32write(Target, S + A - imageBase); + break; + case R_PPC_REL24: + //printf("REL24 S %08x A %08x P %08x\n", S, A, P); + //printf("New Offset: %08x to Addr %08x from %08x\n", S+A-P, S+A, = P); + be32write(Target, ((S+A-P) & ~ADDR24_MASK) | (be32read(Target) & A= DDR24_MASK)); + break; + case R_PPC_ADDR16_LO: + //printf("ADDR16_LO S %08x A %08x P %08x\n", S, A, P); + be16write(Target, S + A); + AddReloc(relocSect, imageBase, relocAddr, P, 2); + break; + case R_PPC_ADDR16_HA: + //printf("ADDR16_HA S %08x A %08x P %08x\n", S, A, P); + be16write(Target, (S + A + 0x8000) >> 16); + AddReloc(relocSect, imageBase, relocAddr, P, 4); + AddReloc(relocSect, imageBase, relocAddr, S + A, -1); + break; + default: + break; + } + + uint8_t newBytes[sizeof(uint32_t)]; + memcpy(newBytes, tword, sizeof(newBytes)); +#if 0 + printf("Reloc changed %08x [%02x %02x %02x %02x] --> [%02x %02x %02x %= 02x]\n", + P & ~3, + oldBytes[0], + oldBytes[1], + oldBytes[2], + oldBytes[3], + newBytes[0], + newBytes[1], + newBytes[2], + newBytes[3]); +#endif +} + +void SingleRelocSection +(const ElfObjectFile &obf, = + const ElfObjectFile::Section §ion, + const std::vector<section_mapping_t> &rvas, + std::vector<uint8_t> &relocData, + uint32_t imageBase, + uint32_t &relocAddr) +{ + Elf32_Rela reloc =3D { }; + uint8_t *Target; + int numreloc, relstart, relsize, j; + uint8_t *sectionData =3D section.getSectionData(); + = + relsize =3D section.getType() =3D=3D SHT_RELA ? 12 : 8; + numreloc =3D section.logicalSize() / relsize; + const ElfObjectFile::Section &targetSection =3D obf.getSection(section= .getInfo()); + + /* Don't relocate non-program section */ + if (!(targetSection.getFlags() & SHF_ALLOC)) + return; + + targetSection.setDirty(); + + /* Get the symbol section */ + const ElfObjectFile::Section &symbolSection =3D obf.getSection(section= .getLink()); + + for(j =3D 0; j < numreloc; j++) + { + SingleReloc + (obf, + sectionData + j * relsize, = + relsize, + rvas, + symbolSection, + targetSection, + relocData, + imageBase, + relocAddr); + } +} Propchange: trunk/tools/RosBE/RosBE-PPC/elfpe/reloc.cpp ---------------------------------------------------------------------------= --- svn:eol-style =3D native Propchange: trunk/tools/RosBE/RosBE-PPC/elfpe/reloc.cpp ---------------------------------------------------------------------------= --- svn:executable =3D * Added: trunk/tools/RosBE/RosBE-PPC/elfpe/reloc.h URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/r=
eloc.h?rev=3D32591&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/tools/RosBE/RosBE-PPC/elfpe/reloc.h (added) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/reloc.h Fri Mar 7 07:53:55 2008 @@ -1,0 +1,22 @@ +#ifndef _ELFPE_RELOC_H +#define _ELFPE_RELOC_H + +#include <vector> +#include "section.h" +#include "objectfile.h" + +void SingleRelocSection +(const ElfObjectFile &obf, + const ElfObjectFile::Section §ion, + const std::vector<section_mapping_t> &rvas, + std::vector<uint8_t> &relocData, + uint32_t imageBase, + uint32_t &relocAddr); + +void AddReloc +(std::vector<uint8_t> &reloc, = + uint32_t imageBase, + uint32_t &relocAddrOff, + uint32_t newReloc, int type); + +#endif//_ELFPE_RELOC_H Propchange: trunk/tools/RosBE/RosBE-PPC/elfpe/reloc.h ---------------------------------------------------------------------------= --- svn:eol-style =3D native Propchange: trunk/tools/RosBE/RosBE-PPC/elfpe/reloc.h ---------------------------------------------------------------------------= --- svn:executable =3D * Added: trunk/tools/RosBE/RosBE-PPC/elfpe/section.h URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/s=
ection.h?rev=3D32591&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/tools/RosBE/RosBE-PPC/elfpe/section.h (added) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/section.h Fri Mar 7 07:53:55 2008 @@ -1,0 +1,16 @@ +#ifndef COMPDVR_SECTION_H +#define COMPDVR_SECTION_H + +typedef struct section_mapping_t { + const ElfObjectFile::Section *section; + uint32_t rva; + int index; + = + section_mapping_t + (const ElfObjectFile::Section *sect, uint32_t rva, int index) : + section(sect), rva(rva), index(index) { } + section_mapping_t(const section_mapping_t &other) : + section(other.section), rva(other.rva), index(other.index) { } +} section_mapping_t; + +#endif//COMPDVR_SECTION_H Propchange: trunk/tools/RosBE/RosBE-PPC/elfpe/section.h ---------------------------------------------------------------------------= --- svn:eol-style =3D native Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/util.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/u=
til.cpp?rev=3D32591&r1=3D32590&r2=3D32591&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/tools/RosBE/RosBE-PPC/elfpe/util.cpp (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/util.cpp Fri Mar 7 07:53:55 2008 @@ -1,4 +1,5 @@ #include "util.h" +#include <assert.h> = uint32_t roundup(uint32_t value, int round) { @@ -34,7 +35,29 @@ le32write_postinc(dataptr, value.second); } = -uint16_t be16read(uint8_t *dataptr) +void be16write_postinc(uint8_t *&dataptr, uint16_t value) +{ + *dataptr++ =3D value >> 8; + *dataptr++ =3D value; +} + +void be16write(uint8_t *dataptr, uint16_t value) +{ + be16write_postinc(dataptr, value); +} + +void be32write_postinc(uint8_t *&dataptr, uint32_t value) +{ + be16write_postinc(dataptr, value >> 16); + be16write_postinc(dataptr, value); +} + +void be32write(uint8_t *dataptr, uint32_t value) +{ + be32write_postinc(dataptr, value); +} + +uint16_t be16read(uint8_t *dataptr) = { return dataptr[0] << 8 | dataptr[1]; } @@ -48,7 +71,7 @@ = uint32_t be32read(uint8_t *dataptr) { - return be16read(dataptr) << 16 | be16read(dataptr+2); + return (be16read(dataptr) << 16) | be16read(dataptr+2); } = uint32_t be32read_postinc(uint8_t *&dataptr) @@ -57,3 +80,35 @@ dataptr +=3D 4; return res; } + +uint32_t FindRVA(const std::vector<section_mapping_t> &mapping, int secnum) +{ + int i; + for (i =3D 0; i < mapping.size(); i++) + if (mapping[i].section->getNumber() =3D=3D secnum) return mapping[i].rva; + return 0; +} + +uint8_t *TargetPtr +(const std::vector<section_mapping_t> &mapping, = + const ElfObjectFile::Section &target, uint32_t va) +{ + uint32_t srva =3D FindRVA(mapping, target.getNumber()); + uint32_t off =3D va - srva; +#if 0 + printf + ("Relocating against VA %08x in section (%08x-%08x) %s\n", = + va, = + srva, = + srva + target.logicalSize(), = + target.getName().c_str()); +#endif + assert(off < target.logicalSize()); + return target.getSectionData() + off; +} + +uint32_t *GetRelocTarget(const std::vector<uint8_t> &reloc, uint32_t off) +{ + return (uint32_t *)(&reloc[0] + off); +} + Modified: trunk/tools/RosBE/RosBE-PPC/elfpe/util.h URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/elfpe/u=
til.h?rev=3D32591&r1=3D32590&r2=3D32591&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/tools/RosBE/RosBE-PPC/elfpe/util.h (original) +++ trunk/tools/RosBE/RosBE-PPC/elfpe/util.h Fri Mar 7 07:53:55 2008 @@ -1,8 +1,11 @@ #ifndef COMPDVR_UTIL_H #define COMPDVR_UTIL_H = +#include <vector> #include <utility> #include <stdint.h> +#include "objectfile.h" +#include "section.h" = void le16write(uint8_t *dataptr, uint16_t value); void le16write_postinc(uint8_t *&dataptr, uint16_t value); @@ -12,6 +15,10 @@ uint16_t le16read_postinc(uint8_t *&dataptr); uint32_t le32read(uint8_t *dataptr); uint32_t le32read_postinc(uint8_t *&dataptr); +void be16write(uint8_t *dataptr, uint16_t value); +void be16write_postinc(uint8_t *&dataptr, uint16_t value); +void be32write(uint8_t *dataptr, uint32_t value); +void be32write_postinc(uint8_t *&dataptr, uint32_t value); uint16_t be16read(uint8_t *dataptr); uint16_t be16read_postinc(uint8_t *&dataptr); uint32_t be32read(uint8_t *dataptr); @@ -21,4 +28,10 @@ void le32pwrite(uint8_t *dataptr, const u32pair_t &pair); uint32_t roundup(uint32_t value, int round); = +uint32_t FindRVA(const std::vector<section_mapping_t> &mapping, int secnum= ); +uint8_t *TargetPtr +(const std::vector<section_mapping_t> &mapping, = + const ElfObjectFile::Section &target, uint32_t va); +uint32_t *GetRelocTarget(const std::vector<uint8_t> &reloc, uint32_t off); + #endif//COMPDVR_UTIL_H
16 years, 9 months
1
0
0
0
[cwittich] 32590: put the newly added code in #ifdef _WIN32
by cwittich@svn.reactos.org
Author: cwittich Date: Thu Mar 6 17:57:24 2008 New Revision: 32590 URL:
http://svn.reactos.org/svn/reactos?rev=3D32590&view=3Drev
Log: put the newly added code in #ifdef _WIN32 Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too=
ls/ccache-2.4/ccache.c?rev=3D32590&r1=3D32589&r2=3D32590&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/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c Thu Mar 6 17= :57:24 2008 @@ -125,9 +125,11 @@ static void failed(void) { char *e; +#ifdef _WIN32 STARTUPINFO si; PROCESS_INFORMATION pi; char* merged =3D build_command(orig_args->argv); +#endif = /* delete intermediate pre-processor file if needed */ if (i_tmpfile) { @@ -157,6 +159,7 @@ args_add_prefix(orig_args, p); } = +#ifdef _WIN32 ZeroMemory(&si, sizeof(STARTUPINFO)); ZeroMemory(&pi, sizeof(PROCESS_INFORMATION)); = @@ -174,6 +177,12 @@ CloseHandle( pi.hThread ); = exit(0); +#else + execv(orig_args->argv[0], orig_args->argv); + cc_log("execv returned (%s)!\n", strerror(errno)); + perror(orig_args->argv[0]); + exit(1); +#endif } = =
16 years, 9 months
1
0
0
0
[cwittich] 32589: replace execv with CreateProcess because we have to wait for the process
by cwittich@svn.reactos.org
Author: cwittich Date: Thu Mar 6 17:54:08 2008 New Revision: 32589 URL:
http://svn.reactos.org/svn/reactos?rev=3D32589&view=3Drev
Log: replace execv with CreateProcess because we have to wait for the process Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too=
ls/ccache-2.4/ccache.c?rev=3D32589&r1=3D32588&r2=3D32589&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/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache.c Thu Mar 6 17= :54:08 2008 @@ -125,6 +125,9 @@ static void failed(void) { char *e; + STARTUPINFO si; + PROCESS_INFORMATION pi; + char* merged =3D build_command(orig_args->argv); = /* delete intermediate pre-processor file if needed */ if (i_tmpfile) { @@ -154,10 +157,23 @@ args_add_prefix(orig_args, p); } = - execv(orig_args->argv[0], orig_args->argv); - cc_log("execv returned (%s)!\n", strerror(errno)); - perror(orig_args->argv[0]); - exit(1); + ZeroMemory(&si, sizeof(STARTUPINFO)); + ZeroMemory(&pi, sizeof(PROCESS_INFORMATION)); + + si.cb =3D sizeof(STARTUPINFO); + + if(!CreateProcessA(orig_args->argv[0], merged, NULL, NULL, FALSE, 0, NULL= , NULL, &si, &pi)) + { + perror(orig_args->argv[0]); + exit(1); + } + + WaitForSingleObject( pi.hProcess, INFINITE ); + + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + + exit(0); } = =
16 years, 9 months
1
0
0
0
← Newer
1
...
19
20
21
22
23
24
25
26
27
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
Results per page:
10
25
50
100
200