From a3b2a6da25a76f17c73d31def3952feb0fd2296e Mon Sep 17 00:00:00 2001 From: Jeff Davidson Date: Mon, 15 Sep 2014 16:29:06 -0700 Subject: Update protobuf library from 2.3 to 2.6. Copied in all files from the open source protobuf project at commit edc5994525c79cd1919859a370837a6ff7c8e308, removing files which have been renamed (COPYING.txt -> LICENSE, README.txt -> README.md). Removed 2.3 prebuilts, which is an approach that will not work due to incompatibility with the 2.6 runtime. Merged in micro/nano-specific changes in the following files: -Android.mk - updated list of C++/Java sources, bumped versions -java/README.txt - merged in micro/nano instructions, bumped versions -java/pom.xml - merged in micro/nano build rules, set packaging to jar -src/Makefile.am - merged in references to micro/nano generators -src/google/protobuf/compiler/javamicro/javamicro_file.h - imported google/protobuf/compiler/code_generator.h and removed redundant OutputDirectory class. -src/google/protobuf/compiler/javanano/javanano_file.h - same -Replaced instances of vector with std::vector as needed to get libprotobuf-cpp-full to compile. Plan to upstream this fix per discussion with protobuf maintainers. Reran autogen.sh to update ./configure and associated scripts. Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48 --- more_tests/Makefile | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100755 more_tests/Makefile (limited to 'more_tests') diff --git a/more_tests/Makefile b/more_tests/Makefile new file mode 100755 index 0000000..286cf0f --- /dev/null +++ b/more_tests/Makefile @@ -0,0 +1,41 @@ +# Additional tests to run before releasing a package. +# +# Run like: +# make PACKAGE=/path/to/protobuf-VERSION.tar.gz +# +# Some of these tests require tools or make assumptions that may not be +# available on end-user machines, so these cannot be part of "make check". For +# example, we test that the headers compile with strict warning settings, but +# since different compilers produce wildly different warnings we cannot assume +# that this test will pass everywhere. If we ran it as part of "make check", +# it could unnecessarily block users from running the real tests just because +# their compiler produces some extra warnings that probably aren't a big deal. +# So we run it separately. + +all: header_warning_test + +clean: + rm -rf src target header_warning_test.cc header_warning_test.o header_warning_test + +# Unpack the package into src, then install it into target. +PACKAGE=protobuf.tar.gz + +src: $(PACKAGE) + tar zxvf $(PACKAGE) + mv `basename $(PACKAGE) .tar.gz` src + +target: src + (cd src && ./configure --prefix=$$PWD/../target --disable-shared) + (cd src && make -j4 check) + (cd src && make install) + +# Verify that headers produce no warnings even under strict settings. +header_warning_test.cc: target + ( (cd target/include && find google/protobuf -name '*.h') | \ + awk '{print "#include \""$$1"\""} ' > header_warning_test.cc ) + +header_warning_test: header_warning_test.cc + # TODO(kenton): Consider adding -pedantic and -Weffc++. Currently these + # produce tons of extra warnings so we'll need to do some work first. + g++ -Itarget/include -Wall -Werror -Wsign-compare -O2 -c header_warning_test.cc + touch header_warning_test -- cgit v1.1