Merge pull request #16 from yast/yard_markdown

autodocs - use markdown format in ruby documentation comments
yast · Jul 22, 2013 · afb7668 · afb7668
2 parents 333c1b5 + 28cd58c
commit afb7668
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.24.3
+2.24.4
diff --git a/devtools/admin/aminclude/autodocs-ycp.ami b/devtools/admin/aminclude/autodocs-ycp.ami
@@ -28,6 +28,8 @@ AUTODOCS_STRIP ?= $(srcdir)/../../src
 
 # yard specific options
 YARD ?= yard
+# use markdown format by default
+YARD_OPTIONS ?= -o . -m markdown
 
 # yard specific clean
 clean-local:
@@ -42,4 +44,4 @@ index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) $(AUTODOCS_RB)
 		pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
 		echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \
 	done
-	if [ -n "$(AUTODOCS_RB)" ]; then $(YARD) doc -o . $(AUTODOCS_RB); fi
+	if [ -n "$(AUTODOCS_RB)" ]; then $(YARD) doc $(YARD_OPTIONS) $(AUTODOCS_RB); fi
diff --git a/package/yast2-devtools.changes b/package/yast2-devtools.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jul 22 13:56:47 UTC 2013 - lslezak@suse.cz
+
+- autodocs - use markdown format in ruby documentation comments,
+  added YARD_OPTIONS to allow overriding the defaults
+- 2.24.4
+
 -------------------------------------------------------------------
 Thu Jul 18 11:14:32 UTC 2013 - mvidner@suse.com