Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
d9d1da95
Commit
d9d1da95
authored
Oct 09, 2014
by
Feng Xiao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update version number to 2.6.1rc1
parent
3b8dadf5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
8 deletions
+8
-8
configure.ac
configure.ac
+1
-1
pom.xml
java/pom.xml
+2
-2
setup.py
python/setup.py
+1
-1
Makefile.am
src/Makefile.am
+3
-3
common.h
src/google/protobuf/stubs/common.h
+1
-1
No files found.
configure.ac
View file @
d9d1da95
...
...
@@ -12,7 +12,7 @@ AC_PREREQ(2.59)
# In the SVN trunk, the version should always be the next anticipated release
# version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed
# the size of one file name in the dist tarfile over the 99-char limit.)
AC_INIT([Protocol Buffers],[2.6.
0
],[protobuf@googlegroups.com],[protobuf])
AC_INIT([Protocol Buffers],[2.6.
1rc1
],[protobuf@googlegroups.com],[protobuf])
AM_MAINTAINER_MODE([enable])
...
...
java/pom.xml
View file @
d9d1da95
...
...
@@ -10,7 +10,7 @@
</parent>
<groupId>
com.google.protobuf
</groupId>
<artifactId>
protobuf-java
</artifactId>
<version>
2.6.
0
</version>
<version>
2.6.
1rc1
</version>
<packaging>
bundle
</packaging>
<name>
Protocol Buffer Java API
</name>
<description>
...
...
@@ -148,7 +148,7 @@
<instructions>
<Bundle-DocURL>
https://developers.google.com/protocol-buffers/
</Bundle-DocURL>
<Bundle-SymbolicName>
com.google.protobuf
</Bundle-SymbolicName>
<Export-Package>
com.google.protobuf;version=2.6.
0
</Export-Package>
<Export-Package>
com.google.protobuf;version=2.6.
1rc1
</Export-Package>
</instructions>
</configuration>
</plugin>
...
...
python/setup.py
View file @
d9d1da95
...
...
@@ -156,7 +156,7 @@ if __name__ == '__main__':
))
setup
(
name
=
'protobuf'
,
version
=
'2.6.
0
'
,
version
=
'2.6.
1rc1
'
,
packages
=
[
'google'
],
namespace_packages
=
[
'google'
],
test_suite
=
'setup.MakeTestSuite'
,
...
...
src/Makefile.am
View file @
d9d1da95
...
...
@@ -95,7 +95,7 @@ nobase_include_HEADERS = \
lib_LTLIBRARIES
=
libprotobuf-lite.la libprotobuf.la libprotoc.la
libprotobuf_lite_la_LIBADD
=
$(PTHREAD_LIBS)
libprotobuf_lite_la_LDFLAGS
=
-version-info
9:
0
:0
-export-dynamic
-no-undefined
libprotobuf_lite_la_LDFLAGS
=
-version-info
9:
1
:0
-export-dynamic
-no-undefined
libprotobuf_lite_la_SOURCES
=
\
google/protobuf/stubs/atomicops_internals_x86_gcc.cc
\
google/protobuf/stubs/atomicops_internals_x86_msvc.cc
\
...
...
@@ -117,7 +117,7 @@ libprotobuf_lite_la_SOURCES = \
google/protobuf/io/zero_copy_stream_impl_lite.cc
libprotobuf_la_LIBADD
=
$(PTHREAD_LIBS)
libprotobuf_la_LDFLAGS
=
-version-info
9:
0
:0
-export-dynamic
-no-undefined
libprotobuf_la_LDFLAGS
=
-version-info
9:
1
:0
-export-dynamic
-no-undefined
libprotobuf_la_SOURCES
=
\
$(libprotobuf_lite_la_SOURCES)
\
google/protobuf/stubs/strutil.cc
\
...
...
@@ -146,7 +146,7 @@ libprotobuf_la_SOURCES = \
google/protobuf/compiler/parser.cc
libprotoc_la_LIBADD
=
$(PTHREAD_LIBS)
libprotobuf.la
libprotoc_la_LDFLAGS
=
-version-info
9:
0
:0
-export-dynamic
-no-undefined
libprotoc_la_LDFLAGS
=
-version-info
9:
1
:0
-export-dynamic
-no-undefined
libprotoc_la_SOURCES
=
\
google/protobuf/compiler/code_generator.cc
\
google/protobuf/compiler/command_line_interface.cc
\
...
...
src/google/protobuf/stubs/common.h
View file @
d9d1da95
...
...
@@ -113,7 +113,7 @@ namespace internal {
// The current version, represented as a single integer to make comparison
// easier: major * 10^6 + minor * 10^3 + micro
#define GOOGLE_PROTOBUF_VERSION 200600
0
#define GOOGLE_PROTOBUF_VERSION 200600
1
// The minimum library version which works with the current version of the
// headers.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment