Commit Graph

85 Commits

Author SHA1 Message Date
Feng Xiao
99aa0f9e8f Down-integrate from internal code base. 2014-11-20 16:18:53 -08:00
Feng Xiao
f157a5651c Down-integrate from internal code base (C++ maps support). 2014-11-14 11:50:31 -08:00
Feng Xiao
643d09ac7d Merge branch 'typofixes-vlajos-20141108' of https://github.com/vlajos/protobuf into typo
Conflicts:
	src/google/protobuf/compiler/java/java_file.cc
2014-11-11 11:01:32 -08:00
Feng Xiao
6ef984af4b Down-integrate from internal code base. 2014-11-10 17:34:54 -08:00
Veres Lajos
c76807211a typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-08 22:59:34 +00:00
Feng Xiao
ad7f41bd57 Merge pull request #50 from dlitz/compat-py3k
setup.py fixes for Python 3
2014-11-08 02:25:53 -05:00
Feng Xiao
df5481c6b3 Update version number to 2.6.2-pre. 2014-10-21 16:47:33 -07:00
Feng Xiao
bba83652e1 Update version number to 2.6.1. 2014-10-20 17:06:06 -07:00
Dwayne Litzenberger
b460610b69 Omit google-apputils dependency under Python 3
Temporary change until a py3k-compatible google-apputils is released.
2014-10-14 13:50:52 -07:00
Dwayne Litzenberger
0fd260eae7 Use 2to3 when building under Python 3. 2014-10-14 13:47:11 -07:00
Feng Xiao
d9d1da95c6 Update version number to 2.6.1rc1 2014-10-08 18:44:37 -07:00
Feng Xiao
0971bb0d57 Down-integrate from internal branch. 2014-10-07 17:44:48 -07:00
Feng Xiao
eb223ed4f7 Merge pull request #3 from dhirschfeld/pyext-fix
Explicitly specify pyext/cpp_message.py in py_modules list
2014-10-02 15:55:32 -07:00
Feng Xiao
e428862450 Replace links to code.google.com/protobuf with developers.google.com/protocol-buffers 2014-10-01 16:26:23 -07:00
David Hirschfeld
ef6eff20bd Explicitly specify pyext/cpp_message.py in py_modules list 2014-08-27 09:25:26 +01:00
jieluo@google.com
a21bf2e646 merge 2.6.0 to trunk 2014-08-25 23:26:40 +00:00
jieluo@google.com
1eba9d9c74 merge tags/2.6.0 into trunk 2014-08-25 20:17:53 +00:00
jieluo@google.com
e61b513b1f make dist complains the file name is too long and refuse to put it to tar. Change the file to a shorter name 2014-08-14 21:51:48 +00:00
jieluo@google.com
24095cc7e5 Add deleted tests back for reflection_cpp2_test.py by addtional exception catch 2014-08-14 18:04:22 +00:00
jieluo@google.com
5dd5f0d09a change python README.txt 2014-08-13 23:26:54 +00:00
jieluo@google.com
b70e586603 put python cpp tests into pyext/ 2014-08-13 21:05:19 +00:00
jieluo@google.com
7580a8929f add shared_pr.h 2014-08-12 21:28:31 +00:00
jieluo@google.com
bde4a3254a down integrate python opensource to svn 2014-08-12 21:10:30 +00:00
jieluo@google.com
4de8f55113 down integrate to svn 2014-07-18 00:47:59 +00:00
xiaofeng@google.com
2c9392f8dd Update version number in trunk 2013-02-28 06:12:28 +00:00
xiaofeng@google.com
a36f1b43e7 Exclude a failing test in MingW build. 2013-02-26 17:49:03 +00:00
xiaofeng@google.com
7f372559cc Down-integrate from internal branch 2013-02-25 10:39:39 +00:00
xiaofeng@google.com
a655b98171 Fix issue 438: add missing 'enum_type_wrapper' to setup.py 2012-12-08 18:44:32 +00:00
liujisi@google.com
e34f1f63b6 Find the protoc from environ first for python. 2012-12-05 01:25:12 +00:00
xiaofeng@google.com
eaaef0b39b Fix issues: 342, 424, 428, 430, 436 2012-12-04 00:59:40 +00:00
liujisi@google.com
ef9acc464d Update version to 2.5.0-pre 2012-11-30 22:38:00 +00:00
xiaofeng@google.com
b55a20fa2c Down-integrate from internal branch 2012-09-22 02:40:50 +00:00
liujisi@google.com
9ced30caf9 Down-integration form opensource depot 2012-08-01 06:22:19 +00:00
liujisi@google.com
e8e6eed0be Fixed a memory leak in python CPP implementation. 2011-06-07 03:38:28 +00:00
liujisi@google.com
5c24564811 Update mainline version to 2.4.2-pre. 2011-05-03 07:06:03 +00:00
liujisi@google.com
03aaa0417f Python CPP implementation now requires c++ libprotobuf installed before running
setup.py to fix RPATH problem.
2011-04-29 02:12:48 +00:00
liujisi@google.com
01cba4b16e Update mainline version to 2.4.1-pre. 2011-02-02 16:45:06 +00:00
liujisi@google.com
42e67e081a update ez_setup.py to fix the python2.6 problem. 2011-01-21 05:46:41 +00:00
liujisi@google.com
5c20ca1fcc Escape C++ Trigraphs. 2010-12-21 05:33:13 +00:00
liujisi@google.com
6f2c3b8734 Boost version number to 2.4.0-pre, add more test cases for text_format.py about unicode field. 2010-12-09 08:59:21 +00:00
liujisi@google.com
9b7f6c544a Fix issues: 223 224 242. 2010-12-08 03:45:27 +00:00
liujisi@google.com
1fd96c43a0 Add new files for vcprojs, fix issues: 165, 211, 228, 240 2010-12-07 06:23:55 +00:00
liujisi@google.com
2726e7a6eb Fix issues: 166 167 172 175 181 188 192 194 195. 2010-12-03 09:12:33 +00:00
liujisi@google.com
33165fe0d5 Submit recent changes from internal branch. See CHANGES.txt for more details. 2010-11-02 13:14:58 +00:00
kenton@google.com
80aa23df6c Fix Issue 218: Check for protoc executable in vsprojects directory. 2010-09-28 21:58:36 +00:00
kenton@google.com
27028bcb97 Fix issue 208. 2010-07-27 21:19:59 +00:00
kenton@google.com
0c293def6c Fix issue 207 2010-07-27 20:45:09 +00:00
kenton@google.com
ea75323710 Update version number in trunk to 2.3.1. 2010-01-09 01:02:25 +00:00
kenton@google.com
7b7a80eae4 Tweak doc comments. 2010-01-08 03:56:03 +00:00
kenton@google.com
535301894e Address comments from various code reviews. 2010-01-07 02:08:03 +00:00