Change in flashrom[master]: Install the man file when using meson as a buildsystem

[Richard Hughes (Code Review)]

Richard Hughes has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/38939 )

Change subject: Install the man file when using meson as a buildsystem
......................................................................

Install the man file when using meson as a buildsystem

This fixes a regression with the Fedora package.

Change-Id: I881bd5002a842072ce9dadea033c51a2668f9e7c
Signed-off-by: Richard Hughes 
---
M meson.build
1 file changed, 9 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/39/38939/1

diff --git a/meson.build b/meson.build
index 375089c..df39290 100644
--- a/meson.build
+++ b/meson.build
@@ -299,6 +299,7 @@
 prefix = get_option('prefix')
 sbindir = join_paths(prefix, get_option('sbindir'))
 libdir = join_paths(prefix, get_option('libdir'))
+mandir = join_paths(prefix, get_option('mandir'))

install_headers([
     'libflashrom.h',
@@ -372,6 +373,14 @@
   description : 'library to interact with flashrom',
 )

+configure_file(
+  input : 'flashrom.8.tmpl',
+  output : 'flashrom.8',
+  copy: true,
+  install: true,
+  install_dir: join_paths(mandir, 'man8'),
+)
+
 flashrom_dep = declare_dependency(
   link_with : flashrom,
   include_directories : include_directories('.'),

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/38939 )

Change subject: Install the man file when using meson as a buildsystem
......................................................................

Patch Set 1: Code-Review+1

[Carl-Daniel Hailfinger (Code Review)]

Carl-Daniel Hailfinger has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/38939 )

Change subject: Install the man file when using meson as a buildsystem
......................................................................

Patch Set 1:

(1 comment)

Could you please extend the Meson rule to take care of man page template processing? Thanks.

https://review.coreboot.org/c/flashrom/+/38939/1/meson.build 
File meson.build:

https://review.coreboot.org/c/flashrom/+/38939/1/meson.build@383 
PS1, Line 383: 
flashrom.8.tmpl is a template file and requires processing. Quoting from the Makefile:

$(PROGRAM).8: $(PROGRAM).8.tmpl
        @# Add the man page change date and version to the man page
        @sed -e 's#.TH FLASHROM 8 .*#.TH FLASHROM 8 "$(MAN_DATE)" "$(VERSION)" "$(MAN_DATE)"#' <$< >$@

[Richard Hughes (Code Review)]

Hello Paul Menzel, build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/flashrom/+/38939

to look at the new patch set (#2).

Change subject: Install the man file when using meson as a buildsystem
......................................................................

Install the man file when using meson as a buildsystem

This fixes a regression with the Fedora package.

Change-Id: I881bd5002a842072ce9dadea033c51a2668f9e7c
Signed-off-by: Richard Hughes 
---
M flashrom.8.tmpl
M meson.build
2 files changed, 12 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/39/38939/2

[Richard Hughes (Code Review)]

Richard Hughes has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/38939 )

Change subject: Install the man file when using meson as a buildsystem
......................................................................

Patch Set 2:
> Patch Set 1:
> Could you please extend the Meson rule to take care of man page template processing?

Sure, no problem. I didn't know how useful it was in the header, but I guess it makes sense to do the same thing as the Makefile. New patch pushed.

[David Hendricks (Code Review)]

David Hendricks has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/38939 )

Change subject: Install the man file when using meson as a buildsystem
......................................................................

Patch Set 2: Code-Review+1

[David Hendricks (Code Review)]

David Hendricks has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/38939 )

Change subject: Install the man file when using meson as a buildsystem
......................................................................

Patch Set 2: Code-Review+2

I think PS2 works, the date in the man page shows up the same when using meson as when using `make` now.

[Patrick Georgi (Code Review)]

Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/38939 )

Change subject: Install the man file when using meson as a buildsystem
......................................................................

Patch Set 2:

(1 comment)

https://review.coreboot.org/c/flashrom/+/38939/2/flashrom.8.tmpl 
File flashrom.8.tmpl:

https://review.coreboot.org/c/flashrom/+/38939/2/flashrom.8.tmpl@43 
PS2, Line 43: .TH FLASHROM 8 "@MAN_DATE@" "@VERSION@" "@MAN_DATE@"
Does it make sense to adapt the Makefile rule to replace these explicitly (like meson), for consistency? Otherwise people get very puzzled if either side changes, or one of the symbols get used in a different line.

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/38939 )

Change subject: Install the man file when using meson as a buildsystem
......................................................................

Patch Set 2:

(1 comment)

https://review.coreboot.org/c/flashrom/+/38939/2/flashrom.8.tmpl 
File flashrom.8.tmpl:

https://review.coreboot.org/c/flashrom/+/38939/2/flashrom.8.tmpl@43 
PS2, Line 43: .TH FLASHROM 8 "@MAN_DATE@" "@VERSION@" "@MAN_DATE@"
> Does it make sense to adapt the Makefile rule to replace these explicitly (like meson), for consiste […]

It would be desirable. Having two build systems is a bit of a mess, IMHO.

[Edward O'Callaghan (Code Review)]

Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/38939 )

Change subject: Install the man file when using meson as a buildsystem
......................................................................

Patch Set 3: Code-Review+2

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/38939 )

Change subject: Install the man file when using meson as a buildsystem
......................................................................

Patch Set 3: Code-Review+2

Looks like it needs a manual rebase. Any takers?

[Edward O'Callaghan (Code Review)]

Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/38939 )

Change subject: Install the man file when using meson as a buildsystem
......................................................................

Patch Set 4:
> Patch Set 3: Code-Review+2
>
> Looks like it needs a manual rebase. Any takers?

You just needed to hit the rebase button, no need to do it manually.

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/38939 )

Change subject: Install the man file when using meson as a buildsystem
......................................................................

Patch Set 4:
> Patch Set 4:
> > Patch Set 3: Code-Review+2
> >
> > Looks like it needs a manual rebase. Any takers?
>
> You just needed to hit the rebase button, no need to do it manually.

Oh, I usually need to manually rebase when there's merge conflicts.

[Patrick Georgi (Code Review)]

Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/38939 )

Change subject: Install the man file when using meson as a buildsystem
......................................................................

Patch Set 4:

(2 comments)

https://review.coreboot.org/c/flashrom/+/38939/2/flashrom.8.tmpl 
File flashrom.8.tmpl:

https://review.coreboot.org/c/flashrom/+/38939/2/flashrom.8.tmpl@43 
PS2, Line 43: .TH FLASHROM 8 "@MAN_DATE@" "@VERSION@" "@MAN_DATE@"
> It would be desirable. Having two build systems is a bit of a mess, IMHO.

Ack

https://review.coreboot.org/c/flashrom/+/38939/1/meson.build 
File meson.build:

https://review.coreboot.org/c/flashrom/+/38939/1/meson.build@383 
PS1, Line 383:
> flashrom.8.tmpl is a template file and requires processing. Quoting from the Makefile: […]

Done

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/flashrom/+/38939 )

Change subject: Install the man file when using meson as a buildsystem
......................................................................

Install the man file when using meson as a buildsystem

This fixes a regression with the Fedora package.

Change-Id: I881bd5002a842072ce9dadea033c51a2668f9e7c
Signed-off-by: Richard Hughes 
Reviewed-on: https://review.coreboot.org/c/flashrom/+/38939
Reviewed-by: Edward O'Callaghan 
Reviewed-by: Angel Pons 
Reviewed-by: David Hendricks 
Tested-by: build bot (Jenkins) 
---
M flashrom.8.tmpl
M meson.build
2 files changed, 12 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  David Hendricks: Looks good to me, approved
  Angel Pons: Looks good to me, approved
  Edward O'Callaghan: Looks good to me, approved

diff --git a/flashrom.8.tmpl b/flashrom.8.tmpl
index fde98c0..db50d59 100644
--- a/flashrom.8.tmpl
+++ b/flashrom.8.tmpl
@@ -40,7 +40,7 @@
 .    }
 .  }
 ..
-.TH FLASHROM 8 "" ""
+.TH FLASHROM 8 "@MAN_DATE@" "@VERSION@" "@MAN_DATE@"
 .SH NAME
 flashrom - detect, read, write, verify and erase flash chips
 .SH SYNOPSIS
diff --git a/meson.build b/meson.build
index 3d395e8..5374e87 100644
--- a/meson.build
+++ b/meson.build
@@ -321,6 +321,7 @@
 prefix = get_option('prefix')
 sbindir = join_paths(prefix, get_option('sbindir'))
 libdir = join_paths(prefix, get_option('libdir'))
+mandir = join_paths(prefix, get_option('mandir'))

install_headers([
     'libflashrom.h',
@@ -394,6 +395,16 @@
   description : 'library to interact with flashrom',
 )

+conf.set('VERSION', version)
+conf.set('MAN_DATE', run_command('util/getrevision.sh', '--date', 'flashrom.8.tmpl').stdout().strip())
+configure_file(
+  input : 'flashrom.8.tmpl',
+  output : 'flashrom.8',
+  configuration : conf,
+  install: true,
+  install_dir: join_paths(mandir, 'man8'),
+)
+
 flashrom_dep = declare_dependency(
   link_with : flashrom,
   include_directories : include_directories('.'),