Author: mvidner Date: Fri Jun 19 10:38:11 2009 New Revision: 57644 URL: http://svn.opensuse.org/viewcvs/yast?rev=57644&view=rev Log: autodocs-ycp.ami: fixes to work with subdirectories: introduced AUTODOCS_STRIP. Fixed pm docs to work with namespaces. Not using $^ so that stripping works (./../foo vs ../foo) Modified: trunk/devtools/VERSION trunk/devtools/devtools/admin/aminclude/autodocs-ycp.ami trunk/devtools/package/yast2-devtools.changes Modified: trunk/devtools/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/VERSION?rev=57644&r1=57643&r2=57644&view=diff ============================================================================== --- trunk/devtools/VERSION (original) +++ trunk/devtools/VERSION Fri Jun 19 10:38:11 2009 @@ -1 +1 @@ -2.18.7 +2.18.8 Modified: trunk/devtools/devtools/admin/aminclude/autodocs-ycp.ami URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/admin/aminclude/autodocs-ycp.ami?rev=57644&r1=57643&r2=57644&view=diff ============================================================================== --- trunk/devtools/devtools/admin/aminclude/autodocs-ycp.ami (original) +++ trunk/devtools/devtools/admin/aminclude/autodocs-ycp.ami Fri Jun 19 10:38:11 2009 @@ -10,6 +10,8 @@ # Optional - the default is $(srcdir)/../../src/*.pm # 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 @@ -18,12 +20,13 @@ AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) +AUTODOCS_STRIP ?= $(srcdir)/../../src index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) #including *.pm, for the index - ${YCPDOC} -d. $^ + ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP) for i in $(AUTODOCS_PM); do \ - b=`basename $$i`; b=$${b%.pm}; \ + b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ - echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \ + echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \ done Modified: trunk/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/package/yast2-devtools.changes?rev=57644&r1=57643&r2=57644&view=diff ============================================================================== --- trunk/devtools/package/yast2-devtools.changes (original) +++ trunk/devtools/package/yast2-devtools.changes Fri Jun 19 10:38:11 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jun 19 10:37:43 CEST 2009 - mvidner@suse.cz + +- autodocs-ycp.ami: fixes to work with subdirectories: + introduced AUTODOCS_STRIP. +- 2.18.8 + +------------------------------------------------------------------- Tue Jun 16 16:42:33 CEST 2009 - mvidner@suse.cz - autodocs-ycp.ami: Added AUTODOCS_SUBDIR, for yast2.rpm -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org