AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

More prep for 2.0.1:

Browse Source 
* Fix version number test so that it accepts "2.0.1rc1".
* Add missing type_checkers.py to Makefile.am.
This commit is contained in:
temporal 2008-08-18 22:55:31 +00:00
parent ea9d0d85fb
commit dd681ad786
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -84,6 +84,7 @@ EXTRA_DIST = \
python/google/protobuf/internal/service_reflection_test.py \
python/google/protobuf/internal/test_util.py \
python/google/protobuf/internal/text_format_test.py \
python/google/protobuf/internal/type_checkers.py \
python/google/protobuf/internal/wire_format.py \
python/google/protobuf/internal/wire_format_test.py \
python/google/protobuf/internal/__init__.py \

9
src/google/protobuf/stubs/common_unittest.cc
View File

@ -37,11 +37,12 @@ namespace {
TEST(VersionTest, VersionMatchesConfig) {
// Verify that the version string specified in config.h matches the one
// in common.h. The config.h version is a string which may have a suffix
// like "beta", so we remove that.
// like "beta" or "rc1", so we remove that.
string version = PACKAGE_VERSION;
int pos = version.size();
while (pos > 0 && !ascii_isdigit(version[pos-1])) {
--pos;
int pos = 0;
while (pos < version.size() &&
(ascii_isdigit(version[pos]) || version[pos] == '.')) {
++pos;
}
version.erase(pos);