Author: ankit
Date: 2007-05-15 16:59:14 -0400 (Tue, 15 May 2007)
New Revision: 77439
Modified:
trunk/monodevelop/Extras/MonoDevelop.Autotools/AutotoolsContext.cs
trunk/monodevelop/Extras/MonoDevelop.Autotools/ChangeLog
trunk/monodevelop/Extras/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs
trunk/monodevelop/Extras/MonoDevelop.Autotools/SolutionDeployer.cs
trunk/monodevelop/Extras/MonoDevelop.Autotools/SolutionMakefileHandler.cs
Log:
* AutotoolsContext.cs (EscapeAndUpperConfigName): New.
(EscapeStringForAutoconf): Escape ' ' also.
* SolutionMakefileHandler.cs: Use EscapeAndUpperConfigName when emitting
config name.
* SimpleProjectMakefileHandler.cs: Likewise.
* SolutionDeployer.cs: Likewise.
Modified: trunk/monodevelop/Extras/MonoDevelop.Autotools/AutotoolsContext.cs
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.Autotools/AutotoolsContext.cs
2007-05-15 20:57:14 UTC (rev 77438)
+++ trunk/monodevelop/Extras/MonoDevelop.Autotools/AutotoolsContext.cs
2007-05-15 20:59:14 UTC (rev 77439)
@@ -22,6 +22,7 @@
using System.IO;
using System.Text;
using System.Collections;
+using System.Collections.Generic;
using MonoDevelop.Projects;
using MonoDevelop.Deployment;
@@ -41,6 +42,7 @@
Set globalFilesReferences = new Set();
Set compilers = new Set ();
ArrayList builtFiles = new ArrayList ();
+ Dictionary<string, string> configNamesDict = new
Dictionary<string, string> (StringComparer.InvariantCultureIgnoreCase);
public DeployContext DeployContext {
get { return deployContext; }
@@ -66,7 +68,15 @@
return configurations;
}
}
-
+
+ public string EscapeAndUpperConfigName (string configName)
+ {
+ if (!configNamesDict.ContainsKey (configName))
+ configNamesDict [configName] =
EscapeStringForAutoconf (configName).ToUpper ();
+
+ return configNamesDict [configName];
+ }
+
public AutotoolsContext ( DeployContext deployContext, string
base_directory, string[] configs )
{
this.deployContext = deployContext;
@@ -233,7 +243,7 @@
foreach (char c in str)
{
if ( char.IsLetterOrDigit (c) || (c == '.' &&
allowPeriods) ) sb.Append ( c );
- else if (c == '-' || c == '_' || (c == '.' &&
!allowPeriods) ) sb.Append ( '_' );
+ else if (c == '-' || c == '_' || c == ' ' || (c
== '.' && !allowPeriods) ) sb.Append ( '_' );
}
return sb.ToString ();
}
Modified: trunk/monodevelop/Extras/MonoDevelop.Autotools/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.Autotools/ChangeLog 2007-05-15
20:57:14 UTC (rev 77438)
+++ trunk/monodevelop/Extras/MonoDevelop.Autotools/ChangeLog 2007-05-15
20:59:14 UTC (rev 77439)
@@ -1,3 +1,12 @@
+2007-05-16 Ankit Jain <[EMAIL PROTECTED]>
+
+ * AutotoolsContext.cs (EscapeAndUpperConfigName): New.
+ (EscapeStringForAutoconf): Escape ' ' also.
+ * SolutionMakefileHandler.cs: Use EscapeAndUpperConfigName when emitting
+ config name.
+ * SimpleProjectMakefileHandler.cs: Likewise.
+ * SolutionDeployer.cs: Likewise.
+
2007-05-11 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Autotools.mdp: Don't copy project references.
Modified:
trunk/monodevelop/Extras/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs
===================================================================
---
trunk/monodevelop/Extras/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs
2007-05-15 20:57:14 UTC (rev 77438)
+++
trunk/monodevelop/Extras/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs
2007-05-15 20:59:14 UTC (rev 77439)
@@ -252,7 +252,7 @@
{
if ( !ctx.IsSupportedConfiguration (
config.Name ) ) continue;
- conf_vars.AppendFormat ("if
ENABLE_{0}\n", config.Name.ToUpper () );
+ conf_vars.AppendFormat ("if
ENABLE_{0}\n", ctx.EscapeAndUpperConfigName (config.Name));
string assembly = (PlatformID.Unix ==
Environment.OSVersion.Platform) ? project.GetRelativeChildPath (
config.CompiledOutputName ) : project.GetRelativeChildPath (
config.CompiledOutputName ).Replace("\\","/");
conf_vars.AppendFormat
("ASSEMBLY_COMPILER_COMMAND = {0}\n",
@@ -436,7 +436,7 @@
foreach ( DotNetProjectConfiguration config in
project.Configurations )
{
if ( !context.IsSupportedConfiguration (
config.Name ) ) continue;
- vars.AppendFormat ( "@{0}_{1}_LIB@", projname,
config.Name.ToUpper () );
+ vars.AppendFormat ( "@{0}_{1}_LIB@", projname,
context.EscapeAndUpperConfigName (config.Name));
}
// add additional assemblies to references
Modified: trunk/monodevelop/Extras/MonoDevelop.Autotools/SolutionDeployer.cs
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.Autotools/SolutionDeployer.cs
2007-05-15 20:57:14 UTC (rev 77438)
+++ trunk/monodevelop/Extras/MonoDevelop.Autotools/SolutionDeployer.cs
2007-05-15 20:59:14 UTC (rev 77439)
@@ -101,7 +101,7 @@
CreateAutoGenDotSH ( monitor );
CreatePkgConfigFile ( combine, monitor,
makefile, context );
- CreateConfigureDotAC ( combine, defaultConf,
monitor );
+ CreateConfigureDotAC ( combine, defaultConf,
monitor, context );
CreateMakefileInclude ( monitor );
AddTopLevelMakefileVars ( makefile, monitor );
@@ -250,7 +250,7 @@
Syscall.chmod ( fileName ,
FilePermissions.S_IXOTH | FilePermissions.S_IROTH | FilePermissions.S_IRWXU |
FilePermissions.S_IRWXG );
}
- void CreateConfigureDotAC ( Combine combine, string
defaultConf, IProgressMonitor monitor )
+ void CreateConfigureDotAC ( Combine combine, string
defaultConf, IProgressMonitor monitor, AutotoolsContext context )
{
monitor.Log.WriteLine ( GettextCatalog.GetString
("Creating configure.ac") );
TemplateEngine templateEngine = new TemplateEngine();
@@ -260,14 +260,14 @@
StringBuilder config_options = new StringBuilder ();
foreach ( IConfiguration config in
combine.Configurations )
{
- string name = config.Name.ToLower();
+ string name = context.EscapeAndUpperConfigName
(config.Name).ToLower();
string def = config ==
combine.ActiveConfiguration ? "YES" : "NO";
string ac_var = "enable_" + name;
// test to see if a configuration was enabled
config_options.AppendFormat (
"AC_ARG_ENABLE({0},\n", name );
config_options.AppendFormat ("
AC_HELP_STRING([--enable-{0}],\n", name );
- config_options.AppendFormat (" [Use
'{0}' Configuration [default={1}]]),\n", config.Name, def );
+ config_options.AppendFormat (" [Use
'{0}' Configuration [default={1}]]),\n", context.EscapeAndUpperConfigName
(config.Name), def );
config_options.AppendFormat ( "
{0}=yes, {0}=no)\n", ac_var );
config_options.AppendFormat (
"AM_CONDITIONAL({0}, test x${1} = xyes)\n", ac_var.ToUpper(), ac_var );
@@ -283,7 +283,7 @@
config_options.Append ( "if test -z
\"$CONFIG_REQUESTED\" ; then\n" );
// AppendConfigVariables ( combine, defaultConf,
config_options );
config_options.AppendFormat ( "
AM_CONDITIONAL({0}, true)\nfi\n", "ENABLE_"
- + defaultConf.ToUpper() );
+ +
context.EscapeAndUpperConfigName (defaultConf));
}
templateEngine.Variables ["CONFIG_OPTIONS"] =
config_options.ToString();
@@ -447,8 +447,9 @@
StringBuilder libraries = new StringBuilder ();
foreach ( IConfiguration config in
combine.Configurations )
{
- libs.AppendFormat ( "@{0}_CONFIG_LIBS@ ",
config.Name.ToUpper() );
- libraries.AppendFormat (
"@{0}_CONFIG_LIBRARIES@ ", config.Name.ToUpper() );
+ string configName =
context.EscapeAndUpperConfigName (config.Name);
+ libs.AppendFormat ( "@{0}_CONFIG_LIBS@ ",
configName);
+ libraries.AppendFormat (
"@{0}_CONFIG_LIBRARIES@ ", configName);
}
templateEngine.Variables ["LIBS"] = libs.ToString ();
templateEngine.Variables ["LIBRARIES"] =
libraries.ToString ();
Modified:
trunk/monodevelop/Extras/MonoDevelop.Autotools/SolutionMakefileHandler.cs
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.Autotools/SolutionMakefileHandler.cs
2007-05-15 20:57:14 UTC (rev 77438)
+++ trunk/monodevelop/Extras/MonoDevelop.Autotools/SolutionMakefileHandler.cs
2007-05-15 20:59:14 UTC (rev 77439)
@@ -55,7 +55,7 @@
{
if ( !ctx.IsSupportedConfiguration (
config.Name ) ) continue;
- subdirs.AppendFormat ( "if {0}\n",
"ENABLE_" + config.Name.ToUpper () );
+ subdirs.AppendFormat ( "if {0}\n",
"ENABLE_" + ctx.EscapeAndUpperConfigName (config.Name));
subdirs.Append (" SUBDIRS = ");
foreach ( CombineEntry ce in
CalculateSubDirOrder ( config ) )
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches