Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #426 from thomasvl/mac_fixup_for_a3_branch | Paul Yang | 2015-05-26 | 6 | -35/+15 | |
|\ \ \ | | | | | | | | | ObjC fixup for the branch. | |||||
| * | | | ObjC fixup for the branch. | Thomas Van Lenten | 2015-05-26 | 6 | -35/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Shouldn't need SRCROOT in the project since Xcode should be setting the working directory to where the project lives. - Remove the packed/unpacked repeated enum field in the tests and update the code to handle the defaults. - Move up the ignore to cover .DS_Store files in src also. add starstar | |||||
* | | | | Null-terminate C strings. | Feng Xiao | 2015-05-26 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | Change-Id: I85675bfcd7697bb058b9af475445a6bfdd7fd967 | |||||
* | | | | Merge pull request #424 from ↵ | Paul Yang | 2015-05-26 | 2 | -0/+2 | |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | jcanizales/make-objc-helpers-available-to-other-plugins Adds objectivec_helpers.h to the headers installed by make. | |||||
| * | | | Add ObjC helpers header to vsproject/extract_includes.bat | Jorge Canizales | 2015-05-26 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Adds objectivec_helpers.h to the headers installed by make. | Jorge Canizales | 2015-05-26 | 1 | -0/+1 | |
|/ / / | ||||||
* | | | Replace the check of "../.git" | Feng Xiao | 2015-05-26 | 1 | -25/+24 | |
| | | | | | | | | | | | | | | | | | | | | | Checking the existence of ".git" is not the right way to check whether we are in develop environment because we distribute source tar-balls where such a ".git" directory does not exist. Replaced it with checking .proto files. | |||||
* | | | Add new headers to extract_includes.bat | Bo Yang | 2015-05-25 | 1 | -2/+16 | |
| | | | ||||||
* | | | Add new files to Makefile.am | Bo Yang | 2015-05-25 | 1 | -1/+32 | |
| | | | ||||||
* | | | Add csharp_EXTRA_DIST to all_EXTRA_DIST. | Bo Yang | 2015-05-25 | 1 | -1/+1 | |
| | | | ||||||
* | | | Add new files for java runtime to Makefile.am | TeBoring | 2015-05-25 | 1 | -0/+3 | |
| | | | ||||||
* | | | Explicitly call destructor of Mutex to release resources. | Feng Xiao | 2015-05-25 | 1 | -1/+5 | |
| | | | | | | | | | | | | Change-Id: I808f4a3689e723d4490aa9ba6f1c14e3936ddcec | |||||
* | | | Make hash_map forward constructor parameters to its base class. | Feng Xiao | 2015-05-25 | 1 | -6/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | We use a custom allocator for map fields and this allocator must be passed correctly to hash_map to make sure it's allocated properly with our custom allocator. Change-Id: Ie59fa24bf11ff28ffd0fa870e24e456c66b2b9c5 | |||||
* | | | Add csharp files to Makefile.am | Bo Yang | 2015-05-25 | 1 | -0/+249 | |
| | | | ||||||
* | | | Add objectivec/generate_descriptors_proto.sh in Makefile.am | Bo Yang | 2015-05-25 | 1 | -0/+1 | |
| | | | ||||||
* | | | Copy two data files from ruby/tests to src/google/compiler/ruby. Tests in ↵ | Bo Yang | 2015-05-25 | 4 | -7/+150 | |
| | | | | | | | | | | | | src/google/compiler/ruby depend on these two files, but they were missed in language distributions other than ruby | |||||
* | | | Remove useless slash in Makefile.am | TeBoring | 2015-05-25 | 1 | -22/+22 | |
| | | | ||||||
* | | | Fix bugs in objective-c. | Bo Yang | 2015-05-25 | 8 | -25/+248 | |
| | | | ||||||
* | | | Merge pull request #422 from google/3.0.0-alpha-3-windows-fix | Paul Yang | 2015-05-25 | 13 | -45/+197 | |
|\ \ \ | | | | | | | | | 3.0.0 alpha 3 windows fix | |||||
| * | | | Fix bugs on windows. | Bo Yang | 2015-05-24 | 11 | -41/+64 | |
| | | | | ||||||
| * | | | Merge pull request #421 from TeBoring/3.0.0-alpha-3-fix | Paul Yang | 2015-05-24 | 2 | -4/+133 | |
|/| | | | | | | | | | | | Fix c++ on windows | |||||
| * | | | Merge branch '3.0.0-alpha-3-fix' of https://github.com/TeBoring/protobuf ↵ | teboring | 2015-05-24 | 2 | -4/+14 | |
| |\ \ \ | | | | | | | | | | | | | | | | into 3.0.0-alpha-3-fix | |||||
| * | | | | Add missing files for test to *.vcproj files | teboring | 2015-05-24 | 2 | -4/+133 | |
| | | | | | ||||||
* | | | | | Merge pull request #420 from TeBoring/3.0.0-alpha-3-fix | Paul Yang | 2015-05-24 | 2 | -4/+14 | |
|\ \ \ \ \ | | |/ / / | |/| | | | Fix C2385: ambiguous access to parent classes' member without specifying | |||||
| * | | | | Fix C2385: accessing parent classes' member without specifying is ambiguous. | Bo Yang | 2015-05-24 | 2 | -4/+14 | |
| |/ / / | ||||||
* | | | | Allow csharp to be configured as a language in configure.ac | teboring | 2015-05-23 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #419 from TeBoring/3.0.0-alpha-3-fix | Paul Yang | 2015-05-23 | 3 | -22/+39 | |
|\| | | | | | | | | | | | Add missing files to *.vcproj | |||||
| * | | | Add missing files to *.vcproj | teboring | 2015-05-23 | 3 | -22/+39 | |
| | | | | ||||||
* | | | | Merge pull request #418 from TeBoring/3.0.0-alpha-3-fix | Paul Yang | 2015-05-23 | 5 | -1504/+376 | |
|\| | | | | | | | | | | | Clean up *.vcproj files | |||||
| * | | | Clean up *.vcproj files | teboring | 2015-05-23 | 5 | -1504/+376 | |
|/ / / | ||||||
* | | | Add two languages (objectivec and csharp) to post_process_dist.sh | teboring | 2015-05-23 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #416 from TeBoring/master | Paul Yang | 2015-05-23 | 7 | -9/+9 | |
|\ \ \ | |/ / |/| | | Update version number to 3.0.0-alpha-3 | |||||
| * | | Update version number to 3.0.0-alpha-3 | teboring | 2015-05-23 | 7 | -9/+9 | |
|/ / | ||||||
* | | Merge pull request #341 from yukawa/fix-undef-GOOGLE_PROTOBUF_MISSING_HASH | Feng Xiao | 2015-05-22 | 1 | -1/+1 | |
|\ \ | | | | | | | Undef GOOGLE_PROTOBUF_MISSING_HASH after it is used. | |||||
| * | | Undef GOOGLE_PROTOBUF_MISSING_HASH after it is used. | Yohei Yukawa | 2015-05-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up CL for df184fba00acc7d4aa7b9d64693c53c815a64eda (Id937e25bbb35968ee76c92bd4a8ce6247408c443), which added #undef GOOGLE_PROTOBUF_MISSING_HASH where GOOGLE_PROTOBUF_MISSING_HASH macro is never defined. With this CL, GOOGLE_PROTOBUF_MISSING_HASH macro will be cleaned up after it is used. | |||||
* | | | Merge pull request #410 from thomasvl/objc_alpha2_drop | Paul Yang | 2015-05-22 | 95 | -1254/+6091 | |
|\ \ \ | | | | | | | | | Objective C Second Alpha Drop | |||||
| * | | | Objective C Second Alpha Drop | Thomas Van Lenten | 2015-05-22 | 95 | -1254/+6091 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Style fixups in the code. - map<> serialization fixes and more tests. - Autocreation of map<> fields (to match repeated fields). - @@protoc_insertion_point(global_scope|imports). - Fixup proto2 syntax extension support. - Move all startup code to +initialize so it happen on class usage and not app startup. - Have generated headers use forward declarations and move imports into generated code, reduces what is need at compile time to speed up compiled and avoid pointless rippling of rebuilds. | |||||
* | | | | Merge pull request #413 from TeBoring/master | Paul Yang | 2015-05-21 | 227 | -3789/+25713 | |
|\ \ \ \ | | | | | | | | | | | down-integrate internal changes | |||||
| * | | | | down-integrate internal changes | Bo Yang | 2015-05-21 | 227 | -3789/+25713 | |
| | | | | | ||||||
* | | | | | Merge pull request #411 from xfxyjwf/master | Paul Yang | 2015-05-21 | 1 | -0/+64 | |
|\ \ \ \ \ | | | | | | | | | | | | | Add default import paths for descriptor.proto and well-known protos. | |||||
| * | | | | | Add default import paths for descriptor.proto and other well-known types to ↵ | Feng Xiao | 2015-05-21 | 1 | -0/+64 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | protoc. Change-Id: I4afa295de4c8ed2a4cd0919cf84aedcd1327d9a5 | |||||
* | | | | | Merge pull request #412 from xfxyjwf/java_wkt | Paul Yang | 2015-05-21 | 3 | -0/+97 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Include well-known types in Java runtime. | |||||
| * | | | | Include well-known types in Java runtime. | Feng Xiao | 2015-05-21 | 3 | -0/+97 | |
|/ / / / | | | | | | | | | | | | | Change-Id: I816fe2fac7fccbcd96dd8510c7c9b5e7996aeadc | |||||
* | | | | Merge pull request #389 from jcanizales/add-podspec | Paul Yang | 2015-05-21 | 2 | -1/+24 | |
|\ \ \ \ | |/ / / |/| | | | Adds a podspec for the proto3 Objective-C runtime. | |||||
| * | | | Adds the podspec to objectivec_EXTRA_DIST in Makefile.am | Jorge Canizales | 2015-05-14 | 1 | -1/+2 | |
| | | | | ||||||
| * | | | Undo previous commit: Make all headers public instead. | Jorge Canizales | 2015-05-14 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | | | Apparently, in Cocoapods, all recursive #imports of public headers need to be public. | |||||
| * | | | Restricts public headers to GPBProtocolBuffers.h and ↵ | Jorge Canizales | 2015-05-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | GPBProtocolBuffers_RuntimeSupport.h | |||||
| * | | | Makes _PackagePrivate.h files private | Jorge Canizales | 2015-05-14 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Adds the initial version of the podspec for the proto3 Objective-C runtime. | Jorge Canizales | 2015-05-14 | 1 | -0/+23 | |
| | | | | ||||||
* | | | | Merge pull request #402 from thomasvl/objc_on_win | Paul Yang | 2015-05-21 | 11 | -103/+125 | |
|\ \ \ \ | | | | | | | | | | | Getting the ObjC generator building on Windows. |