Skip to content

Commit

Permalink
Use newest build tools
Browse files Browse the repository at this point in the history
    Update travis
        Need to install boost so that we can build vera++
  • Loading branch information
Loki-Astari committed Aug 26, 2016
1 parent dc1f3df commit 9fca6e6
Show file tree
Hide file tree
Showing 5 changed files with 83 additions and 21 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Original file line Diff line number Diff line change
@@ -1,11 +1,13 @@
*.o *.o
*.lex.cpp *.lex.cpp
*.lex.h
.*.swp .*.swp
unittest unittest
coverage/ coverage/
debug/ debug/
release/ release/
profile/ profile/
vera/
makefile_tmp makefile_tmp
Makefile.extra Makefile.extra
Makefile.config Makefile.config
Expand All @@ -15,5 +17,5 @@ autom4te.cache/
config.log config.log
config.status config.status
libtool libtool
stamp-h1 stamp-h[0-9]
confdefs.h confdefs.h
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ git:
language: cpp language: cpp
os: os:
- linux - linux
futureos:
- osx - osx
compiler: compiler:
- gcc - gcc
Expand All @@ -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.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" == "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 - 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: install:
- ./configure --with-thors-network-byte-order --with-thor-build-local-vera - ./configure --with-thor-build-on-travis --with-thors-network-byte-order
script: script:
- PATH=${PATH}:$(pwd)/build/bin make - export PATH=${PATH}:$(pwd)/build/bin;make
after_success: after_success:
- ./uploadcodecovrage - ./uploadcodecovrage
branches: branches:
Expand Down
2 changes: 1 addition & 1 deletion build
91 changes: 75 additions & 16 deletions configure
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -781,7 +781,7 @@ SHELL'
ac_subst_files='' ac_subst_files=''
ac_user_opts=' ac_user_opts='
enable_option_checking enable_option_checking
with_thor_build_local_vera with_thor_build_on_travis
enable_vera enable_vera
enable_shared enable_shared
enable_static enable_static
Expand Down Expand Up @@ -1451,9 +1451,9 @@ Optional Features:
Optional Packages: Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-thor-build-local-vera --with-thor-build-on-travis
Usually used by travis to install vera++ for testing Used by travis to install and do some configuration
purposes
--with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
both] both]
--with-aix-soname=aix|svr4|both --with-aix-soname=aix|svr4|both
Expand Down Expand Up @@ -2394,17 +2394,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Set up the build system # 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 for ac_prog in wget
do do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
Expand Down Expand Up @@ -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 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 git submodule init
if git submodule update; then : if git submodule update; then :


else else
as_fn_error $? " as_fn_error $? "



git submodule updated failed: 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. 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 If the above command failed it probably means that you have not registered your \"public key\" with github.com


Expand All @@ -3029,6 +3073,21 @@ git submodule update
" "$LINENO" 5 " "$LINENO" 5


fi fi
)


if test "${with_thor-build-on-travis}" == ""; then :

else

(
./build/third/vera-install
)



fi





# Check whether --enable-vera was given. # Check whether --enable-vera was given.
Expand Down
1 change: 0 additions & 1 deletion configure.ac
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ AC_PREREQ([2.65])


# Set up the build system # Set up the build system
AC_CONFIG_MACRO_DIR([build/autotools/m4]) AC_CONFIG_MACRO_DIR([build/autotools/m4])
AX_THOR_FUNC_USE_INSTALL_LOCAL_VERA
AX_THOR_FUNC_BUILD AX_THOR_FUNC_BUILD
AC_CONFIG_AUX_DIR([build/autotools/build]) AC_CONFIG_AUX_DIR([build/autotools/build])


Expand Down

0 comments on commit 9fca6e6

Please sign in to comment.