Here's the complete patch. Note that I changed dist.sh so that it should
still work correctly on both trunk and 1.0.x, but haven't actually
tested that assumption. I've also replaced the occurences of
SVN_VER_MICRO in several package makefiles.
cd c:/Home/brane/src/svn/repo/
svn diff
Index: subversion/libsvn_ra/ra_loader.c
===================================================================
--- subversion/libsvn_ra/ra_loader.c (revision 9708)
+++ subversion/libsvn_ra/ra_loader.c (working copy)
@@ -97,7 +97,7 @@
apr_status_t status;
libname = apr_psprintf (pool, "libsvn_ra_%s-%d.so.0",
- ra_name, SVN_VER_LIBRARY);
+ ra_name, SVN_VER_MAJOR);
funcname = apr_psprintf (pool, "svn_ra_%s_init", ra_name);
/* find/load the specified library */
Index: subversion/include/svn_version.h
===================================================================
--- subversion/include/svn_version.h (revision 9708)
+++ subversion/include/svn_version.h (working copy)
@@ -63,16 +63,16 @@
*
* Modify for every released patch.
*/
-#define SVN_VER_MICRO 0
+#define SVN_VER_PATCH 0
-/** Library version number.
- *
- * Modify whenever there's an incompatible change in the library ABI.
- * ### this is semantically equivalent to SVN_VER_MAJOR. fix...
- */
-#define SVN_VER_LIBRARY 1
+/** @deprecated Provided for backward compatibility with the 1.0 API. */
+#define SVN_VER_MICRO SVN_VER_PATCH
+/** @deprecated Provided for backward compatibility with the 1.0 API. */
+#define SVN_VER_LIBRARY SVN_VER_MAJOR
+
+
/** Version tag: a string describing the version.
*
* This tag remains " (dev build)" in the repository so that we can
@@ -120,7 +120,7 @@
/** Version number */
#define SVN_VER_NUM APR_STRINGIFY(SVN_VER_MAJOR) \
"." APR_STRINGIFY(SVN_VER_MINOR) \
- "." APR_STRINGIFY(SVN_VER_MICRO)
+ "." APR_STRINGIFY(SVN_VER_PATCH)
/** Version number with tag (contains no whitespace) */
#define SVN_VER_NUMBER SVN_VER_NUM SVN_VER_NUMTAG
@@ -143,7 +143,7 @@
{
int major; /**< Major version number */
int minor; /**< Minor version number */
- int micro; /**< Patch number */
+ int patch; /**< Patch number */
/**
* The verison tag (#SVN_VER_NUMTAG).\ Must always point to a
@@ -161,7 +161,7 @@
{ \
SVN_VER_MAJOR, \
SVN_VER_MINOR, \
- SVN_VER_MICRO, \
+ SVN_VER_PATCH, \
SVN_VER_NUMTAG \
} \
Index: subversion/libsvn_fs/fs-loader.c
===================================================================
--- subversion/libsvn_fs/fs-loader.c (revision 9708)
+++ subversion/libsvn_fs/fs-loader.c (working copy)
@@ -79,7 +79,7 @@
apr_status_t status;
libname = apr_psprintf (pool, "libsvn_fs_%s-%d.so.0",
- name, SVN_VER_LIBRARY);
+ name, SVN_VER_MAJOR);
funcname = apr_psprintf (pool, "svn_fs_%s__init", name);
/* Find/load the specified library. If we get an error, assume
Index: subversion/libsvn_subr/version.c
===================================================================
--- subversion/libsvn_subr/version.c (revision 9708)
+++ subversion/libsvn_subr/version.c (working copy)
@@ -37,14 +37,14 @@
/* Development library; require exact match. */
return (my_version->major == lib_version->major
&& my_version->minor == lib_version->minor
- && my_version->micro == lib_version->micro
+ && my_version->patch == lib_version->patch
&& 0 == strcmp (my_version->tag, lib_version->tag));
else if (my_version->tag[0] != '\0')
/* Development client; must be newer than the library. */
return (my_version->major == lib_version->major
&& (my_version->minor > lib_version->minor
|| (my_version->minor == lib_version->minor
- && my_version->micro > lib_version->micro)));
+ && my_version->patch > lib_version->patch)));
else
/* General compatibility rules for released versions. */
return (my_version->major == lib_version->major
@@ -69,9 +69,9 @@
" expected %d.%d.%d%s"),
checklist[i].label,
lib_version->major, lib_version->minor,
- lib_version->micro, lib_version->tag,
+ lib_version->patch, lib_version->tag,
my_version->major, my_version->minor,
- my_version->micro, my_version->tag);
+ my_version->patch, my_version->tag);
}
return err;
Index: build/generator/gen_base.py
===================================================================
--- build/generator/gen_base.py (revision 9708)
+++ build/generator/gen_base.py (working copy)
@@ -44,7 +44,7 @@
# Version comes from a header file since it is used in the code.
try:
vsn_parser = getversion.Parser()
- vsn_parser.search('SVN_VER_LIBRARY', 'libver')
+ vsn_parser.search('SVN_VER_MAJOR', 'libver')
self.cfg.version = vsn_parser.parse(verfname).libver
except:
raise GenError('Unable to extract version.')
Index: build/getversion.py
===================================================================
--- build/getversion.py (revision 9708)
+++ build/getversion.py (working copy)
@@ -40,7 +40,7 @@
p = Parser()
p.search('SVN_VER_MAJOR', 'major')
p.search('SVN_VER_MINOR', 'minor')
- p.search('SVN_VER_MICRO', 'patch')
+ p.search('SVN_VER_PATCH', 'patch')
import os, sys
r = p.parse(sys.argv[1])
Index: dist.sh
===================================================================
--- dist.sh (revision 9708)
+++ dist.sh (working copy)
@@ -150,14 +150,15 @@
ver_major=`echo $VERSION | cut -d '.' -f 1`
ver_minor=`echo $VERSION | cut -d '.' -f 2`
-ver_micro=`echo $VERSION | cut -d '.' -f 3`
+ver_patch=`echo $VERSION | cut -d '.' -f 3`
vsn_file="$DISTPATH/subversion/include/svn_version.h"
sed \
-e "/#define *SVN_VER_MAJOR/s/[0-9]\+/$ver_major/" \
-e "/#define *SVN_VER_MINOR/s/[0-9]\+/$ver_minor/" \
- -e "/#define *SVN_VER_MICRO/s/[0-9]\+/$ver_micro/" \
+ -e "/#define *SVN_VER_PATCH/s/[0-9]\+/$ver_patch/" \
+ -e "/#define *SVN_VER_MICRO/s/[0-9]\+/$ver_patch/" \
-e "/#define *SVN_VER_TAG/s/dev build/r$REVISION_SVN/" \
-e '/#define *SVN_VER_NUMTAG/s/".*"/""/' \
-e "/#define *SVN_VER_REVISION/s/0/$REVISION_SVN/" \
Index: packages/rpm/redhat-7.x/Makefile
===================================================================
--- packages/rpm/redhat-7.x/Makefile (revision 9708)
+++ packages/rpm/redhat-7.x/Makefile (working copy)
@@ -16,7 +16,7 @@
NAME := $(shell grep '^Name:' < $(SPECFILE) | sed -e 's/^Name: //')
SVN_VERSION_MAJOR := $(shell grep 'define SVN_VER_MAJOR' < $(VERSION_FILE) | (read one two three; echo $$three) )
SVN_VERSION_MINOR := $(shell grep 'define SVN_VER_MINOR' < $(VERSION_FILE) | (read one two three; echo $$three) )
-SVN_VERSION_MICRO := $(shell grep 'define SVN_VER_MICRO' < $(VERSION_FILE) | (read one two three; echo $$three) )
+SVN_VERSION_MICRO := $(shell grep 'define SVN_VER_PATCH' < $(VERSION_FILE) | (read one two three; echo $$three) )
VERSION := $(SVN_VERSION_MAJOR).$(SVN_VERSION_MINOR).$(SVN_VERSION_MICRO)
RELEASE := $(shell svn st -v $(SPECFILE) | cut -b 10- | ( read one two ; echo $$one ) )
OSREL := $(shell ./find-osrel | ( read one two ; echo $$one ))
Index: packages/rpm/mandrake-9.0/Makefile
===================================================================
--- packages/rpm/mandrake-9.0/Makefile (revision 9708)
+++ packages/rpm/mandrake-9.0/Makefile (working copy)
@@ -160,7 +160,7 @@
SVN_VERSION_MAJOR := $(shell grep 'define SVN_VER_MAJOR' < $(VERSION_FILE) | (read one two three; echo $$three) )
SVN_VERSION_MINOR := $(shell grep 'define SVN_VER_MINOR' < $(VERSION_FILE) | (read one two three; echo $$three) )
SVN_VERSION_MINOR := $(if $(TRUNK),$(shell sh increment-revision $(SVN_VERSION_MINOR)),$(SVN_VERSION_MINOR))
-SVN_VERSION_MICRO := $(shell grep 'define SVN_VER_MICRO' < $(VERSION_FILE) | (read one two three; echo $$three) )
+SVN_VERSION_MICRO := $(shell grep 'define SVN_VER_PATCH' < $(VERSION_FILE) | (read one two three; echo $$three) )
VERSION := $(PRE)$(SVN_VERSION_MAJOR).$(SVN_VERSION_MINOR).$(SVN_VERSION_MICRO)
# The relase depends on whether this is a blessed copy or not
Index: packages/rpm/mandrake-9.1/make-version-patch
===================================================================
--- packages/rpm/mandrake-9.1/make-version-patch (revision 9708)
+++ packages/rpm/mandrake-9.1/make-version-patch (working copy)
@@ -67,7 +67,7 @@
}
FIND_MAJOR='#define SVN_VER_MAJOR'
FIND_MINOR='#define SVN_VER_MINOR'
-FIND_MICRO='#define SVN_VER_MICRO'
+FIND_MICRO='#define SVN_VER_PATCH'
Header
VerPatch "$VERSION" 1 "$FIND_MAJOR" "$SVN_VERSION" MAJOR
VerPatch "$VERSION" 2 "$FIND_MINOR" "$SVN_VERSION" MINOR
Index: packages/rpm/mandrake-9.1/Makefile
===================================================================
--- packages/rpm/mandrake-9.1/Makefile (revision 9708)
+++ packages/rpm/mandrake-9.1/Makefile (working copy)
@@ -168,7 +168,7 @@
SVN_VERSION_MAJOR := $(shell grep 'define SVN_VER_MAJOR' < $(VERSION_FILE) | (read one two three; echo $$three) )
SVN_VERSION_MINOR := $(shell grep 'define SVN_VER_MINOR' < $(VERSION_FILE) | (read one two three; echo $$three) )
SVN_VERSION_MINOR := $(if $(TRUNK),$(shell sh increment-revision $(SVN_VERSION_MINOR)),$(SVN_VERSION_MINOR))
-SVN_VERSION_MICRO := $(shell grep 'define SVN_VER_MICRO' < $(VERSION_FILE) | (read one two three; echo $$three) )
+SVN_VERSION_MICRO := $(shell grep 'define SVN_VER_PATCH' < $(VERSION_FILE) | (read one two three; echo $$three) )
LONGVER := $(SVN_VERSION_MAJOR)-$(SVN_VERSION_MINOR)-$(SVN_VERSION_MICRO)
VERSION := $(PRE)$(SVN_VERSION_MAJOR).$(SVN_VERSION_MINOR).$(SVN_VERSION_MICRO)
Index: packages/rpm/redhat-8+/Makefile
===================================================================
--- packages/rpm/redhat-8+/Makefile (revision 9708)
+++ packages/rpm/redhat-8+/Makefile (working copy)
@@ -16,7 +16,7 @@
NAME := $(shell grep '^Name:' < $(SPECFILE) | sed -e 's/^Name: //')
SVN_VERSION_MAJOR := $(shell grep 'define SVN_VER_MAJOR' < $(VERSION_FILE) | (read one two three; echo $$three) )
SVN_VERSION_MINOR := $(shell grep 'define SVN_VER_MINOR' < $(VERSION_FILE) | (read one two three; echo $$three) )
-SVN_VERSION_MICRO := $(shell grep 'define SVN_VER_MICRO' < $(VERSION_FILE) | (read one two three; echo $$three) )
+SVN_VERSION_MICRO := $(shell grep 'define SVN_VER_PATCH' < $(VERSION_FILE) | (read one two three; echo $$three) )
VERSION := $(SVN_VERSION_MAJOR).$(SVN_VERSION_MINOR).$(SVN_VERSION_MICRO)
RELEASE := $(shell svn st -v $(SPECFILE) | cut -b 10- | ( read one two ; echo $$one ) )
OSREL := $(shell ./find-osrel | ( read one two ; echo $$one ))
Index: packages/rpm/mandrake-9.2/Makefile
===================================================================
--- packages/rpm/mandrake-9.2/Makefile (revision 9708)
+++ packages/rpm/mandrake-9.2/Makefile (working copy)
@@ -160,7 +160,7 @@
SVN_VERSION_MAJOR := $(shell grep 'define SVN_VER_MAJOR' < $(VERSION_FILE) | (read one two three; echo $$three) )
SVN_VERSION_MINOR := $(shell grep 'define SVN_VER_MINOR' < $(VERSION_FILE) | (read one two three; echo $$three) )
SVN_VERSION_MINOR := $(if $(TRUNK),$(shell sh increment-revision $(SVN_VERSION_MINOR)),$(SVN_VERSION_MINOR))
-SVN_VERSION_MICRO := $(shell grep 'define SVN_VER_MICRO' < $(VERSION_FILE) | (read one two three; echo $$three) )
+SVN_VERSION_MICRO := $(shell grep 'define SVN_VER_PATCH' < $(VERSION_FILE) | (read one two three; echo $$three) )
VERSION := $(PRE)$(SVN_VERSION_MAJOR).$(SVN_VERSION_MINOR).$(SVN_VERSION_MICRO)
# The relase depends on whether this is a blessed copy or not
Index: packages/rpm/wbel-3/Makefile
===================================================================
--- packages/rpm/wbel-3/Makefile (revision 9708)
+++ packages/rpm/wbel-3/Makefile (working copy)
@@ -16,7 +16,7 @@
NAME := $(shell grep '^Name:' < $(SPECFILE) | sed -e 's/^Name: //')
SVN_VERSION_MAJOR := $(shell grep 'define SVN_VER_MAJOR' < $(VERSION_FILE) | (read one two three; echo $$three) )
SVN_VERSION_MINOR := $(shell grep 'define SVN_VER_MINOR' < $(VERSION_FILE) | (read one two three; echo $$three) )
-SVN_VERSION_MICRO := $(shell grep 'define SVN_VER_MICRO' < $(VERSION_FILE) | (read one two three; echo $$three) )
+SVN_VERSION_MICRO := $(shell grep 'define SVN_VER_PATCH' < $(VERSION_FILE) | (read one two three; echo $$three) )
VERSION := $(SVN_VERSION_MAJOR).$(SVN_VERSION_MINOR).$(SVN_VERSION_MICRO)
RELEASE := $(shell svn st -v $(SPECFILE) | cut -b 10- | ( read one two ; echo $$one ) )
OSREL := $(shell ./find-osrel | ( read one two ; echo $$one ))
Index: packages/rpm/fedora-1/Makefile
===================================================================
--- packages/rpm/fedora-1/Makefile (revision 9708)
+++ packages/rpm/fedora-1/Makefile (working copy)
@@ -16,7 +16,7 @@
NAME := $(shell grep '^Name:' < $(SPECFILE) | sed -e 's/^Name: //')
SVN_VERSION_MAJOR := $(shell grep 'define SVN_VER_MAJOR' < $(VERSION_FILE) | (read one two three; echo $$three) )
SVN_VERSION_MINOR := $(shell grep 'define SVN_VER_MINOR' < $(VERSION_FILE) | (read one two three; echo $$three) )
-SVN_VERSION_MICRO := $(shell grep 'define SVN_VER_MICRO' < $(VERSION_FILE) | (read one two three; echo $$three) )
+SVN_VERSION_MICRO := $(shell grep 'define SVN_VER_PATCH' < $(VERSION_FILE) | (read one two three; echo $$three) )
VERSION := $(SVN_VERSION_MAJOR).$(SVN_VERSION_MINOR).$(SVN_VERSION_MICRO)
RELEASE := $(shell svn st -v $(SPECFILE) | cut -b 10- | ( read one two ; echo $$one ) )
OSREL := $(shell ./find-osrel | ( read one two ; echo $$one ))
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri May 14 09:08:04 2004