Thu Nov 30 12:15:03 CET 2006 Paolo Molaro <lupus@ximian.com>

* Ship a Cecil binary in the source tarball. Added a
	configure option to specify a Cecil binary.
	* style.xsl: fixed mangling of hrefs.


svn path=/trunk/monocov/; revision=68738

ChangeLog

@@ -1,4 +1,10 @@
 
+Thu Nov 30 12:15:03 CET 2006 Paolo Molaro <lupus@ximian.com>
+
+	* Ship a Cecil binary in the source tarball. Added a
+	configure option to specify a Cecil binary.
+	* style.xsl: fixed mangling of hrefs.
+
 Mon Nov 27 13:47:24 CET 2006 Paolo Molaro <lupus@ximian.com>
 
 	* UI updates. Removed unused dependency on gnome-sharp.

MANIFEST

@@ -25,3 +25,4 @@ symbols.cs
 nunit-console.cs
 coverage.c
 monocov.1
+Mono.Cecil.dll

Makefile

@@ -93,7 +93,7 @@ clean:
 	rm -f monocov.exe monocov.exe.mdb symbols.exe symbols.exe.mdb nunit-console.exe libmono-profiler-monocov.so
 
 distclean:
-	rm -f monocov Mono.Cecil.dll config.make Constants.cs
+	rm -f monocov config.make Constants.cs
 
 dist:
 	tar -chzf $(PROJECTNAME)-$(VERSION).tar.gz `cat MANIFEST` \

README

@@ -11,7 +11,9 @@ the program you want to gather coverage data from and a Gtk# user interface.
 ----------------
 
 Recent Mono and Gtk# releases. You also need Mono.Cecil installed
-or copied in the source dir and where the programs are run from..
+or copied in the source dir and where the programs are run from.
+The source release contains Mono.Cecil.dll and make install takes
+care of installing it properly.
 
 2. USAGE
 --------
@@ -64,11 +66,16 @@ To export the data as XML, run monocov like this:
 The generated XML files use a default stylesheet which is a bit ugly. It would
 be good if somebody could contribute a better one :)
 
+To export the data as HTML, run monocov like this:
+	monocov --export-html=<DEST DIR> <DATA FILE NAME>
+
 2.5 KNOWN BUGS
 --------------
 
 In the source code view (when double-clicking on an entry), the view is not
 scrolled to the first line of the method.
+The --debug option to mono should not be required and it should be enabled
+by default.
 
 3. UTILITY PROGRAMS
 -------------------
@@ -103,7 +110,7 @@ zlib/libpng.
 
 Zoltan Varga (vargaz@freemail.hu)
 Jacob Ilsø Christensen (jacobilsoe@gmail.com)
-or 
+or preferably
 the mono devel list (mono-devel-list@ximian.com)
 
 RANDOM NOTES:

configure

@@ -5,11 +5,12 @@ VERSION=0.2
 help()
 {
 	echo ""
-	echo "Usage is: configure [--prefix=PREFIX]"
+	echo "Usage is: configure [--prefix=PREFIX] [--cecil=PATH_TO_CECIL_DLL]"
 	echo ""
 }
 
 prefix=/usr/local
+cecilbin=
 
 while [ $# -ne 0 ]; do
   case $1 in
@@ -26,6 +27,10 @@ while [ $# -ne 0 ]; do
 	prefix="$1"
 	shift
 	;;
+    --cecil=*)
+    	cecilbin=`echo $1 | sed 's/--cecil=//'`;
+	shift
+	;;
     *)
 	echo Unknown option: $1
 	help
@@ -33,15 +38,23 @@ while [ $# -ne 0 ]; do
   esac
 done
 
-cecilbin=`pkg-config --variable=Libraries mono-cecil`
-
-if test -z $cecilbin; then
-	echo "Cecil is not installed."
-	exit 1
+if test -z "$cecilbin"; then
+	cecilbin=`pkg-config --variable=Libraries mono-cecil`
 fi
 
-# copy Mono.Cecil here
-cp $cecilbin .
+if test -z "$cecilbin"; then
+	echo "Cecil is not installed."
+	if test -f Mono.Cecil.dll; then
+		echo "Using packaged Mono.Cecil.dll."
+	else
+		echo "No Mono.Cecil.dll found, use --cecil=/path/to/Mono.Cecil.dll option."
+		exit 1
+	fi
+else
+	# copy Mono.Cecil here
+	echo "Using Cecil from $cecilbin."
+	cp $cecilbin .
+fi
 
 echo "prefix=$prefix" > config.make
 echo "VERSION=$VERSION" >> config.make

style.xsl

@@ -71,14 +71,11 @@
             <xsl:with-param name="count" select="3"/>
           </xsl:call-template>
           <xsl:variable name="url">
-            <xsl:if test="name()='project'">
-              project<xsl:value-of select="$link-suffix"/>
+            <xsl:if test="name()='project'">project<xsl:value-of select="$link-suffix"/>
             </xsl:if>
-            <xsl:if test="name()='namespace'">
-              namespace-<xsl:value-of select="@name"/><xsl:value-of select="$link-suffix"/>
+            <xsl:if test="name()='namespace'">namespace-<xsl:value-of select="@name"/><xsl:value-of select="$link-suffix"/>
             </xsl:if>
-            <xsl:if test="name()='class'">
-              class-<xsl:value-of select="@fullname"/><xsl:value-of select="$link-suffix"/>
+            <xsl:if test="name()='class'">class-<xsl:value-of select="@fullname"/><xsl:value-of select="$link-suffix"/>
             </xsl:if>
           </xsl:variable>
           <xsl:if test="count(..|/)=1">