Author: scotte
Date: 2006-06-15 19:47:51 -0400 (Thu, 15 Jun 2006)
New Revision: 61784
Modified:
trunk/monodevelop/Extras/MonoDevelop.Autotools/ChangeLog
trunk/monodevelop/Extras/MonoDevelop.Autotools/SolutionDeployer.cs
trunk/monodevelop/Extras/MonoDevelop.Autotools/templates/Makefile.include
Log:
2006-06-15 Scott Ellington <[EMAIL PROTECTED]>
* SolutionDeployer.cs: always run autogen.sh on Deploy
* templates/Makefile.include: clean up
Modified: trunk/monodevelop/Extras/MonoDevelop.Autotools/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.Autotools/ChangeLog 2006-06-15
22:38:50 UTC (rev 61783)
+++ trunk/monodevelop/Extras/MonoDevelop.Autotools/ChangeLog 2006-06-15
23:47:51 UTC (rev 61784)
@@ -1,5 +1,10 @@
2006-06-15 Scott Ellington <[EMAIL PROTECTED]>
+
+ * SolutionDeployer.cs: always run autogen.sh on Deploy
+ * templates/Makefile.include: clean up
+2006-06-15 Scott Ellington <[EMAIL PROTECTED]>
+
* SimpleProjectMakefileHandler.cs:
* templates/exe.wrapper.in.template:
pass runtime parameters on to exe wrapper
Modified: trunk/monodevelop/Extras/MonoDevelop.Autotools/SolutionDeployer.cs
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.Autotools/SolutionDeployer.cs
2006-06-15 22:38:50 UTC (rev 61783)
+++ trunk/monodevelop/Extras/MonoDevelop.Autotools/SolutionDeployer.cs
2006-06-15 23:47:51 UTC (rev 61784)
@@ -108,11 +108,24 @@
if ( !HasGeneratedFiles (combine) )
if ( !GenerateFiles ( combine, monitor ) )
return;
- monitor.BeginTask ( GettextCatalog.GetString(
"Deploying Solution to Tarball" ) , 2 );
+ monitor.BeginTask ( GettextCatalog.GetString(
"Deploying Solution to Tarball" ) , 3 );
try
{
string baseDir = Path.GetDirectoryName (
combine.FileName);
+ ProcessWrapper ag_process =
Runtime.ProcessService.StartProcess ( "sh",
+ "autogen.sh",
+ baseDir,
+ monitor.Log,
+ monitor.Log,
+ null );
+ ag_process.WaitForOutput ();
+
+ if ( ag_process.ExitCode > 0 )
+ throw new Exception (
GettextCatalog.GetString ("An unspecified error occurred while running
'{0}'","autogen.sh") );
+
+ monitor.Step ( 1 );
+
StringWriter sw = new StringWriter ();
LogTextWriter chainedOutput = new LogTextWriter
();
chainedOutput.ChainWriter (monitor.Log);
@@ -127,7 +140,7 @@
process.WaitForOutput ();
if ( process.ExitCode > 0 )
- throw new Exception (
GettextCatalog.GetString ("An unspecified error occurred while running 'make
dist'") );
+ throw new Exception (
GettextCatalog.GetString ("An unspecified error occurred while running '{0}'",
"make dist") );
monitor.Step ( 1 );
Modified:
trunk/monodevelop/Extras/MonoDevelop.Autotools/templates/Makefile.include
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.Autotools/templates/Makefile.include
2006-06-15 22:38:50 UTC (rev 61783)
+++ trunk/monodevelop/Extras/MonoDevelop.Autotools/templates/Makefile.include
2006-06-15 23:47:51 UTC (rev 61784)
@@ -2,9 +2,8 @@
build_resources = $(addprefix $(srcdir)/, $(RESOURCES))
build_resources_embed = $(foreach res,$(build_resources), $(addprefix
-resource:,$(res)),$(RESOURCES_PREFIX)$(notdir $(res)))
-build_references = $(DLL_REFERENCES)
build_references_ref = $(REFERENCES)
-build_references_ref += $(foreach ref, $(build_references), -r:$(ref))
+build_references_ref += $(foreach ref, $(DLL_REFERENCES), -r:$(ref))
build_references_ref += $(foreach ref, $(PROJECT_REFERENCES), -r:$(ref))
EXTRA_DIST = $(FILES) $(GENERATED_FILES) $(RESOURCES) $(ASSEMBLY_WRAPPER_IN)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
