[Mono-docs-list] monodoc --assemble and monodoc --update switches

John Luke jluke@users.sourceforge.net
Wed, 10 Mar 2004 12:54:54 -0500


--=-hHsPV4XvG0RMalOVo4fy
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Hello,
	Here is a patch to add --update and --assemble switches to the monodoc
script, install update.exe, and other small updates. Ok to commit?


--=-hHsPV4XvG0RMalOVo4fy
Content-Disposition: attachment; filename=monodoc_updates.diff
Content-Type: text/x-diff; name=monodoc_updates.diff; charset=UTF-8
Content-Transfer-Encoding: 7bit

? monodoc-0.10
? monodoc_updates.diff
? test.diff
? tree.tree
? tree.zip
? generator/stub.cs
Index: ChangeLog
===================================================================
RCS file: /cvs/public/monodoc/ChangeLog,v
retrieving revision 1.17
diff -u -r1.17 ChangeLog
--- ChangeLog	9 Mar 2004 19:45:48 -0000	1.17
+++ ChangeLog	10 Mar 2004 17:22:25 -0000
@@ -1,3 +1,12 @@
+2004-03-10  John Luke  <jluke@cfl.rr.com>
+	
+	* Makefile.am: dist monodoc.pc and add generator to SUBDIRS
+	* configure.in: output generator/Makefile
+	* monodoc.in: add --update and --assemble switches and
+	add them to --help output
+	* generator/makefile: rm
+	* generator/Makefile.am: install update.exe and dist update.cs
+
 2004-03-09  Todd Berman  <tberman@sevenl.net>
 
 	* Makefile.am: remove monodoc sed target
Index: Makefile.am
===================================================================
RCS file: /cvs/public/monodoc/Makefile.am,v
retrieving revision 1.13
diff -u -r1.13 Makefile.am
--- Makefile.am	9 Mar 2004 19:45:48 -0000	1.13
+++ Makefile.am	10 Mar 2004 17:22:25 -0000
@@ -1,6 +1,6 @@
-SUBDIRS = browser class extras
+SUBDIRS = browser class extras generator
 
-EXTRA_DIST = monodoc.in monodoc.png monodoc.svg monodoc.desktop
+EXTRA_DIST = monodoc.in monodoc.png monodoc.svg monodoc.desktop monodoc.pc
 
 bin_SCRIPTS = monodoc mod
 
Index: configure.in
===================================================================
RCS file: /cvs/public/monodoc/configure.in,v
retrieving revision 1.13
diff -u -r1.13 configure.in
--- configure.in	9 Mar 2004 19:45:48 -0000	1.13
+++ configure.in	10 Mar 2004 17:22:25 -0000
@@ -13,6 +13,7 @@
 browser/Makefile
 class/Makefile
 extras/Makefile
+generator/Makefile
 monodoc.pc
 monodoc
 browser/monodoc.config
Index: monodoc.in
===================================================================
RCS file: /cvs/public/monodoc/monodoc.in,v
retrieving revision 1.9
diff -u -r1.9 monodoc.in
--- monodoc.in	9 Mar 2004 17:11:13 -0000	1.9
+++ monodoc.in	10 Mar 2004 17:22:25 -0000
@@ -7,6 +7,11 @@
 fi
 
 case x$1 in
+	x--assemble)
+	shift;
+	mono @monodocdir@/assembler.exe $*
+	exit 0
+	;;
     x--get-sourcesdir)
 	echo @monodocdir@/sources
 	exit 0
@@ -16,11 +21,18 @@
 	mono @monodocdir@/normalize.exe $*
 	exit 0
 	;;
+	x--update)
+	shift;
+	mono @monodocdir@/updater.exe $*
+	exit 0
+	;;
     x--help)
 	echo "Usage is:"
 	echo "monodoc [options]"
 	echo ""
 	echo "where [options] is one of the following:"
+	echo "  --assemble		runs the doc assembler"
+	echo "  --update		runs the doc updater"
 	echo "  --help		print this message"
 	echo "  --html TOPIC		print the html contents of TOPIC"
 	echo "  --get-sourcesdir	print the location of monodoc sources"
Index: generator/.cvsignore
===================================================================
RCS file: /cvs/public/monodoc/generator/.cvsignore,v
retrieving revision 1.2
diff -u -r1.2 .cvsignore
--- generator/.cvsignore	29 Oct 2003 22:10:41 -0000	1.2
+++ generator/.cvsignore	10 Mar 2004 17:22:26 -0000
@@ -1 +1,3 @@
 *.exe
+Makefile
+Makefile.in
Index: generator/Makefile.am
===================================================================
RCS file: generator/Makefile.am
diff -N generator/Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ generator/Makefile.am	10 Mar 2004 17:22:26 -0000
@@ -0,0 +1,16 @@
+MCS = mcs
+SRC = updater.cs
+PROGRAM = updater.exe
+
+monodocdir = $(libdir)/monodoc
+monodoc_DATA = $(PROGRAM)
+
+all: $(PROGRAM)
+
+$(PROGRAM): updater.cs
+	$(MCS) /debug /out:$(PROGRAM) $(SRC)
+
+CLEANFILES = updater.exe
+
+EXTRA_DIST = $(SRC)
+
Index: generator/makefile
===================================================================
RCS file: generator/makefile
diff -N generator/makefile
--- generator/makefile	29 Oct 2003 22:10:42 -0000	1.12
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-MCS=mcs
-SRC=updater.cs
-PROGRAM=updater.exe
-
-all: $(PROGRAM)
-
-$(PROGRAM): updater.cs
-	$(MCS) /debug /out:$(PROGRAM) $(SRC)
-
-clean:
-	rm -f $(PROGRAM)

--=-hHsPV4XvG0RMalOVo4fy--