This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag Marpa-R2-2.085_006
in repository libmarpa-r2-perl.

commit aa2fcf6ea539c6c6b538465b7fab1463e679fef8
Author: Jeffrey Kegler <jk...@cpan.org>
Date:   Fri May 2 11:20:13 2014 -0700

    Github issue #139
---
 cpan/inc/Marpa/R2/Build_Me.pm   |  3 +++
 cpan/libmarpa/ac/Makefile.am    |  3 ++-
 cpan/libmarpa/ac/configure.ac   | 12 ++++++------
 cpan/libmarpa/dev/marpa.w       | 35 +++++++++++++++--------------------
 cpan/libmarpa/public/VERSION.in |  2 +-
 5 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/cpan/inc/Marpa/R2/Build_Me.pm b/cpan/inc/Marpa/R2/Build_Me.pm
index 8141ff0..be2678b 100644
--- a/cpan/inc/Marpa/R2/Build_Me.pm
+++ b/cpan/inc/Marpa/R2/Build_Me.pm
@@ -577,6 +577,9 @@ INLINEHOOK
             say {$config_fh} join q{ }, '#define MARPA_MAJOR_VERSION', 
$libmarpa_version[0];
             say {$config_fh} join q{ }, '#define MARPA_MINOR_VERSION', 
$libmarpa_version[1];
             say {$config_fh} join q{ }, '#define MARPA_MICRO_VERSION', 
$libmarpa_version[2];
+            say {$config_fh} join q{ }, '#define MARPA_H_MAJOR_VERSION', 
$libmarpa_version[0];
+            say {$config_fh} join q{ }, '#define MARPA_H_MINOR_VERSION', 
$libmarpa_version[1];
+            say {$config_fh} join q{ }, '#define MARPA_H_MICRO_VERSION', 
$libmarpa_version[2];
 
             close($config_fh);
             $ac = Config::AutoConf->new();
diff --git a/cpan/libmarpa/ac/Makefile.am b/cpan/libmarpa/ac/Makefile.am
index 87c9444..bbfe039 100644
--- a/cpan/libmarpa/ac/Makefile.am
+++ b/cpan/libmarpa/ac/Makefile.am
@@ -17,6 +17,7 @@
 
 AM_CFLAGS = $(WARNING_CFLAGS) $(MARPA_DEBUG_FLAG)
 AM_CPPFLAGS = $(WARNING_CPPFLAGS)
+RELEASE= 
$(MARPA_LIB_MAJOR_VERSION).$(MARPA_LIB_MINOR_VERSION).$(MARPA_LIB_MICRO_VERSION)
 ACLOCAL_AMFLAGS = -I m4
 lib_LTLIBRARIES = libmarpa.la
 libmarpa_la_SOURCES = marpa.c marpa.h \
@@ -29,7 +30,7 @@ EXTRA_DIST = VERSION \
   win32/marpa.def Makefile.win32 win32/do_config_h.pl \
   notes/shared_test.txt
 libmarpa_la_LIBADD = $(LIBOBJS)
-libmarpa_la_LDFLAGS = -release 
$(MARPA_MAJOR_VERSION).$(MARPA_MINOR_VERSION).$(MARPA_MICRO_VERSION)
+libmarpa_la_LDFLAGS = -release $(RELEASE)
 include_HEADERS = marpa.h \
   marpa_avl.h marpa_tavl.h marpa_ami.h \
   marpa_slif.h marpa_obs.h
diff --git a/cpan/libmarpa/ac/configure.ac b/cpan/libmarpa/ac/configure.ac
index 67e0b8c..40e6044 100644
--- a/cpan/libmarpa/ac/configure.ac
+++ b/cpan/libmarpa/ac/configure.ac
@@ -104,12 +104,12 @@ fi
 
 AC_SUBST(WARNING_CFLAGS)
 AC_SUBST(WARNING_CPPFLAGS)
-AC_SUBST(MARPA_MAJOR_VERSION, [marpa_major_version])
-AC_SUBST(MARPA_MINOR_VERSION, [marpa_minor_version])
-AC_SUBST(MARPA_MICRO_VERSION, [marpa_micro_version])
-AC_DEFINE([MARPA_MAJOR_VERSION], [marpa_major_version], [Marpa major version.])
-AC_DEFINE([MARPA_MINOR_VERSION], [marpa_minor_version], [Marpa minor version.])
-AC_DEFINE([MARPA_MICRO_VERSION], [marpa_micro_version], [Marpa micro version.])
+AC_SUBST(MARPA_LIB_MAJOR_VERSION, [marpa_major_version])
+AC_SUBST(MARPA_LIB_MINOR_VERSION, [marpa_minor_version])
+AC_SUBST(MARPA_LIB_MICRO_VERSION, [marpa_micro_version])
+AC_DEFINE([MARPA_LIB_MAJOR_VERSION], [marpa_major_version], [Marpa major 
version.])
+AC_DEFINE([MARPA_LIB_MINOR_VERSION], [marpa_minor_version], [Marpa minor 
version.])
+AC_DEFINE([MARPA_LIB_MICRO_VERSION], [marpa_micro_version], [Marpa micro 
version.])
 AC_ARG_VAR(MARPA_DEBUG_FLAG,[Marpa debugging])
 
 AC_CHECK_SIZEOF([int])
diff --git a/cpan/libmarpa/dev/marpa.w b/cpan/libmarpa/dev/marpa.w
index 6b7755e..9d48143 100644
--- a/cpan/libmarpa/dev/marpa.w
+++ b/cpan/libmarpa/dev/marpa.w
@@ -592,16 +592,16 @@ It is all compile-time constants,
 so it is expected that
 it will be optimized out completely at compile time.
 @d HEADER_VERSION_MISMATCH (
-   MARPA_MAJOR_VERSION != MARPA_H_MAJOR_VERSION
-   || MARPA_MINOR_VERSION != MARPA_H_MINOR_VERSION
-   || MARPA_MICRO_VERSION != MARPA_H_MICRO_VERSION
+   MARPA_LIB_MAJOR_VERSION != MARPA_H_MAJOR_VERSION
+   || MARPA_LIB_MINOR_VERSION != MARPA_H_MINOR_VERSION
+   || MARPA_LIB_MICRO_VERSION != MARPA_H_MICRO_VERSION
 )
 @ Set globals to the library version numbers,
 so that they can be found at runtime.
 @<Global constant variables@> =
-const int marpa_major_version = MARPA_MAJOR_VERSION;
-const int marpa_minor_version = MARPA_MINOR_VERSION;
-const int marpa_micro_version = MARPA_MICRO_VERSION;
+const int marpa_major_version = MARPA_LIB_MAJOR_VERSION;
+const int marpa_minor_version = MARPA_LIB_MINOR_VERSION;
+const int marpa_micro_version = MARPA_LIB_MICRO_VERSION;
 
 @ @<Function definitions@> =
 Marpa_Error_Code
@@ -609,13 +609,11 @@ marpa_check_version (int required_major,
                     int required_minor,
                     int required_micro)
 {
-  if (required_major != MARPA_MAJOR_VERSION)
+  if (required_major != MARPA_LIB_MAJOR_VERSION)
     return MARPA_ERR_MAJOR_VERSION_MISMATCH;
-  if (required_minor > MARPA_MINOR_VERSION)
+  if (required_minor != MARPA_LIB_MINOR_VERSION)
     return MARPA_ERR_MINOR_VERSION_MISMATCH;
-  if (required_minor < MARPA_MINOR_VERSION)
-    return MARPA_ERR_NONE;
-  if (required_micro > MARPA_MICRO_VERSION)
+  if (required_micro != MARPA_LIB_MICRO_VERSION)
     return MARPA_ERR_MICRO_VERSION_MISMATCH;
   return MARPA_ERR_NONE;
 }
@@ -625,9 +623,9 @@ marpa_check_version (int required_major,
 Marpa_Error_Code
 marpa_version (int* version)
 {
-  *version++ = MARPA_MAJOR_VERSION;
-  *version++ = MARPA_MINOR_VERSION;
-  *version = MARPA_MICRO_VERSION;
+  *version++ = MARPA_LIB_MAJOR_VERSION;
+  *version++ = MARPA_LIB_MINOR_VERSION;
+  *version = MARPA_LIB_MICRO_VERSION;
   return 0;
 }
 
@@ -15912,12 +15910,9 @@ extern const int marpa_major_version;
 extern const int marpa_minor_version;
 extern const int marpa_micro_version;
 
-#define MARPA_CHECK_VERSION(major,minor,micro) @| \
-    @[ (MARPA_MAJOR_VERSION > (major) \
-        @| || (MARPA_MAJOR_VERSION == (major) && MARPA_MINOR_VERSION > 
(minor)) \
-        @| || (MARPA_MAJOR_VERSION == (major) && MARPA_MINOR_VERSION == 
(minor) \
-        @|  && MARPA_MICRO_VERSION >= (micro)))
-        @]@#
+#define MARPA_MAJOR_VERSION MARPA_H_MAJOR_VERSION
+#define MARPA_MINOR_VERSION MARPA_H_MINOR_VERSION
+#define MARPA_MICRO_VERSION MARPA_H_MICRO_VERSION
 
 @<Public defines@>@;
 @<Public incomplete structures@>@;
diff --git a/cpan/libmarpa/public/VERSION.in b/cpan/libmarpa/public/VERSION.in
index c030e71..5607580 100644
--- a/cpan/libmarpa/public/VERSION.in
+++ b/cpan/libmarpa/public/VERSION.in
@@ -1 +1 @@
-@MARPA_MAJOR_VERSION@.@MARPA_MINOR_VERSION@.@MARPA_MICRO_VERSION@
+@MARPA_LIB_MAJOR_VERSION@.@MARPA_LIB_MINOR_VERSION@.@MARPA_LIB_MICRO_VERSION@

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-perl/packages/libmarpa-r2-perl.git

_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

Reply via email to