[libmarpa-r2-perl] 08/32: New build procedure: t+
Jonas Smedegaard
dr at jones.dk
Sat Nov 22 18:38:36 UTC 2014
This is an automated email from the git hooks/post-receive script.
js pushed a commit to annotated tag Marpa-R2-2.087_000
in repository libmarpa-r2-perl.
commit ae7f85fc40e20f82f508e57e23b792ecbe6f8d00
Author: Jeffrey Kegler <JKEGL at cpan.org>
Date: Fri Jul 4 10:34:46 2014 -0700
New build procedure: t+
---
bump_version | 30 --------------
cpan/Changes | 4 ++
cpan/doit.pl | 56 +++++++++++++++++++++++++++
cpan/html/lib/Marpa/R2/HTML.pm | 2 +-
cpan/html/lib/Marpa/R2/HTML/Callback.pm | 2 +-
cpan/html/lib/Marpa/R2/HTML/Config.pm | 2 +-
cpan/html/lib/Marpa/R2/HTML/Config/Compile.pm | 2 +-
cpan/html/lib/Marpa/R2/HTML/Internal.pm | 2 +-
cpan/html/meta/make_internal_pm.pl | 2 +-
cpan/inc/Marpa/R2/Build_Me.pm | 5 ++-
cpan/lib/Marpa/R2.pm | 2 +-
cpan/lib/Marpa/R2/ASF.pm | 2 +-
cpan/lib/Marpa/R2/Grammar.pm | 2 +-
cpan/lib/Marpa/R2/Internal.pm | 2 +-
cpan/lib/Marpa/R2/MetaAST.pm | 2 +-
cpan/lib/Marpa/R2/MetaG.pm | 2 +-
cpan/lib/Marpa/R2/Recognizer.pm | 2 +-
cpan/lib/Marpa/R2/SLG.pm | 2 +-
cpan/lib/Marpa/R2/SLR.pm | 2 +-
cpan/lib/Marpa/R2/Stuifzand.pm | 2 +-
cpan/lib/Marpa/R2/Thin/Trace.pm | 2 +-
cpan/lib/Marpa/R2/Value.pm | 2 +-
cpan/meta/make_internal_pm.pl | 2 +-
cpan/xs/R2.xs | 6 +--
24 files changed, 85 insertions(+), 54 deletions(-)
diff --git a/bump_version b/bump_version
index ef405c7..31101b2 100644
--- a/bump_version
+++ b/bump_version
@@ -89,36 +89,6 @@ for my $versioned_file (@versioned_files) {
print $out $file;
}
-for my $configure_ac_file (
- qw(
- cpan/libmarpa/ac/configure.ac
- cpan/libmarpa/ac_doc/configure.ac
- )
- )
-{
- say STDERR $configure_ac_file;
- my $file = do { local ( @ARGV, $/ ) = ($configure_ac_file); <> };
- $file =~ s{
- ( m4_define [(] [\[] marpa_major_version [\]] [,] \s* [\[] ) \d+ ( [\]] )
- }{$1${libmarpa_major}$2}xms;
- $file =~ s{
- ( m4_define [(] [\[] marpa_minor_version [\]] [,] \s* [\[] ) \d+ ( [\]] )
- }{$1${libmarpa_minor}$2}xms;
- $file =~ s{
- ( m4_define [(] [\[] marpa_micro_version [\]] [,] \s* [\[] ) \d+ ( [\]] )
- }{$1${libmarpa_micro}$2}xms;
- open my $out, '>', $configure_ac_file;
- print $out $file;
-} ## end for my $configure_ac_file ( qw( cpan/libmarpa/ac/configure.ac...))
-
-{
- open my $out, '>', 'cpan/libmarpa/public/marpa.h-version';
- say $out join " ", q{#define MARPA_MAJOR_VERSION}, $libmarpa_major;
- say $out join " ", q{#define MARPA_MINOR_VERSION}, $libmarpa_minor;
- say $out join " ", q{#define MARPA_MICRO_VERSION}, $libmarpa_micro;
- close $out;
-}
-
chdir 'cpan';
die qq{"perl Build.PL" failed: $!}
if not IPC::Cmd::run(
diff --git a/cpan/Changes b/cpan/Changes
index 2e24520..e16ef1f 100644
--- a/cpan/Changes
+++ b/cpan/Changes
@@ -15,6 +15,10 @@
Revision history for Marpa::R2
+2.087_001 (libmarpa 7.0.0) Fri Jul 4 10:31:34 PDT 2014
+
+ * New build procedure.
+
2.087_000 (libmarpa 6.1.1) Sat May 31 18:07:17 PDT 2014
* New series of developer's releases.
diff --git a/cpan/doit.pl b/cpan/doit.pl
new file mode 100644
index 0000000..9145dee
--- /dev/null
+++ b/cpan/doit.pl
@@ -0,0 +1,56 @@
+#!perl
+
+use 5.010;
+use strict;
+use warnings;
+use autodie;
+use IPC::Cmd;
+use Cwd;
+
+my $commitish = 'master';
+my $libmarpa_repo = 'git at github.com:jeffreykegler/libmarpa.git';
+my $stage = 'core/stage';
+
+die "core/stage already exists" if -r $stage;
+die "libmarpa_build already exists" if -r 'libmarpa_build';
+
+if (not IPC::Cmd::run(
+ command => [ qw(git clone --depth 1), $libmarpa_repo, $stage ],
+ verbose => 1
+ )
+ )
+{
+ die "Could not clone";
+} ## end if ( not IPC::Cmd::run( command => [ qw(git clone -n --depth 1)...]))
+
+if (not IPC::Cmd::run(
+ command => [ qw(git checkout), $commitish ],
+ verbose => 1
+ )
+ )
+{
+ die qq{Could not checkout "$commitish"};
+} ## end if ( not IPC::Cmd::run( command => [ qw(git checkout)...]))
+
+# CHIDR into staging dir
+chdir $stage || die "Could not chdir";
+
+if (not IPC::Cmd::run(
+ command => [ qw(make dist) ],
+ verbose => 1
+ )
+ )
+{
+ die qq{Could not make dist};
+} ## end if ( not IPC::Cmd::run( command => [ qw(git checkout)...]))
+
+if (not IPC::Cmd::run(
+ command => [ qw(sh etc/cp_libmarpa.sh ../../libmarpa_build) ],
+ verbose => 1
+ )
+ )
+{
+ die qq{Could not make dist};
+} ## end if ( not IPC::Cmd::run( command => [ qw(git checkout)...]))
+
+exit 0
diff --git a/cpan/html/lib/Marpa/R2/HTML.pm b/cpan/html/lib/Marpa/R2/HTML.pm
index 6433271..2d4df15 100644
--- a/cpan/html/lib/Marpa/R2/HTML.pm
+++ b/cpan/html/lib/Marpa/R2/HTML.pm
@@ -20,7 +20,7 @@ use strict;
use warnings;
use vars qw( $VERSION $STRING_VERSION );
-$VERSION = '2.087_000';
+$VERSION = '2.087_001';
$STRING_VERSION = $VERSION;
## no critic (BuiltinFunctions::ProhibitStringyEval)
$VERSION = eval $VERSION;
diff --git a/cpan/html/lib/Marpa/R2/HTML/Callback.pm b/cpan/html/lib/Marpa/R2/HTML/Callback.pm
index 47008ee..22eebaa 100644
--- a/cpan/html/lib/Marpa/R2/HTML/Callback.pm
+++ b/cpan/html/lib/Marpa/R2/HTML/Callback.pm
@@ -20,7 +20,7 @@ use strict;
package Marpa::R2::HTML::Callback;
use vars qw( $VERSION $STRING_VERSION );
-$VERSION = '2.087_000';
+$VERSION = '2.087_001';
$STRING_VERSION = $VERSION;
## use critic (BuiltinFunctions::ProhibitStringyEval)
$VERSION = eval $VERSION;
diff --git a/cpan/html/lib/Marpa/R2/HTML/Config.pm b/cpan/html/lib/Marpa/R2/HTML/Config.pm
index 2302b95..e78020a 100644
--- a/cpan/html/lib/Marpa/R2/HTML/Config.pm
+++ b/cpan/html/lib/Marpa/R2/HTML/Config.pm
@@ -20,7 +20,7 @@ use strict;
use warnings;
use vars qw($VERSION $STRING_VERSION);
-$VERSION = '2.087_000';
+$VERSION = '2.087_001';
$STRING_VERSION = $VERSION;
## no critic(BuiltinFunctions::ProhibitStringyEval)
$VERSION = eval $VERSION;
diff --git a/cpan/html/lib/Marpa/R2/HTML/Config/Compile.pm b/cpan/html/lib/Marpa/R2/HTML/Config/Compile.pm
index 54f17d6..8fb885b 100644
--- a/cpan/html/lib/Marpa/R2/HTML/Config/Compile.pm
+++ b/cpan/html/lib/Marpa/R2/HTML/Config/Compile.pm
@@ -20,7 +20,7 @@ use strict;
use warnings;
use vars qw($VERSION $STRING_VERSION);
-$VERSION = '2.087_000';
+$VERSION = '2.087_001';
$STRING_VERSION = $VERSION;
## no critic(BuiltinFunctions::ProhibitStringyEval)
$VERSION = eval $VERSION;
diff --git a/cpan/html/lib/Marpa/R2/HTML/Internal.pm b/cpan/html/lib/Marpa/R2/HTML/Internal.pm
index 4fe8de2..e9ea4a0 100644
--- a/cpan/html/lib/Marpa/R2/HTML/Internal.pm
+++ b/cpan/html/lib/Marpa/R2/HTML/Internal.pm
@@ -24,7 +24,7 @@ use warnings;
use Carp;
use vars qw($VERSION $STRING_VERSION);
-$VERSION = '2.087_000';
+$VERSION = '2.087_001';
$STRING_VERSION = $VERSION;
$VERSION = eval $VERSION;
diff --git a/cpan/html/meta/make_internal_pm.pl b/cpan/html/meta/make_internal_pm.pl
index 73a05d4..4fdadee 100644
--- a/cpan/html/meta/make_internal_pm.pl
+++ b/cpan/html/meta/make_internal_pm.pl
@@ -97,7 +97,7 @@ use warnings;
use Carp;
use vars qw($VERSION $STRING_VERSION);
-$VERSION = '2.087_000';
+$VERSION = '2.087_001';
$STRING_VERSION = $VERSION;
$VERSION = eval $VERSION;
END_OF_HEADER
diff --git a/cpan/inc/Marpa/R2/Build_Me.pm b/cpan/inc/Marpa/R2/Build_Me.pm
index 9af2c4e..f44c0f2 100644
--- a/cpan/inc/Marpa/R2/Build_Me.pm
+++ b/cpan/inc/Marpa/R2/Build_Me.pm
@@ -379,7 +379,7 @@ sub do_libmarpa {
my $cwd = $self->cwd();
my $base_dir = $self->base_dir();
- my $dist_dir = File::Spec->catdir( $base_dir, 'libmarpa_dist' );
+ my $dist_dir = File::Spec->catdir( $base_dir, 'core/stage/dist' );
my $build_dir = File::Spec->catdir(
$base_dir,
( defined $self->args('libmarpa-shared')
@@ -389,11 +389,12 @@ sub do_libmarpa {
);
my $build_stamp_file = File::Spec->catfile( $build_dir, 'stamp-h1' );
+ my $build_makefile = File::Spec->catfile( $build_dir, 'Makefile' );
my $dist_stamp_file = File::Spec->catfile( $dist_dir, 'stamp-h1' );
# If build directory exists and contains a stamp file more recent than the
# tar file, we are done.
- return if $self->up_to_date( [$dist_stamp_file], $build_stamp_file ) ;
+ return if $self->up_to_date( [$dist_stamp_file], [$build_stamp_file, $build_makefile] ) ;
# Otherwise, rebuild from scratch
File::Path::rmtree($build_dir);
diff --git a/cpan/lib/Marpa/R2.pm b/cpan/lib/Marpa/R2.pm
index ace351e..e60d4e2 100644
--- a/cpan/lib/Marpa/R2.pm
+++ b/cpan/lib/Marpa/R2.pm
@@ -20,7 +20,7 @@ use strict;
use warnings;
use vars qw($VERSION $STRING_VERSION @ISA $DEBUG);
-$VERSION = '2.087_000';
+$VERSION = '2.087_001';
$STRING_VERSION = $VERSION;
## no critic (BuiltinFunctions::ProhibitStringyEval)
$VERSION = eval $VERSION;
diff --git a/cpan/lib/Marpa/R2/ASF.pm b/cpan/lib/Marpa/R2/ASF.pm
index ad33dd4..b117ab1 100644
--- a/cpan/lib/Marpa/R2/ASF.pm
+++ b/cpan/lib/Marpa/R2/ASF.pm
@@ -21,7 +21,7 @@ use warnings;
no warnings qw(recursion);
use vars qw($VERSION $STRING_VERSION);
-$VERSION = '2.087_000';
+$VERSION = '2.087_001';
$STRING_VERSION = $VERSION;
## no critic(BuiltinFunctions::ProhibitStringyEval)
$VERSION = eval $VERSION;
diff --git a/cpan/lib/Marpa/R2/Grammar.pm b/cpan/lib/Marpa/R2/Grammar.pm
index b7c059b..e3b4e1f 100644
--- a/cpan/lib/Marpa/R2/Grammar.pm
+++ b/cpan/lib/Marpa/R2/Grammar.pm
@@ -26,7 +26,7 @@ no warnings qw(recursion qw);
use strict;
use vars qw($VERSION $STRING_VERSION);
-$VERSION = '2.087_000';
+$VERSION = '2.087_001';
$STRING_VERSION = $VERSION;
## no critic(BuiltinFunctions::ProhibitStringyEval)
$VERSION = eval $VERSION;
diff --git a/cpan/lib/Marpa/R2/Internal.pm b/cpan/lib/Marpa/R2/Internal.pm
index cf2da8e..661c7ab 100644
--- a/cpan/lib/Marpa/R2/Internal.pm
+++ b/cpan/lib/Marpa/R2/Internal.pm
@@ -24,7 +24,7 @@ use warnings;
use Carp;
use vars qw($VERSION $STRING_VERSION);
-$VERSION = '2.087_000';
+$VERSION = '2.087_001';
$STRING_VERSION = $VERSION;
$VERSION = eval $VERSION;
diff --git a/cpan/lib/Marpa/R2/MetaAST.pm b/cpan/lib/Marpa/R2/MetaAST.pm
index 318f786..279eb3b 100644
--- a/cpan/lib/Marpa/R2/MetaAST.pm
+++ b/cpan/lib/Marpa/R2/MetaAST.pm
@@ -20,7 +20,7 @@ use strict;
use warnings;
use vars qw($VERSION $STRING_VERSION);
-$VERSION = '2.087_000';
+$VERSION = '2.087_001';
$STRING_VERSION = $VERSION;
## no critic(BuiltinFunctions::ProhibitStringyEval)
$VERSION = eval $VERSION;
diff --git a/cpan/lib/Marpa/R2/MetaG.pm b/cpan/lib/Marpa/R2/MetaG.pm
index 2049aaa..6a3fa42 100644
--- a/cpan/lib/Marpa/R2/MetaG.pm
+++ b/cpan/lib/Marpa/R2/MetaG.pm
@@ -20,7 +20,7 @@ use strict;
use warnings;
use vars qw($VERSION $STRING_VERSION);
-$VERSION = '2.087_000';
+$VERSION = '2.087_001';
$STRING_VERSION = $VERSION;
## no critic(BuiltinFunctions::ProhibitStringyEval)
$VERSION = eval $VERSION;
diff --git a/cpan/lib/Marpa/R2/Recognizer.pm b/cpan/lib/Marpa/R2/Recognizer.pm
index 75a9203..890131c 100644
--- a/cpan/lib/Marpa/R2/Recognizer.pm
+++ b/cpan/lib/Marpa/R2/Recognizer.pm
@@ -21,7 +21,7 @@ use strict;
use English qw( -no_match_vars );
use vars qw($VERSION $STRING_VERSION);
-$VERSION = '2.087_000';
+$VERSION = '2.087_001';
$STRING_VERSION = $VERSION;
## no critic(BuiltinFunctions::ProhibitStringyEval)
$VERSION = eval $VERSION;
diff --git a/cpan/lib/Marpa/R2/SLG.pm b/cpan/lib/Marpa/R2/SLG.pm
index 44a5723..1d9b16b 100644
--- a/cpan/lib/Marpa/R2/SLG.pm
+++ b/cpan/lib/Marpa/R2/SLG.pm
@@ -20,7 +20,7 @@ use strict;
use warnings;
use vars qw($VERSION $STRING_VERSION);
-$VERSION = '2.087_000';
+$VERSION = '2.087_001';
$STRING_VERSION = $VERSION;
## no critic(BuiltinFunctions::ProhibitStringyEval)
$VERSION = eval $VERSION;
diff --git a/cpan/lib/Marpa/R2/SLR.pm b/cpan/lib/Marpa/R2/SLR.pm
index ba3b5ac..ae08125 100644
--- a/cpan/lib/Marpa/R2/SLR.pm
+++ b/cpan/lib/Marpa/R2/SLR.pm
@@ -20,7 +20,7 @@ use strict;
use warnings;
use vars qw($VERSION $STRING_VERSION);
-$VERSION = '2.087_000';
+$VERSION = '2.087_001';
$STRING_VERSION = $VERSION;
## no critic(BuiltinFunctions::ProhibitStringyEval)
$VERSION = eval $VERSION;
diff --git a/cpan/lib/Marpa/R2/Stuifzand.pm b/cpan/lib/Marpa/R2/Stuifzand.pm
index 7cd8347..eefad90 100644
--- a/cpan/lib/Marpa/R2/Stuifzand.pm
+++ b/cpan/lib/Marpa/R2/Stuifzand.pm
@@ -20,7 +20,7 @@ use strict;
use warnings;
use vars qw($VERSION $STRING_VERSION);
-$VERSION = '2.087_000';
+$VERSION = '2.087_001';
$STRING_VERSION = $VERSION;
## no critic(BuiltinFunctions::ProhibitStringyEval)
$VERSION = eval $VERSION;
diff --git a/cpan/lib/Marpa/R2/Thin/Trace.pm b/cpan/lib/Marpa/R2/Thin/Trace.pm
index 7112574..d841f2d 100644
--- a/cpan/lib/Marpa/R2/Thin/Trace.pm
+++ b/cpan/lib/Marpa/R2/Thin/Trace.pm
@@ -20,7 +20,7 @@ use warnings;
use strict;
use vars qw($VERSION $STRING_VERSION);
-$VERSION = '2.087_000';
+$VERSION = '2.087_001';
$STRING_VERSION = $VERSION;
$VERSION = eval $VERSION;
diff --git a/cpan/lib/Marpa/R2/Value.pm b/cpan/lib/Marpa/R2/Value.pm
index 0bde664..0d336e0 100644
--- a/cpan/lib/Marpa/R2/Value.pm
+++ b/cpan/lib/Marpa/R2/Value.pm
@@ -20,7 +20,7 @@ use warnings;
use strict;
use vars qw($VERSION $STRING_VERSION);
-$VERSION = '2.087_000';
+$VERSION = '2.087_001';
$STRING_VERSION = $VERSION;
## no critic (BuiltinFunctions::ProhibitStringyEval)
$VERSION = eval $VERSION;
diff --git a/cpan/meta/make_internal_pm.pl b/cpan/meta/make_internal_pm.pl
index a6c4342..5457129 100644
--- a/cpan/meta/make_internal_pm.pl
+++ b/cpan/meta/make_internal_pm.pl
@@ -97,7 +97,7 @@ use warnings;
use Carp;
use vars qw($VERSION $STRING_VERSION);
-$VERSION = '2.087_000';
+$VERSION = '2.087_001';
$STRING_VERSION = $VERSION;
$VERSION = eval $VERSION;
END_OF_HEADER
diff --git a/cpan/xs/R2.xs b/cpan/xs/R2.xs
index e58d08b..3dcff66 100644
--- a/cpan/xs/R2.xs
+++ b/cpan/xs/R2.xs
@@ -2370,9 +2370,9 @@ slr_es_span_to_literal_sv (Scanless_R * slr,
return newSVpvn ("", 0);
}
-#define EXPECTED_LIBMARPA_MAJOR 6
-#define EXPECTED_LIBMARPA_MINOR 1
-#define EXPECTED_LIBMARPA_MICRO 1
+#define EXPECTED_LIBMARPA_MAJOR 7
+#define EXPECTED_LIBMARPA_MINOR 0
+#define EXPECTED_LIBMARPA_MICRO 0
MODULE = Marpa::R2 PACKAGE = Marpa::R2::Thin
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libmarpa-r2-perl.git
More information about the Pkg-perl-cvs-commits
mailing list