From 3dc1e109ed2aeda68e3d9b9d97a53aa376dad212 Mon Sep 17 00:00:00 2001 From: "alexis.lagoutte@gmail.com" Date: Wed, 6 May 2015 08:20:01 +0000 Subject: [PATCH 1/2] Fix install of UCI * Disable LUA for UCI (not needed) * fix linking by install lib and launch ldconfig FossilOrigin-Name: 4f863a6b45810f0bdd4b69bb18a28d1615bd9022f50ba765681575871240764e --- src/contrib/install_libuci.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/contrib/install_libuci.sh b/src/contrib/install_libuci.sh index a07871bd..b2d0184c 100755 --- a/src/contrib/install_libuci.sh +++ b/src/contrib/install_libuci.sh @@ -6,6 +6,10 @@ mkdir build cd build cmake .. make ubox +mkdir -p /usr/local/include/libubox +cp ../*.h /usr/local/include/libubox +cp libubox.so /usr/local/lib +ldconfig cd ../.. git clone git://nbd.name/uci.git uci @@ -18,6 +22,7 @@ LDFLAGS=-L../../libubox/build/ export CFLAGS export LDFLAGS -cmake .. +cmake .. -DBUILD_LUA:BOOL=OFF make uci cli make install +ldconfig From 1ea1d58a568d9973f1d0c28eaa5535f76ab35415 Mon Sep 17 00:00:00 2001 From: "alexis.lagoutte@gmail.com" Date: Wed, 6 May 2015 08:49:04 +0000 Subject: [PATCH 2/2] Add .travis.yml FossilOrigin-Name: 6fbe703ed7d92893e69523eb9c22858d6e117567b09cc4a8200ea1e5930f77e0 --- .travis.yml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..866ff2e7 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,48 @@ +language: cpp +compiler: + - clang + - gcc +sudo: require +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.9 + - libstdc++-4.9-dev + - autoconf + - automake + - autotools-dev + - libtool + - libgmp-dev + - libconfuse-dev + - lua5.1 + - liblua5.1-0-dev +# No yet whitelisted for Travis +# - libgnutls28-dev +# - libnl-3-dev +# - libnl-genl-3-dev +before_install: + - $CC --version + - if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi + - $CC --version + - $CXX --version + - sudo apt-get install libgnutls28-dev libnl-genl-3-dev libnl-3-dev +before_script: + - cd src/contrib + - sudo ./install_libuci.sh + - cd jsmn + - make + - cd .. + - cd .. +script: + - cd capwap + - make + - cd .. + - cd wtp + - make + - ./wtp & + - cd .. + - cd ac + - make + - ./actube &