Skip to content

Commit

Permalink
Changes from review
Browse files Browse the repository at this point in the history
  • Loading branch information
jreidinger committed Jul 19, 2016
1 parent 9d4505e commit 46ac8c2
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 15 deletions.
27 changes: 14 additions & 13 deletions build-tools/aminclude/autodocs-ycp.ami
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
# Builds source documentation for YCP sources
# Uses ycpdoc
# PARAMETERS:
# AUTODOCS_YCP: Files that the ycp autodocs is built from
# Optional - the default is $(srcdir)/../../src/*.ycp
# AUTODOCS_PM: Files that the perl autodocs is built from
# Optional - the default is $(srcdir)/../../src/*.pm
# AUTODOCS_RB: Files that the ruby autodocs is built from (using yard)
# Optional - the default is $(srcdir)/../../src/modules/*.rb) $(srcdir)/../../src/include/*/*.rb
# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs
# Optional - the default is no subdir, $(docdir)/autodocs
# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __
# Optional - the default is $(srcdir)/../../src
# AUTODOCS_YCP: Files that the ycp autodocs is built from
# Optional - the default is $(srcdir)/../../src/*.ycp
# AUTODOCS_PM: Files that the perl autodocs is built from
# Optional - the default is $(srcdir)/../../src/*.pm
# AUTODOCS_RB: Files that the ruby autodocs is built from (using yard)
# Optional - the default is $(srcdir)/../../src/modules/*.rb) $(srcdir)/../../src/include/*/*.rb
# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs
# Optional - the default is no subdir, $(docdir)/autodocs
# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __
# Optional - the default is $(srcdir)/../../src

htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs

Expand Down Expand Up @@ -53,14 +53,15 @@ index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) $(AUTODOCS_RB)
else \
echo "yard not available, skipping"; \
if [ ! -f index.html ]; then \
echo '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">\
<html lang="en">\
echo '<!DOCTYPE html>\
<html>\
<head>\
<meta http-equiv="content-type" content="text/html; charset=utf-8">\
<meta charset="UTF-8">\
<title>YaST Package Documentation</title>\
</head>\
<body>\
<a href="http://yast.github.io/">Go to official YaST documentation</a>\
<p>This is just a stub, to generate the full source code documentation install the "yardoc" tool.</p>\
</body>\
</html>' > index.html;\
fi; \
Expand Down
4 changes: 2 additions & 2 deletions package/yast2-devtools.changes
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
-------------------------------------------------------------------
Tue Jul 19 07:14:16 UTC 2016 - jreidinger@suse.com

- Generate simple page if yard is not available( follow-up of
previous fix for building ) (part of FATE#320356)
- Generate simple page if yard is not available (follow-up of
previous fix for building) (part of FATE#320356)
- 3.1.45

-------------------------------------------------------------------
Expand Down

0 comments on commit 46ac8c2

Please sign in to comment.