diff options
| author | Scott Ellington <scotte@mono-cvs.ximian.com> | 2006-06-19 22:19:07 +0400 |
|---|---|---|
| committer | Scott Ellington <scotte@mono-cvs.ximian.com> | 2006-06-19 22:19:07 +0400 |
| commit | a4f74626b1e5d057fb27be11bafd3f823a4a7963 (patch) | |
| tree | b7ad0c9d6bc07ff3c39a744f0ab9f9262e1f258c /Extras/MonoDevelop.Autotools/SolutionDeployer.cs | |
| parent | cac9b67d7618676aa2bc051bee1475597d6b3d20 (diff) | |
2006-06-19 Scott Ellington <scott.ellington@gmail.com>
* SimpleProjectMakefileHandler.cs:
* AutotoolsContext.cs:
* SolutionDeployer.cs:
use the new CombineEntry.Version property
* TarballTargetEditorWidget.cs: default to active config
svn path=/trunk/monodevelop/; revision=61849
Diffstat (limited to 'Extras/MonoDevelop.Autotools/SolutionDeployer.cs')
| -rw-r--r-- | Extras/MonoDevelop.Autotools/SolutionDeployer.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Extras/MonoDevelop.Autotools/SolutionDeployer.cs b/Extras/MonoDevelop.Autotools/SolutionDeployer.cs index 24abdfa805..6c180c2d53 100644 --- a/Extras/MonoDevelop.Autotools/SolutionDeployer.cs +++ b/Extras/MonoDevelop.Autotools/SolutionDeployer.cs @@ -74,9 +74,7 @@ namespace MonoDevelop.Autotools throw new Exception ( GettextCatalog.GetString ("MonoDevelop does not currently support generating autotools files for one (or more) child projects.") ); solution_name = combine.Name; - // FIXME: pull version out of AssemblyInfo.cs? - // or wait for http://bugzilla.ximian.com/show_bug.cgi?id=77889 - solution_version = "0.1"; + solution_version = AutotoolsContext.EscapeStringForAutoconf (combine.Version); Makefile makefile = handler.Deploy ( context, combine, monitor ); string path = solution_dir + "/Makefile"; @@ -291,7 +289,7 @@ namespace MonoDevelop.Autotools StringWriter packageChecks = new StringWriter(); foreach ( string pkg in context.GetRequiredPackages () ) { - string pkgvar = AutotoolsContext.GetPkgVar (pkg); + string pkgvar = AutotoolsContext.GetPkgConfigVariable (pkg); packageChecks.Write("PKG_CHECK_MODULES(["); packageChecks.Write(pkgvar); packageChecks.Write("], ["); |