]>
Commit | Line | Data |
---|---|---|
8a85b52c JB |
1 | --- protobuf-3.1.0/autogen.sh.orig 2016-12-29 21:02:59.643624708 +0100 |
2 | +++ protobuf-3.1.0/autogen.sh 2016-12-29 21:03:02.716958006 +0100 | |
3 | @@ -27,21 +27,6 @@ | |
0759da77 ER |
4 | exit 1 |
5 | fi | |
6 | ||
8a85b52c | 7 | -# Check that gmock is present. Usually it is already there since the |
0759da77 | 8 | -# directory is set up as an SVN external. |
8a85b52c JB |
9 | -if test ! -e gmock; then |
10 | - echo "Google Mock not present. Fetching gmock-1.7.0 from the web..." | |
11 | - curl $curlopts -L -O https://github.com/google/googlemock/archive/release-1.7.0.zip | |
12 | - unzip -q release-1.7.0.zip | |
13 | - rm release-1.7.0.zip | |
14 | - mv googlemock-release-1.7.0 gmock | |
15 | - | |
16 | - curl $curlopts -L -O https://github.com/google/googletest/archive/release-1.7.0.zip | |
17 | - unzip -q release-1.7.0.zip | |
18 | - rm release-1.7.0.zip | |
19 | - mv googletest-release-1.7.0 gmock/gtest | |
0759da77 ER |
20 | -fi |
21 | - | |
22 | set -ex | |
23 | ||
0759da77 | 24 | # TODO(kenton): Remove the ",no-obsolete" part and fix the resulting warnings. |
8a85b52c JB |
25 | --- protobuf-3.1.0/Makefile.am.orig 2016-09-24 04:12:45.000000000 +0200 |
26 | +++ protobuf-3.1.0/Makefile.am 2016-12-29 21:03:50.640290792 +0100 | |
27 | @@ -11,28 +11,8 @@ | |
28 | # Always include gmock in distributions. | |
29 | DIST_SUBDIRS = $(subdirs) src conformance benchmarks | |
0759da77 | 30 | |
8a85b52c JB |
31 | -# Build gmock before we build protobuf tests. We don't add gmock to SUBDIRS |
32 | -# because then "make check" would also build and run all of gmock's own tests, | |
0759da77 | 33 | -# which takes a lot of time and is generally not useful to us. Also, we don't |
8a85b52c JB |
34 | -# want "make install" to recurse into gmock since we don't want to overwrite |
35 | -# the installed version of gmock if there is one. | |
0759da77 | 36 | -check-local: |
8a85b52c JB |
37 | - @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock" |
38 | - @cd gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la | |
39 | - @cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la | |
0759da77 | 40 | - |
8a85b52c | 41 | -# We would like to clean gmock when "make clean" is invoked. But we have to |
0759da77 | 42 | -# be careful because clean-local is also invoked during "make distclean", but |
8a85b52c JB |
43 | -# "make distclean" already recurses into gmock because it's listed among the |
44 | -# DIST_SUBDIRS. distclean will delete gmock/Makefile, so if we then try to | |
0759da77 ER |
45 | -# cd to the directory again and "make clean" it will fail. So, check that the |
46 | -# Makefile exists before recursing. | |
8a85b52c JB |
47 | clean-local: |
48 | - @if test -e gmock/Makefile; then \ | |
49 | - echo "Making clean in gmock"; \ | |
50 | - cd gmock && $(MAKE) $(AM_MAKEFLAGS) clean; \ | |
51 | - fi; \ | |
52 | - if test -e conformance/Makefile; then \ | |
53 | + @if test -e conformance/Makefile; then \ | |
54 | echo "Making clean in conformance"; \ | |
55 | cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \ | |
56 | fi; \ | |
50af910a JB |
57 | --- protobuf-3.3.0/src/Makefile.am.orig 2017-04-27 01:32:21.000000000 +0200 |
58 | +++ protobuf-3.3.0/src/Makefile.am 2017-05-27 11:43:16.651910938 +0200 | |
59 | @@ -744,15 +744,22 @@ | |
8a85b52c JB |
60 | google/protobuf/testing/file.cc \ |
61 | google/protobuf/testing/file.h | |
0759da77 | 62 | |
8a85b52c JB |
63 | +gmock_dir = /usr/src/gmock/src |
64 | +gmock_inc_dir = /usr/src/gmock/src | |
65 | +gtest_inc_dir = /usr/include/gtest | |
66 | +check_LTLIBRARIES = libgmock.la libgmock_main.la | |
67 | +libgmock_la_SOURCES = ./gmock-all.cc | |
68 | +libgmock_main_la_SOURCES = ./gmock_main.cc | |
69 | + | |
0759da77 | 70 | check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \ |
8a85b52c JB |
71 | protobuf-lite-test test_plugin protobuf-lite-arena-test \ |
72 | no-warning-test $(GZCHECKPROGRAMS) | |
0759da77 | 73 | protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ |
8a85b52c JB |
74 | - ../gmock/gtest/lib/libgtest.la \ |
75 | - ../gmock/lib/libgmock.la \ | |
76 | - ../gmock/lib/libgmock_main.la | |
77 | -protobuf_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include \ | |
78 | - -I$(srcdir)/../gmock/include | |
79 | + -lgtest \ | |
80 | + libgmock_main.la \ | |
81 | + libgmock.la | |
82 | +protobuf_test_CPPFLAGS = -I$(gtest_inc_dir) \ | |
83 | + -I$(gmock_inc_dir) | |
0759da77 ER |
84 | # Disable optimization for tests unless the user explicitly asked for it, |
85 | # since test_util.cc takes forever to compile with optimization (with GCC). | |
86 | # See configure.ac for more info. | |
50af910a | 87 | @@ -837,11 +844,11 @@ |
0759da77 ER |
88 | # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined. |
89 | protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \ | |
72bc381c | 90 | libprotoc.la \ |
8a85b52c JB |
91 | - ../gmock/gtest/lib/libgtest.la \ |
92 | - ../gmock/lib/libgmock.la \ | |
93 | - ../gmock/lib/libgmock_main.la | |
94 | -protobuf_lazy_descriptor_test_CPPFLAGS = -I$(srcdir)/../gmock/include \ | |
95 | - -I$(srcdir)/../gmock/gtest/include \ | |
96 | + -lgtest \ | |
97 | + libgmock_main.la \ | |
98 | + libgmock.la | |
99 | +protobuf_lazy_descriptor_test_CPPFLAGS = -I$(gmock_dir) \ | |
100 | + -I$(gtest_inc_dir) \ | |
72bc381c | 101 | -DPROTOBUF_TEST_NO_DESCRIPTORS |
0759da77 ER |
102 | protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) |
103 | protobuf_lazy_descriptor_test_SOURCES = \ | |
50af910a JB |
104 | @@ -862,9 +869,9 @@ |
105 | # full runtime and we want to make sure this test builds without full | |
106 | # runtime. | |
107 | protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ | |
108 | - ../gmock/gtest/lib/libgtest.la \ | |
109 | - ../gmock/lib/libgmock.la \ | |
110 | - ../gmock/lib/libgmock_main.la | |
111 | + -lgtest \ | |
112 | + libgmock_main.la \ | |
113 | + libgmock.la | |
114 | protobuf_lite_test_CPPFLAGS= -I$(srcdir)/../gmock/include \ | |
115 | -I$(srcdir)/../gmock/gtest/include | |
116 | protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) | |
117 | @@ -877,11 +884,11 @@ | |
8a85b52c JB |
118 | # gtest when building the test internally our memory sanitizer doesn't detect |
119 | # memory leaks (don't know why). | |
120 | protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ | |
121 | - ../gmock/gtest/lib/libgtest.la \ | |
122 | - ../gmock/lib/libgmock.la \ | |
123 | - ../gmock/lib/libgmock_main.la | |
124 | -protobuf_lite_arena_test_CPPFLAGS = -I$(srcdir)/../gmock/include \ | |
125 | - -I$(srcdir)/../gmock/gtest/include | |
126 | + -lgtest \ | |
127 | + libgmock_main.la \ | |
128 | + libgmock.la | |
129 | +protobuf_lite_arena_test_CPPFLAGS = -I$(gmock_inc_dir) \ | |
130 | + -I$(gtest_inc_dir) | |
131 | protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) | |
132 | protobuf_lite_arena_test_SOURCES = \ | |
133 | google/protobuf/lite_arena_unittest.cc \ | |
50af910a | 134 | @@ -890,8 +897,8 @@ |
0759da77 ER |
135 | |
136 | # Test plugin binary. | |
137 | test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ | |
8a85b52c JB |
138 | - ../gmock/gtest/lib/libgtest.la |
139 | -test_plugin_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include | |
0759da77 | 140 | + -lgtest |
8a85b52c | 141 | +test_plugin_CPPFLAGS = -I$(gmock_inc_dir) |
0759da77 | 142 | test_plugin_SOURCES = \ |
8a85b52c JB |
143 | google/protobuf/compiler/mock_code_generator.cc \ |
144 | google/protobuf/testing/file.cc \ | |
50af910a | 145 | @@ -920,9 +927,9 @@ |
8a85b52c JB |
146 | echo "TEST(NoWarningTest, Empty) {}" >> no_warning_test.cc |
147 | ||
148 | no_warning_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \ | |
149 | - ../gmock/gtest/lib/libgtest.la \ | |
150 | - ../gmock/gtest/lib/libgtest_main.la | |
151 | -no_warning_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include | |
152 | + -lgtest \ | |
153 | + -lgtest_main | |
154 | +no_warning_test_CPPFLAGS = -I$(gtest_inc_dir) | |
155 | no_warning_test_CXXFLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_DEF) $(ZLIB_DEF) \ | |
156 | -Wall -Werror | |
157 | nodist_no_warning_test_SOURCES = no_warning_test.cc $(protoc_outputs) |