Commit Graph

3492 Commits

Author SHA1 Message Date
Jon Skeet
f18a5b09ac Fixed spacing 2010-10-26 19:45:03 +01:00
Charles Stanhope
ef234da0e3 Added CodedInputStream ctor symmetrical with CodedOutputStream. 2010-10-19 05:37:44 -07:00
Wink Saville
69004c5194 am 3574de1c: Remove vestigial references to StringUtf8Micro.
Merge commit '3574de1ca8301e1e13d1c89f2e2a902499d6bae9' into gingerbread-plus-aosp

* commit '3574de1ca8301e1e13d1c89f2e2a902499d6bae9':
  Remove vestigial references to StringUtf8Micro.
2010-10-07 13:56:12 -07:00
Wink Saville
b164b01203 Remove vestigial references to StringUtf8Micro.
Change-Id: Ica75231b03de4768c671bf046b92bd7630ecd5c8
2010-10-06 10:00:08 -07:00
Jean-Baptiste Queru
ee613fac56 merge from gingerbread
Change-Id: Id43a6262c3f5cffc37db77748f129acb9c841823
2010-10-05 15:05:17 -07:00
Jean-Baptiste Queru
6ebe2303fd Make these modules optional.
This allows compiling this code in Gingerbread.

Bug: 3064326

Change-Id: Idab78a5a31a3c2fc35bcdb773aaecf1e4fb70bcb
2010-10-05 10:26:34 -07:00
Omari Stephens
aa6776432a Make protobuf usable by host-side java apps
Change-Id: Ic214bfb361eb2167d301b55a34b209a84a6d4a08
2010-09-30 18:50:26 -07:00
kenton@google.com
80aa23df6c Fix Issue 218: Check for protoc executable in vsprojects directory. 2010-09-28 21:58:36 +00:00
ArnoldZokas
89694eccf9 Removed redundant rules from gitignore 2010-09-26 21:14:16 +01:00
ArnoldZokas
2c94ecc74a Removed cfg folder in preparation for build configuration refactoring 2010-09-26 21:10:59 +01:00
ArnoldZokas
0e97eb2800 Removed original NAnt build script 2010-09-26 20:55:30 +01:00
kenton@google.com
a4a9ef8c8b Roll back revision 313. A similar but far more exensive change was made in our internal branch, which will be integrated soon. 2010-09-17 23:20:04 +00:00
kenton@google.com
b541e3c966 Use native line endings on VS project files (they are, in fact, text). 2010-09-17 22:37:46 +00:00
ArnoldZokas
ed0b7140fa Build performance optimisations 2010-09-12 15:09:16 +01:00
csharptest
e8e1dab03f Completed the following changes & testing, see todo.txt for more information
1 - Add a way to specify the output directory
2 - Added an option "file_extension" to control the suffix for cs files generated, defaults to ".cs"
3 - Added the option for "umbrella_namespace" used when nest_classes=false and having name conflicts
4 - Optionally remove dependencies to csharp options
5 - Investigate command line parsing library
6 - Investigate calling protoc directly
7 - Unable to resolve dependencies correctly
8 - Added several (20) nunits to automate the command-line invocation of each option
2010-09-03 16:36:50 -05:00
csharptest
5c69749b0b Completed the following changes & testing, see todo.txt for more information
1 - Add a way to specify the output directory
2 - Added an option "file_extension" to control the suffix for cs files generated, defaults to ".cs"
3 - Added the option for "umbrella_namespace" used when nest_classes=false and having name conflicts
4 - Optionally remove dependencies to csharp options
5 - Investigate command line parsing library
6 - Investigate calling protoc directly
7 - Unable to resolve dependencies correctly
8 - Added several (20) nunits to automate the command-line invocation of each option
2010-09-03 16:35:05 -05:00
kenton@google.com
27028bcb97 Fix issue 208. 2010-07-27 21:19:59 +00:00
kenton@google.com
0c293def6c Fix issue 207 2010-07-27 20:45:09 +00:00
Jon Skeet
eb1af68201 Add separate obj directory for CF build to avoid corruption.
committer: Arnold Zokas <arnold.zokas@coderoom.net>
2010-07-09 05:45:29 +08:00
Jon Skeet
d65173a9c5 Add separate obj directory for CF build to avoid corruption. 2010-07-08 21:43:36 +01:00
ArnoldZokas
d10c5e794d build performance optimisations 2010-07-08 00:10:32 +01:00
ArnoldZokas
fca5d2b6a2 Removed obsolete messages from build 2010-06-30 00:47:15 +01:00
ArnoldZokas
eb577e6096 Implemented an alternative build script using MSBuild 4.0 2010-06-30 00:34:22 +01:00
ArnoldZokas
7a9ef8725e Added NUnit 2.2.8.0 to lib 2010-06-30 00:33:32 +01:00
ArnoldZokas
afd1ee9454 Updated git ignore list 2010-06-30 00:32:49 +01:00
Wink Saville
7d0a2a3c88 Add libprotobuf-cpp-2.3.0-full.
Add full c++ version of libprotobuf as a static library.

Change-Id: I153bc913ff51e6a904284b733cac000497e1caac
2010-06-28 15:05:24 -07:00
Wink Saville
00302c1d16 Changed speed optimization for strings.
Removed use of StringUtf8Micro and instead use an extra byte array
instance variable directly in the class. This allows the list returned
for repeated strings to be a String instead of a StringUtf8Micro
making the class compatible with existing code.

Removed PerfTimer.java which isn't used.

Change-Id: Ie6acfb40f98f59a48c1a795d86f715078f9611f5
2010-06-07 17:04:13 -07:00
Wink Saville
e9da248ad9 Add libprotobuf-java-2.3.0-lite.
Also, have all the libraries follow the same naming convention so
rename com.google.protobuf.micro library to libprotobuf-java-2.3.0-micro.

Change-Id: I7c2a7d883a17f9a6d084ce4cac9601e344e416bf
2010-06-04 17:44:37 -07:00
Kenny Root
c0333631e1 Skip stlport for simulator
The host's stl library conflicts with stlport, so we need to exclude
stlport from inclusion in the build if we're targeting the simulator.

Change-Id: Ib4da6140f4b8abb271d8e67636ccec2a796c8c5a
2010-06-04 09:39:02 -07:00
Wink Saville
c778cad86d Merge "Add libprotobuf-cpp-2.3.0-lite" 2010-06-03 15:55:02 -07:00
Wink Saville
acf8ef12d0 Add libprotobuf-cpp-2.3.0-lite
Added android/config.h which will be used to configure
android builds of libraries. Currently I've undef HAVE_HASH_MAP
and HAVE_HASH_SET as the versions in stlport generated compile
errors.

Updated .gitignore to be more selective on what it ignores so
android/config.h wouldn't be ignored.

Change-Id: I53f3636121db2c6017491a37998b816aaf0cab5d
2010-06-03 15:33:07 -07:00
Wink Saville
ce7a2b0149 Add support for Java micro protobuf's to protobuf-2.3.0.
See README.android for additional information.

Change-Id: I6693e405c0d651eacacd3227a876129865dd0d3c
2010-05-29 13:13:38 -07:00
Wink Saville
5ab6e29684 Add protobuf 2.3.0 sources
This is the contents of protobuf-2.3.0.tar.bz2 from
http://code.google.com/p/protobuf/downloads/list.

Change-Id: Idfde09ce7ef5ac027b07ee83f2674fbbed5c30b2
2010-05-29 13:00:38 -07:00
Wink Saville
e5566f8673 Add support for Java micro protobuf's to protobuf-2.2.0a.
See README.android for additional information.

Change-Id: I9c5ef2eec484cc87e32841f39060f8f27b8e8472
2010-05-28 11:49:52 -07:00
Wink Saville
3df2fda0e4 Add protobuf 2.2.0a sources
This is the contents of protobuf-2.2.0a.tar.bz2 from
http://code.google.com/p/protobuf/downloads/list and
is the base code for the javamicro code generator.

Change-Id: Ie9a0440a824d615086445b6636944484b3155afa
2010-05-27 16:25:37 -07:00
Wink Saville
f9e5cc7058 The Android specific files prior to adding protobuf 2.2.0a sources.
Change-Id: Ib1009c088a3815c9152385e2b764a2c7cd28317e
2010-05-27 15:44:42 -07:00
Jon Skeet
706c5f6985 Add option to remove CLSCompliance attribute 2010-05-19 22:15:45 +01:00
Jon Skeet
290089ab7c Copy protos directory when releasing 2010-05-19 21:55:52 +01:00
Jon Skeet
8b6554ceb8 Improve distribution target 2010-05-19 21:41:06 +01:00
Jon Skeet
7f419b131d Added license file 2010-05-19 21:36:00 +01:00
Jon Skeet
8631daa883 Fixed build to work with VS2010 2010-05-19 21:15:10 +01:00
Jon Skeet
17ded8261d Fix issue 10 - check serialized size before writing to stream 2010-05-19 21:07:58 +01:00
kenton@google.com
15b675eea5 add cast to avoid compiler warning 2010-04-23 19:15:05 +00:00
kenton@google.com
d09ab8538d Allow services with lite runtime when using rpc generator plugin. 2010-04-19 19:15:12 +00:00
kenton@google.com
b3f6a15806 Improve coded_stream.h handling on MSVC. Avoid a bogus runtime check and enable little-endian optimization. Based on patch from Nathan McDaniel. 2010-04-05 23:19:54 +00:00
kenton@google.com
6793c1af26 Use full paths when writing MSVS-style errors. Patch from Oleg Smolsky. 2010-04-05 21:45:45 +00:00
Jon Skeet
ae9b3ff224 Release preparation 2010-04-01 20:32:45 +01:00
Ayende Rahien
88732e254e Minor 2010-02-23 07:15:12 +00:00
Ayende Rahien
4d2582081d Fixing an issue where I passed the wrong value in, causing an error with long buffers 2010-02-19 01:22:30 +02:00
Ayende Rahien
162b656fdd Implementing string interning 2010-02-19 00:30:23 +02:00