modified tools/rbuild/backend/mingw/mingw.cpp

modified   tools/rbuild/backend/mingw/mingw.h
   From now on, the MinGW back-end will also support the Microsoft command line C/C++ compiler (cl) and incremental linker (link). Support is currently limited to detecting the tools, and invoking them with the wrong arguments. Only Windows hosts are currently supported

added      tools/rbuild/backend/mingw/mstools_detection.cpp
modified   tools/rbuild/rbuild.mak
   Auto-detection of Microsoft compiler and linker: if rbuild finds them in the path, it will use those. Otherwise, it will look for the highest version installed by any of the supported Microsoft products. Supported Microsoft products are Visual Studio 2005 and higher, Visual C++ Express and Windows DDK version 6001 and higher. Optimizing versions of the compiler will take precedence over "standard edition" compilers, regardless of version number

modified   tools/rbuild/configuration.cpp
modified   tools/rbuild/rbuild.cpp
modified   tools/rbuild/rbuild.h
   New command line options for rbuild to choose the tools set for the MinGW back-end: -Mc<compiler set>, -Ml<linker set>, -M<build tools set>. Defaults to -Mgnu, so that support for Microsoft tools has to be opted into

svn path=/trunk/; revision=41343

reactos/tools/rbuild/backend/mingw/mingw.cpp

@@ -726,6 +726,11 @@ MingwBackend::DetectCompiler ()
 	printf ( "Detecting compiler..." );
 
 	bool detectedCompiler = false;
+	bool supportedCompiler = false;
+	string compilerVersion;
+
+	if ( ProjectNode.configuration.Compiler == GnuGcc )
+	{
 		const string& ROS_PREFIXValue = Environment::GetVariable ( "ROS_PREFIX" );
 		if ( ROS_PREFIXValue.length () > 0 )
 		{
@@ -749,9 +754,19 @@ MingwBackend::DetectCompiler ()
 		}
 
 		if ( detectedCompiler )
+			compilerVersion = GetCompilerVersion ( compilerCommand );
+
+		supportedCompiler = IsSupportedCompilerVersion ( compilerVersion );
+	}
+	else if ( ProjectNode.configuration.Compiler == MicrosoftC )
 	{
-		string compilerVersion = GetCompilerVersion ( compilerCommand );
+		detectedCompiler = DetectMicrosoftCompiler ( compilerVersion );
-		if ( IsSupportedCompilerVersion ( compilerVersion ) )
+		supportedCompiler = true; // TODO
+	}
+
+	if ( detectedCompiler )
+	{
+		if ( supportedCompiler )
 			printf ( "detected (%s %s)\n", compilerCommand.c_str (), compilerVersion.c_str() );
 		else
 		{
@@ -953,6 +968,11 @@ MingwBackend::DetectBinutils ()
 	printf ( "Detecting binutils..." );
 
 	bool detectedBinutils = false;
+	bool supportedBinutils = false;
+	string binutilsVersion;
+
+	if ( ProjectNode.configuration.Linker == GnuLd )
+	{
 		const string& ROS_PREFIXValue = Environment::GetVariable ( "ROS_PREFIX" );
 
 		if ( ROS_PREFIXValue.length () > 0 )
@@ -978,9 +998,20 @@ MingwBackend::DetectBinutils ()
 		}
 		if ( detectedBinutils )
 		{
-		string binutilsVersion = GetBinutilsVersionDate ( binutilsCommand );
+			binutilsVersion = GetBinutilsVersionDate ( binutilsCommand );
-		if ( IsSupportedBinutilsVersion ( binutilsVersion ) )
+			supportedBinutils = IsSupportedBinutilsVersion ( binutilsVersion );
-			printf ( "detected (%s %s)\n", binutilsCommand.c_str (), GetBinutilsVersion( binutilsCommand ).c_str() );
+		}
+	}
+	else if ( ProjectNode.configuration.Linker == MicrosoftLink )
+	{
+		detectedBinutils = DetectMicrosoftLinker ( binutilsVersion );
+		supportedBinutils = true; // TODO
+	}
+
+	if ( detectedBinutils )
+	{
+		if ( supportedBinutils )
+			printf ( "detected (%s %s)\n", binutilsCommand.c_str (), binutilsVersion.c_str() );
 		else
 		{
 			printf ( "detected (%s), but with unsupported version (%s)\n",
@@ -1021,6 +1052,8 @@ MingwBackend::DetectNetwideAssembler ()
 
 void
 MingwBackend::DetectPipeSupport ()
+{
+	if ( ProjectNode.configuration.Compiler == GnuGcc )
 	{
 		printf ( "Detecting compiler -pipe support..." );
 
@@ -1050,13 +1083,14 @@ MingwBackend::DetectPipeSupport ()
 		else
 			printf ( "not detected\n" );
 	}
+}
 
 void
 MingwBackend::DetectPCHSupport ()
 {
 	printf ( "Detecting compiler pre-compiled header support..." );
 
-	if ( configuration.PrecompiledHeadersEnabled )
+	if ( configuration.PrecompiledHeadersEnabled && ProjectNode.configuration.Compiler == GnuGcc )
 	{
 		string path = "tools" + sSep + "rbuild" + sSep + "backend" + sSep + "mingw" + sSep + "pch_detection.h";
 		string cmd = ssprintf (

reactos/tools/rbuild/backend/mingw/mingw.h

@@ -45,10 +45,12 @@ public:
 	std::string AddDirectoryTarget ( const std::string& directory,
 	                                 Directory* directoryTree );
 	const Module& GetAliasedModuleOrModule ( const Module& module ) const;
+	bool compilerNeedsHelper;
 	std::string compilerPrefix;
 	std::string compilerCommand;
 	std::string nasmCommand;
 	std::string binutilsPrefix;
+	bool binutilsNeedsHelper;
 	std::string binutilsCommand;
 	bool usePipe, manualBinutilsSetting;
 	Directory* intermediateDirectory;
@@ -115,6 +117,8 @@ private:
 	void GenerateDirectoryTargets ();
 	FILE* fMakefile;
 	bool use_pch;
+	bool DetectMicrosoftCompiler ( std::string& version );
+	bool DetectMicrosoftLinker ( std::string& version );
 };
 
 

reactos/tools/rbuild/configuration.cpp

@@ -33,6 +33,8 @@ Configuration::Configuration ()
 	InstallFiles = false;
 	UseConfigurationInPath = false;
 	UseVSVersionInPath = false;
+	Compiler = GnuGcc;
+	Linker = GnuLd;
 }
 
 Configuration::~Configuration ()

reactos/tools/rbuild/rbuild.cpp

@@ -160,6 +160,58 @@ ParseVCProjectSwitch (
 	return true;
 }
 
+bool
+ParseMingwSwitch ( char* switchStart )
+{
+	switchStart += 2;
+
+	if ( *switchStart == 'c' )
+	{
+		++ switchStart;
+
+		if ( strcmp ( switchStart, "msc" ) == 0 )
+			configuration.Compiler = MicrosoftC;
+		else if ( strcmp ( switchStart, "gcc" ) == 0 )
+			configuration.Compiler = GnuGcc;
+		else
+		{
+			printf ( "Unknown value of -Mc: %s\n", switchStart );
+			return false;
+		}
+	}
+	else if ( *switchStart == 'l' )
+	{
+		++ switchStart;
+
+		if ( strcmp ( switchStart, "mslink" ) == 0 )
+			configuration.Linker = MicrosoftLink;
+		else if ( strcmp ( switchStart, "ld" ) == 0 )
+			configuration.Linker = GnuLd;
+		else
+		{
+			printf ( "Unknown value of -Ml: %s\n", switchStart );
+			return false;
+		}
+	}
+	else if ( strcmp ( switchStart, "microsoft" ) == 0 )
+	{
+		configuration.Compiler = MicrosoftC;
+		configuration.Linker = MicrosoftLink;
+	}
+	else if ( strcmp ( switchStart, "gnu" ) == 0 )
+	{
+		configuration.Compiler = GnuGcc;
+		configuration.Linker = GnuLd;
+	}
+	else
+	{
+		printf ( "Unknown value of -M: %s\n", switchStart );
+		return false;
+	}
+
+	return true;
+}
+
 bool
 ParseMakeSwitch ( char switchChar2 )
 {
@@ -252,6 +304,8 @@ ParseSwitch ( int argc, char** argv, int index )
 			break;
 		case 'm':
 			return ParseMakeSwitch ( switchChar2 );
+		case 'M':
+			return ParseMingwSwitch ( argv[index] );
 		case 'p':
 			return ParseProxyMakefileSwitch ( switchChar2 );
 		case 'D':
@@ -309,6 +363,14 @@ main ( int argc, char** argv )
 		printf ( "                tree.\n" );
 		printf ( "  -vs{version}  Version of MS VS project files. Default is %s.\n", MS_VS_DEF_VERSION );
 		printf ( "  -vo{version|configuration} Adds subdirectory path to the default Intermediate-Outputdirectory.\n" );
+		printf ( "  -Mc{compiler} Compiler to use for mingw backend. Can be one of:\n" );
+		printf ( "                %-10s %s (default)\n", "gcc", "GNU compiler collection (gcc, g++)\n");
+		printf ( "                %-10s %s\n", "msc", "Microsoft Visual C++ (cl)\n");
+		printf ( "  -Ml{compiler} Linker to use for mingw backend. Can be one of:\n" );
+		printf ( "                %-10s %s (default)\n", "ld", "GNU binutils (ld, dlltool)\n");
+		printf ( "                %-10s %s\n", "mslink", "Microsoft Linker (link, lib)\n");
+		printf ( "  -Mmicrosoft   Same as -Mcmsc -Mlmslink\n" );
+		printf ( "  -Mgnu         Same as -Mcgcc -Mlld\n" );
 		printf ( "  -Dvar=val     Set the value of 'var' variable to 'val'.\n" );
 		printf ( "\n" );
 		printf ( "  buildsystem   Target build system. Can be one of:\n" );

reactos/tools/rbuild/rbuild.h

@@ -155,6 +155,18 @@ enum DependenciesType
 	FullDependencies
 };
 
+enum CompilerSet
+{
+	GnuGcc,
+	MicrosoftC
+};
+
+enum LinkerSet
+{
+	GnuLd,
+	MicrosoftLink
+};
+
 class Configuration
 {
 public:
@@ -174,6 +186,8 @@ public:
 	bool MakeHandlesInstallDirectories;
 	bool GenerateProxyMakefilesInSourceTree;
 	bool InstallFiles;
+	CompilerSet Compiler;
+	LinkerSet Linker;
 };
 
 class Environment

reactos/tools/rbuild/rbuild.mak

@@ -199,6 +199,7 @@ RBUILD_TEST_TARGET = \
 RBUILD_BACKEND_MINGW_BASE_SOURCES = $(addprefix $(RBUILD_MINGW_BASE_), \
 	mingw.cpp \
 	modulehandler.cpp \
+	mstools_detection.cpp \
 	proxymakefile.cpp \
 	rule.cpp \
 	)
@@ -349,6 +350,10 @@ RBUILD_HOST_CXXFLAGS = -I$(RBUILD_BASE) -I$(TOOLS_BASE) -I$(INFLIB_BASE) $(TOOLS
 
 RBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS)
 
+ifeq ($(HOST),mingw32-windows)
+RBUILD_HOST_LFLAGS += -loleaut32 -lole32 -luuid
+endif
+
 .PHONY: rbuild
 rbuild: $(RBUILD_TARGET)
 host_gpp += -g
@@ -477,6 +482,10 @@ $(RBUILD_MINGW_INT_)modulehandler.o: $(RBUILD_MINGW_BASE_)modulehandler.cpp $(RB
 	$(ECHO_HOSTCC)
 	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
 
+$(RBUILD_MINGW_INT_)mstools_detection.o: $(RBUILD_MINGW_BASE_)mstools_detection.cpp $(RBUILD_HEADERS) | $(RBUILD_MINGW_INT)
+	$(ECHO_HOSTCC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
 $(RBUILD_MINGW_INT_)proxymakefile.o: $(RBUILD_MINGW_BASE_)proxymakefile.cpp $(RBUILD_HEADERS) | $(RBUILD_MINGW_INT)
 	$(ECHO_HOSTCC)
 	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@