serverscanning/capnproto-java-rpc
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Build with c++14. Upgrade capnproto-c++ to 0.7.0 in travis config.

Browse source
This commit is contained in:
David Renshaw 2019-08-18 12:06:33 -04:00
parent debd250ddc
commit 1ff258d090
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
.travis.yml
View file

@ -8,14 +8,17 @@ env:
- export PKG_CONFIG_PATH="$HOME/lib/pkgconfig" - export PKG_CONFIG_PATH="$HOME/lib/pkgconfig"
addons: addons:
apt: apt:
sources:
- ubuntu-toolchain-r-test
packages: packages:
- gcc - gcc-7
- g++ - g++-7
install: install:
- curl -O https://capnproto.org/capnproto-c++-0.5.3.tar.gz - curl -O https://capnproto.org/capnproto-c++-0.7.0.tar.gz
- tar zxf capnproto-c++-0.5.3.tar.gz - tar zxf capnproto-c++-0.7.0.tar.gz
- cd capnproto-c++-0.5.3 - cd capnproto-c++-0.7.0
- ./configure --prefix=$HOME - ./configure --prefix=$HOME CC=gcc-7 CXX=g++-7
- make -j3 - make -j3
- make install - make install
- cd ../ - cd ../
@ -25,8 +28,8 @@ jdk:
- openjdk7 - openjdk7
- openjdk8 - openjdk8
script: script:
- make - make CC=gcc-7 CXX=g++-7
- make addressbook - make CC=gcc-7 CXX=g++-7 addressbook
- sbt test - sbt test
- sbt doc - sbt doc

4
Makefile
View file

@ -8,7 +8,7 @@ CAPNP_CXX_FLAGS=-I $(CAPNP_PREFIX)/include -L $(CAPNP_PREFIX)/lib -lkj -lcapnp
endif endif
CXX=g++ CXX=g++
CXX_FLAGS=-std=c++11 $(CAPNP_CXX_FLAGS) CXX_FLAGS=-std=c++14 $(CAPNP_CXX_FLAGS)
CAPNPC_JAVA_SOURCES=compiler/src/main/cpp/capnpc-java.c++ CAPNPC_JAVA_SOURCES=compiler/src/main/cpp/capnpc-java.c++
@ -25,7 +25,7 @@ capnpc-java : $(CAPNPC_JAVA_SOURCES)
MINGW_LIBS=~/src/capnproto/c++/build-mingw/.libs/libcapnp.a ~/src/capnproto/c++/build-mingw/.libs/libkj.a MINGW_LIBS=~/src/capnproto/c++/build-mingw/.libs/libcapnp.a ~/src/capnproto/c++/build-mingw/.libs/libkj.a
MINGW_CXX=i686-w64-mingw32-g++ MINGW_CXX=i686-w64-mingw32-g++
MINGW_FLAGS=-O2 -DNDEBUG -I/usr/local/include -std=c++11 -static -static-libgcc -static-libstdc++ MINGW_FLAGS=-O2 -DNDEBUG -I/usr/local/include -std=c++14 -static -static-libgcc -static-libstdc++
capnpc-java.exe : $(CAPNPC_JAVA_SOURCES) capnpc-java.exe : $(CAPNPC_JAVA_SOURCES)
$(MINGW_CXX) $(MINGW_FLAGS) $(CAPNPC_JAVA_SOURCES) $(MINGW_LIBS) -o capnpc-java.exe $(MINGW_CXX) $(MINGW_FLAGS) $(CAPNPC_JAVA_SOURCES) $(MINGW_LIBS) -o capnpc-java.exe