Hongli Lai
2011-Jun-06 17:31 UTC
[PATCH] Ensure that ''make gem'' builds the documentation too.
>From bfefc2cf0efb0913a42862886363b3140dcdbb2a Mon Sep 17 00:00:00 2001From: Hongli Lai (Phusion) <hongli at phusion.nl> Date: Mon, 6 Jun 2011 13:39:00 +0200 Subject: [PATCH] Ensure that ''make gem'' builds the documentation too. If autogenerated documentation files, like man pages, don''t exist then ''make gem'' will fail, complaining that some files are not found. By depending the ''gem'' target on the ''doc'' target we ensure that ''make gem'' always works. Signed-off-by: Hongli Lai (Phusion) <hongli at phusion.nl> --- GNUmakefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 4072826..90cc451 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -257,7 +257,7 @@ gem: $(pkggem) install-gem: $(pkggem) gem install $(CURDIR)/$< -$(pkggem): .manifest fix-perms +$(pkggem): .manifest fix-perms doc gem build $(rfpackage).gemspec mkdir -p pkg mv $(@F) $@ -- 1.7.5
Eric Wong
2011-Jun-06 17:51 UTC
[PATCH] Ensure that ''make gem'' builds the documentation too.
Hongli Lai <hongli at phusion.nl> wrote:> >From bfefc2cf0efb0913a42862886363b3140dcdbb2a Mon Sep 17 00:00:00 2001 > From: Hongli Lai (Phusion) <hongli at phusion.nl> > Date: Mon, 6 Jun 2011 13:39:00 +0200 > Subject: [PATCH] Ensure that ''make gem'' builds the documentation too. > > If autogenerated documentation files, like man pages, don''t exist then > ''make gem'' will fail, complaining that some files are not found. By > depending the ''gem'' target on the ''doc'' target we ensure that ''make gem'' > always works. > > Signed-off-by: Hongli Lai (Phusion) <hongli at phusion.nl>Oops, this was a regression introduced when I switched to wrongdoc in f62ef19a4aa3d3e4ce1aa37a499907ff776a8964 Perhaps this is better? It''ll also affect the tgz target and not just the gem target. diff --git a/GNUmakefile b/GNUmakefile index da55052..61fb739 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -164,7 +164,7 @@ pkg_extra := GIT-VERSION-FILE ChangeLog LATEST NEWS \ ChangeLog: GIT-VERSION-FILE .wrongdoc.yml wrongdoc prepare -.manifest: ChangeLog $(ext)/unicorn_http.c +.manifest: ChangeLog $(ext)/unicorn_http.c man (git ls-files && for i in $@ $(pkg_extra); do echo $$i; done) | \ LC_ALL=C sort > $@+ cmp $@+ $@ || mv $@+ $@ -- Eric Wong
Hongli Lai
2011-Jun-07 15:11 UTC
[PATCH] Ensure that ''make gem'' builds the documentation too.
On Mon, Jun 6, 2011 at 7:51 PM, Eric Wong <normalperson at yhbt.net> wrote:> Oops, this was a regression introduced when I switched to wrongdoc > in f62ef19a4aa3d3e4ce1aa37a499907ff776a8964 > > Perhaps this is better? ?It''ll also affect the tgz target and not > just the gem target.I''m fine with it if it works. :) -- Phusion | Ruby & Rails deployment, scaling and tuning solutions Web: http://www.phusion.nl/ E-mail: info at phusion.nl Chamber of commerce no: 08173483 (The Netherlands)
Eric Wong
2011-Jun-07 17:06 UTC
[PATCH] Ensure that ''make gem'' builds the documentation too.
Hongli Lai <hongli at phusion.nl> wrote:> On Mon, Jun 6, 2011 at 7:51 PM, Eric Wong <normalperson at yhbt.net> wrote: > > Oops, this was a regression introduced when I switched to wrongdoc > > in f62ef19a4aa3d3e4ce1aa37a499907ff776a8964 > > > > Perhaps this is better? ?It''ll also affect the tgz target and not > > just the gem target. > > I''m fine with it if it works. :)Pushed out with the following commit message:>From 0dc56fd03ea478ae054e3d0398703f43e017723b Mon Sep 17 00:00:00 2001From: Eric Wong <normalperson at yhbt.net> Date: Tue, 7 Jun 2011 09:56:30 -0700 Subject: [PATCH] build: ensure gem and tgz targets build manpages Original patch by Hongli Lai <hongli at phusion.nl>:> >From bfefc2cf0efb0913a42862886363b3140dcdbb2a Mon Sep 17 00:00:00 2001 > From: Hongli Lai (Phusion) <hongli at phusion.nl> > Date: Mon, 6 Jun 2011 13:39:00 +0200 > Subject: [PATCH] Ensure that ''make gem'' builds the documentation too. > > If autogenerated documentation files, like man pages, don''t exist then > ''make gem'' will fail, complaining that some files are not found. By > depending the ''gem'' target on the ''doc'' target we ensure that ''make gem'' > always works. > > Signed-off-by: Hongli Lai (Phusion) <hongli at phusion.nl>ref: http://mid.gmane.org/4DED0EE2.7040400 at phusion.nl -- Eric Wong