Skip to content

Commit 783f733

Browse files
committed
Swapped VERSION and RELEASE for DBIXS_VERSION was already used as such
1 parent aad0a40 commit 783f733

39 files changed

+48
-54
lines changed

DBIXS.h

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
#ifndef DBIXS_VERSION /* prevent multiple inclusion */
1414

15+
/* define DBIXS_VERSION & DBIXS_REVISION */
16+
#include "dbixs_rev.h"
17+
1518
#ifndef DBIS
1619
#define DBIS dbis /* default name for dbistate_t variable */
1720
#endif
@@ -32,9 +35,6 @@
3235
#undef std
3336
#endif
3437

35-
/* define DBIXS_REVISION */
36-
#include "dbixs_rev.h"
37-
3838
/* Perl backwards compatibility definitions */
3939
#define NEED_sv_2pv_flags
4040
#define NEED_croak_xs_usage
@@ -43,9 +43,6 @@
4343
/* DBI SQL_* type definitions */
4444
#include "dbi_sql.h"
4545

46-
47-
#define DBIXS_VERSION 93 /* superseded by DBIXS_REVISION */
48-
4946
#ifdef NEED_DBIXS_VERSION
5047
#if NEED_DBIXS_VERSION > DBIXS_VERSION
5148
error You_need_to_upgrade_your_DBI_module_before_building_this_driver
@@ -54,7 +51,6 @@ error You_need_to_upgrade_your_DBI_module_before_building_this_driver
5451
#define NEED_DBIXS_VERSION DBIXS_VERSION
5552
#endif
5653

57-
5854
#define DBI_LOCK
5955
#define DBI_UNLOCK
6056

dbixs_rev.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
/* Tue Mar 11 10:51:15 2025 */
2-
/* M dbixs_rev.pl */
3-
/* M lib/DBI/Changes.pm */
4-
#define DBIXS_VERSION 1
5-
#define DBIXS_RELEASE 648
6-
#define DBIXS_REVISION 1703
1+
/* Fri Mar 14 15:13:25 2025 */
2+
#define DBIXS_RELEASE 1
3+
#define DBIXS_VERSION 648
4+
#define DBIXS_REVISION 1705

dbixs_rev.pl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ sub skip_update {
1414

1515
-d ".git" or skip_update ("No git env");
1616

17-
my ($dbiv, $dbir);
17+
my ($dbir, $dbiv);
1818
open my $fh, "<", "DBI.pm" or die "DBI.pm: $!\n";
1919
while (<$fh>) {
2020
m/\b VERSION \s*=\s* (["']) ([0-9]+) \. ([0-9]+) \1/x or next;
21-
($dbiv, $dbir) = ($2, $3);
21+
($dbir, $dbiv) = ($2, $3);
2222
close $fh;
2323
last;
2424
}
25-
$dbiv or die "Cannot fetch DBI version from DBI.pm\n";
25+
$dbir or die "Cannot fetch DBI version from DBI.pm\n";
2626

2727
my @n = eval { qx{git log --pretty=oneline} };
2828
@n or skip_update ("Git log was empty");
@@ -35,8 +35,8 @@ sub skip_update {
3535

3636
my $def = "DBIXS_REVISION";
3737
my $rev = scalar @n;
38-
print $fh "#define DBIXS_VERSION $dbiv\n";
3938
print $fh "#define DBIXS_RELEASE $dbir\n";
39+
print $fh "#define DBIXS_VERSION $dbiv\n";
4040
print $fh "#define $def $rev\n";
4141
close $fh or die "Error closing $dbixs_rev_file: $!\n";
42-
print "Wrote $def $rev to $dbixs_rev_file for DBI-$dbiv.$dbir\n";
42+
print "Wrote $def $rev to $dbixs_rev_file for DBI-$dbir.$dbiv\n";

doc/Bundle-DBI.3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
.\" ========================================================================
5959
.\"
6060
.IX Title "Bundle::DBI 3"
61-
.TH Bundle::DBI 3 2024-08-13 "perl v5.40.0" "User Contributed Perl Documentation"
61+
.TH Bundle::DBI 3 2024-08-13 "perl v5.40.1" "User Contributed Perl Documentation"
6262
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
6363
.\" way too many mistakes in technical documents.
6464
.if n .ad l

doc/Bundle-DBI.man

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ DESCRIPTION
3535
AUTHORS
3636
Jonathan Leffler, Jochen Wiedmann and Tim Bunce.
3737

38-
perl v5.40.0 2024-08-13 Bundle::DBI(3)
38+
perl v5.40.1 2024-08-13 Bundle::DBI(3)

doc/DBD-DBM.3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
.\" ========================================================================
5959
.\"
6060
.IX Title "DBD::DBM 3"
61-
.TH DBD::DBM 3 2024-08-19 "perl v5.40.0" "User Contributed Perl Documentation"
61+
.TH DBD::DBM 3 2024-08-19 "perl v5.40.1" "User Contributed Perl Documentation"
6262
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
6363
.\" way too many mistakes in technical documents.
6464
.if n .ad l

doc/DBD-DBM.man

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -785,4 +785,4 @@ SEE ALSO
785785
DBI, SQL::Statement, DBI::SQL::Nano, AnyDBM_File, DB_File, BerkeleyDB,
786786
MLDBM, YAML::MLDBM, MLDBM::Serializer::JSON
787787

788-
perl v5.40.0 2024-08-19 DBD::DBM(3)
788+
perl v5.40.1 2024-08-19 DBD::DBM(3)

doc/DBD-File.3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
.\" ========================================================================
5959
.\"
6060
.IX Title "DBD::File 3"
61-
.TH DBD::File 3 2025-01-17 "perl v5.40.0" "User Contributed Perl Documentation"
61+
.TH DBD::File 3 2025-01-17 "perl v5.40.1" "User Contributed Perl Documentation"
6262
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
6363
.\" way too many mistakes in technical documents.
6464
.if n .ad l

doc/DBD-File.man

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,4 +435,4 @@ SEE ALSO
435435
DBI, DBD::DBM, DBD::CSV, Text::CSV, Text::CSV_XS, SQL::Statement, and
436436
DBI::SQL::Nano
437437

438-
perl v5.40.0 2025-01-17 DBD::File(3)
438+
perl v5.40.1 2025-01-17 DBD::File(3)

doc/DBD-Gofer-Policy-Base.3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
.\" ========================================================================
5959
.\"
6060
.IX Title "DBD::Gofer::Policy::Base 3"
61-
.TH DBD::Gofer::Policy::Base 3 2024-08-13 "perl v5.40.0" "User Contributed Perl Documentation"
61+
.TH DBD::Gofer::Policy::Base 3 2024-08-13 "perl v5.40.1" "User Contributed Perl Documentation"
6262
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
6363
.\" way too many mistakes in technical documents.
6464
.if n .ad l

0 commit comments

Comments
 (0)