Commit graph

2218 commits

Author SHA1 Message Date
Feng Xiao
52737c2bc8 Add appveyor.xml for windows tests. 2015-06-12 23:41:29 -07:00
Feng Xiao
54a4cccb97 Merge pull request #481 from Qartar/master
Workaround for MSVC's string literal compiler limit.
2015-06-12 14:56:02 -07:00
Feng Xiao
68c8762b98 Merge pull request #489 from tamird/go-package-descriptor
Give descriptor.proto a go package
2015-06-12 13:41:54 -07:00
Qartar
2fe6d7bc57 Workaround for MSVC's string literal compiler limit.
Escape characters don't count for string literal size, no need to pre-generate escape string.

Added unit test to touch enormous cpp generated descriptor.

Updated makefile to include enormous_descriptor.proto

Fixed language compatibility error.
2015-06-12 13:23:09 -07:00
Tamir Duberstein
66463d7e4b Give descriptor.proto a go package
This is currently done in golang/protobuf using `sed`. This change
should simplify things.
2015-06-12 06:40:18 -04:00
Jisi Liu
7b35416374 Merge pull request #486 from thomasvl/assets_podspec
Update podspec, rename assets to drop @
2015-06-10 13:17:59 -07:00
Thomas Van Lenten
0f2b4a0e82 Update podspec for files that can build now, rename assets to not need @ in the name. 2015-06-10 14:30:59 -04:00
Feng Xiao
91becaa867 Merge pull request #483 from thomasvl/fixup_travis_2
Remove the OS X checks from travis.sh, instead use excludes
2015-06-10 10:54:32 -07:00
Joshua Haberman
c35ac0789b Merge pull request #477 from haberman/upbupdate
Updated upb to latest version (C89).
2015-06-10 09:04:30 -07:00
Thomas Van Lenten
c4d3638f51 Remove the OS X checks from travis.sh, instead use excludes to not fire up a vm for something we can't test. 2015-06-10 08:51:06 -04:00
Paul Yang
686db5c355 Merge pull request #484 from TeBoring/temp
Update version number of objective-c to 3.0.0-alpha-4-pre
2015-06-09 17:18:50 -07:00
Paul Yang
fb466c13a7 Merge pull request #480 from thomasvl/objc_beta_drop
Beta quality drop of Objective C Support.
2015-06-09 17:17:45 -07:00
Bo Yang
9dd2bc4ea1 Update version number of objective-c to 3.0.0-alpha-4-pre 2015-06-09 16:16:46 -07:00
Josh Haberman
e3ce451b60 Fixed compiler warnings and added -std=c99.
upb no longer requires -std=c99 but the Ruby/C
code still uses C99 features.
2015-06-09 11:08:25 -07:00
Austin Schuh
fd73235f6b Refactored threadlocal logic.
Refactored the threadlocal logic for Android and IOS into logic in
platform_macro.h which computes a GOOGLE_PROTOBUF_NO_THREADLOCAL
define which is then used elsewhere.  This allows new platforms
without THREADLOCAL to be easily defined.
2015-06-08 18:49:16 -07:00
Josh Haberman
e8ed021ee7 Updated upb to latest version (C89).
Since this version of upb supports C89, all of the
extra compiler flags are no longer required.
2015-06-08 17:56:03 -07:00
Thomas Van Lenten
d846b0b059 Beta quality drop of Objective C Support.
- Add more to the ObjC dir readme.
- Merge the ExtensionField and ExtensionDescriptor to reduce overhead.
- Fix an initialization race.
- Clean up the Xcode schemes.
- Remove the class/enum filter.
- Remove some forced inline that were bloating things without proof of performance wins.
- Rename some internal types to avoid conflicts with the well know types protos.
- Drop the use of ApplyFunctions to the compiler/optimizer can do what it wants.
- Better document some possible future improvements.
- Add missing support for parsing repeated primitive fields in packed or unpacked forms.
- Improve -hash.
- Add *Count for repeated and map<> fields to avoid auto create when checking for them being set.
2015-06-08 17:17:22 -04:00
Feng Xiao
9cbdaedb86 Exclude 3 failing tests on osx from travis. 2015-06-08 13:00:45 -07:00
Feng Xiao
872beb738b Merge pull request #469 from xfxyjwf/vsprojects
Remove vsprojects.
2015-06-08 12:21:49 -07:00
Feng Xiao
3f9be70d06 Merge pull request #361 from brianduff/sync_aosp
Speed up little endian int/long writes.
2015-06-06 00:44:39 -07:00
Feng Xiao
b9baa47eaf Merge pull request #468 from AustinSchuh/unsigned_proto
Marked another compiler literal unsigned.
2015-06-06 00:40:51 -07:00
Feng Xiao
f51f1b7bb6 Merge pull request #467 from AustinSchuh/GOOGLE_PREDICT_FALSE
Fixed bug in GOOGLE_PREDICT_FALSE.
2015-06-06 00:39:12 -07:00
Feng Xiao
ee6b3d5529 Remove vsprojects. 2015-06-05 23:57:01 -07:00
Feng Xiao
dffd542bb8 Update ./update_file_lists.sh.
Make it executable and generate extract_includes.bat in the same directory.
2015-06-05 23:36:05 -07:00
Austin Schuh
307af628e6 Marked another compiler literal unsigned.
When compiling a protobuf with gcc 4.1.2 for powerpc, I ran into
another of the following warning message:

INFO: From Compiling my_proto.pb.cc powerpc-603e-linux-gcc:
bazel-out/local_linux-dbg/genfiles/my_proto.pb.cc: In member
   function `virtual void MyProto::Clear()':
   bazel-out/local_linux-dbg/genfiles/my_proto.pb.cc:223: warning: this
      decimal constant is unsigned only in ISO C90

The line in the proto file that was triggering it was:

  if (_has_bits_[24 / 32] & 4278190080) {
    ZR_(field1_, field2_);
  }

_has_bits_ is a uint32.  The constant mask should therefore be
unsigned.  This change updates the constant to be generated as
unsigned.
2015-06-05 22:46:01 -07:00
Feng Xiao
e9839ff444 Add back incorrectly excluded cmake targets. 2015-06-05 21:24:23 -07:00
Austin Schuh
f4c8627edb Fixed bug in GOOGLE_PREDICT_FALSE.
The GOOGLE_PREDICT_FALSE macro is both incorrect, and doesn't match
the macro definition in glog, which causes conflicts when including
both libraries.  This commit fixes that by making it identical to
what is in glog.
2015-06-05 18:49:25 -07:00
Joshua Haberman
68975a4e50 Merge pull request #460 from haberman/conformance-names
Conformance tests can now be excluded based on their names.
2015-06-05 14:50:34 -07:00
Jie Luo
8fe039a69a Merge pull request #462 from anandolee/master
Migrate writer to printer for C#
2015-06-04 16:15:23 -07:00
Josh Haberman
23bf3b566f Removed test_name from conformance.proto.
Change-Id: I382dcda97fa123a6da4ff5faad5d7ece95853f33
2015-06-04 15:04:00 -07:00
Feng Xiao
42f109d7bc Merge pull request #457 from xfxyjwf/cmake
Add cmake support.
2015-06-04 13:35:45 -07:00
Jie Luo
90da3514cd Migrate writer to io::Printer for C# 2015-06-04 11:39:13 -07:00
Feng Xiao
2286ab328c Fix README.md formatting.
Change-Id: I121cb70bfdc4894c297ab1a36f1db47736c0652b
2015-06-04 11:28:19 -07:00
Jisi Liu
60c510a381 Merge pull request #456 from xfxyjwf/android
Remove Android.mk
2015-06-04 08:40:18 -07:00
Feng Xiao
34448fca45 Add an cmake option to exclude tests. 2015-06-04 01:27:19 -07:00
Josh Haberman
d2b67389b3 Conformance tests can now be excluded based on their names.
This allows us to enable conformance tests even when we know
that some tests are failing and need to be fixed.

Change-Id: I372f43663008747db6f2b2cf06e6ffa4c6d85b2d
2015-06-03 12:08:08 -07:00
Feng Xiao
96f1d4ada2 Merge pull request #453 from bakineggs/master
Add protoc path detection for Mac OS
2015-06-03 11:20:08 -07:00
Feng Xiao
b866d3c727 Remove Android.mk
This file bares a different copyright license and also doesn't actually
work (out-dated file lists, no config.h/pbconfig.h, refers to inexist
AOSP paths).
2015-06-02 22:04:45 -07:00
Feng Xiao
dbcfc5e202 Merge pull request #444 from xfxyjwf/vs2010_fix
Fix two issues on vs2010.
2015-06-02 21:32:41 -07:00
Dan Barry
0af3ed5189 Add protoc path detection for Mac OS 2015-06-02 17:11:35 -07:00
Paul Yang
4644f99d1a Merge pull request #447 from murgatroid99/podspec_fix
Add remaining not-already-imported well known types files to podspec
2015-06-02 16:03:38 -07:00
Feng Xiao
69433f3810 Merge pull request #305 from ezegomez/master
Fix unittest in i386
2015-06-02 10:53:03 -07:00
Feng Xiao
d1281cdb69 Merge pull request #451 from jcanizales/document-why-podspec-is-on-root
Document why the podspec is on the root of the repo
2015-06-02 10:30:26 -07:00
Michael Lumish
8cbb4cf1b3 Merge pull request #1 from jcanizales/podspec_fix
A few corrections to the proposed podspec
2015-06-02 08:34:43 -07:00
Jorge Canizales
9d6b946a9e Reorder fields so it looks like exclude_files affects preserve_paths 2015-06-02 01:03:03 -07:00
Jorge Canizales
e55a25c086 Better documentation 2015-06-02 00:42:40 -07:00
Jorge Canizales
d377c17b34 Remove backslashes after commas 2015-06-02 00:42:40 -07:00
Jorge Canizales
6afcaf0f2d Remove struct.proto too (redefines GPBValue) 2015-06-02 00:42:40 -07:00
Jorge Canizales
153d61a1a1 s/pobjc/pbobjc and simplify a bit the podspec 2015-06-02 00:42:40 -07:00
Jorge Canizales
249483e93c Document why the podspec is on the root of the repo 2015-06-01 19:55:27 -07:00