[npwoods] 18268: Rbuild: Enhanced MSVC support

Rbuild: Enhanced MSVC support

1.  Enhanced the MSVC backends so that it pulls in information from the
main project
2.  Fixed bugs in Path::RelativeFromDirectory() in tools\rbuild\XML.cpp

With these changes, many VC projects generated by rbuild now compile
without any tweaking
Modified: trunk/reactos/tools/rbuild/XML.cpp
Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
  _____  

Modified: trunk/reactos/tools/rbuild/XML.cpp
--- trunk/reactos/tools/rbuild/XML.cpp	2005-10-04 15:32:04 UTC (rev
18267)
+++ trunk/reactos/tools/rbuild/XML.cpp	2005-10-05 00:27:25 UTC (rev
18268)
@@ -186,20 +186,28 @@

 #ifdef WIN32
 	// this squirreliness is b/c win32 has drive letters and *nix
doesn't...
 	// not possible to do relative across different drive letters
-	if ( vbase[0] != vpath[0] )
-		return path;
+	{
+		char path_driveletter = (path[1] == ':') ?
toupper(path[0]) : 0;
+		char base_driveletter = (base_directory[1] == ':') ?
toupper(base_directory[0]) : 0;
+		if ( path_driveletter != base_driveletter )
+			return path;
+	}
 #endif
 	size_t i = 0;
 	while ( i < vbase.size() && i < vpath.size() && vbase[i] ==
vpath[i] )
 		++i;
+
+	// did we go through all of the path?
 	if ( vbase.size() == vpath.size() && i == vpath.size() )
 		return ".";
+
 	if ( i < vbase.size() )
 	{
 		// path goes above our base directory, we will need some
..'s
-		for ( size_t j = 0; j < i; j++ )
+		for ( size_t j = i; j < vbase.size(); j++ )
 			vout.push_back ( ".." );
 	}
+
 	while ( i < vpath.size() )
 		vout.push_back ( vpath[i++] );
 
  _____  

Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
--- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
2005-10-04 15:32:04 UTC (rev 18267)
+++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp
2005-10-05 00:27:25 UTC (rev 18268)
@@ -77,12 +77,10 @@

 	string dsp_path = module.GetBasePath();
 	vector<string> c_srcs, source_files, resource_files, includes,
libraries, defines;
 	vector<const IfableData*> ifs_list;
+	ifs_list.push_back ( &module.project.non_if_data );
 	ifs_list.push_back ( &module.non_if_data );
 
-	defines.push_back ( "WIN32" );
-	defines.push_back ( "_WINDOWS" );
-	defines.push_back ( "WIN32" );
-	defines.push_back ( "_MBCS" );
+	// this is a define in MinGW w32api, but not Microsoft's headers
 	defines.push_back ( "STDCALL=__stdcall" );
 
 	while ( ifs_list.size() )
@@ -107,6 +105,10 @@
 		const vector<Include*>& incs = data.includes;
 		for ( i = 0; i < incs.size(); i++ )
 		{
+			// explicitly omit win32api directories
+			if ( !strncmp(incs[i]->directory.c_str(),
"w32api", 6 ) )
+				continue;
+
 			string path = Path::RelativeFromDirectory (
 				incs[i]->directory,
 				module.GetBasePath() );
@@ -361,13 +363,7 @@
 		fprintf ( OUT, " /c" );
 		fprintf ( OUT, "\r\n" );
 
-		vector<string> defines2;
-		defines2.push_back ( "WINVER=0x0501" );
-		defines2.push_back ( "_WIN32_WINNT=0x0501" );
-		defines2.push_back ( "_WIN32_IE=0x0600" );
-		defines2.push_back ( "WIN32" );
-		defines2.push_back ( "_WINDOWS" );
-		defines2.push_back ( "_MBCS" );
+		vector<string> defines2 = defines;
 		if ( debug )
 		{
 			defines2.push_back ( "_DEBUG" );
@@ -433,7 +429,7 @@
 			for ( i = 0; i < includes.size(); i++ )
 			{
 				const string& include = includes[i];
-				if ( strpbrk ( include.c_str(), "[\\\"]"
) )
+				if ( strpbrk ( include.c_str(), "[\\\"]"
) || !strncmp ( include.c_str(), "../", 3 ) )
 				{
 					fprintf ( OUT, " /I \"%s\"",
include.c_str() );
 				}
@@ -478,7 +474,7 @@
 			}
 			fprintf ( OUT, "# ADD BASE RSC /l 0x41d /d
\"_DEBUG\"\r\n" );
 			fprintf ( OUT, "# ADD RSC /l 0x41d" );
-			if ( wine )
+			/*if ( wine )*/
 			{
 				for ( i = 0; i < includes.size(); i++ )
 				{
@@ -755,7 +751,7 @@
 	fprintf ( OUT, "# Begin Group \"Resource Files\"\r\n" );
 	fprintf ( OUT, "\r\n" );
 	fprintf ( OUT, "# PROP Default_Filter
\"ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe\"\r\n" );
-	for ( i = 0; i < resource_files.size(); i++ )
+/*	for ( i = 0; i < resource_files.size(); i++ )
 	{
 		const string& resource_file = resource_files[i];
 		fprintf ( OUT, "# Begin Source File\r\n" );
@@ -763,7 +759,7 @@
 		fprintf ( OUT, "SOURCE=.\\%s\r\n", resource_file.c_str()
);
 		fprintf ( OUT, "# End Source File\r\n" );
 	}
-	fprintf ( OUT, "# End Group\r\n" );
+*/	fprintf ( OUT, "# End Group\r\n" );
 
 	fprintf ( OUT, "# End Target\r\n" );
 	fprintf ( OUT, "# End Project\r\n" );
  _____  

Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
--- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
2005-10-04 15:32:04 UTC (rev 18267)
+++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
2005-10-05 00:27:25 UTC (rev 18268)
@@ -1,408 +1,425 @@

-/*
- * Copyright (C) 2002 Patrik Stridvall
- * Copyright (C) 2005 Royce Mitchell III
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifdef _MSC_VER
-#pragma warning ( disable : 4786 )
-#endif//_MSC_VER
-
-#include <string>
-#include <vector>
-
-#include <stdio.h>
-
-#include "msvc.h"
-
-using std::string;
-using std::vector;
-
-void
-MSVCBackend::_generate_vcproj ( const Module& module )
-{
-	size_t i;
-	// TODO FIXME wine hack?
-	//const bool wine = false;
-
-	string vcproj_file = VcprojFileName(module);
-	printf ( "Creating MSVC.NET project: '%s'\n",
vcproj_file.c_str() );
-	FILE* OUT = fopen ( vcproj_file.c_str(), "wb" );
-
-	vector<string> imports;
-	for ( i = 0; i < module.non_if_data.libraries.size(); i++ )
-	{
-		imports.push_back (
module.non_if_data.libraries[i]->name );
-	}
-
-	string module_type = GetExtension(module.GetTargetName());
-	bool lib = (module_type == ".lib") || (module_type == ".a");
-	bool dll = (module_type == ".dll");
-	bool exe = (module_type == ".exe");
-	// TODO FIXME - need more checks here for 'sys' and possibly
'drv'?
-
-	bool console = exe && (module.type == Win32CUI);
-
-	// TODO FIXME - not sure if the count here is right...
-	int parts = 0;
-	const char* p = strpbrk ( vcproj_file.c_str(), "/\\" );
-	while ( p )
-	{
-		++parts;
-		p = strpbrk ( p+1, "/\\" );
-	}
-	string msvc_wine_dir = "..";
-	while ( --parts )
-		msvc_wine_dir += "\\..";
-
-	string wine_include_dir = msvc_wine_dir + "\\include";
-
-	//$progress_current++;
-	//$output->progress("$dsp_file (file $progress_current of
$progress_max)");
-
-	// TODO FIXME - what's diff. betw. 'c_srcs' and 'source_files'?
-	string vcproj_path = module.GetBasePath();
-	vector<string> c_srcs, source_files, resource_files, includes,
libraries, defines;
-	vector<const IfableData*> ifs_list;
-	ifs_list.push_back ( &module.non_if_data );
-
-	defines.push_back ( "WIN32" );
-	defines.push_back ( "_WINDOWS" );
-	defines.push_back ( "WIN32" );
-	defines.push_back ( "_MBCS" );
-	defines.push_back ( "STDCALL=__stdcall" );
-
-	while ( ifs_list.size() )
-	{
-		const IfableData& data = *ifs_list.back();
-		ifs_list.pop_back();
-		// TODO FIXME - refactor needed - we're discarding if
conditions
-		for ( i = 0; i < data.ifs.size(); i++ )
-			ifs_list.push_back ( &data.ifs[i]->data );
-		const vector<File*>& files = data.files;
-		for ( i = 0; i < files.size(); i++ )
-		{
-			// TODO FIXME - do we want the full path of the
file here?
-			string file = string(".") +
&files[i]->name[vcproj_path.size()];
-
-			source_files.push_back ( file );
-			if ( !stricmp ( Right(file,2).c_str(), ".c" ) )
-				c_srcs.push_back ( file );
-			if ( !stricmp ( Right(file,3).c_str(), ".rc" ) )
-				resource_files.push_back ( file );
-		}
-		const vector<Include*>& incs = data.includes;
-		for ( i = 0; i < incs.size(); i++ )
-		{
-			string path = Path::RelativeFromDirectory (
-				incs[i]->directory,
-				module.GetBasePath() );
-			includes.push_back ( path );
-		}
-		const vector<Library*>& libs = data.libraries;
-		for ( i = 0; i < libs.size(); i++ )
-		{
-			libraries.push_back ( libs[i]->name + ".lib" );
-		}
-		const vector<Define*>& defs = data.defines;
-		for ( i = 0; i < defs.size(); i++ )
-		{
-			if ( defs[i]->value[0] )
-				defines.push_back ( defs[i]->name + "="
+ defs[i]->value );
-			else
-				defines.push_back ( defs[i]->name );
-		}
-	}
-
-	vector<string> header_files;
-
-	bool no_cpp = true;
-	bool no_msvc_headers = true;
-
-	std::vector<std::string> cfgs;
-
-	cfgs.push_back ( module.name + " - Win32" );
-
-	if (!no_cpp)
-	{
-		std::vector<std::string> _cfgs;
-		for ( i = 0; i < cfgs.size(); i++ )
-		{
-			_cfgs.push_back ( cfgs[i] + " C" );
-			_cfgs.push_back ( cfgs[i] + " C++" );
-		}
-		cfgs.resize(0);
-		cfgs = _cfgs;
-	}
-
-	if (!no_msvc_headers)
-	{
-		std::vector<std::string> _cfgs;
-		for ( i = 0; i < cfgs.size(); i++ )
-		{
-			_cfgs.push_back ( cfgs[i] + " MSVC Headers" );
-			_cfgs.push_back ( cfgs[i] + " Wine Headers" );
-		}
-		cfgs.resize(0);
-		cfgs = _cfgs;
-	}
-
-	string default_cfg = cfgs.back();
-
-	fprintf ( OUT, "<?xml version=\"1.0\" encoding =
\"Windows-1252\"?>\r\n" );
-	fprintf ( OUT, "<VisualStudioProject\r\n" );
-	fprintf ( OUT, "\tProjectType=\"Visual C++\"\r\n" );
-	fprintf ( OUT, "\tVersion=\"7.00\"\r\n" );
-	fprintf ( OUT, "\tName=\"%s\"\r\n", module.name.c_str() );
-	fprintf ( OUT, "\tKeyword=\"Win32Proj\">\r\n" );
-
-	fprintf ( OUT, "\t<Platforms>\r\n" );
-	fprintf ( OUT, "\t\t<Platform\r\n" );
-	fprintf ( OUT, "\t\t\tName=\"Win32\"/>\r\n" );
-	fprintf ( OUT, "\t</Platforms>\r\n" );
-
-	int n = 0;
-
-	std::string output_dir;
-
-	fprintf ( OUT, "\t<Configurations>\r\n" );
-	for ( size_t icfg = 0; icfg < cfgs.size(); icfg++ )
-	{
-		std::string& cfg = cfgs[icfg];
-
-		bool debug = !strstr ( cfg.c_str(), "Release" );
-		//bool msvc_headers = ( 0 != strstr ( cfg.c_str(), "MSVC
Headers" ) );
-
-		fprintf ( OUT, "\t\t<Configuration\r\n" );
-		fprintf ( OUT, "\t\t\tName=\"%s|Win32\"\r\n",
cfg.c_str() );
-		fprintf ( OUT, "\t\t\tOutputDirectory=\"%s\"\r\n",
cfg.c_str() );
-		fprintf ( OUT, "\t\t\tIntermediateDirectory=\"%s\"\r\n",
cfg.c_str() );
-		fprintf ( OUT, "\t\t\tConfigurationType=\"%d\"\r\n", exe
? 1 : dll ? 2 : lib ? 4 : -1 );
-		fprintf ( OUT, "\t\t\tCharacterSet=\"2\">\r\n" );
-
-		fprintf ( OUT, "\t\t\t<Tool\r\n" );
-		fprintf ( OUT, "\t\t\t\tName=\"VCCLCompilerTool\"\r\n"
);
-		fprintf ( OUT, "\t\t\t\tOptimization=\"%d\"\r\n", debug
? 0 : 2 );
-
-		fprintf ( OUT, "\t\t\t\tAdditionalIncludeDirectories=\""
);
-		bool multiple_includes = false;
-		for ( i = 0; i < includes.size(); i++ )
-		{
-			const string& include = includes[i];
-			if ( strcmp ( include.c_str(), "." ) )
-			{
-				if ( multiple_includes )
-					fprintf ( OUT, ";" );
-				fprintf ( OUT, "%s", include.c_str() );
-				multiple_includes = true;
-			}
-		}
-		fprintf ( OUT, "\"\r\n " );
-
-		if ( debug )
-		{
-			defines.push_back ( "_DEBUG" );
-			if ( lib || exe )
-			{
-				defines.push_back ( "_LIB" );
-			}
-			else
-			{
-				defines.push_back ( "_WINDOWS" );
-				defines.push_back ( "_USRDLL" );
-			}
-		}
-		else
-		{
-			defines.push_back ( "NDEBUG" );
-			if ( lib || exe )
-			{
-				defines.push_back ( "_LIB" );
-			}
-			else
-			{
-				defines.push_back ( "_WINDOWS" );
-				defines.push_back ( "_USRDLL" );
-			}
-		}
-
-		fprintf ( OUT, "\t\t\t\tPreprocessorDefinitions=\"" );
-		for ( i = 0; i < defines.size(); i++ )
-		{
-			if ( i > 0 )
-				fprintf ( OUT, ";" );
-			fprintf ( OUT, "%s", defines[i].c_str() );
-		}
-		fprintf ( OUT, "\"\r\n" );
-
-		fprintf ( OUT, "\t\t\t\tMinimalRebuild=\"TRUE\"\r\n" );
-		fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"3\"\r\n" );
-		fprintf ( OUT, "\t\t\t\tRuntimeLibrary=\"5\"\r\n" );
-		fprintf ( OUT, "\t\t\t\tBufferSecurityCheck=\"%s\"\r\n",
debug ? "TRUE" : "FALSE" );
-		fprintf ( OUT,
"\t\t\t\tEnableFunctionLevelLinking=\"%s\"\r\n", debug ?
"TRUE" :
"FALSE" );
-		fprintf ( OUT, "\t\t\t\tUsePrecompiledHeader=\"0\"\r\n"
);
-		fprintf ( OUT, "\t\t\t\tWarningLevel=\"1\"\r\n" );
-		fprintf ( OUT,
"\t\t\t\tDetect64BitPortabilityProblems=\"TRUE\"\r\n" );
-		fprintf ( OUT,
"\t\t\t\tDebugInformationFormat=\"4\"/>\r\n" );
-
-		fprintf ( OUT, "\t\t\t<Tool\r\n" );
-		fprintf ( OUT,
"\t\t\t\tName=\"VCCustomBuildTool\"/>\r\n" );
-
-		if ( lib )
-		{
-			fprintf ( OUT, "\t\t\t<Tool\r\n" );
-			fprintf ( OUT,
"\t\t\t\tName=\"VCLibrarianTool\"\r\n" );
-			fprintf ( OUT,
"\t\t\t\tOutputFile=\"$(OutDir)/%s.%s\"/>\r\n",
module.name.c_str(),
module_type.c_str() );
-		}
-		else
-		{
-			fprintf ( OUT, "\t\t\t<Tool\r\n" );
-			fprintf ( OUT,
"\t\t\t\tName=\"VCLinkerTool\"\r\n" );
-
-			fprintf ( OUT,
"\t\t\t\tAdditionalDependencies=\"" );
-			for ( i = 0; i < libraries.size(); i++ )
-			{
-				if ( i > 0 )
-					fprintf ( OUT, " " );
-				fprintf ( OUT, "%s",
libraries[i].c_str() );
-			}
-			fprintf ( OUT, "\"\r\n" );
-
-			fprintf ( OUT,
"\t\t\t\tOutputFile=\"$(OutDir)/%s.%s\"\r\n", module.name.c_str(),
module_type.c_str() );
-			fprintf ( OUT,
"\t\t\t\tLinkIncremental=\"%d\"\r\n", debug ? 2 : 1 );
-			fprintf ( OUT,
"\t\t\t\tGenerateDebugInformation=\"TRUE\"\r\n" );
-
-			if ( debug )
-				fprintf ( OUT,
"\t\t\t\tProgramDatabaseFile=\"$(OutDir)/%s.pdb\"\r\n",
module.name.c_str() );
-
-			fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n",
console ? 1 : 2 );
-			fprintf ( OUT,
"\t\t\t\tTargetMachine=\"%d\"/>\r\n", 1 );
-		}
-
-		fprintf ( OUT, "\t\t\t<Tool\r\n" );
-		fprintf ( OUT, "\t\t\t\tName=\"VCMIDLTool\"/>\r\n" );
-		fprintf ( OUT, "\t\t\t<Tool\r\n" );
-		fprintf ( OUT,
"\t\t\t\tName=\"VCPostBuildEventTool\"/>\r\n" );
-		fprintf ( OUT, "\t\t\t<Tool\r\n" );
-		fprintf ( OUT,
"\t\t\t\tName=\"VCPreBuildEventTool\"/>\r\n" );
-		fprintf ( OUT, "\t\t\t<Tool\r\n" );
-		fprintf ( OUT,
"\t\t\t\tName=\"VCPreLinkEventTool\"/>\r\n" );
-		fprintf ( OUT, "\t\t\t<Tool\r\n" );
-		fprintf ( OUT,
"\t\t\t\tName=\"VCResourceCompilerTool\"/>\r\n" );
-		fprintf ( OUT, "\t\t\t<Tool\r\n" );
-		fprintf ( OUT,
"\t\t\t\tName=\"VCWebServiceProxyGeneratorTool\"/>\r\n" );
-		fprintf ( OUT, "\t\t\t<Tool\r\n" );
-		fprintf ( OUT,
"\t\t\t\tName=\"VCWebDeploymentTool\"/>\r\n" );
-		fprintf ( OUT, "\t\t</Configuration>\r\n" );
-
-		n++;
-	}
-	fprintf ( OUT, "\t</Configurations>\r\n" );
-
-	fprintf ( OUT, "\t<Files>\r\n" );
-
-	// Source files
-	fprintf ( OUT, "\t\t<Filter\r\n" );
-	fprintf ( OUT, "\t\t\tName=\"Source Files\"\r\n" );
-	fprintf ( OUT,
"\t\t\tFilter=\"cpp;c;cxx;rc;def;r;odl;idl;hpj;bat\">\r\n" );
-	for ( size_t isrcfile = 0; isrcfile < source_files.size();
isrcfile++ )
-	{
-		const string& source_file =
DosSeparator(source_files[isrcfile]);
-		fprintf ( OUT, "\t\t\t<File\r\n" );
-		fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n",
source_file.c_str() );
-		fprintf ( OUT, "\t\t\t</File>\r\n" );
-	}
-	fprintf ( OUT, "\t\t</Filter>\r\n" );
-
-	// Header files
-	fprintf ( OUT, "\t\t<Filter\r\n" );
-	fprintf ( OUT, "\t\t\tName=\"Header Files\"\r\n" );
-	fprintf ( OUT, "\t\t\tFilter=\"h;hpp;hxx;hm;inl\">\r\n" );
-	for ( i = 0; i < header_files.size(); i++ )
-	{
-		const string& header_file = header_files[i];
-		fprintf ( OUT, "\t\t\t<File\r\n" );
-		fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n",
header_file.c_str() );
-		fprintf ( OUT, "\t\t\t</File>\r\n" );
-	}
-	fprintf ( OUT, "\t\t</Filter>\r\n" );
-
-	// Resource files
-	fprintf ( OUT, "\t\t<Filter\r\n" );
-	fprintf ( OUT, "\t\t\tName=\"Resource Files\"\r\n" );
-	fprintf ( OUT,
"\t\t\tFilter=\"ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe\">\r\n"
);
-	for ( i = 0; i < header_files.size(); i++ )
-	{
-		const string& resource_file = resource_files[i];
-		fprintf ( OUT, "\t\t\t<File\r\n" );
-		fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n",
resource_file.c_str() );
-		fprintf ( OUT, "\t\t\t</File>\r\n" );
-	}
-	fprintf ( OUT, "\t\t</Filter>\r\n" );
-
-	fprintf ( OUT, "\t</Files>\r\n" );
-	fprintf ( OUT, "\t<Globals>\r\n" );
-	fprintf ( OUT, "\t</Globals>\r\n" );
-	fprintf ( OUT, "</VisualStudioProject>\r\n" );
-	fclose(OUT);
-}
-
-void
-MSVCBackend::_generate_sln_header ( FILE* OUT )
-{
-    fprintf ( OUT, "Microsoft Visual Studio Solution File, Format
Version 9.00\r\n" );
-    fprintf ( OUT, "# Visual C++ Express 2005\r\n" );
-    fprintf ( OUT, "\r\n" );
-}
-
-void
-MSVCBackend::_generate_sln ( FILE* OUT )
-{
-	_generate_sln_header(OUT);
-	// TODO FIXME - is it necessary to sort them?
-	for ( size_t i = 0; i < ProjectNode.modules.size(); i++ )
-	{
-		Module& module = *ProjectNode.modules[i];
-
-		std::string vcproj_file = VcprojFileName ( module );
-		_generate_dsw_project ( OUT, module, vcproj_file,
module.dependencies );
-    }
-//    _generate_dsw_footer ( OUT );
-}
-
-
-
-/*
-	m_devFile << "Microsoft Visual Studio Solution File, Format
Version 9.00" << endl;
-	m_devFile << "# Visual C++ Express 2005" << endl;
-
-	m_devFile << "# FIXME Project listings here" << endl;
-	m_devFile << "EndProject" << endl;
-	m_devFile << "Global" << endl;
-	m_devFile << "	GlobalSection(SolutionConfigurationPlatforms) =
preSolution" << endl;
-	m_devFile << "		Debug|Win32 = Debug|Win32" << endl;
-	m_devFile << "		Release|Win32 = Release|Win32" << endl;
-	m_devFile << "	EndGlobalSection" << endl;
-	m_devFile << "	GlobalSection(ProjectConfigurationPlatforms) =
postSolution" << endl;
-	m_devFile << "	#FIXME Project Listings Here" << endl;
-	m_devFile << "	EndGlobalSection" << endl;
-	m_devFile << "	GlobalSection(SolutionProperties) = preSolution"
<< endl;
-	m_devFile << "		HideSolutionNode = FALSE" << endl;
-	m_devFile << "	EndGlobalSection" << endl;
-	m_devFile << "EndGlobal" << endl;
-
-	m_devFile << endl << endl;
-*/
+/*
+ * Copyright (C) 2002 Patrik Stridvall
+ * Copyright (C) 2005 Royce Mitchell III
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifdef _MSC_VER
+#pragma warning ( disable : 4786 )
+#endif//_MSC_VER
+
+#include <string>
+#include <vector>
+
+#include <stdio.h>
+
+#include "msvc.h"
+
+using std::string;
+using std::vector;
+
+void
+MSVCBackend::_generate_vcproj ( const Module& module )
+{
+	size_t i;
+	// TODO FIXME wine hack?
+	//const bool wine = false;
+
+	string vcproj_file = VcprojFileName(module);
+	printf ( "Creating MSVC.NET project: '%s'\n",
vcproj_file.c_str() );
+	FILE* OUT = fopen ( vcproj_file.c_str(), "wb" );
+
+	vector<string> imports;
+	for ( i = 0; i < module.non_if_data.libraries.size(); i++ )
+	{
+		imports.push_back (
module.non_if_data.libraries[i]->name );
+	}
+
+	string module_type = GetExtension(module.GetTargetName());
+	bool lib = (module_type == ".lib") || (module_type == ".a");
+	bool dll = (module_type == ".dll");
+	bool exe = (module_type == ".exe");
+	// TODO FIXME - need more checks here for 'sys' and possibly
'drv'?
+
+	bool console = exe && (module.type == Win32CUI);
+
+	// TODO FIXME - not sure if the count here is right...
+	int parts = 0;
+	const char* p = strpbrk ( vcproj_file.c_str(), "/\\" );
+	while ( p )
+	{
+		++parts;
+		p = strpbrk ( p+1, "/\\" );
+	}
+	string msvc_wine_dir = "..";
+	while ( --parts )
+		msvc_wine_dir += "\\..";
+
+	string wine_include_dir = msvc_wine_dir + "\\include";
+
+	//$progress_current++;
+	//$output->progress("$dsp_file (file $progress_current of
$progress_max)");
+
+	// TODO FIXME - what's diff. betw. 'c_srcs' and 'source_files'?
+	string vcproj_path = module.GetBasePath();
+	vector<string> c_srcs, source_files, resource_files, includes,
libraries, defines;
+	vector<const IfableData*> ifs_list;
+	ifs_list.push_back ( &module.project.non_if_data );
+	ifs_list.push_back ( &module.non_if_data );
+
+	// this is a define in MinGW w32api, but not Microsoft's headers
+	defines.push_back ( "STDCALL=__stdcall" );
+
+	while ( ifs_list.size() )
+	{
+		const IfableData& data = *ifs_list.back();
+		ifs_list.pop_back();
+		// TODO FIXME - refactor needed - we're discarding if
conditions
+		for ( i = 0; i < data.ifs.size(); i++ )
+			ifs_list.push_back ( &data.ifs[i]->data );
+		const vector<File*>& files = data.files;
+		for ( i = 0; i < files.size(); i++ )
+		{
+			// TODO FIXME - do we want the full path of the
file here?
+			string file = string(".") +
&files[i]->name[vcproj_path.size()];
+
+			source_files.push_back ( file );
+			if ( !stricmp ( Right(file,2).c_str(), ".c" ) )
+				c_srcs.push_back ( file );
+			if ( !stricmp ( Right(file,3).c_str(), ".rc" ) )
+				resource_files.push_back ( file );
+		}
+		const vector<Include*>& incs = data.includes;
+		for ( i = 0; i < incs.size(); i++ )
+		{
+			// explicitly omit win32api directories
+			if ( !strncmp(incs[i]->directory.c_str(),
"w32api", 6 ) )
+				continue;
+
+			string path = Path::RelativeFromDirectory (
+				incs[i]->directory,
+				module.GetBasePath() );
+			includes.push_back ( path );
+		}
+		const vector<Library*>& libs = data.libraries;
+		for ( i = 0; i < libs.size(); i++ )
+		{
+			libraries.push_back ( libs[i]->name + ".lib" );
+		}
+		const vector<Define*>& defs = data.defines;
+		for ( i = 0; i < defs.size(); i++ )
+		{
+			if ( defs[i]->value[0] )
+				defines.push_back ( defs[i]->name + "="
+ defs[i]->value );
+			else
+				defines.push_back ( defs[i]->name );
+		}
+	}
+
+	vector<string> header_files;
+
+	bool no_cpp = true;
+	bool no_msvc_headers = true;
+
+	std::vector<std::string> cfgs;
+
+	cfgs.push_back ( module.name + " - Win32" );
+
+	if (!no_cpp)
+	{
+		std::vector<std::string> _cfgs;
+		for ( i = 0; i < cfgs.size(); i++ )
+		{
+			_cfgs.push_back ( cfgs[i] + " C" );
+			_cfgs.push_back ( cfgs[i] + " C++" );
+		}
+		cfgs.resize(0);
+		cfgs = _cfgs;
+	}
+
+	if (!no_msvc_headers)
+	{
+		std::vector<std::string> _cfgs;
+		for ( i = 0; i < cfgs.size(); i++ )
+		{
+			_cfgs.push_back ( cfgs[i] + " MSVC Headers" );
+			_cfgs.push_back ( cfgs[i] + " Wine Headers" );
+		}
+		cfgs.resize(0);
+		cfgs = _cfgs;
+	}
+
+	string default_cfg = cfgs.back();
+
+	fprintf ( OUT, "<?xml version=\"1.0\" encoding =
\"Windows-1252\"?>\r\n" );
+	fprintf ( OUT, "<VisualStudioProject\r\n" );
+	fprintf ( OUT, "\tProjectType=\"Visual C++\"\r\n" );
+	fprintf ( OUT, "\tVersion=\"7.00\"\r\n" );
+	fprintf ( OUT, "\tName=\"%s\"\r\n", module.name.c_str() );
+	fprintf ( OUT, "\tKeyword=\"Win32Proj\">\r\n" );
+
+	fprintf ( OUT, "\t<Platforms>\r\n" );
+	fprintf ( OUT, "\t\t<Platform\r\n" );
+	fprintf ( OUT, "\t\t\tName=\"Win32\"/>\r\n" );
+	fprintf ( OUT, "\t</Platforms>\r\n" );
+
+	int n = 0;
+
+	std::string output_dir;
+
+	fprintf ( OUT, "\t<Configurations>\r\n" );
+	for ( size_t icfg = 0; icfg < cfgs.size(); icfg++ )
+	{
+		std::string& cfg = cfgs[icfg];
+
+		bool debug = !strstr ( cfg.c_str(), "Release" );
+		//bool msvc_headers = ( 0 != strstr ( cfg.c_str(), "MSVC
Headers" ) );
+
+		fprintf ( OUT, "\t\t<Configuration\r\n" );
+		fprintf ( OUT, "\t\t\tName=\"%s|Win32\"\r\n",
cfg.c_str() );
+		fprintf ( OUT, "\t\t\tOutputDirectory=\"%s\"\r\n",
cfg.c_str() );
+		fprintf ( OUT, "\t\t\tIntermediateDirectory=\"%s\"\r\n",
cfg.c_str() );
+		fprintf ( OUT, "\t\t\tConfigurationType=\"%d\"\r\n", exe
? 1 : dll ? 2 : lib ? 4 : -1 );
+		fprintf ( OUT, "\t\t\tCharacterSet=\"2\">\r\n" );
+
+		fprintf ( OUT, "\t\t\t<Tool\r\n" );
+		fprintf ( OUT, "\t\t\t\tName=\"VCCLCompilerTool\"\r\n"
);
+		fprintf ( OUT, "\t\t\t\tOptimization=\"%d\"\r\n", debug
? 0 : 2 );
+
+		fprintf ( OUT, "\t\t\t\tAdditionalIncludeDirectories=\""
);
+		bool multiple_includes = false;
+		for ( i = 0; i < includes.size(); i++ )
+		{
+			const string& include = includes[i];
+			if ( strcmp ( include.c_str(), "." ) )
+			{
+				if ( multiple_includes )
+					fprintf ( OUT, ";" );
+				fprintf ( OUT, "%s", include.c_str() );
+				multiple_includes = true;
+			}
+		}
+		fprintf ( OUT, "\"\r\n " );
+
+		if ( debug )
+		{
+			defines.push_back ( "_DEBUG" );
+			if ( lib || exe )
+			{
+				defines.push_back ( "_LIB" );
+			}
+			else
+			{
+				defines.push_back ( "_WINDOWS" );
+				defines.push_back ( "_USRDLL" );
+			}
+		}
+		else
+		{
+			defines.push_back ( "NDEBUG" );
+			if ( lib || exe )
+			{
+				defines.push_back ( "_LIB" );
+			}
+			else
+			{
+				defines.push_back ( "_WINDOWS" );
+				defines.push_back ( "_USRDLL" );
+			}
+		}
+
+		fprintf ( OUT, "\t\t\t\tPreprocessorDefinitions=\"" );
+		for ( i = 0; i < defines.size(); i++ )
+		{
+			if ( i > 0 )
+				fprintf ( OUT, ";" );
+			fprintf ( OUT, "%s", defines[i].c_str() );
+		}
+		fprintf ( OUT, "\"\r\n" );
+
+		fprintf ( OUT, "\t\t\t\tMinimalRebuild=\"TRUE\"\r\n" );
+		fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"3\"\r\n" );
+		fprintf ( OUT, "\t\t\t\tRuntimeLibrary=\"5\"\r\n" );
+		fprintf ( OUT, "\t\t\t\tBufferSecurityCheck=\"%s\"\r\n",
debug ? "TRUE" : "FALSE" );
+		fprintf ( OUT,
"\t\t\t\tEnableFunctionLevelLinking=\"%s\"\r\n", debug ?
"TRUE" :
"FALSE" );
+		fprintf ( OUT, "\t\t\t\tUsePrecompiledHeader=\"0\"\r\n"
);
+		fprintf ( OUT, "\t\t\t\tWarningLevel=\"1\"\r\n" );
+		fprintf ( OUT,
"\t\t\t\tDetect64BitPortabilityProblems=\"TRUE\"\r\n" );
+		fprintf ( OUT,
"\t\t\t\tDebugInformationFormat=\"4\"/>\r\n" );
+
+		fprintf ( OUT, "\t\t\t<Tool\r\n" );
+		fprintf ( OUT,
"\t\t\t\tName=\"VCCustomBuildTool\"/>\r\n" );
+
+		if ( lib )
+		{
+			fprintf ( OUT, "\t\t\t<Tool\r\n" );
+			fprintf ( OUT,
"\t\t\t\tName=\"VCLibrarianTool\"\r\n" );
+			fprintf ( OUT,
"\t\t\t\tOutputFile=\"$(OutDir)/%s.%s\"/>\r\n",
module.name.c_str(),
module_type.c_str() );
+		}
+		else
+		{
+			fprintf ( OUT, "\t\t\t<Tool\r\n" );
+			fprintf ( OUT,
"\t\t\t\tName=\"VCLinkerTool\"\r\n" );
+
+			fprintf ( OUT,
"\t\t\t\tAdditionalDependencies=\"" );
+			for ( i = 0; i < libraries.size(); i++ )
+			{
+				if ( i > 0 )
+					fprintf ( OUT, " " );
+				fprintf ( OUT, "%s",
libraries[i].c_str() );
+			}
+			fprintf ( OUT, "\"\r\n" );
+
+			fprintf ( OUT,
"\t\t\t\tOutputFile=\"$(OutDir)/%s.%s\"\r\n", module.name.c_str(),
module_type.c_str() );
+			fprintf ( OUT,
"\t\t\t\tLinkIncremental=\"%d\"\r\n", debug ? 2 : 1 );
+			fprintf ( OUT,
"\t\t\t\tGenerateDebugInformation=\"TRUE\"\r\n" );
+
+			if ( debug )
+				fprintf ( OUT,
"\t\t\t\tProgramDatabaseFile=\"$(OutDir)/%s.pdb\"\r\n",
module.name.c_str() );
+
+			fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n",
console ? 1 : 2 );
+			fprintf ( OUT,
"\t\t\t\tTargetMachine=\"%d\"/>\r\n", 1 );
+		}
+		
+		fprintf ( OUT, "\t\t\t<Tool\r\n" );
+		fprintf ( OUT,
"\t\t\t\tName=\"VCResourceCompilerTool\"\r\n" );
+		fprintf ( OUT, "\t\t\t\tAdditionalIncludeDirectories=\""
);
+		multiple_includes = false;
+		for ( i = 0; i < includes.size(); i++ )
+		{
+			const string& include = includes[i];
+			if ( strcmp ( include.c_str(), "." ) )
+			{
+				if ( multiple_includes )
+					fprintf ( OUT, ";" );
+				fprintf ( OUT, "%s", include.c_str() );
+				multiple_includes = true;
+			}
+		}
+		fprintf ( OUT, "\"/>\r\n " );
+
+		fprintf ( OUT, "\t\t\t<Tool\r\n" );
+		fprintf ( OUT, "\t\t\t\tName=\"VCMIDLTool\"/>\r\n" );
+		fprintf ( OUT, "\t\t\t<Tool\r\n" );
+		fprintf ( OUT,
"\t\t\t\tName=\"VCPostBuildEventTool\"/>\r\n" );
+		fprintf ( OUT, "\t\t\t<Tool\r\n" );
+		fprintf ( OUT,
"\t\t\t\tName=\"VCPreBuildEventTool\"/>\r\n" );
+		fprintf ( OUT, "\t\t\t<Tool\r\n" );
+		fprintf ( OUT,
"\t\t\t\tName=\"VCPreLinkEventTool\"/>\r\n" );
+		fprintf ( OUT, "\t\t\t<Tool\r\n" );
+		fprintf ( OUT,
"\t\t\t\tName=\"VCWebServiceProxyGeneratorTool\"/>\r\n" );
+		fprintf ( OUT, "\t\t\t<Tool\r\n" );
+		fprintf ( OUT,
"\t\t\t\tName=\"VCWebDeploymentTool\"/>\r\n" );
+		fprintf ( OUT, "\t\t</Configuration>\r\n" );
+
+		n++;
+	}
+	fprintf ( OUT, "\t</Configurations>\r\n" );
+
+	fprintf ( OUT, "\t<Files>\r\n" );
+
+	// Source files
+	fprintf ( OUT, "\t\t<Filter\r\n" );
+	fprintf ( OUT, "\t\t\tName=\"Source Files\"\r\n" );
+	fprintf ( OUT,
"\t\t\tFilter=\"cpp;c;cxx;rc;def;r;odl;idl;hpj;bat\">\r\n" );
+	for ( size_t isrcfile = 0; isrcfile < source_files.size();
isrcfile++ )
+	{
+		const string& source_file =
DosSeparator(source_files[isrcfile]);
+		fprintf ( OUT, "\t\t\t<File\r\n" );
+		fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n",
source_file.c_str() );
+		fprintf ( OUT, "\t\t\t</File>\r\n" );
+	}
+	fprintf ( OUT, "\t\t</Filter>\r\n" );
+
+	// Header files
+	fprintf ( OUT, "\t\t<Filter\r\n" );
+	fprintf ( OUT, "\t\t\tName=\"Header Files\"\r\n" );
+	fprintf ( OUT, "\t\t\tFilter=\"h;hpp;hxx;hm;inl\">\r\n" );
+	for ( i = 0; i < header_files.size(); i++ )
+	{
+		const string& header_file = header_files[i];
+		fprintf ( OUT, "\t\t\t<File\r\n" );
+		fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n",
header_file.c_str() );
+		fprintf ( OUT, "\t\t\t</File>\r\n" );
+	}
+	fprintf ( OUT, "\t\t</Filter>\r\n" );
+
+	// Resource files
+	fprintf ( OUT, "\t\t<Filter\r\n" );
+	fprintf ( OUT, "\t\t\tName=\"Resource Files\"\r\n" );
+	fprintf ( OUT,
"\t\t\tFilter=\"ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe\">\r\n"
);
+	for ( i = 0; i < header_files.size(); i++ )
+	{
+		const string& resource_file = resource_files[i];
+		fprintf ( OUT, "\t\t\t<File\r\n" );
+		fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n",
resource_file.c_str() );
+		fprintf ( OUT, "\t\t\t</File>\r\n" );
+	}
+	fprintf ( OUT, "\t\t</Filter>\r\n" );
+
+	fprintf ( OUT, "\t</Files>\r\n" );
+	fprintf ( OUT, "\t<Globals>\r\n" );
+	fprintf ( OUT, "\t</Globals>\r\n" );
+	fprintf ( OUT, "</VisualStudioProject>\r\n" );
+	fclose(OUT);
+}
+
+void
+MSVCBackend::_generate_sln_header ( FILE* OUT )
+{
+    fprintf ( OUT, "Microsoft Visual Studio Solution File, Format
Version 9.00\r\n" );
+    fprintf ( OUT, "# Visual C++ Express 2005\r\n" );
+    fprintf ( OUT, "\r\n" );
+}
+
+void
+MSVCBackend::_generate_sln ( FILE* OUT )
+{
+	_generate_sln_header(OUT);
+	// TODO FIXME - is it necessary to sort them?
+	for ( size_t i = 0; i < ProjectNode.modules.size(); i++ )
+	{
+		Module& module = *ProjectNode.modules[i];
+
+		std::string vcproj_file = VcprojFileName ( module );
+		_generate_dsw_project ( OUT, module, vcproj_file,
module.dependencies );
+    }
+//    _generate_dsw_footer ( OUT );
+}
+
+
+
+/*
+	m_devFile << "Microsoft Visual Studio Solution File, Format
Version 9.00" << endl;
+	m_devFile << "# Visual C++ Express 2005" << endl;
+
+	m_devFile << "# FIXME Project listings here" << endl;
+	m_devFile << "EndProject" << endl;
+	m_devFile << "Global" << endl;
+	m_devFile << "	GlobalSection(SolutionConfigurationPlatforms) =
preSolution" << endl;
+	m_devFile << "		Debug|Win32 = Debug|Win32" << endl;
+	m_devFile << "		Release|Win32 = Release|Win32" << endl;
+	m_devFile << "	EndGlobalSection" << endl;
+	m_devFile << "	GlobalSection(ProjectConfigurationPlatforms) =
postSolution" << endl;
+	m_devFile << "	#FIXME Project Listings Here" << endl;
+	m_devFile << "	EndGlobalSection" << endl;
+	m_devFile << "	GlobalSection(SolutionProperties) = preSolution"
<< endl;
+	m_devFile << "		HideSolutionNode = FALSE" << endl;
+	m_devFile << "	EndGlobalSection" << endl;
+	m_devFile << "EndGlobal" << endl;
+
+	m_devFile << endl << endl;
+*/