Permalink
Browse files

Use newest build tools

    Update travis
        Need to install boost so that we can build vera++
  • Loading branch information...
1 parent dc1f3df commit 9fca6e6fdb5414abb4eaffd18857a56f5b737647 @Loki-Astari committed Aug 25, 2016
Showing with 83 additions and 21 deletions.
  1. +3 −1 .gitignore
  2. +4 −2 .travis.yml
  3. +1 −1 build
  4. +75 −16 configure
  5. +0 −1 configure.ac
View
@@ -1,11 +1,13 @@
*.o
*.lex.cpp
+*.lex.h
.*.swp
unittest
coverage/
debug/
release/
profile/
+vera/
makefile_tmp
Makefile.extra
Makefile.config
@@ -15,5 +17,5 @@ autom4te.cache/
config.log
config.status
libtool
-stamp-h1
+stamp-h[0-9]
confdefs.h
View
@@ -3,6 +3,7 @@ git:
language: cpp
os:
- linux
+futureos:
- osx
compiler:
- gcc
@@ -25,10 +26,11 @@ before_install:
- if [ "$TRAVIS_OS_NAME" == "linux" -a "$CXX" == "clang++" ]; then a=$(sudo find / -name llvm-cov | grep 3.5 | head -1);sudo ln -s ${a} /usr/bin/llvm-cov;fi
- if [ "$TRAVIS_OS_NAME" == "linux" -a "$CXX" == "clang++" ]; then a=$(sudo find / -name llvm-cov | grep 3.4 | head -1);sudo mv ${a} ${a}.old;fi
- if [ "$TRAVIS_OS_NAME" == "osx" -a "$CXX" == "clang++" ]; then sudo ln -s /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/llvm-cov /usr/local/bin/llvm-cov; fi
+ - sudo apt-get install libboost-all-dev
install:
- - ./configure --with-thors-network-byte-order --with-thor-build-local-vera
+ - ./configure --with-thor-build-on-travis --with-thors-network-byte-order
script:
- - PATH=${PATH}:$(pwd)/build/bin make
+ - export PATH=${PATH}:$(pwd)/build/bin;make
after_success:
- ./uploadcodecovrage
branches:
View
@@ -781,7 +781,7 @@ SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
-with_thor_build_local_vera
+with_thor_build_on_travis
enable_vera
enable_shared
enable_static
@@ -1451,9 +1451,9 @@ Optional Features:
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-thor-build-local-vera
- Usually used by travis to install vera++ for testing
- purposes
+ --with-thor-build-on-travis
+ Used by travis to install and do some configuration
+
--with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
both]
--with-aix-soname=aix|svr4|both
@@ -2394,17 +2394,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Set up the build system
-
-# Check whether --with-thor-build-local-vera was given.
-if test "${with_thor_build_local_vera+set}" = set; then :
- withval=$with_thor_build_local_vera;
- ./build/third/vera-install
-
-
-fi
-
-
-
for ac_prog in wget
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -3006,15 +2995,70 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+# Check whether --with-thor-build-on-travis was given.
+if test "${with_thor_build_on_travis+set}" = set; then :
+ withval=$with_thor_build_on_travis;
+fi
+
+
+
+(
+ cd .
+ if test "${with_thor-build-on-travis}" == ""; then :
+
+else
+
+ mv .gitmodules gitmodules.old
+ sed -e 's#git@\([^:]*\):#https://\1/#' gitmodules.old > .gitmodules
+ rm gitmodules.old
+
+
+fi
git submodule init
if git submodule update; then :
else
as_fn_error $? "
-
git submodule updated failed:
+Currently all Loki-Astari submodules are retrieved using ssh.
+If the above command failed it probably means that you have not registered your \"public key\" with github.com
+
+See this article on StackOverflow for simple instructions:
+http://stackoverflow.com/questions/25828483/github-permission-denied-publickey
+
+
+Once you have installed the keys you can restart the configuration with:
+git submodule update
+./configure <Same Flags You had before>
+ " "$LINENO" 5
+
+fi
+)
+
+
+(
+ cd build
+ if test "${with_thor-build-on-travis}" == ""; then :
+
+else
+
+ mv .gitmodules gitmodules.old
+ sed -e 's#git@\([^:]*\):#https://\1/#' gitmodules.old > .gitmodules
+ rm gitmodules.old
+
+
+fi
+ git submodule init
+ if git submodule update; then :
+
+else
+ as_fn_error $? "
+
+git submodule updated failed:
Currently all Loki-Astari submodules are retrieved using ssh.
If the above command failed it probably means that you have not registered your \"public key\" with github.com
@@ -3029,6 +3073,21 @@ git submodule update
" "$LINENO" 5
fi
+)
+
+
+ if test "${with_thor-build-on-travis}" == ""; then :
+
+else
+
+(
+ ./build/third/vera-install
+)
+
+
+
+fi
+
# Check whether --enable-vera was given.
View
@@ -4,7 +4,6 @@ AC_PREREQ([2.65])
# Set up the build system
AC_CONFIG_MACRO_DIR([build/autotools/m4])
-AX_THOR_FUNC_USE_INSTALL_LOCAL_VERA
AX_THOR_FUNC_BUILD
AC_CONFIG_AUX_DIR([build/autotools/build])

0 comments on commit 9fca6e6

Please sign in to comment.