AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
3,522 Commits 35 Branches 138 Tags 124 MiB
368a2f4cee
Commit Graph

3522 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Van Lenten
368a2f4cee Automated testing tweaks for ObjC 
- Move the ObjC tests into the list and exclude them on linux, this will change
  where in the order they start, since they are longer, it will have other
  things run in parallel instead of them ending up last and taking the longest.
- Switch to the Xcode 7.3 image.
- Drop the use of xctool and stream line things through the full_mac_build.sh
  script. This means we end up with only one build script instead of two.
- Tweaks to the mac build script:
  - Make iOS Xcode version support explicit
  - Support Debug/Release only building
  - Change the OS X min parallel count to 2 to better deal with VMs.
- Split the travis ios tests into the two Xcode Configurations as the logs are
  choking travis.
 2016-05-24 15:39:36 -04:00
Feng Xiao
2131b2d544 Merge pull request #1588 from jeffmvr/master 
added missing closing bracket for _cmakedir_desc in cmake/install.cmake:88
 2016-05-22 21:51:45 -07:00
Jeff Merver
733ef986e5 added missing closing bracket for _cmakedir_desc in cmake/install.cmake line 88 2016-05-21 16:01:32 -07:00
Feng Xiao
594ce567ab Merge pull request #1578 from wal-rus/cmake-install-namespace 
Add protobuf:: namespace to installed targets
 2016-05-20 20:23:36 -07:00
Walter Gray
28f35b4f16 add protobuf:: namespace to installed targets 2016-05-20 18:03:32 -07:00
Feng Xiao
38e4713191 Merge pull request #1523 from xfxyjwf/compatibility_tests 
Add compatibilty tests against v2.5.0
 2016-05-20 15:17:05 -07:00
Feng Xiao
a31d14b7d0 Describe platform requirements for the compatibility tests. 2016-05-20 15:15:15 -07:00
Thomas Van Lenten
5c6518fd27 Merge pull request #1583 from thomasvl/pods_integration_followup 
Make the CocoaPods integration tests more robust
 2016-05-20 14:57:42 -04:00
Feng Xiao
2338e03570 Merge pull request #1576 from wal-rus/cmake-versionfile 
Make protobuf-config-version.cmake.in set the required variables
 2016-05-20 11:50:00 -07:00
Feng Xiao
beca1f52ef Merge pull request #1575 from wal-rus/cmake-install-msvc 
Make cmake configuration file install path configurable
 2016-05-20 11:45:01 -07:00
Thomas Van Lenten
6c47faa890 Make the CocoaPods integration tests more robust 
- Env solution doesn't seem to always work, use template pod files and copy
  them in place instead.
- Flush the pods cache before and after runs.
- Make pod install verbose to have the info incase something goes wrong.
 2016-05-20 11:06:43 -04:00
Walter Gray
02a28a8fea Update protobuf-config-version.cmake.in to correctly set the required variables (PACKAGE_VERSION_EXACT, PACKAGE_VERSION_COMPATIBLE, PACKAGE_VERSION_UNSUITABLE) 2016-05-19 15:25:03 -07:00
Walter Gray
7d79458fc5 Fix the cmake configuration file install path to be more standards compliant (See the description of cmake's config search behavior on https://cmake.org/cmake/help/v3.4/command/find_package.html) 2016-05-19 14:52:04 -07:00
Thomas Van Lenten
c034ba768f Merge pull request #1574 from thomasvl/test_schemes 
Add shared schemes for the CocoaPods integration tests
 2016-05-19 16:50:12 -04:00
Thomas Van Lenten
20b5bf624f Add shared schemes for the CocoaPods integration tests 
Otherwise the projects have to be opened once to create user schemes for the
command line builds to work.
 2016-05-19 16:47:35 -04:00
Thomas Van Lenten
12dffd9089 Merge pull request #1572 from thomasvl/podspec_tests_2 
OS X gitignore cleanup and cocoapods integration tests
 2016-05-19 16:13:47 -04:00
Thomas Van Lenten
16dd477a29 CocoaPod Integration Tests 
- Add an Xcode 6.3 created default iOS Project.
- Add an Xcode 6.3 created default OS X Project.
- Add Podfiles to for both that use Protobufs from within the tree.
- Add a script to run the tests (and cleanup) to help confirm the state of the
  Protobuf.podspec and sources.
 2016-05-19 14:31:39 -04:00
Joshua Haberman
cc5296b869 Merge pull request #1558 from haberman/rubyoneof 
Ruby oneofs: return default instead of nil for unset fields.
 2016-05-19 08:28:20 -07:00
Thomas Van Lenten
daec44fa52 Expand the OS X/Xcode gitignores 
- Add the folder CocoaPods will add to the root folder.
- Move and expand the entries in the objectivec directory.
 2016-05-19 10:08:51 -04:00
Josh Haberman
2d514ce2d8 Fixed oneof behavior for enums and fixed JRuby. 2016-05-18 15:39:29 -07:00
Joshua Haberman
431ba4b37d Merge pull request #1549 from xyzzyz/arena_export 
Export class Arena to shared library.
 2016-05-18 13:14:55 -07:00
Joshua Haberman
ba696e7bed Merge pull request #1547 from xyzzyz/js_generator 
Fix #include in js_generator.cc
 2016-05-18 13:14:19 -07:00
Jisi Liu
cbb9183e89 Merge pull request #1559 from google/beta-3 
Merge beta-3 release branch again.
 2016-05-18 11:44:56 -07:00
Josh Haberman
545527e8cf Ruby oneofs: return default instead of nil for unset fields. 2016-05-18 10:58:02 -07:00
Paul Yang
32e3d7a109 Merge pull request #1412 from google/internal 
Integrate interanl changes
 2016-05-18 20:36:35 +08:00
Bo Yang
6673283a56 Integrate interanl changes 2016-05-18 17:11:22 +08:00
Joshua Haberman
718eb75b51 Merge pull request #1548 from anandolee/master 
JSON format for Any message must print @type first
 2016-05-17 17:24:15 -07:00
Jisi Liu
97aa8a0784 Merge pull request #1551 from pherl/beta-3 
Fix protoc artifact pom version
 2016-05-17 17:20:51 -07:00
Jisi Liu
fe06eb62c6 Fix protoc artifact pom version 2016-05-17 17:01:10 -07:00
Jie Luo
b01b1a8ebe JSON format for Any message must print @type first, use OrderedDict instead of {} 2016-05-17 15:14:53 -07:00
Feng Xiao
4f630a6857 Add compatiblity tests against v2.5.0 2016-05-17 15:13:59 -07:00
Adam Michalik
810ba9b8f2 Export class Arena to shared library. 
This got broken in commit 6ef984af4b
which integrated changes from internal branch.
 2016-05-17 14:39:48 -07:00
Adam Michalik
f2885f619a Fix #include in js_generator.cc 
The commit 3b3c8abb96 has replaced the <>
with "" in #include statement in js_generator.cc
 2016-05-17 12:43:32 -07:00
Jisi Liu
67d2d45d73 Merge pull request #1546 from pherl/beta-3 
Added download_url to be able to upload to pypi.
 2016-05-17 10:59:07 -07:00
Jisi Liu
b3bb46c51b Added download_url to be able to upload to pypi. 2016-05-17 10:50:43 -07:00
Jisi Liu
c8be6ee00c Merge pull request #1542 from google/beta-3 
Merge Beta 3 release branch into master
 2016-05-16 13:46:16 -07:00
Jisi Liu
3470b6895a Merge pull request #1540 from pherl/changelog 
Update changes for lite
 2016-05-16 11:34:04 -07:00
Jisi Liu
cf1fd7ed65 Merge pull request #1533 from pherl/mapcomment 
Remove the comments about iterator validation
 2016-05-16 11:33:46 -07:00
Jisi Liu
0ec34bfbc1 Update changes for lite 2016-05-16 11:20:33 -07:00
Jisi Liu
5e7c4cb3f6 Remove the comments about iterator validation 
As it may be implementation dependent.
 2016-05-13 18:12:57 -07:00
Jisi Liu
f2db1e0e39 Merge pull request #1532 from pherl/changelog 
Update changelogs for C++ maps
 2016-05-13 17:47:10 -07:00
Jisi Liu
034867f762 Update changelogs for C++ maps 2016-05-13 16:16:14 -07:00
Joshua Haberman
dc4970684a Merge pull request #1529 from gkraynov/test-redundant-varint 
Test redundant varint fields decoding in JS.
 2016-05-13 14:50:46 -07:00
Jisi Liu
5c29835f67 Merge pull request #1528 from pherl/master 
Remove the instructions for pbconfig.h
 2016-05-13 11:27:24 -07:00
Jisi Liu
b126706cf0 Merge pull request #1527 from haberman/changelog 
Added release notes for Ruby and JavaScript.
 2016-05-12 17:57:29 -07:00
Josh Haberman
d346f4998d Added release notes for Ruby and JavaScript. 2016-05-12 17:55:56 -07:00
Jisi Liu
ce7e502e4b Remove the instructions for pbconfig.h 2016-05-12 17:55:29 -07:00
Jisi Liu
7b87f77a25 Merge pull request #1521 from zhangkun83/master 
Fine-tune build scripts and better documentation.
 2016-05-12 17:50:13 -07:00
Kun Zhang
04757db7a8 Fix the server id in example 2016-05-12 16:39:49 -07:00
Jisi Liu
9f84114864 Merge pull request #1520 from pherl/hashmapvs2008 
Bridge vs2008 hashmaps.
 2016-05-12 10:34:40 -07:00