Re: [PATCH 4/4] Move initialization of Git::SVN variables into Git::SVN.
Eric Wong <normalperson@yhbt.net> wrote:
Show 7 quoted lines
> Junio C Hamano <gitster@pobox.com> wrote:
> > Eric Wong <normalperson@yhbt.net> writes:
> >
> > > I'll put the following after ms/makefile-pl but before ms/git-svn-pm:
> >
> > OK, it seems that you haven't pushed out the result yet (which is
> > fine); how do we want to proceed?
> So I'll hold off until we can fix the build regressions (working on it
> now)
OK, all fixed, all I needed was this (squashed in):
--- a/perl/Makefile
+++ b/perl/Makefile
@@ -22,6 +22,8 @@ clean:
$(RM) $(makfile).old
$(RM) PM.stamp
+$(makfile): PM.stamp
+
ifdef NO_PERL_MAKEMAKER
instdir_SQ = $(subst ','\'',$(prefix)/lib)
-------------
The redundant dependencies are biting us :< I agree there presence in
the top-level Makefile needs to be reviewed.
Anyways, you can pull this now from my master:
The following changes since commit cdd159b2f56c9e69e37bbb8f5af301abd93e5407:
Merge branch 'jc/test-lib-source-build-options-early' (2012-07-25 15:47:08 -0700)
are available in the git repository at:
git://bogomips.org/git-svn master
for you to fetch changes up to 5c71028fced46d03bf81b8625680d9ac87c8f4f0:
Move initialization of Git::SVN variables into Git::SVN. (2012-07-27 22:14:54 +0000)
----------------------------------------------------------------
Junio C Hamano (1):
perl: detect new files in MakeMaker builds
Michael G. Schwern (7):
Quiet warning if Makefile.PL is run with -w and no --localedir
Don't lose Error.pm if $@ gets clobbered.
The Makefile.PL will now find .pm files itself.
Extract some utilities from git-svn to allow extracting Git::SVN.
Prepare Git::SVN for extraction into its own file.
Extract Git::SVN from git-svn into its own .pm file.
Move initialization of Git::SVN variables into Git::SVN.
Makefile | 7 +
git-svn.perl | 2340 +---------------------------------------
perl/.gitignore | 1 +
perl/Git/SVN.pm | 2324 +++++++++++++++++++++++++++++++++++++++
perl/Git/SVN/Utils.pm | 59 +
perl/Makefile | 5 +
perl/Makefile.PL | 35 +-
t/Git-SVN/00compile.t | 9 +
t/Git-SVN/Utils/can_compress.t | 11 +
t/Git-SVN/Utils/fatal.t | 34 +
10 files changed, 2487 insertions(+), 2338 deletions(-)
create mode 100644 perl/Git/SVN.pm
create mode 100644 perl/Git/SVN/Utils.pm
create mode 100644 t/Git-SVN/00compile.t
create mode 100644 t/Git-SVN/Utils/can_compress.t
create mode 100644 t/Git-SVN/Utils/fatal.t