vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Don't require grub-mkconfig_lib to generate manpages for programs.

Browse source 
* gentpl.py (manpage): Additional argument adddeps. Add adddeps to
	dependencies, don't add grub-mkconfig_lib.
	(program): Pass empty adddeps.
	(script): Pass grub-mkconfig_lib as adddeps.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-09-12 08:27:26 +02:00
parent 592fd0e4d6
commit 250e475b26
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2012-09-12 Vladimir Serbinenko <phcoder@gmail.com>
Don't require grub-mkconfig_lib to generate manpages for programs.
* gentpl.py (manpage): Additional argument adddeps. Add adddeps to
dependencies, don't add grub-mkconfig_lib.
(program): Pass empty adddeps.
(script): Pass grub-mkconfig_lib as adddeps.
2012-09-11 Vladimir Serbinenko <phcoder@gmail.com> 2012-09-11 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/disk/diskfilter.c (free_array) [GRUB_UTIL]: Fix memory leak. * grub-core/disk/diskfilter.c (free_array) [GRUB_UTIL]: Fix memory leak.

8
gentpl.py
View file

@ -484,10 +484,10 @@ def library(platform):
def installdir(default="bin"): def installdir(default="bin"):
return "[+ IF installdir +][+ installdir +][+ ELSE +]" + default + "[+ ENDIF +]" return "[+ IF installdir +][+ installdir +][+ ELSE +]" + default + "[+ ENDIF +]"
def manpage(): def manpage(adddeps):
r = "if COND_MAN_PAGES\n" r = "if COND_MAN_PAGES\n"
r += gvar_add("man_MANS", "[+ name +].[+ mansection +]\n") r += gvar_add("man_MANS", "[+ name +].[+ mansection +]\n")
r += rule("[+ name +].[+ mansection +]", "[+ name +] grub-mkconfig_lib", """ r += rule("[+ name +].[+ mansection +]", "[+ name +] " + adddeps, """
chmod a+x [+ name +] chmod a+x [+ name +]
PATH=$(builddir):$$PATH pkgdatadir=$(builddir) $(HELP2MAN) --section=[+ mansection +] -i $(top_srcdir)/docs/man/[+ name +].h2m -o $@ [+ name +] PATH=$(builddir):$$PATH pkgdatadir=$(builddir) $(HELP2MAN) --section=[+ mansection +] -i $(top_srcdir)/docs/man/[+ name +].h2m -o $@ [+ name +]
""") """)
@ -503,7 +503,7 @@ def program(platform, test=False):
r += gvar_add("TESTS", "[+ name +]") r += gvar_add("TESTS", "[+ name +]")
r += "[+ ELSE +]" r += "[+ ELSE +]"
r += var_add(installdir() + "_PROGRAMS", "[+ name +]") r += var_add(installdir() + "_PROGRAMS", "[+ name +]")
r += "[+ IF mansection +]" + manpage() + "[+ ENDIF +]" r += "[+ IF mansection +]" + manpage("") + "[+ ENDIF +]"
r += "[+ ENDIF +]" r += "[+ ENDIF +]"
r += var_set(cname() + "_SOURCES", platform_sources(platform)) r += var_set(cname() + "_SOURCES", platform_sources(platform))
@ -532,7 +532,7 @@ def script(platform):
r += gvar_add ("TESTS", "[+ name +]") r += gvar_add ("TESTS", "[+ name +]")
r += "[+ ELSE +]" r += "[+ ELSE +]"
r += var_add(installdir() + "_SCRIPTS", "[+ name +]") r += var_add(installdir() + "_SCRIPTS", "[+ name +]")
r += "[+ IF mansection +]" + manpage() + "[+ ENDIF +]" r += "[+ IF mansection +]" + manpage("grub-mkconfig_lib") + "[+ ENDIF +]"
r += "[+ ENDIF +]" r += "[+ ENDIF +]"
r += rule("[+ name +]", platform_sources(platform) + " $(top_builddir)/config.status", """ r += rule("[+ name +]", platform_sources(platform) + " $(top_builddir)/config.status", """