---

yaml
---
r: 14758
b: refs/heads/try
c: 93a0821
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 4d4995fc60be7cc5854fc38b468b441fa8c78d45
+refs/heads/try: 93a082149ac8735013313604637029659da9ea45
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/configure

@@ -319,7 +319,6 @@ probe CFG_LLVM_CONFIG      llvm-config
 probe CFG_VALGRIND         valgrind
 probe CFG_PERF             perf
 probe CFG_ISCC             iscc
-probe CFG_NATURALDOCS      NaturalDocs naturaldocs
 probe CFG_LLNEXTGEN        LLnextgen
 probe CFG_PANDOC           pandoc
 probe CFG_PDFLATEX         pdflatex
@@ -413,7 +412,6 @@ step_msg "making directories"
 
 for i in \
     doc doc/core doc/std \
-    nd nd/core nd/std \
     dl tmp
 do
     make_dir $i

branches/try/doc/Languages.txt

@@ -100,42 +100,34 @@ endif
 
 
 ######################################################################
-# Naturaldocs (library reference related)
+# Rustdoc (libcore/std)
 ######################################################################
 
-ifeq ($(CFG_NATURALDOCS),)
-  $(info cfg: no naturaldocs found, omitting library doc build)
+ifeq ($(CFG_PANDOC),)
+  $(info cfg: no pandoc found, omitting library doc build)
 else
 
-define libdoc
-doc/$(1)/index.html: nd/$(1)/Languages.txt nd/$(1)/Topics.txt \
-                     nd/$(1)/lib.css $(2)
-	@$$(call E, naturaldocs: $$@)
-	$(CFG_NATURALDOCS) -i $(S)src/lib$(1) -o HTML doc/$(1) \
-                       -p nd/$(1) -r -s Default lib
-
-nd/$(1)/Languages.txt: $(S)doc/Languages.txt
-	@$$(call E, cp: $$@)
-	$(Q)cp $$< $$@
+# The rustdoc executable
+RUSTDOC = $(HBIN2_H_$(CFG_HOST_TRIPLE))/rustdoc$(X)
 
-nd/$(1)/Topics.txt: $(S)doc/Topics.txt
-	@$$(call E, cp: $$@)
-	$(Q)cp $$< $$@
+# The library documenting macro
+# $(1) - The output directory
+# $(2) - The crate file
+# $(3) - The crate soruce files
+define libdoc
+doc/$(1)/index.html: $(2) $(3) $$(RUSTDOC) doc/$(1)/rust.css
+	@$$(call E, rustdoc: $$@)
+	$(Q)$(RUSTDOC) $(2) --output-dir=doc/$(1)
 
-nd/$(1)/lib.css: $(S)doc/lib.css
+doc/$(1)/rust.css: $(S)doc/rust.css
 	@$$(call E, cp: $$@)
 	$(Q)cp $$< $$@
 
-GENERATED += nd/$(1)/Languages.txt \
-             nd/$(1)/Topics.txt \
-             nd/$(1)/Menu.txt \
-             nd/$(1)/Data
-
-DOCS += doc/$(1)/index.html nd/$(1)/lib.css
+DOCS += doc/$(1)/index.html
 endef
 
-$(eval $(call libdoc,core,$(CORELIB_CRATE) $(CORELIB_INPUTS)))
-$(eval $(call libdoc,std,$(STDLIB_CRATE) $(STDLIB_INPUTS)))
+$(eval $(call libdoc,core,$(CORELIB_CRATE),$(CORELIB_INPUTS)))
+$(eval $(call libdoc,std,$(STDLIB_CRATE),$(STDLIB_INPUTS)))
 endif