PATCH AgilityPack.dll removal

[Cambell Prince]

Hi,

Attached is a patch for the build system for the removal of
AgilityPack.dll from the build system.

It's the patch itself, not a patch against the mono debian package svn.  
How would you like patches presented?

Regards,
Cambell


#! /bin/sh /usr/share/dpatch/dpatch-run
## palaso-223-AgilityPack.dpatch by Cambell Prince <cambell_prince@...>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Removes the AgilityPack.dll used to build html documentation from the build system
## DP: http://projects.palaso.org/issues/show/223

@DPATCH@

diff -r 5fe9983ecc51 -r fa11e402e647 docs/Makefile.am
--- a/docs/Makefile.am Tue May 12 15:21:38 2009 +0700
+++ b/docs/Makefile.am Wed May 13 09:34:22 2009 +0700
@@ -97,7 +97,7 @@
 mono-file-formats.tree: docs.make Makefile.am $(srcdir)/deploy/.stamp
  cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) $@
 
-$(srcdir)/deploy/.stamp: convert.exe Makefile.am
+$(srcdir)/deploy/.stamp: Makefile.am
  $(mkdir_p) $(srcdir)/html
  runtimedir=`cd ../runtime && pwd`; export runtimedir; \
  cd $(srcdir) && MONO_PATH=$(mcs_topdir_from_srcdir)/class/lib/net_2_0 perl ./exdoc -h . ../mono/*/*.c
@@ -105,6 +105,6 @@
 
 extract: $(srcdir)/deploy/.stamp
 
-convert.exe: convert.cs AgilityPack.dll
- cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) convert.exe
+#convert.exe: convert.cs AgilityPack.dll
+# cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) convert.exe
 
diff -r 5fe9983ecc51 -r fa11e402e647 docs/Makefile.in
--- a/docs/Makefile.in Tue May 12 15:21:38 2009 +0700
+++ b/docs/Makefile.in Wed May 13 09:34:22 2009 +0700
@@ -527,7 +527,7 @@
 mono-file-formats.tree: docs.make Makefile.am $(srcdir)/deploy/.stamp
  cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) $@
 
-$(srcdir)/deploy/.stamp: convert.exe Makefile.am
+$(srcdir)/deploy/.stamp: Makefile.am
  $(mkdir_p) $(srcdir)/html
  runtimedir=`cd ../runtime && pwd`; export runtimedir; \
  cd $(srcdir) && MONO_PATH=$(mcs_topdir_from_srcdir)/class/lib/net_2_0 perl ./exdoc -h . ../mono/*/*.c
@@ -535,8 +535,8 @@
 
 extract: $(srcdir)/deploy/.stamp
 
-convert.exe: convert.cs AgilityPack.dll
- cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) convert.exe
+#convert.exe: convert.cs AgilityPack.dll
+# cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) convert.exe
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -r 5fe9983ecc51 -r fa11e402e647 docs/exdoc
--- a/docs/exdoc Tue May 12 15:21:38 2009 +0700
+++ b/docs/exdoc Wed May 13 09:34:22 2009 +0700
@@ -135,17 +135,21 @@
 </html>
 EOF
  close OUT;
- system ("$ENV{runtimedir}/mono-wrapper convert.exe $dir/html/$name $dir/html/x-$name");
 
- # clean up the mess that AgilityPack does, it CDATAs our CSS
- open HACK, "$dir/html/x-$name" || die "Could not open $dir/html/x-$name";
+ # convert removed due to AgilityPack.dll DFSG issues
+ #system ("$ENV{runtimedir}/mono-wrapper convert.exe $dir/html/$name $dir/html/x-$name");
+ #
+ ## clean up the mess that AgilityPack does, it CDATAs our CSS
+ #open HACK, "$dir/html/x-$name" || die "Could not open $dir/html/x-$name";
+ open HACK, "$dir/html/$name" || die "Could not open $dir/html/$name";
  open HACKOUT, ">$dir/deploy/$name" || die "Could not open output";
-
+
  while (<HACK>){
     s/^\/\/<!\[CDATA\[//;
     s/^\/\/\]\]>\/\///;
     print HACKOUT $_;
  }
+
  #system ("cp.exe $dir/html/$name $dir/deploy/$name");
     }
 }

_______________________________________________
Pkg-mono-devel mailing list
Pkg-mono-devel@...
http://lists.alioth.debian.org/mailman/listinfo/pkg-mono-devel