[libmarpa-r2-perl] 24/32: Update Libmarpa to 7.0.1
Jonas Smedegaard
dr at jones.dk
Sat Nov 22 18:38:40 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 992e74c9cd3ae812cc32569e3c2dff7687bc4285
Author: Jeffrey Kegler <JKEGL at cpan.org>
Date: Sun Jul 6 19:51:20 2014 -0700
Update Libmarpa to 7.0.1
---
cpan/core/read_only/LIB_VERSION | 2 +-
cpan/core/read_only/Makefile.am | 5 +-
cpan/core/read_only/Makefile.in | 5 +-
cpan/core/read_only/README.INSTALL | 28 ++++++++++
cpan/core/read_only/configure | 24 ++++-----
cpan/core/read_only/configure.ac | 2 +-
cpan/core/read_only/marpa.h | 2 +-
cpan/core/read_only/notes/shared_test.txt | 90 -------------------------------
cpan/core/read_only/stamp-h1 | 2 +-
cpan/core/read_only/win32/marpa.def | 2 +-
cpan/etc/libmarpa_get.pl | 14 ++---
11 files changed, 57 insertions(+), 119 deletions(-)
diff --git a/cpan/core/read_only/LIB_VERSION b/cpan/core/read_only/LIB_VERSION
index 66ce77b..9fe9ff9 100644
--- a/cpan/core/read_only/LIB_VERSION
+++ b/cpan/core/read_only/LIB_VERSION
@@ -1 +1 @@
-7.0.0
+7.0.1
diff --git a/cpan/core/read_only/Makefile.am b/cpan/core/read_only/Makefile.am
index dc85a18..0881aac 100644
--- a/cpan/core/read_only/Makefile.am
+++ b/cpan/core/read_only/Makefile.am
@@ -26,9 +26,8 @@ libmarpa_la_SOURCES = marpa.c marpa.h \
marpa_tavl.c marpa_tavl.h \
marpa_ami.c marpa_ami.h \
marpa_codes.c marpa_slif.c
-EXTRA_DIST = LIB_VERSION \
- win32/marpa.def Makefile.win32 win32/do_config_h.pl \
- notes/shared_test.txt
+EXTRA_DIST = LIB_VERSION README.INSTALL \
+ win32/marpa.def Makefile.win32 win32/do_config_h.pl
libmarpa_la_LIBADD = $(LIBOBJS)
libmarpa_la_LDFLAGS = -release $(RELEASE)
include_HEADERS = marpa.h \
diff --git a/cpan/core/read_only/Makefile.in b/cpan/core/read_only/Makefile.in
index 5537254..a414436 100644
--- a/cpan/core/read_only/Makefile.in
+++ b/cpan/core/read_only/Makefile.in
@@ -270,9 +270,8 @@ libmarpa_la_SOURCES = marpa.c marpa.h \
marpa_ami.c marpa_ami.h \
marpa_codes.c marpa_slif.c
-EXTRA_DIST = LIB_VERSION \
- win32/marpa.def Makefile.win32 win32/do_config_h.pl \
- notes/shared_test.txt
+EXTRA_DIST = LIB_VERSION README.INSTALL \
+ win32/marpa.def Makefile.win32 win32/do_config_h.pl
libmarpa_la_LIBADD = $(LIBOBJS)
libmarpa_la_LDFLAGS = -release $(RELEASE)
diff --git a/cpan/core/read_only/README.INSTALL b/cpan/core/read_only/README.INSTALL
new file mode 100644
index 0000000..70a9c32
--- /dev/null
+++ b/cpan/core/read_only/README.INSTALL
@@ -0,0 +1,28 @@
+This is an autotools-built distribution, and is built and installed
+as described in the autotools documents. The INSTALL file in this
+directory is the standard autotools INSTALL file, unaltered. The rest
+of this document contains some notes that supplement it.
+
+TAGS
+====
+
+Libmarpa allows you to specify a "tag" at configure time. This is
+compiled into the Libmarpa library and can be used to identify it.
+The archetypal use case is testing -- the tag is a convenent way to
+ensure that you are testing with the library that you think you are
+testing with. By default, if you compile with GCC, the tag is a time
+stamp, recording when the preprocessor was run. You can also set the
+tag explicitly:
+
+ ./configure MARPA_DEBUG_FLAG=-DMARPA_TAG=testing123
+
+The standard Marpa::R2 test suite prints the tag early in its test output:
+
+ t/00-load.t ............ 1/4 # Marpa::R2 version is 2.085_004 #
+ Libmarpa version is 6.0.3 # Libmarpa tag: testing123
+
+You can put spaces and other non-word characters into the tag, but
+you have to figure out how to make them run the guantlet from shell to
+Makefile to compiler command line. Here's an example who works on Linux:
+
+ ./configure MARPA_DEBUG_FLAG="\"-DMARPA_TAG=*This is a test*\""
diff --git a/cpan/core/read_only/configure b/cpan/core/read_only/configure
index e3f97fd..a812862 100755
--- a/cpan/core/read_only/configure
+++ b/cpan/core/read_only/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libmarpa 7.0.0.
+# Generated by GNU Autoconf 2.68 for libmarpa 7.0.1.
#
# Report bugs to <http://rt.cpan.org/NoAuth/Bugs.html?Dist=Marpa>.
#
@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libmarpa'
PACKAGE_TARNAME='libmarpa'
-PACKAGE_VERSION='7.0.0'
-PACKAGE_STRING='libmarpa 7.0.0'
+PACKAGE_VERSION='7.0.1'
+PACKAGE_STRING='libmarpa 7.0.1'
PACKAGE_BUGREPORT='http://rt.cpan.org/NoAuth/Bugs.html?Dist=Marpa'
PACKAGE_URL=''
@@ -1294,7 +1294,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libmarpa 7.0.0 to adapt to many kinds of systems.
+\`configure' configures libmarpa 7.0.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1364,7 +1364,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libmarpa 7.0.0:";;
+ short | recursive ) echo "Configuration of libmarpa 7.0.1:";;
esac
cat <<\_ACEOF
@@ -1467,7 +1467,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libmarpa configure 7.0.0
+libmarpa configure 7.0.1
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2068,7 +2068,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libmarpa $as_me 7.0.0, which was
+It was created by libmarpa $as_me 7.0.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2889,7 +2889,7 @@ fi
# Define the identity of the package.
PACKAGE='libmarpa'
- VERSION='7.0.0'
+ VERSION='7.0.1'
cat >>confdefs.h <<_ACEOF
@@ -12571,7 +12571,7 @@ MARPA_LIB_MAJOR_VERSION=7
MARPA_LIB_MINOR_VERSION=0
-MARPA_LIB_MICRO_VERSION=0
+MARPA_LIB_MICRO_VERSION=1
$as_echo "#define MARPA_LIB_MAJOR_VERSION 7" >>confdefs.h
@@ -12580,7 +12580,7 @@ $as_echo "#define MARPA_LIB_MAJOR_VERSION 7" >>confdefs.h
$as_echo "#define MARPA_LIB_MINOR_VERSION 0" >>confdefs.h
-$as_echo "#define MARPA_LIB_MICRO_VERSION 0" >>confdefs.h
+$as_echo "#define MARPA_LIB_MICRO_VERSION 1" >>confdefs.h
@@ -13184,7 +13184,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libmarpa $as_me 7.0.0, which was
+This file was extended by libmarpa $as_me 7.0.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13250,7 +13250,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libmarpa config.status 7.0.0
+libmarpa config.status 7.0.1
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/cpan/core/read_only/configure.ac b/cpan/core/read_only/configure.ac
index 843b82b..e88dab3 100644
--- a/cpan/core/read_only/configure.ac
+++ b/cpan/core/read_only/configure.ac
@@ -25,7 +25,7 @@ m4_define(marpa_configure_in)
m4_define([marpa_major_version], [7])
m4_define([marpa_minor_version], [0])
-m4_define([marpa_micro_version], [0])
+m4_define([marpa_micro_version], [1])
m4_define([marpa_version],
[marpa_major_version.marpa_minor_version.marpa_micro_version])
diff --git a/cpan/core/read_only/marpa.h b/cpan/core/read_only/marpa.h
index 67e0e27..4436ec3 100644
--- a/cpan/core/read_only/marpa.h
+++ b/cpan/core/read_only/marpa.h
@@ -33,7 +33,7 @@
#define MARPA_MAJOR_VERSION 7
#define MARPA_MINOR_VERSION 0
-#define MARPA_MICRO_VERSION 0
+#define MARPA_MICRO_VERSION 1
#line 1 "./marpa.h-err"
#define MARPA_ERROR_COUNT 99
diff --git a/cpan/core/read_only/notes/shared_test.txt b/cpan/core/read_only/notes/shared_test.txt
deleted file mode 100644
index e27ff68..0000000
--- a/cpan/core/read_only/notes/shared_test.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2014 Jeffrey Kegler
-# This file is part of Libmarpa. Libmarpa is free software: you can
-# redistribute it and/or modify it under the terms of the GNU Lesser
-# General Public License as published by the Free Software Foundation,
-# either version 3 of the License, or (at your option) any later version.
-#
-# Libmarpa is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser
-# General Public License along with Libmarpa. If not, see
-# http://www.gnu.org/licenses/.
-
-# IMPORTANT!!! The Marpa build has changed and this script no
-# longer works.
-
-I've added the ability to test external shared libraries to Marpa::R2.
-
-Note the primary intent is to test *external* shared libraries in
-arbitrary places, so by default the test fails because it cannot find a
-shared library. This behavior may be a little perplexing if you stumble
-into it by accident, because in the course of setting up shared library
-testing, you do need to create one.
-
-Doesn't let "principle of least surprise" dictate that Marpa::R2
-by default find the shared library it created? Here I invoke the
-"principle of least dangerous surprise". Forcing the user to specify
-explicitly which shared library minimizes the risk that he is testing
-against the wrong library, and usually the test results from the shared
-library inside Marpa::R2 will *not* be those of interest.
-
-Here are the details. (I am assuming a Linux environment.)
-
-1.) In the Marpa::R2 cpan directory:
-
- rm -r blib_shared libmarpa_shared
-
-This step is optional, and assures you a clean environment.
-
-2.) In the Marpa::R2 cpan directory:
-
- ./Build code --libmarpa-shared=1
-
-3.) To test you need to tell the system where to find the shared library
-that you are interested in. It does *not* assume that it is the one you've
-just built. This is done differently on different systems, but in Linux
-this works:
-
- LD_LIBRARY_PATH=$HOME/stage/libmarpa_dist/.libs ./Build test --libmarpa-shared=1
-
-LD_LIBRARY_PATH tells Linux where to look for additional shared libraries.
-If LD_LIBRARY_PATH were not specified the test would fail.
-
-4.) If you really want to test the library that was built in step 2, you
-have to find it and point the library search path to it. Currently it is
-in libmarpa_shared/.libs in the cpan directory and so this works on Linux:
-
- LD_LIBRARY_PATH=libmarpa_shared/.libs ./Build test --libmarpa-shared=1
-
-Note 1: You can't install the shared library that Marpa::R2 creates.
-This is a feature. To create a shared library for installation, you
-should copy the libmarpa distribution outside the Marpa::R2 directory
-structure, make the needed changes, (for example, you may need to convert
-libmarpa's version number to some new scheme), and then copy it to the
-destination you've picked.
-
-Note 2: In the "--libmarpa-shared=1" flag, the assignment to 1 is necessary.
-Otherwise Module::Build assumes that you've set "libmarpa-shared" to undefined.
-
-Note 3: To be sure you are actually testing the library you hope you
-are testing, libmarpa now has a "tag", which can be set at compile
-time and which can identify every compilation uniquely. By default,
-if you compile with GCC, the tag is a time stamp, recording when the
-preprocessor was run. You can also set the tag explicitly:
-
- ./configure MARPA_DEBUG_FLAG=-DMARPA_TAG=testing123
-
-The tag appears early in the test output:
-
- t/00-load.t ............ 1/4 # Marpa::R2 version is 2.085_004
- # Libmarpa version is 6.0.3
- # Libmarpa tag: testing123
-
-You can put spaces and other non-word characters into the tag, but you have to
-figure out how to make them run the guantlet from shell to Makefile to compiler
-command line. Here's an example who works on Linux:
-
- ./configure MARPA_DEBUG_FLAG="\"-DMARPA_TAG=*This is a test*\""
diff --git a/cpan/core/read_only/stamp-h1 b/cpan/core/read_only/stamp-h1
index 709e3e4..d517d0f 100644
--- a/cpan/core/read_only/stamp-h1
+++ b/cpan/core/read_only/stamp-h1
@@ -1 +1 @@
-Fri Jul 4 15:14:28 PDT 2014
+Sun Jul 6 19:50:07 PDT 2014
diff --git a/cpan/core/read_only/win32/marpa.def b/cpan/core/read_only/win32/marpa.def
index 7329d09..ec29c57 100644
--- a/cpan/core/read_only/win32/marpa.def
+++ b/cpan/core/read_only/win32/marpa.def
@@ -1,7 +1,7 @@
; DO NOT EDIT DIRECTLY.
; This file was automatically generated.
; This file is for the Microsoft linker.
-; Fri Jul 4 15:13:45 2014
+; Sun Jul 6 19:49:24 2014
EXPORTS
marpa_check_version
marpa_version
diff --git a/cpan/etc/libmarpa_get.pl b/cpan/etc/libmarpa_get.pl
index b052a55..6598f4f 100644
--- a/cpan/etc/libmarpa_get.pl
+++ b/cpan/etc/libmarpa_get.pl
@@ -21,7 +21,9 @@ use autodie;
use IPC::Cmd;
use File::Path;
-my $commitish = 'master';
+my $commitish = shift;
+die "Usage: $0 commitish" if not $commitish;
+
my $libmarpa_repo = 'git at github.com:jeffreykegler/libmarpa.git';
my $stage = 'core/stage';
@@ -29,7 +31,7 @@ die "core/stage already exists" if -e $stage;
die "libmarpa_build already exists" if -e 'libmarpa_build';
if (not IPC::Cmd::run(
- command => [ qw(git clone --depth 1), $libmarpa_repo, $stage ],
+ command => [ qw(git clone), $libmarpa_repo, $stage ],
verbose => 1
)
)
@@ -37,8 +39,11 @@ if (not IPC::Cmd::run(
die "Could not clone";
} ## end if ( not IPC::Cmd::run( command => [ qw(git clone -n --depth 1)...]))
+# CHIDR into staging dir
+chdir $stage || die "Could not chdir";
+
if (not IPC::Cmd::run(
- command => [ qw(git checkout), $commitish ],
+ command => [ qw(git checkout -b working), $commitish ],
verbose => 1
)
)
@@ -46,9 +51,6 @@ if (not IPC::Cmd::run(
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
--
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