Attachment #538308 for bug #660360

View | Details | Raw Unified | Return to bug 660360
Collapse All | Expand All




SUBDIRS = . src

# Always include third_party directories in distributions.
DIST_SUBDIRS = src conformance benchmarks

# Build gmock before we build protobuf tests.  We don't add gmock to SUBDIRS
# because then "make check" would also build and run all of gmock's own tests,

# want "make install" to recurse into gmock since we don't want to overwrite
# the installed version of gmock if there is one.
check-local:
	@echo "Making lib/libgmock.a lib/libgmock_main.a in gmock"
	@cd third_party/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
	@cd third_party/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la

# We would like to clean gmock when "make clean" is invoked.  But we have to
# be careful because clean-local is also invoked during "make distclean", but

# cd to the directory again and "make clean" it will fail.  So, check that the
# Makefile exists before recursing.
clean-local:
	@if test -e conformance/Makefile; then \
	  echo "Making clean in googletest"; \
	  cd third_party/googletest && $(MAKE) $(AM_MAKEFLAGS) clean; \
	fi; \
	if test -e conformance/Makefile; then \
	  echo "Making clean in conformance"; \
	  cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \
	fi; \





AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])

# HACK:  Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS,
#   since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock
#   too.
export CFLAGS
export CXXFLAGS
AC_CONFIG_SUBDIRS([third_party/googletest])

AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc])
AC_OUTPUT




                 protobuf-lite-test test_plugin protobuf-lite-arena-test \
                 $(GZCHECKPROGRAMS)
protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
                      -lgtest -lgmock -lgmock_main
                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la     \
                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
protobuf_test_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include \
                         -I$(GOOGLEMOCK_SRC_DIR)/include
# Disable optimization for tests unless the user explicitly asked for it,
# since test_util.cc takes forever to compile with optimization (with GCC).
# See configure.ac for more info.

# Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
                      libprotoc.la                                   \
                      -lgtest -lgmock -lgmock_main
protobuf_lazy_descriptor_test_CPPFLAGS = -DPROTOBUF_TEST_NO_DESCRIPTORS
                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \
                                         -I$(GOOGLETEST_SRC_DIR)/include \
                                         -DPROTOBUF_TEST_NO_DESCRIPTORS
protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
protobuf_lazy_descriptor_test_SOURCES =                        \
  google/protobuf/compiler/cpp/cpp_unittest.cc                 \

# full runtime and we want to make sure this test builds without full
# runtime.
protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la     \
                           -lgtest -lgmock -lgmock_main
                           $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
                           $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
protobuf_lite_test_CPPFLAGS= -I$(GOOGLEMOCK_SRC_DIR)/include \
                             -I$(GOOGLETEST_SRC_DIR)/include
protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
protobuf_lite_test_SOURCES =                                           \
  google/protobuf/lite_unittest.cc                                     \

# gtest when building the test internally our memory sanitizer doesn't detect
# memory leaks (don't know why).
protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
                      -lgtest -lgmock -lgmock_main
                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la        \
                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
protobuf_lite_arena_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include  \
                                    -I$(GOOGLETEST_SRC_DIR)/include
protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
protobuf_lite_arena_test_SOURCES =       \
  google/protobuf/lite_arena_unittest.cc \


# Test plugin binary.
test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
                    -lgtest
test_plugin_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include
test_plugin_SOURCES =                                          \
  google/protobuf/compiler/mock_code_generator.cc              \
  google/protobuf/testing/file.cc                              \

Return to bug 660360

Lines 209-220 Link Here

(-)protobuf-3.6.0.orig/configure.ac (-7 lines)
209		209
210	AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])	210	AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
211		211
212	# HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS,
213	# since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock
214	# too.
215	export CFLAGS
216	export CXXFLAGS
217	AC_CONFIG_SUBDIRS([third_party/googletest])
218
219	AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc])	212	AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc])
220	AC_OUTPUT	213	AC_OUTPUT

Lines 719-729 Link Here

(-)protobuf-3.6.0.orig/src/Makefile.am (-23 / +6 lines)
719	protobuf-lite-test test_plugin protobuf-lite-arena-test \	719	protobuf-lite-test test_plugin protobuf-lite-arena-test \
720	$(GZCHECKPROGRAMS)	720	$(GZCHECKPROGRAMS)
721	protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \	721	protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
722	$(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \	722	-lgtest -lgmock -lgmock_main
723	$(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
724	$(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
725	protobuf_test_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include \
726	-I$(GOOGLEMOCK_SRC_DIR)/include
727	# Disable optimization for tests unless the user explicitly asked for it,	723	# Disable optimization for tests unless the user explicitly asked for it,
728	# since test_util.cc takes forever to compile with optimization (with GCC).	724	# since test_util.cc takes forever to compile with optimization (with GCC).
729	# See configure.ac for more info.	725	# See configure.ac for more info.
Lines 811-822 Link Here
811	# Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.	807	# Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
812	protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \	808	protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
813	libprotoc.la \	809	libprotoc.la \
814	$(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \	810	-lgtest -lgmock -lgmock_main
815	$(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \	811	protobuf_lazy_descriptor_test_CPPFLAGS = -DPROTOBUF_TEST_NO_DESCRIPTORS
816	$(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
817	protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \
818	-I$(GOOGLETEST_SRC_DIR)/include \
819	-DPROTOBUF_TEST_NO_DESCRIPTORS
820	protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)	812	protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
821	protobuf_lazy_descriptor_test_SOURCES = \	813	protobuf_lazy_descriptor_test_SOURCES = \
822	google/protobuf/compiler/cpp/cpp_unittest.cc \	814	google/protobuf/compiler/cpp/cpp_unittest.cc \
Lines 837-847 Link Here
837	# full runtime and we want to make sure this test builds without full	829	# full runtime and we want to make sure this test builds without full
838	# runtime.	830	# runtime.
839	protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \	831	protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
840	$(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \	832	-lgtest -lgmock -lgmock_main
841	$(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
842	$(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
843	protobuf_lite_test_CPPFLAGS= -I$(GOOGLEMOCK_SRC_DIR)/include \
844	-I$(GOOGLETEST_SRC_DIR)/include
845	protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)	833	protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
846	protobuf_lite_test_SOURCES = \	834	protobuf_lite_test_SOURCES = \
847	google/protobuf/lite_unittest.cc \	835	google/protobuf/lite_unittest.cc \
Lines 853-863 Link Here
853	# gtest when building the test internally our memory sanitizer doesn't detect	841	# gtest when building the test internally our memory sanitizer doesn't detect
854	# memory leaks (don't know why).	842	# memory leaks (don't know why).
855	protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \	843	protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
856	$(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \	844	-lgtest -lgmock -lgmock_main
857	$(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
858	$(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
859	protobuf_lite_arena_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \
860	-I$(GOOGLETEST_SRC_DIR)/include
861	protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)	845	protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
862	protobuf_lite_arena_test_SOURCES = \	846	protobuf_lite_arena_test_SOURCES = \
863	google/protobuf/lite_arena_unittest.cc \	847	google/protobuf/lite_arena_unittest.cc \
Lines 867-874 Link Here
867		851
868	# Test plugin binary.	852	# Test plugin binary.
869	test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \	853	test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
870	$(GOOGLETEST_BUILD_DIR)/lib/libgtest.la	854	-lgtest
871	test_plugin_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include
872	test_plugin_SOURCES = \	855	test_plugin_SOURCES = \
873	google/protobuf/compiler/mock_code_generator.cc \	856	google/protobuf/compiler/mock_code_generator.cc \
874	google/protobuf/testing/file.cc \	857	google/protobuf/testing/file.cc \

Lines 9-15 Link Here

(-)protobuf-3.6.0.orig/Makefile.am (-9 / +2 lines)
9	SUBDIRS = . src	9	SUBDIRS = . src
10		10
11	# Always include third_party directories in distributions.	11	# Always include third_party directories in distributions.
12	DIST_SUBDIRS = src conformance benchmarks third_party/googletest	12	DIST_SUBDIRS = src conformance benchmarks
13		13
14	# Build gmock before we build protobuf tests. We don't add gmock to SUBDIRS	14	# Build gmock before we build protobuf tests. We don't add gmock to SUBDIRS
15	# because then "make check" would also build and run all of gmock's own tests,	15	# because then "make check" would also build and run all of gmock's own tests,
Lines 17-25 Link Here
17	# want "make install" to recurse into gmock since we don't want to overwrite	17	# want "make install" to recurse into gmock since we don't want to overwrite
18	# the installed version of gmock if there is one.	18	# the installed version of gmock if there is one.
19	check-local:	19	check-local:
20	@echo "Making lib/libgmock.a lib/libgmock_main.a in gmock"
21	@cd third_party/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
22	@cd third_party/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
23		20
24	# We would like to clean gmock when "make clean" is invoked. But we have to	21	# We would like to clean gmock when "make clean" is invoked. But we have to
25	# be careful because clean-local is also invoked during "make distclean", but	22	# be careful because clean-local is also invoked during "make distclean", but
Lines 28-38 Link Here
28	# cd to the directory again and "make clean" it will fail. So, check that the	25	# cd to the directory again and "make clean" it will fail. So, check that the
29	# Makefile exists before recursing.	26	# Makefile exists before recursing.
30	clean-local:	27	clean-local:
31	@if test -e third_party/googletest/Makefile; then \	28	@if test -e conformance/Makefile; then \
32	echo "Making clean in googletest"; \
33	cd third_party/googletest && $(MAKE) $(AM_MAKEFLAGS) clean; \
34	fi; \
35	if test -e conformance/Makefile; then \
36	echo "Making clean in conformance"; \	29	echo "Making clean in conformance"; \
37	cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \	30	cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \
38	fi; \	31	fi; \