From a791062e1d89a768439fe92586548fcbe2e58e83 Mon Sep 17 00:00:00 2001 From: David Renshaw Date: Thu, 15 May 2014 17:35:39 -0400 Subject: [PATCH 1/9] add a travis config --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..d817710 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,6 @@ +language: java +jdk: + - oraclejdk7 + - openjdk7 + - openjdk6 +script: make From 7b5b7f399c16033269a802823a72e2854ac1fdbb Mon Sep 17 00:00:00 2001 From: David Renshaw Date: Thu, 15 May 2014 17:53:52 -0400 Subject: [PATCH 2/9] tell travis to install capnproto --- .travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.travis.yml b/.travis.yml index d817710..dba4e90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,4 +3,14 @@ jdk: - oraclejdk7 - openjdk7 - openjdk6 +before_install: + - yes | sudo add-apt-repository ppa:ubuntu-toolchain-r/test + - sudo apt-get update +install: + - sudo apt-get install g++-4.8 + - curl -O https://capnproto.org/capnproto-c++-0.4.1.tar.gz + - tar zxf capnproto-c++-0.4.1.tar.gz + - export CC=gcc-4.7 + - export CXX=g++-4.7 + - cd capnproto-c++-0.4.1 && ./configure && make -j5 && sudo make install script: make From 0c903828a005b23d1fe49836a62fa57051504aed Mon Sep 17 00:00:00 2001 From: David Renshaw Date: Thu, 15 May 2014 17:57:03 -0400 Subject: [PATCH 3/9] oops --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index dba4e90..36c4c07 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ install: - sudo apt-get install g++-4.8 - curl -O https://capnproto.org/capnproto-c++-0.4.1.tar.gz - tar zxf capnproto-c++-0.4.1.tar.gz - - export CC=gcc-4.7 - - export CXX=g++-4.7 + - export CC=gcc-4.8 + - export CXX=g++-4.8 - cd capnproto-c++-0.4.1 && ./configure && make -j5 && sudo make install script: make From e8b88a04850e75b2ba6f66992d9594d314bbc967 Mon Sep 17 00:00:00 2001 From: David Renshaw Date: Thu, 15 May 2014 17:57:25 -0400 Subject: [PATCH 4/9] this too --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 36c4c07..fe8ef18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ before_install: - yes | sudo add-apt-repository ppa:ubuntu-toolchain-r/test - sudo apt-get update install: - - sudo apt-get install g++-4.8 + - sudo apt-get install g++-4.8 gcc-4.8 - curl -O https://capnproto.org/capnproto-c++-0.4.1.tar.gz - tar zxf capnproto-c++-0.4.1.tar.gz - export CC=gcc-4.8 From d426b2718a93bfc6b32d2991208e82dcd8895ca6 Mon Sep 17 00:00:00 2001 From: David Renshaw Date: Thu, 15 May 2014 18:01:45 -0400 Subject: [PATCH 5/9] exit the directory --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fe8ef18..480306b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,5 +12,5 @@ install: - tar zxf capnproto-c++-0.4.1.tar.gz - export CC=gcc-4.8 - export CXX=g++-4.8 - - cd capnproto-c++-0.4.1 && ./configure && make -j5 && sudo make install + - cd capnproto-c++-0.4.1 && ./configure && make -j5 && sudo make install && cd .. script: make From 5668ccdd4fe669d0b647e93303a47beba141e73b Mon Sep 17 00:00:00 2001 From: David Renshaw Date: Thu, 15 May 2014 18:07:06 -0400 Subject: [PATCH 6/9] tell make about g++-4.8 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 480306b..0d66f22 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,4 +13,4 @@ install: - export CC=gcc-4.8 - export CXX=g++-4.8 - cd capnproto-c++-0.4.1 && ./configure && make -j5 && sudo make install && cd .. -script: make +script: make CXX=g++-4.8 From e9ef1b7836256a0dbf5bfdbfea307afc456a9530 Mon Sep 17 00:00:00 2001 From: David Renshaw Date: Thu, 15 May 2014 18:12:22 -0400 Subject: [PATCH 7/9] CXX_FLAGS --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8e24093..db47924 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ -CXX=g++ -std=c++11 +CXX=g++ +CXX_FLAGS=-std=c++11 CAPNP_SOURCES=\ src/capnp/AnyPointer.java\ From 7c69421595577a234a4b761e3ac409b61b98bf75 Mon Sep 17 00:00:00 2001 From: David Renshaw Date: Thu, 15 May 2014 18:17:25 -0400 Subject: [PATCH 8/9] actually use the flags --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index db47924..c947b1a 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ $(CAPNP_COMPILATION_MARKER) : $(CAPNP_SOURCES) javac -d . $(CAPNP_SOURCES) capnpc-java : $(CAPNPC_JAVA_SOURCES) - $(CXX) -I/usr/local/include -L/usr/local/lib -lkj -lcapnp $(CAPNPC_JAVA_SOURCES) -o capnpc-java + $(CXX) $(CXX_FLAGS) -I/usr/local/include -L/usr/local/lib -lkj -lcapnp $(CAPNPC_JAVA_SOURCES) -o capnpc-java addressbook : capnp capnpc-java examples/AddressbookMain.java From ace50e39c1bfc98e9abf1d74953eb69374c8faab Mon Sep 17 00:00:00 2001 From: David Renshaw Date: Thu, 15 May 2014 18:22:46 -0400 Subject: [PATCH 9/9] maybe linker order matters? --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c947b1a..2dd99a8 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ $(CAPNP_COMPILATION_MARKER) : $(CAPNP_SOURCES) javac -d . $(CAPNP_SOURCES) capnpc-java : $(CAPNPC_JAVA_SOURCES) - $(CXX) $(CXX_FLAGS) -I/usr/local/include -L/usr/local/lib -lkj -lcapnp $(CAPNPC_JAVA_SOURCES) -o capnpc-java + $(CXX) $(CXX_FLAGS) -I/usr/local/include -L/usr/local/lib $(CAPNPC_JAVA_SOURCES) -lkj -lcapnp -o capnpc-java addressbook : capnp capnpc-java examples/AddressbookMain.java