Commit Graph

33 Commits

Author SHA1 Message Date
Jisi Liu
1876a27e66 Update filelist again 2017-07-19 14:46:49 -07:00
Jisi Liu
11b6661e66 update build file list 2017-07-19 12:10:43 -07:00
Jisi Liu
3af881c7e2 Merge master into 3.4.x 2017-07-18 16:26:16 -07:00
Jisi Liu
09354db143 Merge from Google internal for 3.4 release 2017-07-18 15:38:30 -07:00
yjjnls
8f367c0b2d replenish missed header files in install step
install 'generated_message_table_driven.h' and 'metadata_lite.h', they are included when compiling the files generated using protoc.exe 3.3.0
2017-06-19 14:15:54 +08:00
Feng Xiao
32d7830e4b Fix C++ build for down-integration. 2017-03-29 14:52:33 -07:00
Feng Xiao
c94555f955 Double-quote file paths in extract_includes.bat.in
This allows the file path to contain spaces which is very common on
windows.
2017-03-10 16:32:19 -08:00
Jonathan Hseu
ef927cc428 Switch to gcc atomic intrinsics for macOS and delete the file that uses (#2699)
the deprecated atomics.
2017-02-10 14:55:34 -08:00
Jisi Liu
f92b455aa6 Add missing files. 2016-12-05 10:16:47 -08:00
Sergio Campama
e75cf40e8f Fixing references to the removed atomicops_internals_pnacl.h file. 2016-11-10 10:20:07 -05:00
Adam Cozzette
7fecfdbaa8 Added new has_bits.h file to cmake/extract_includes.bat.in (#2152)
This is necessary so that the CMake build knows to include this header
file in the installation include/ directory.
2016-10-10 11:43:48 -07:00
Jisi Liu
d947308aa1 update files to include php generators (#2165) 2016-10-06 11:49:47 -07:00
Paul Yang
e0e54661f7 Check in php implementation. (#2052)
This pull request includes two implementation: C extension and PHP
package. Both implementations support encode/decode of singular,
repeated and map fields.
2016-09-15 11:09:01 -07:00
Konstantin Podsvirov
7d275ec168 CMake: remove repeated_field_reflection.h from extract list 2016-08-01 20:54:41 +03:00
Bo Yang
20b532544f Integrate interanl changes 2016-06-02 15:44:32 -07:00
Jisi Liu
1f4f3e26bd Update file list to include the missing extension lite file. 2016-04-18 14:12:08 -07:00
Gaurav Vaish
74d8b0bebc Added access_level for types
* `csharp_options`: Added `Options` to encapsulate generator options.
   Supported options for now - file_extension, base_namespace
* `{Blah}Generator`: Now accept `Options*` as parameter to constructor
* `csharp_generator.cc`: Parse and populate options
* `Makefile.am`: Added `csharp_options.h`
* `extract_includes.bat.in`: Added `csharp_options.h`

Refactoring code to two commits. This is the first commit
2016-04-05 09:47:11 -07:00
Feng Xiao
ef6c72b46b Update BUILD/cmake files.
Change-Id: I6fa9f1b65d6c06b891aabf3f3d868364d74d727d
2015-12-28 17:33:55 -08:00
Feng Xiao
e841bac4fc Down-integrate from internal code base. 2015-12-11 17:10:28 -08:00
Doug Kwan
2a50e67c78 Add support for POWER Linux 2015-11-03 14:49:42 -08:00
Jisi Liu
c3bc155ace Merge branch 'master' of github.com:google/protobuf
Change-Id: If3fb07754a734bae610d95124528e073515ac525
2015-08-21 11:44:49 -07:00
Jisi Liu
b0f661181d Down-integrate from internal branch.
Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
2015-08-21 11:18:45 -07:00
Jon Skeet
2ee4b56655 Merge pull request #629 from google/master
Integrate changes from upstream/master into csharp-experimental
2015-07-21 12:58:43 +01:00
Jisi Liu
12f6e3dd0e update header list.
Change-Id: I75459b8b6562c3ac58fa4b1e4513accdda43ad64
2015-07-17 11:36:51 -07:00
Jisi Liu
7b216119ee Update make file for extra headers.
Change-Id: Ifbc415755266ba3d0ffa5661fcd7c7d2e3b32a22
2015-07-17 11:34:33 -07:00
Jan Tattermusch
fa544f4835 Merge pull request #586 from jtattermusch/csharp_names_export
Export c# naming routines publicly
2015-07-16 17:33:56 -07:00
Jisi Liu
bd4bc9e72c remove pbconfig from extract script
Change-Id: I5049da7449cbada781aa1e23485a336b584802cb
2015-07-13 10:41:18 -07:00
Jan Tattermusch
cacbedf04e export c# naming routines publicly 2015-07-10 13:40:34 -07:00
Jisi Liu
1e534d7ac3 Merge pull request #505 from pherl/bazel
Add bazel support for the project
2015-06-18 11:19:34 -07:00
Jisi Liu
1c42a8b336 Move cmake/update_file_lists.sh preparing for bazel support.
Change-Id: Idecb2e3a5169f7b40d832242c9c10b0eb4325654
2015-06-17 13:31:26 -07:00
Feng Xiao
818c5eee08 Fix broken builds. 2015-06-17 11:19:46 -07:00
Feng Xiao
e96ff30120 Down-integrate from internal code base.
[ci skip]

Change-Id: I9391c09640e0b0b2b21c45a97a1fc91814d95c5d
2015-06-15 18:24: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