Walter Gray
d13b3d0d96
remove useless cleanup - config.cmake files are executed in their own context.
9 years ago
Walter Gray
04265e40da
Remove if(TRUE)
9 years ago
Feng Xiao
2131b2d544
Merge pull request #1588 from jeffmvr/master
...
added missing closing bracket for _cmakedir_desc in cmake/install.cmake:88
9 years ago
Jeff Merver
733ef986e5
added missing closing bracket for _cmakedir_desc in cmake/install.cmake line 88
9 years ago
Feng Xiao
594ce567ab
Merge pull request #1578 from wal-rus/cmake-install-namespace
...
Add protobuf:: namespace to installed targets
9 years ago
Walter Gray
28f35b4f16
add protobuf:: namespace to installed targets
9 years ago
Feng Xiao
38e4713191
Merge pull request #1523 from xfxyjwf/compatibility_tests
...
Add compatibilty tests against v2.5.0
9 years ago
Feng Xiao
a31d14b7d0
Describe platform requirements for the compatibility tests.
9 years ago
Thomas Van Lenten
5c6518fd27
Merge pull request #1583 from thomasvl/pods_integration_followup
...
Make the CocoaPods integration tests more robust
9 years ago
Feng Xiao
2338e03570
Merge pull request #1576 from wal-rus/cmake-versionfile
...
Make protobuf-config-version.cmake.in set the required variables
9 years ago
Feng Xiao
beca1f52ef
Merge pull request #1575 from wal-rus/cmake-install-msvc
...
Make cmake configuration file install path configurable
9 years ago
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.
9 years ago
Walter Gray
02a28a8fea
Update protobuf-config-version.cmake.in to correctly set the required variables (PACKAGE_VERSION_EXACT, PACKAGE_VERSION_COMPATIBLE, PACKAGE_VERSION_UNSUITABLE)
9 years ago
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 )
9 years ago
Thomas Van Lenten
c034ba768f
Merge pull request #1574 from thomasvl/test_schemes
...
Add shared schemes for the CocoaPods integration tests
9 years ago
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.
9 years ago
Thomas Van Lenten
12dffd9089
Merge pull request #1572 from thomasvl/podspec_tests_2
...
OS X gitignore cleanup and cocoapods integration tests
9 years ago
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.
9 years ago
Joshua Haberman
cc5296b869
Merge pull request #1558 from haberman/rubyoneof
...
Ruby oneofs: return default instead of nil for unset fields.
9 years ago
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.
9 years ago
Josh Haberman
2d514ce2d8
Fixed oneof behavior for enums and fixed JRuby.
9 years ago
Joshua Haberman
431ba4b37d
Merge pull request #1549 from xyzzyz/arena_export
...
Export class Arena to shared library.
9 years ago
Joshua Haberman
ba696e7bed
Merge pull request #1547 from xyzzyz/js_generator
...
Fix #include in js_generator.cc
9 years ago
Jisi Liu
cbb9183e89
Merge pull request #1559 from google/beta-3
...
Merge beta-3 release branch again.
9 years ago
Josh Haberman
545527e8cf
Ruby oneofs: return default instead of nil for unset fields.
9 years ago
Paul Yang
32e3d7a109
Merge pull request #1412 from google/internal
...
Integrate interanl changes
9 years ago
Bo Yang
6673283a56
Integrate interanl changes
9 years ago
Joshua Haberman
718eb75b51
Merge pull request #1548 from anandolee/master
...
JSON format for Any message must print @type first
9 years ago
Jisi Liu
97aa8a0784
Merge pull request #1551 from pherl/beta-3
...
Fix protoc artifact pom version
9 years ago
Jisi Liu
fe06eb62c6
Fix protoc artifact pom version
9 years ago
Jie Luo
b01b1a8ebe
JSON format for Any message must print @type first, use OrderedDict instead of {}
9 years ago
Feng Xiao
4f630a6857
Add compatiblity tests against v2.5.0
9 years ago
Adam Michalik
810ba9b8f2
Export class Arena to shared library.
...
This got broken in commit 6ef984af4b
which integrated changes from internal branch.
9 years ago
Adam Michalik
f2885f619a
Fix #include in js_generator.cc
...
The commit 3b3c8abb96
has replaced the <>
with "" in #include statement in js_generator.cc
9 years ago
Jisi Liu
67d2d45d73
Merge pull request #1546 from pherl/beta-3
...
Added download_url to be able to upload to pypi.
9 years ago
Jisi Liu
b3bb46c51b
Added download_url to be able to upload to pypi.
9 years ago
Jisi Liu
c8be6ee00c
Merge pull request #1542 from google/beta-3
...
Merge Beta 3 release branch into master
9 years ago
Jisi Liu
3470b6895a
Merge pull request #1540 from pherl/changelog
...
Update changes for lite
9 years ago
Jisi Liu
cf1fd7ed65
Merge pull request #1533 from pherl/mapcomment
...
Remove the comments about iterator validation
9 years ago
Jisi Liu
0ec34bfbc1
Update changes for lite
9 years ago
Jisi Liu
5e7c4cb3f6
Remove the comments about iterator validation
...
As it may be implementation dependent.
9 years ago
Jisi Liu
f2db1e0e39
Merge pull request #1532 from pherl/changelog
...
Update changelogs for C++ maps
9 years ago
Jisi Liu
034867f762
Update changelogs for C++ maps
9 years ago
Joshua Haberman
dc4970684a
Merge pull request #1529 from gkraynov/test-redundant-varint
...
Test redundant varint fields decoding in JS.
9 years ago
Jisi Liu
5c29835f67
Merge pull request #1528 from pherl/master
...
Remove the instructions for pbconfig.h
9 years ago
Jisi Liu
b126706cf0
Merge pull request #1527 from haberman/changelog
...
Added release notes for Ruby and JavaScript.
9 years ago
Josh Haberman
d346f4998d
Added release notes for Ruby and JavaScript.
9 years ago
Jisi Liu
ce7e502e4b
Remove the instructions for pbconfig.h
9 years ago
Jisi Liu
7b87f77a25
Merge pull request #1521 from zhangkun83/master
...
Fine-tune build scripts and better documentation.
9 years ago
Kun Zhang
04757db7a8
Fix the server id in example
9 years ago