Add doc-update target support.

The doc-update target updates the Documentation/en directory for libraries
(and is otherwise ignored).

svn path=/trunk/mcs/; revision=116287

diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index ad7c113af3dc2ace5a654d923c246693bc579327..6b3c2bc91c5f6d5852c954a57ef7b98a9a149a1f 100644 (file)
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-17  Jonathan Pryor  <jpryor@novell.com>
+
+       * build.rules: doc-update is now a standard target; provide a $(MDOC)
+         variable to simplify running the `mdoc` updater program.
+       * executable.make: Add doc-update target support (does nothing).
+       * library.make: Add doc-update target support; runs `mdoc update` on
+         the assembly, updating the documentation within Documentation/en.
+       * Makefile: Add doc-update target support.
+
 2008-09-14  Zoltan Varga  <vargaz@gmail.com>
 
        * library.make: Allow FIXTURE make variable to be passed to nunit.

diff --git a/mcs/build/Makefile b/mcs/build/Makefile
index 3d2538ec38ecfb6b3eb65ba8e71777a83f9f4fab..46b6d086400d8c5e1f750797ee1c066c1ffd9677 100644 (file)
--- a/mcs/build/Makefile
+++ b/mcs/build/Makefile
@@ -4,7 +4,7 @@ include ../build/rules.make
 
 BUILT_FILES = common/Consts.cs
 
-all-local install-local test-local run-test-local run-test-ondotnet-local uninstall-local: $(BUILT_FILES)
+all-local install-local test-local run-test-local run-test-ondotnet-local uninstall-local doc-update-local: $(BUILT_FILES)
        @:
 
 clean-local:

diff --git a/mcs/build/executable.make b/mcs/build/executable.make
index 98dff0cc9a388b3f423d846060eb03fd1d096df8..7e94162b0a173992fcee37656c8248fa95f29673 100644 (file)
--- a/mcs/build/executable.make
+++ b/mcs/build/executable.make
@@ -120,3 +120,7 @@ ifneq ($(response),$(sourcefile))
 $(response): $(topdir)/build/executable.make $(depsdir)/.stamp
 endif
 $(makefrag): $(topdir)/build/executable.make $(depsdir)/.stamp
+
+doc-update-local:
+       @:
+

diff --git a/mcs/build/library.make b/mcs/build/library.make
index a2946aa72eb1ea43891d00d1ebc575128bee4634..04b999f85a5d7edddc60c315666a4f0008e1b854 100644 (file)
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -366,3 +366,22 @@ ifneq ($(response),$(sourcefile))
 $(response): $(topdir)/build/library.make $(depsdir)/.stamp
 endif
 $(makefrag) $(test_response) $(test_makefrag) $(btest_response) $(btest_makefrag): $(topdir)/build/library.make $(depsdir)/.stamp
+
+## Documentation stuff
+
+Q_MDOC_UP=$(if $(V),,@echo "MDOC-UP [$(PROFILE)] $(notdir $(@))";)
+MDOC_UP  =$(Q_MDOC_UP) \
+       if `echo $(PROFILE) | grep ^net_1_ > /dev/null 2>/dev/null` ; then    \
+               $(RUNTIME) $(topdir)/tools/mdoc/monodocer1.exe                      \
+                       -path:Documentation/en -assembly:$(the_lib) ;                     \
+       else                                                                  \
+               $(RUNTIME) $(topdir)/tools/mdoc/mdoc.exe update --delete            \
+                       -o Documentation/en $(the_lib) ;                                  \
+       fi
+
+doc-update-local: $(the_libdir)/.doc-stamp
+
+$(the_libdir)/.doc-stamp: $(the_lib)
+       $(MDOC_UP)
+       @echo "doc-stamp" > $@
+

diff --git a/mcs/build/rules.make b/mcs/build/rules.make
index f73e659cca2da9ef4a7cd4bb28674d96ee8d512b..ef4348fe22eeba648346cd85f96f7d004facb3e1 100644 (file)
--- a/mcs/build/rules.make
+++ b/mcs/build/rules.make
@@ -112,7 +112,7 @@ gacutil = $(topdir)/class/lib/net_1_1_bootstrap/gacutil.exe
 GACUTIL = MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(gacutil)
 endif
 
-STD_TARGETS = test run-test run-test-ondotnet clean install uninstall
+STD_TARGETS = test run-test run-test-ondotnet clean install uninstall doc-update
 
 $(STD_TARGETS): %: do-%
 
@@ -181,3 +181,9 @@ dist-default:
 
 withmcs:
        $(MAKE) MCS='$(INTERNAL_MCS)' BOOTSTRAP_MCS='$(INTERNAL_MCS)' all
+
+## Documentation stuff
+
+Q_MDOC =$(if $(V),,@echo "MDOC    [$(PROFILE)] $(notdir $(@))";)
+MDOC   =$(Q_MDOC) $(RUNTIME) $(topdir)/tools/mdoc/mdoc.exe
+

diff --git a/mcs/class/ChangeLog b/mcs/class/ChangeLog
index 0fef6ab858cc29aa12e1af89efb28473ea3b95d2..015c9db9d2f475f62d1ae99f25b6df86cf7ecf8f 100644 (file)
--- a/mcs/class/ChangeLog
+++ b/mcs/class/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-17  Jonathan Pryor  <jpryor@novell.com>
+
+       * I18N/Makefile: Add doc-update target support.
+
 2008-10-13  Jonathan Pryor  <jpryor@novell.com>
 
        * Makefile (net_2_0_dirs): Add Mono.Options.

diff --git a/mcs/class/I18N/Makefile b/mcs/class/I18N/Makefile
index 7c95c460d97c28be13735a8bd9222bdbd8e138d9..cf31c067d649f18ad34f408ac85168bcb79cb511 100644 (file)
--- a/mcs/class/I18N/Makefile
+++ b/mcs/class/I18N/Makefile
@@ -12,6 +12,6 @@ DISTFILES = \
        tools/ucm2cp.c  \
        tools/uni2tab.c
 
-all-local install-local clean-local test-local run-test-local run-test-ondotnet-local uninstall-local:
+all-local install-local clean-local test-local run-test-local run-test-ondotnet-local uninstall-local doc-update-local:
 
 dist-local: dist-default

diff --git a/mcs/class/System.Data.DataSetExtensions/ChangeLog b/mcs/class/System.Data.DataSetExtensions/ChangeLog
index 6c75f584e3b4947fa9f73c054c369c608036d1d0..c033e9bdfbf58e24ce0313e66244bbb5cf30bc97 100644 (file)
--- a/mcs/class/System.Data.DataSetExtensions/ChangeLog
+++ b/mcs/class/System.Data.DataSetExtensions/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-17  Jonathan Pryor  <jpryor@novell.com>
+
+       * Test/Makefile: Add doc-update target support.
+
 2008-05-14  Atsushi Enomoto  <atsushi@ximian.com>
 
        * Makefile : use EXTRA_DISTFILES.

diff --git a/mcs/class/System.Data.DataSetExtensions/Test/Makefile b/mcs/class/System.Data.DataSetExtensions/Test/Makefile
index 345f777ec8b8f67d87d1f71acf264127ed1056db..727fda262a41a2c1985c1566bc487c01719634cf 100644 (file)
--- a/mcs/class/System.Data.DataSetExtensions/Test/Makefile
+++ b/mcs/class/System.Data.DataSetExtensions/Test/Makefile
@@ -1,7 +1,7 @@
 thisdir = class/System.Data.DataSetExtensions/Test
 include ../../../build/rules.make
 
-all-local install-local clean-local test-local run-test-local run-test-ondotnet-local uninstall-local:
+all-local install-local clean-local test-local run-test-local run-test-ondotnet-local uninstall-local doc-update-local:
 
 DISTFILES =  $(wildcard *.aspx)
 

diff --git a/mcs/class/System.Web.Extensions/ChangeLog b/mcs/class/System.Web.Extensions/ChangeLog
index aec22e344fb21d888696687c70d2bbdecd3a780a..4584a27943ea9adc175736274dabb47777b182b3 100644 (file)
--- a/mcs/class/System.Web.Extensions/ChangeLog
+++ b/mcs/class/System.Web.Extensions/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-17  Jonathan Pryor  <jpryor@novell.com>
+
+       * Test/Makefile: Add doc-update target support.
+
 2008-10-08  Atsushi Enomoto  <atsushi@ximian.com>
 
        * Makefile: add reference to S.D.Linq.

diff --git a/mcs/class/System.Web.Extensions/Test/Makefile b/mcs/class/System.Web.Extensions/Test/Makefile
index d0648e88e3aa4f71700b7e7b1c5029d657c2ea1c..b1bbb91620f0dd3aca290bed02eed06e7fe5617a 100644 (file)
--- a/mcs/class/System.Web.Extensions/Test/Makefile
+++ b/mcs/class/System.Web.Extensions/Test/Makefile
@@ -1,7 +1,7 @@
 thisdir = class/System.Web.Extensions/Test
 include ../../../build/rules.make
 
-all-local install-local clean-local test-local run-test-local run-test-ondotnet-local uninstall-local:
+all-local install-local clean-local test-local run-test-local run-test-ondotnet-local uninstall-local doc-update-local:
 
 DISTFILES =  $(wildcard *.aspx)
 

diff --git a/mcs/class/System.Web/ChangeLog b/mcs/class/System.Web/ChangeLog
index 28599a58dc9ff8beca0e285e52d05cf494db8a56..6fe81b133c882ba91e6e6f2cc422de7235885fca 100644 (file)
--- a/mcs/class/System.Web/ChangeLog
+++ b/mcs/class/System.Web/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-17  Jonathan Pryor  <jpryor@novell.com>
+
+       * Test/Makefile: Add doc-update target support.
+
 2008-10-09  Marek Habersack  <mhabersack@novell.com>
 
        * System.Web.dll.sources: added System.Web.Configuration_2.0/MonoSettingsSection.cs

diff --git a/mcs/class/System.Web/Test/Makefile b/mcs/class/System.Web/Test/Makefile
index 6899e30bfe4540e0cd118c2bb4de13778ba1210f..a1baa9500ecd28471a878d525cf9c86f57306fe4 100644 (file)
--- a/mcs/class/System.Web/Test/Makefile
+++ b/mcs/class/System.Web/Test/Makefile
@@ -2,7 +2,7 @@ thisdir = class/System.Web/Test
 SUBDIRS = TestMonoWeb
 include ../../../build/rules.make
 
-all-local install-local clean-local test-local run-test-local run-test-ondotnet-local uninstall-local:
+all-local install-local clean-local test-local run-test-local run-test-ondotnet-local uninstall-local doc-update-local:
 
 DISTFILES = DataBinderTests.cs $(wildcard *.aspx)
 

diff --git a/mcs/class/System.Web/Test/TestMonoWeb/Makefile b/mcs/class/System.Web/Test/TestMonoWeb/Makefile
index 8c6dae82c5f799b939b696e81beffdd8bc213a1d..1bb546aab1180e654996530632ecc91f3f079568 100644 (file)
--- a/mcs/class/System.Web/Test/TestMonoWeb/Makefile
+++ b/mcs/class/System.Web/Test/TestMonoWeb/Makefile
@@ -6,7 +6,7 @@ LOCAL_MCS_FLAGS = /nowarn:0168 /nowarn:0162 /unsafe \
  /noconfig /r:System.dll /r:System.Web.dll \
  /r:System.Drawing.dll /r:System.Xml.dll
 
-all-local install-local uninstall-local:
+all-local install-local uninstall-local doc-update-local:
 
 # it doesn't compile for me.
 # test-local: TestMonoWeb.exe

diff --git a/mcs/jay/ChangeLog b/mcs/jay/ChangeLog
index df8b18174adaba1ee1d86638bc7b9d26f8df138c..1e49ad3b614bd3f18e77e7eeda5b9f3abff41cca 100644 (file)
--- a/mcs/jay/ChangeLog
+++ b/mcs/jay/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-17  Jonathan Pryor  <jpryor@novell.com>
+
+       * Makefile: Add doc-update target support.
+
 2008-09-09  Miguel de Icaza  <miguel@novell.com>
 
        * skeleton.cs: A little refactoring to support producing a list of

diff --git a/mcs/jay/Makefile b/mcs/jay/Makefile
index 1e97eb094dcc34aa340b23b3ee93a6b4e1b275c8..238cd994891b3db0172f94909196d3ef6850d5d2 100644 (file)
--- a/mcs/jay/Makefile
+++ b/mcs/jay/Makefile
@@ -41,7 +41,7 @@ clean-local:
 
 dist-local: dist-default
 
-test-local run-test-local run-test-ondotnet-local:
+test-local run-test-local run-test-ondotnet-local doc-update-local:
 
 jay: $(sources:.c=.o)
        $(CCOMPILE) -o $@ $^

diff --git a/mcs/tools/ChangeLog b/mcs/tools/ChangeLog
index 14831e29bfbcb92d935b6e3686cdbaf956529431..fdc02217f3c8a196b7137302da16c948d9628cd7 100644 (file)
--- a/mcs/tools/ChangeLog
+++ b/mcs/tools/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-17  Jonathan Pryor  <jpryor@novell.com>
+
+       * Makefile: Add doc-update target support.
+
 2008-10-17  Jb Evain  <jbevain@novell.com>
 
        * Makefile: clean the Makefile, following the pattern in ../class,

diff --git a/mcs/tools/Makefile b/mcs/tools/Makefile
index b12ab6ea67db05b1f90bc982dd4fbee8b2eb50e4..a24a339c09965becb4c3b525cf62b55026e0ad3b 100644 (file)
--- a/mcs/tools/Makefile
+++ b/mcs/tools/Makefile
@@ -78,7 +78,7 @@ DISTFILES = \
        gensources.sh                   \
        removecomments.sh
 
-test-local run-test-local run-test-ondotnet-local all-local install-local uninstall-local:
+test-local run-test-local run-test-ondotnet-local all-local install-local uninstall-local doc-update-local:
        @:
 
 dist-local: dist-default

diff --git a/mcs/tools/corcompare/ChangeLog b/mcs/tools/corcompare/ChangeLog
index 3e1e5ef5b22e6b00db91a6dd847dd47bbee0eda3..bfe9e4aaa43037b5d13de81c65a6172b8fb76986 100644 (file)
--- a/mcs/tools/corcompare/ChangeLog
+++ b/mcs/tools/corcompare/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-17  Jonathan Pryor  <jpryor@novell.com>
+
+       * Makefile: Add doc-update target support.
+
 2008-05-21  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * mono-api.xsl: Added support for event accessors.

diff --git a/mcs/tools/corcompare/Makefile b/mcs/tools/corcompare/Makefile
index eaa8c36c96b3101b66f09897784835a9b485f463..1be2ee45d84718a975aea7c1131bc632794dc3c1 100644 (file)
--- a/mcs/tools/corcompare/Makefile
+++ b/mcs/tools/corcompare/Makefile
@@ -34,6 +34,8 @@ DISTFILES= $(CORCOMPARE_SOURCES) $(APIINFO_SOURCES) $(APIDIFF_SOURCES) cormissin
 
 all-local: $(ALL_PROGRAMS)
 
+doc-update-local:
+
 install-local: $(ALL_PROGRAMS)
        $(MKINSTALLDIRS) $(DESTDIR)$(PROGRAM_INSTALL_DIR)
        for i in $(ALL_PROGRAMS) ; do \

diff --git a/mcs/tools/security/ChangeLog b/mcs/tools/security/ChangeLog
index 019a24104ff8546e0ab1a95429321f1180354575..4a65a885e25c6f7d7d45c9dae5a604309630b80e 100644 (file)
--- a/mcs/tools/security/ChangeLog
+++ b/mcs/tools/security/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-17  Jonathan Pryor  <jpryor@novell.com>
+
+       * Makefile: Add doc-update target support.
+
 2008-03-13  Sebastien Pouliot  <sebastien@ximian.com>
 
        * AssemblyInfo.cs: Update copyright notices.

diff --git a/mcs/tools/security/Makefile b/mcs/tools/security/Makefile
index 91bef5d09a0faf0f00a79a09de122b73f1fe56a0..f0bc901e5460213a665efdc14882c4b22527d019 100644 (file)
--- a/mcs/tools/security/Makefile
+++ b/mcs/tools/security/Makefile
@@ -30,6 +30,8 @@ else
 all-local: $(SECURITY_TARGETS)
 endif
 
+doc-update-local:
+
 install-local: all-local
 uninstall-local: