Skip to content

Commit 274fc93

Browse files
committed
fix: turns out we don't need to vendor google's protos!
1 parent 9672ed0 commit 274fc93

14 files changed

+3
-2634
lines changed

Makefile.test

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ $(OCAMLOPTIONS_HINC)/ocamloptions.pb.cc: $(OCAMLOPTIONS_HINC)/ocamloptions.proto
4848
%_cpp.tsk: %_cpp.cpp %.pb.cc $(OCAMLOPTIONS_HINC)/ocamloptions.pb.cc
4949
$(CXX) $(CPPFLAGS) $(LDFLAGS) \
5050
-I ./ -I $(INTEGRATION_TESTS_DIR) -I $(OCAMLOPTIONS_HINC) $(PB_HINC_L) \
51-
$(PB_LINC_L) \
51+
$(PB_LINC_L) $(PB_HINC_I) \
5252
$? \
5353
-o $@ -l protobuf
5454

@@ -58,7 +58,7 @@ $(INTEGRATION_TESTS_DIR)/test10_cpp.tsk: \
5858
$(INTEGRATION_TESTS_DIR)/test09.pb.cc
5959
$(CXX) $(CPPFLAGS) $(LDFLAGS) \
6060
-I ./ -I $(INTEGRATION_TESTS_DIR) \
61-
$(PB_LINC_L) \
61+
$(PB_LINC_L) $(PB_HINC_I) \
6262
$? \
6363
-o $@ -l protobuf
6464

dep/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ RUN opam exec -- dune runtest
1818

1919
# integration tests
2020
RUN opam install ppx_deriving -y
21-
RUN opam exec -- make clean build integration PB_LINC=/usr/lib/x86_64-linux-gnu/ PB_HINC=/usr/include/x86_64-linux-gnu/
21+
RUN opam exec -- make clean build integration PB_LINC=/usr/lib/x86_64-linux-gnu/ PB_HINC=/usr/include/
2222

src/tests/integration-tests/google/protobuf/any.proto

-162
This file was deleted.

src/tests/integration-tests/google/protobuf/api.proto

-207
This file was deleted.

0 commit comments

Comments
 (0)