aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Test under tox: Python 2.6, 2.7, 3.3, 3.4.Tres Seaver2015-01-131-0/+13
|
* Ignore more derived files.Tres Seaver2015-01-131-1/+2
|
* Merge branch 'ignore_so_libs' into straddle_py2_py3Tres Seaver2015-01-131-0/+1
|\
| * Ignore .so files.Tres Seaver2015-01-131-0/+1
| |
* | Straddle Python 2.6, 2.7, 3.3, 3.4.Tres Seaver2015-01-1310-123/+123
| |
* | Don't check in derived objects.Tres Seaver2015-01-132-0/+0
| |
* | Compatibility with Python2.6 unittest.Tres Seaver2015-01-134-21/+35
| |
* | Use 'io.BytesIO' rather than 'cStringIO.StringIO'.Tres Seaver2015-01-132-3/+3
| |
* | Typo.Tres Seaver2015-01-131-1/+1
| |
* | Merge branch 'prep_for_py2_py3_straddle' into straddle_py2_py3Tres Seaver2015-01-131-1/+1
|\ \ | | | | | | | | | | | | Conflicts: python/setup.py
| * | Overlooked dependency.Tres Seaver2015-01-131-1/+1
| | |
* | | Merge branch 'drop-apputils-dependency' into straddle_py2_py3Tres Seaver2015-01-1324-96/+100
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Conflicts: python/google/protobuf/internal/message_factory_test.py python/google/protobuf/internal/reflection_test.py python/google/protobuf/internal/text_format_test.py
| * | Drop dependency on 'google.apputils'.Tres Seaver2015-01-1322-96/+100
| |/ | | | | | | Use stdlib's 'unittest' instead.
* / Prepare for Python2-Python3 straddle.Tres Seaver2015-01-1315-198/+144
|/ | | | | | | | | | | | | - Remove PY25 cruft. - Selectively apply cleanups from 'python-modernize': - New exception syntax. - Use 'six' to handle module renames. - Use 'six' to handle text / binary stuff. This PR covers most of the work from #66 which falls inside `python` (rather than the Python code generation stuff in 'src').
* Merge pull request #160 from zhangkun83/masterFeng Xiao2015-01-122-0/+88
|\ | | | | Include names.h as java_names.h in the opensource tree
| * Align backslash verticallyzhangkun832015-01-121-1/+1
| |
| * Include names.h as java_names.h in the opensource treezhangkun832015-01-122-0/+88
|/
* Merge pull request #143 from Ivoz/patch-1Feng Xiao2014-12-221-2/+2
|\ | | | | Update python version / setuptools instructions
| * Update python version / setuptools instructionsMatt Iversen2014-12-171-2/+2
| | | | | | | | | | Reflect the change that protobuf should now only be supporting 2.6+ (I'd guess note python 3.x+ when its supported in implementation) Refer to the Python Packaging User Guide for installing setuptools (and pip) instead of out of date telecommunity guide.
* | Merge pull request #46 from adalq/versionFeng Xiao2014-12-201-0/+35
|\ \ | | | | | | Add __version__
| * | Updated __version__Adal Chiriliuc2014-12-141-1/+1
| | |
| * | Add __version__Adal Chiriliuc2014-10-101-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | Added __version__ attr to package so that scripts that check local packages to see if newer versions are available can work. Almost all Python packages have a version attr, and the vast majority of them name it "__version__"
| * | Revert "Add __version__"Adal Chiriliuc2014-10-102-35/+0
| | | | | | | | | | | | This reverts commit 5337cf564f5eb43c1975d1cfd87b4efba9e6bf35.
| * | Add __version__Adal Chiriliuc2014-10-102-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | Added __version__ attr to package so that scripts that check local packages to see if newer versions are available can work. Almost all Python packages have a version attr, and the vast majority of them name it "__version__"
* | | Merge pull request #139 from c0nk/masterFeng Xiao2014-12-201-1/+2
|\ \ \ | |_|/ |/| | Improved little endian byte order detection
| * | Improved little endian byte order detectionKal Conley2014-12-161-1/+2
|/ / | | | | | | | | | | | | Including <sys/param.h> on Mac/iOS doesn't define __BYTE_ORDER so PROTOBUF_LITTLE_ENDIAN was never being defined. This commit adds a check for the __LITTLE_ENDIAN__ macro which is defined by clang and Apple gcc on little endian architectures.
* | Merge pull request #136 from cfallin/ruby-proto3-onlyJoshua Haberman2014-12-121-0/+8
|\ \ | | | | | | Support Ruby code generation only for proto3.
| * | Support Ruby code generation only for proto3.Chris Fallin2014-12-121-0/+8
|/ /
* | Add missing header files in src/Makefile.amFeng Xiao2014-12-121-1/+3
| |
* | Update ruby DIST_FILES.Feng Xiao2014-12-121-9/+16
| |
* | Adds Travis Cl support to test the code automatically.Feng Xiao2014-12-122-0/+6
| |
* | Merge pull request #134 from cfallin/masterJoshua Haberman2014-12-1220-62/+17557
|\ \ | | | | | | Update Ruby build setup to produce gems successfully. Include upb as a single .c / .h file.
| * | Rename protobuf Ruby module to google/protobuf and rework its buildChris Fallin2014-12-1220-62/+17557
|/ / | | | | | | | | | | system. The Ruby module build now uses an amalgamated distribution of upb, and successfully builds a Ruby gem called 'google-protobuf' with module 'google/protobuf'.
* | Merge pull request #128 from krishnanm86/masterFeng Xiao2014-12-122-14/+14
|\ \ | | | | | | Source code refactoring. Extracted common functionality in cpp_helpers.c...
| * | Reverting the space at the end for both files changedKrishna2014-12-122-2/+2
| | |
| * | Reverting the space at the endKrishna2014-12-121-1/+1
| | |
| * | Returned print_indent and print_outdent back to printservicestub and ↵Krishna2014-12-121-5/+8
| | | | | | | | | | | | printserviceclass in python generator
| * | Reverted changes to cpp_helpers.cc and made code reviews to python_geenerator.ccKrishna2014-12-113-22/+20
| | |
| * | Fixed bugsKrishna2014-12-103-5/+8
| | |
| * | Source code refactoring. Extracted common functionality in cpp_helpers.cc ↵Krishna2014-12-102-26/+22
| | | | | | | | | | | | and python/python_generator.cc
* | | Merge pull request #113 from nsuke/oneof-c++11Feng Xiao2014-12-115-41/+40
|\ \ \ | | | | | | | | Make C++ code generation of string oneof field compatible with C++11
| * | | Make C++ string oneof field compatible with C++11Nobuaki Sukegawa2014-12-032-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | string oneof field was generated into "const ArenaStringPtr" field inside "default_oneof_instance_" struct (of name "<class name>OneofInstance"). On the other hand, in C++11, const field of type with trivial default constructor causes enclosing type's implicit default constructor to be deleted. Since ArenaStringPtr has tirvial default constructor, this caused default constructor of "default_oneof_instance_" struct to be deleted, making the constructor call inside generated code invalid and fail to compile.
| * | | Display element name in test error logNobuaki Sukegawa2014-12-031-2/+2
| | | |
| * | | Make test code runnable with C++11Nobuaki Sukegawa2014-12-033-37/+37
| |/ / | | | | | | | | | | | | Preprocessor token right after string literal without whitespace results in parse failure in C++11.
* | | Describe how to get gtest source for Visual Studio users.Feng Xiao2014-12-111-0/+7
| | |
* | | Update gtest version to v1.7.0.Feng Xiao2014-12-111-3/+5
| | |
* | | Update version number to v3.0.0-preFeng Xiao2014-12-103-4/+4
| | |
* | | Merge branch v3.0.0-alpha-1 into master.Feng Xiao2014-12-1045-275/+972
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * | | Fix LIBPROTOBUF_PROTOBUF annotations for buliding protobuf as DLLs.v3.0.0-alpha-1Feng Xiao2014-12-098-18/+33
| | | |
| * | | Remove map_field.cc from lite-runtime.Feng Xiao2014-12-092-5/+1
| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-25 19:20:01 +0000