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

33 Commits

Author SHA1 Message Date
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
Thomas Van Lenten
f367642103 Add two missing ignores for conformance directory. 2016-05-06 11:44:42 -04:00
CH Albach
5477f8cdba Manually down-integrate python JSON struct support from internal code base. 2016-01-29 18:10:50 -08:00
Thomas Van Lenten
1745f7eae9 Add support for the conformance test for objc when run on OS X 2015-11-18 11:58:19 -05:00
Thomas Van Lenten
42f2eee932 Cleanups of deps and ignores for conformance 
- Hopefully complete the deps for other languages for the generated conformance proto sources.
- List the generated sources for cleanup by make's clean rules.
- Make the toplevel nuke the pyc files that can get created in the ObjC dir.
 2015-11-16 11:29:59 -05:00
Thomas Van Lenten
f0411ec974 Update the Mac build script to include the conformance tests 
- Kick off the conformance tests
- Add missing ignore for something generated by a build on the conformance directory.
 2015-11-04 15:14:54 -05:00
Konstantin Podsvirov
c3aa4c2675 Improved SHARED build from CMake project 2015-10-15 02:56:48 +03:00
Dan O'Reilly
4fefc07ec5 Fix duplicate entry in .gitignore 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-18 11:31:37 -04:00
Dan O'Reilly
e47cdd5a55 Merge remote-tracking branch 'upstream/master' into py2_py3_straddle 
Conflicts:
	python/google/protobuf/descriptor_pool.py
	python/google/protobuf/internal/api_implementation_default_test.py
	python/google/protobuf/internal/cpp_message.py
	python/google/protobuf/internal/descriptor_database_test.py
	python/google/protobuf/internal/descriptor_pool_test.py
	python/google/protobuf/internal/descriptor_python_test.py
	python/google/protobuf/internal/descriptor_test.py
	python/google/protobuf/internal/generator_test.py
	python/google/protobuf/internal/message_factory_python_test.py
	python/google/protobuf/internal/message_factory_test.py
	python/google/protobuf/internal/message_test.py
	python/google/protobuf/internal/proto_builder_test.py
	python/google/protobuf/internal/python_message.py
	python/google/protobuf/internal/reflection_test.py
	python/google/protobuf/internal/service_reflection_test.py
	python/google/protobuf/internal/symbol_database_test.py
	python/google/protobuf/internal/text_encoding_test.py
	python/google/protobuf/internal/text_format_test.py
	python/google/protobuf/internal/unknown_fields_test.py
	python/google/protobuf/internal/wire_format_test.py
	python/google/protobuf/pyext/descriptor_cpp2_test.py
	python/google/protobuf/pyext/message_factory_cpp2_test.py
	python/google/protobuf/pyext/reflection_cpp2_generated_test.py
	python/setup.py
	ruby/lib/google/protobuf/message_exts.rb
 2015-08-12 23:57:46 -04:00
Jon Skeet
50a3a809e8 Merge remote-tracking branch 'upstream/master' into proto3-only 2015-06-19 17:35:01 +01:00
Feng Xiao
818c5eee08 Fix broken builds. 2015-06-17 11:19:46 -07:00
Jon Skeet
09f3f4eec3 Updates to handle use of cmake for Windows builds. 2015-06-17 15:16:14 +01:00
Jisi Liu
f48dca5044 Make pbconfig.h independent of config.h 
Change-Id: I31ead985b4ac5b02fb7558d34c1da19fd837b50a
 2015-06-13 00:01:09 -07:00
Thomas Van Lenten
58cd4a47e8 ObjC fixup for the branch. 
- Shouldn't need SRCROOT in the project since Xcode should be setting the working directory to where the project lives.
- Remove the packed/unpacked repeated enum field in the tests and update the code to handle the defaults.
- Move up the ignore to cover .DS_Store files in src also.

add starstar
 2015-05-26 14:01:54 -04:00
Bo Yang
50a765ba03 Fix bugs in objective-c. 2015-05-25 12:48:03 -07:00
Bo Yang
f87e5b7e74 Fix C2385: accessing parent classes' member without specifying is ambiguous. 2015-05-24 00:13:26 -07:00
Bo Yang
5db217305f down-integrate internal changes 2015-05-21 19:32:02 -07:00
Jan Tattermusch
4111310830 Merge branch 'master' of github.com:google/protobuf into integrate_from_master 2015-05-13 13:35:02 -07:00
Paul Yang
b89de5f6e0 Merge pull request #331 from thomasvl/objc_alpha1_drop 
Objective C compiler plugin and runtime
 2015-05-06 17:32:07 -07:00
Tamir Duberstein
6d3e61676a [PYTHON] gitignore eggs 2015-05-06 17:02:57 -04:00
Thomas Van Lenten
30650d81d9 Alpha 1 drop of Google's Objective C plugin and runtime support for protobufs. 2015-05-06 13:19:14 -04:00
Jon Skeet
c56475088d Change to using xUnit for all unit tests, and fetch that via NuGet. 
This includes fetching the VS unit test runner package, so that tests can be run from Visual Studio's Test Explorer.
 2015-04-30 11:29:35 +01:00
Jon Skeet
8d7e9433b3 Add C# files to Visual Studio projects. 
Also ignore Windows native build output files.
 2015-04-24 09:21:31 +01:00
Tamir Duberstein
b63d432add .gitignore generated file 2015-03-31 10:21:49 -07:00
Jisi Liu
1939efed2d Add .so to .gitignore. 
Change-Id: I5418606cb51a43a8cd7f91f26448cf0e8dde1016
 2015-02-28 16:54:15 -08:00
Jisi Liu
c2f2bce6af Update .gitignore so that the newly-added config.h is visible to git. 
Change-Id: I0054c8d6f80fc71073ca70a121f1acafc12e030b
 2015-02-25 16:48:26 -08:00
Jisi Liu
7af23e88be Add java compiled targets and several tests target into .gitignore. 2015-02-09 13:11:03 -08:00
Tres Seaver
d0eb89cb69 Ignore more derived files. 2015-01-13 15:57:20 -05:00
Tres Seaver
58dbea9944 Ignore .so files. 2015-01-13 14:17:25 -05:00
Tres Seaver
2c495e402d Ignore artifacts from autogen.sh 2014-12-09 13:01:42 -05:00
Tres Seaver
e9d18bca28 Ignore files generated from new 'map*.protobuf' sources. 2014-11-18 18:41:40 -05:00
Tres Seaver
113eb61e6b Avoid '**/' patterns for compat w/ git < 1.8. 
Ignore generated test scaffolding files.

Exclude Python build artifacts.
 2014-11-17 20:05:42 -05:00
John Beard
2853cd4a10 Add .gitignore file 
Includes files generated by each of:
   * autogen.sh
   * configure
   * make
 2014-10-16 12:57:15 +01:00