Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
17 changed files
with
1,858 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,196 @@ | ||
## Process this file with automake to produce Makefile.in | ||
|
||
ACLOCAL_AMFLAGS = -I m4 | ||
|
||
AUTOMAKE_OPTIONS = foreign | ||
|
||
# Build . before src so that our all-local and clean-local hooks kicks in at | ||
# the right time. | ||
SUBDIRS = . src | ||
|
||
# Always include gtest in distributions. | ||
DIST_SUBDIRS = $(subdirs) src | ||
|
||
# Build gtest before we build protobuf tests. We don't add gtest to SUBDIRS | ||
# because then "make check" would also build and run all of gtest's own tests, | ||
# which takes a lot of time and is generally not useful to us. Also, we don't | ||
# want "make install" to recurse into gtest since we don't want to overwrite | ||
# the installed version of gtest if there is one. | ||
check-local: | ||
@echo "Making lib/libgtest.a lib/libgtest_main.a in gtest" | ||
@cd gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la | ||
|
||
# We would like to clean gtest when "make clean" is invoked. But we have to | ||
# be careful because clean-local is also invoked during "make distclean", but | ||
# "make distclean" already recurses into gtest because it's listed among the | ||
# DIST_SUBDIRS. distclean will delete gtest/Makefile, so if we then try to | ||
# cd to the directory again and "make clean" it will fail. So, check that the | ||
# Makefile exists before recursing. | ||
clean-local: | ||
@if test -e gtest/Makefile; then \ | ||
echo "Making clean in gtest"; \ | ||
cd gtest && $(MAKE) $(AM_MAKEFLAGS) clean; \ | ||
fi | ||
|
||
pkgconfigdir = $(libdir)/pkgconfig | ||
pkgconfig_DATA = protobuf.pc protobuf-lite.pc | ||
|
||
EXTRA_DIST = \ | ||
autogen.sh \ | ||
generate_descriptor_proto.sh \ | ||
README.txt \ | ||
INSTALL.txt \ | ||
COPYING.txt \ | ||
CONTRIBUTORS.txt \ | ||
CHANGES.txt \ | ||
editors/README.txt \ | ||
editors/proto.vim \ | ||
editors/protobuf-mode.el \ | ||
vsprojects/config.h \ | ||
vsprojects/extract_includes.bat \ | ||
vsprojects/libprotobuf.vcproj \ | ||
vsprojects/libprotobuf-lite.vcproj \ | ||
vsprojects/libprotoc.vcproj \ | ||
vsprojects/protobuf.sln \ | ||
vsprojects/protoc.vcproj \ | ||
vsprojects/readme.txt \ | ||
vsprojects/test_plugin.vcproj \ | ||
vsprojects/tests.vcproj \ | ||
vsprojects/lite-test.vcproj \ | ||
vsprojects/convert2008to2005.sh \ | ||
examples/README.txt \ | ||
examples/Makefile \ | ||
examples/addressbook.proto \ | ||
examples/add_person.cc \ | ||
examples/list_people.cc \ | ||
examples/AddPerson.java \ | ||
examples/ListPeople.java \ | ||
examples/add_person.py \ | ||
examples/list_people.py \ | ||
java/src/main/java/com/google/protobuf/AbstractMessage.java \ | ||
java/src/main/java/com/google/protobuf/AbstractMessageLite.java \ | ||
java/src/main/java/com/google/protobuf/BlockingRpcChannel.java \ | ||
java/src/main/java/com/google/protobuf/BlockingService.java \ | ||
java/src/main/java/com/google/protobuf/ByteString.java \ | ||
java/src/main/java/com/google/protobuf/CodedInputStream.java \ | ||
java/src/main/java/com/google/protobuf/CodedOutputStream.java \ | ||
java/src/main/java/com/google/protobuf/Descriptors.java \ | ||
java/src/main/java/com/google/protobuf/DynamicMessage.java \ | ||
java/src/main/java/com/google/protobuf/ExtensionRegistry.java \ | ||
java/src/main/java/com/google/protobuf/ExtensionRegistryLite.java \ | ||
java/src/main/java/com/google/protobuf/FieldSet.java \ | ||
java/src/main/java/com/google/protobuf/GeneratedMessage.java \ | ||
java/src/main/java/com/google/protobuf/GeneratedMessageLite.java \ | ||
java/src/main/java/com/google/protobuf/Internal.java \ | ||
java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java \ | ||
java/src/main/java/com/google/protobuf/LazyStringArrayList.java \ | ||
java/src/main/java/com/google/protobuf/LazyStringList.java \ | ||
java/src/main/java/com/google/protobuf/Message.java \ | ||
java/src/main/java/com/google/protobuf/MessageLite.java \ | ||
java/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java \ | ||
java/src/main/java/com/google/protobuf/MessageOrBuilder.java \ | ||
java/src/main/java/com/google/protobuf/ProtocolMessageEnum.java \ | ||
java/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java \ | ||
java/src/main/java/com/google/protobuf/RpcCallback.java \ | ||
java/src/main/java/com/google/protobuf/RpcChannel.java \ | ||
java/src/main/java/com/google/protobuf/RpcController.java \ | ||
java/src/main/java/com/google/protobuf/RpcUtil.java \ | ||
java/src/main/java/com/google/protobuf/Service.java \ | ||
java/src/main/java/com/google/protobuf/ServiceException.java \ | ||
java/src/main/java/com/google/protobuf/SingleFieldBuilder.java \ | ||
java/src/main/java/com/google/protobuf/SmallSortedMap.java \ | ||
java/src/main/java/com/google/protobuf/TextFormat.java \ | ||
java/src/main/java/com/google/protobuf/UninitializedMessageException.java \ | ||
java/src/main/java/com/google/protobuf/UnknownFieldSet.java \ | ||
java/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java \ | ||
java/src/main/java/com/google/protobuf/WireFormat.java \ | ||
java/src/test/java/com/google/protobuf/AbstractMessageTest.java \ | ||
java/src/test/java/com/google/protobuf/CodedInputStreamTest.java \ | ||
java/src/test/java/com/google/protobuf/CodedOutputStreamTest.java \ | ||
java/src/test/java/com/google/protobuf/DeprecatedFieldTest.java \ | ||
java/src/test/java/com/google/protobuf/DescriptorsTest.java \ | ||
java/src/test/java/com/google/protobuf/DynamicMessageTest.java \ | ||
java/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java \ | ||
java/src/test/java/com/google/protobuf/GeneratedMessageTest.java \ | ||
java/src/test/java/com/google/protobuf/LazyStringArrayListTest.java \ | ||
java/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java \ | ||
java/src/test/java/com/google/protobuf/LiteTest.java \ | ||
java/src/test/java/com/google/protobuf/MessageTest.java \ | ||
java/src/test/java/com/google/protobuf/NestedBuildersTest.java \ | ||
java/src/test/java/com/google/protobuf/RepeatedFieldBuilderTest.java \ | ||
java/src/test/java/com/google/protobuf/ServiceTest.java \ | ||
java/src/test/java/com/google/protobuf/SingleFieldBuilderTest.java \ | ||
java/src/test/java/com/google/protobuf/SmallSortedMapTest.java \ | ||
java/src/test/java/com/google/protobuf/TestBadIdentifiers.java \ | ||
java/src/test/java/com/google/protobuf/TestUtil.java \ | ||
java/src/test/java/com/google/protobuf/TextFormatTest.java \ | ||
java/src/test/java/com/google/protobuf/UnknownFieldSetTest.java \ | ||
java/src/test/java/com/google/protobuf/UnmodifiableLazyStringListTest.java \ | ||
java/src/test/java/com/google/protobuf/WireFormatTest.java \ | ||
java/src/test/java/com/google/protobuf/multiple_files_test.proto \ | ||
java/src/test/java/com/google/protobuf/nested_builders_test.proto \ | ||
java/src/test/java/com/google/protobuf/nested_extension.proto \ | ||
java/src/test/java/com/google/protobuf/nested_extension_lite.proto \ | ||
java/src/test/java/com/google/protobuf/non_nested_extension.proto \ | ||
java/src/test/java/com/google/protobuf/non_nested_extension_lite.proto \ | ||
java/src/test/java/com/google/protobuf/test_bad_identifiers.proto \ | ||
java/pom.xml \ | ||
java/README.txt \ | ||
python/google/protobuf/internal/generator_test.py \ | ||
python/google/protobuf/internal/containers.py \ | ||
python/google/protobuf/internal/decoder.py \ | ||
python/google/protobuf/internal/descriptor_test.py \ | ||
python/google/protobuf/internal/encoder.py \ | ||
python/google/protobuf/internal/message_listener.py \ | ||
python/google/protobuf/internal/message_test.py \ | ||
python/google/protobuf/internal/more_extensions.proto \ | ||
python/google/protobuf/internal/more_messages.proto \ | ||
python/google/protobuf/internal/python_message.py \ | ||
python/google/protobuf/internal/cpp_message.py \ | ||
python/google/protobuf/internal/api_implementation.py \ | ||
python/google/protobuf/internal/reflection_test.py \ | ||
python/google/protobuf/internal/service_reflection_test.py \ | ||
python/google/protobuf/internal/test_util.py \ | ||
python/google/protobuf/internal/text_format_test.py \ | ||
python/google/protobuf/internal/type_checkers.py \ | ||
python/google/protobuf/internal/wire_format.py \ | ||
python/google/protobuf/internal/wire_format_test.py \ | ||
python/google/protobuf/internal/__init__.py \ | ||
python/google/protobuf/pyext/python-proto2.cc \ | ||
python/google/protobuf/pyext/python_descriptor.cc \ | ||
python/google/protobuf/pyext/python_descriptor.h \ | ||
python/google/protobuf/pyext/python_protobuf.cc \ | ||
python/google/protobuf/pyext/python_protobuf.h \ | ||
python/google/protobuf/descriptor.py \ | ||
python/google/protobuf/message.py \ | ||
python/google/protobuf/reflection.py \ | ||
python/google/protobuf/service.py \ | ||
python/google/protobuf/service_reflection.py \ | ||
python/google/protobuf/text_format.py \ | ||
python/google/protobuf/__init__.py \ | ||
python/google/__init__.py \ | ||
python/ez_setup.py \ | ||
python/setup.py \ | ||
python/mox.py \ | ||
python/stubout.py \ | ||
python/README.txt | ||
|
||
# Deletes all the files generated by autogen.sh. | ||
MAINTAINERCLEANFILES = \ | ||
aclocal.m4 \ | ||
config.guess \ | ||
config.sub \ | ||
configure \ | ||
depcomp \ | ||
install-sh \ | ||
ltmain.sh \ | ||
Makefile.in \ | ||
missing \ | ||
mkinstalldirs \ | ||
config.h.in \ | ||
stamp.h.in \ | ||
m4/ltsugar.m4 \ | ||
m4/libtool.m4 \ | ||
m4/ltversion.m4 \ | ||
m4/lt~obsolete.m4 \ | ||
m4/ltoptions.m4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
#!/bin/sh | ||
|
||
# Run this script to generate the configure script and other files that will | ||
# be included in the distribution. These files are not checked in because they | ||
# are automatically generated. | ||
|
||
set -e | ||
|
||
# Check that we're being run from the right directory. | ||
if test ! -f src/google/protobuf/stubs/common.h; then | ||
cat >&2 << __EOF__ | ||
Could not find source code. Make sure you are running this script from the | ||
root of the distribution tree. | ||
__EOF__ | ||
exit 1 | ||
fi | ||
|
||
# Check that gtest is present. Usually it is already there since the | ||
# directory is set up as an SVN external. | ||
if test ! -e gtest; then | ||
echo "Google Test not present. Fetching gtest-1.5.0 from the web..." | ||
curl http://googletest.googlecode.com/files/gtest-1.5.0.tar.bz2 | tar jx | ||
mv gtest-1.5.0 gtest | ||
fi | ||
|
||
set -ex | ||
|
||
# Temporary hack: Must change C runtime library to "multi-threaded DLL", | ||
# otherwise it will be set to "multi-threaded static" when MSVC upgrades | ||
# the project file to MSVC 2005/2008. vladl of Google Test says gtest will | ||
# probably change their default to match, then this will be unnecessary. | ||
# One of these mappings converts the debug configuration and the other | ||
# converts the release configuration. I don't know which is which. | ||
sed -i -e 's/RuntimeLibrary="5"/RuntimeLibrary="3"/g; | ||
s/RuntimeLibrary="4"/RuntimeLibrary="2"/g;' gtest/msvc/*.vcproj | ||
|
||
# TODO(kenton): Remove the ",no-obsolete" part and fix the resulting warnings. | ||
autoreconf -f -i -Wall,no-obsolete | ||
|
||
rm -rf autom4te.cache config.h.in~ | ||
exit 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,149 @@ | ||
## Process this file with autoconf to produce configure. | ||
## In general, the safest way to proceed is to run ./autogen.sh | ||
|
||
AC_PREREQ(2.59) | ||
|
||
# Note: If you change the version, you must also update it in: | ||
# * java/pom.xml | ||
# * python/setup.py | ||
# * src/google/protobuf/stubs/common.h | ||
# * src/Makefile.am (Update -version-info for LDFLAGS if needed) | ||
# | ||
# In the SVN trunk, the version should always be the next anticipated release | ||
# version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed | ||
# the size of one file name in the dist tarfile over the 99-char limit.) | ||
AC_INIT([Protocol Buffers],[2.4.2-pre],[protobuf@googlegroups.com],[protobuf]) | ||
|
||
|
||
AC_CONFIG_SRCDIR(src/google/protobuf/message.cc) | ||
AC_CONFIG_HEADERS([config.h]) | ||
AC_CONFIG_MACRO_DIR([m4]) | ||
|
||
# autoconf's default CXXFLAGS are usually "-g -O2". These aren't necessarily | ||
# the best choice for libprotobuf. | ||
AS_IF([test "x${ac_cv_env_CFLAGS_set}" = "x"], | ||
[CFLAGS=""]) | ||
AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"], | ||
[CXXFLAGS=""]) | ||
|
||
AC_CANONICAL_TARGET | ||
|
||
AM_INIT_AUTOMAKE | ||
|
||
AC_ARG_WITH([zlib], | ||
[AS_HELP_STRING([--with-zlib], | ||
[include classes for streaming compressed data in and out @<:@default=check@:>@])], | ||
[],[with_zlib=check]) | ||
|
||
AC_ARG_WITH([protoc], | ||
[AS_HELP_STRING([--with-protoc=COMMAND], | ||
[use the given protoc command instead of building a new one when building tests (useful for cross-compiling)])], | ||
[],[with_protoc=no]) | ||
|
||
# Checks for programs. | ||
AC_PROG_CC | ||
AC_PROG_CXX | ||
AC_LANG([C++]) | ||
ACX_USE_SYSTEM_EXTENSIONS | ||
AM_CONDITIONAL(GCC, test "$GCC" = yes) # let the Makefile know if we're gcc | ||
|
||
# test_util.cc takes forever to compile with GCC and optimization turned on. | ||
AC_MSG_CHECKING([C++ compiler flags...]) | ||
AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"],[ | ||
AS_IF([test "$GCC" = "yes"],[ | ||
PROTOBUF_OPT_FLAG="-O2" | ||
CXXFLAGS="${CXXFLAGS} -g" | ||
]) | ||
# Protocol Buffers contains several checks that are intended to be used only | ||
# for debugging and which might hurt performance. Most users are probably | ||
# end users who don't want these checks, so add -DNDEBUG by default. | ||
CXXFLAGS="$CXXFLAGS -DNDEBUG" | ||
AC_MSG_RESULT([use default: $PROTOBUF_OPT_FLAG $CXXFLAGS]) | ||
],[ | ||
AC_MSG_RESULT([use user-supplied: $CXXFLAGS]) | ||
]) | ||
|
||
AC_SUBST(PROTOBUF_OPT_FLAG) | ||
|
||
ACX_CHECK_SUNCC | ||
|
||
# Have to do libtool after SUNCC, other wise it "helpfully" adds Crun Cstd | ||
# to the link | ||
AC_PROG_LIBTOOL | ||
|
||
# Checks for header files. | ||
AC_HEADER_STDC | ||
AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h stdlib.h unistd.h]) | ||
|
||
# Checks for library functions. | ||
AC_FUNC_MEMCMP | ||
AC_FUNC_STRTOD | ||
AC_CHECK_FUNCS([ftruncate memset mkdir strchr strerror strtol]) | ||
|
||
# Check for zlib. | ||
HAVE_ZLIB=0 | ||
AS_IF([test "$with_zlib" != no], [ | ||
AC_MSG_CHECKING([zlib version]) | ||
# First check the zlib header version. | ||
AC_COMPILE_IFELSE( | ||
AC_LANG_PROGRAM([[ | ||
#include <zlib.h> | ||
#if !defined(ZLIB_VERNUM) || (ZLIB_VERNUM < 0x1204) | ||
# error zlib version too old | ||
#endif | ||
]], []), [ | ||
AC_MSG_RESULT([ok (1.2.0.4 or later)]) | ||
# Also need to add -lz to the linker flags and make sure this succeeds. | ||
AC_SEARCH_LIBS([zlibVersion], [z], [ | ||
AC_DEFINE([HAVE_ZLIB], [1], [Enable classes using zlib compression.]) | ||
HAVE_ZLIB=1 | ||
], [ | ||
AS_IF([test "$with_zlib" != check], [ | ||
AC_MSG_FAILURE([--with-zlib was given, but no working zlib library was found]) | ||
]) | ||
]) | ||
], [ | ||
AS_IF([test "$with_zlib" = check], [ | ||
AC_MSG_RESULT([headers missing or too old (requires 1.2.0.4)]) | ||
], [ | ||
AC_MSG_FAILURE([--with-zlib was given, but zlib headers were not present or were too old (requires 1.2.0.4)]) | ||
]) | ||
]) | ||
]) | ||
AM_CONDITIONAL([HAVE_ZLIB], [test $HAVE_ZLIB = 1]) | ||
|
||
AS_IF([test "$with_protoc" != "no"], [ | ||
PROTOC=$with_protoc | ||
AS_IF([test "$with_protoc" = "yes"], [ | ||
# No argument given. Use system protoc. | ||
PROTOC=protoc | ||
]) | ||
AS_IF([echo "$PROTOC" | grep -q '^@<:@^/@:>@.*/'], [ | ||
# Does not start with a slash, but contains a slash. So, it's a relative | ||
# path (as opposed to an absolute path or an executable in $PATH). | ||
# Since it will actually be executed from the src directory, prefix with | ||
# the current directory. We also insert $ac_top_build_prefix in case this | ||
# is a nested package and --with-protoc was actually given on the outer | ||
# package's configure script. | ||
PROTOC=`pwd`/${ac_top_build_prefix}$PROTOC | ||
]) | ||
AC_SUBST([PROTOC]) | ||
]) | ||
AM_CONDITIONAL([USE_EXTERNAL_PROTOC], [test "$with_protoc" != "no"]) | ||
|
||
ACX_PTHREAD | ||
AC_CXX_STL_HASH | ||
|
||
# HACK: Make gtest's configure script pick up our copy of CFLAGS and CXXFLAGS, | ||
# since the flags added by ACX_CHECK_SUNCC must be used when compiling gtest | ||
# too. | ||
export CFLAGS | ||
export CXXFLAGS | ||
AC_CONFIG_SUBDIRS([gtest]) | ||
|
||
AC_CONFIG_FILES([Makefile src/Makefile protobuf.pc protobuf-lite.pc]) | ||
AC_OUTPUT |
Oops, something went wrong.