feedc0de/boost_config
1
0
Fork 0
forked from boostorg/config
Code Pull Requests Activity

Revert "Print config info via b2"

Browse Source 
This reverts commit dd47b4b59e.

# Conflicts:
#	test/Jamfile.v2
This commit is contained in:
jzmaddock
2019-06-26 18:11:29 +01:00
parent 6409132b36
commit ab3807ef83
4 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -294,7 +294,9 @@ script:
- if [ $TEST_INTEL ]; then source ~/.bashrc; fi - if [ $TEST_INTEL ]; then source ~/.bashrc; fi
- |- - |-
echo "using $TOOLSET : : $COMPILER : <cxxflags>$EXTRA_FLAGS <linkflags>$EXTRA_FLAGS ;" > ~/user-config.jam echo "using $TOOLSET : : $COMPILER : <cxxflags>$EXTRA_FLAGS <linkflags>$EXTRA_FLAGS ;" > ~/user-config.jam
- ./b2 libs/config/test//print_config_info toolset=$TOOLSET cxxstd=$CXXSTD $CXXSTD_DIALECT - IFS=','
- for CXXLOCAL in $CXXSTD; do (cd libs/config/test && ../../../b2 config_info_travis_install toolset=$TOOLSET cxxstd=$CXXLOCAL $CXXSTD_DIALECT && echo With Standard Version $CXXLOCAL && ./config_info_travis && rm ./config_info_travis) done
- unset IFS
- ./b2 -j3 libs/config/test toolset=$TOOLSET cxxstd=$CXXSTD $CXXSTD_DIALECT - ./b2 -j3 libs/config/test toolset=$TOOLSET cxxstd=$CXXSTD $CXXSTD_DIALECT
notifications: notifications:

12
appveyor.bat Normal file
View File

@ -0,0 +1,12 @@
IF NOT DEFINED CXXSTD (
ECHO %ARGS:"=%
..\..\..\b2 config_info_travis_install %ARGS:"=%
config_info_travis
del config_info_travis.exe
)
IF DEFINED CXXSTD FOR %%A IN (%CXXSTD%) DO (
ECHO %ARGS:"=%
..\..\..\b2 -a -d2 config_info_travis_install %ARGS:"=% cxxstd=%%A
config_info_travis
del config_info_travis.exe
)

2
appveyor.yml
View File

@ -69,5 +69,5 @@ build: off
test_script: test_script:
- cd libs\config\test - cd libs\config\test
- ..\..\..\b2 print_config_info %ARGS% cxxstd=%CXXSTD% - ..\appveyor.bat
- ..\..\..\b2 -j3 %ARGS% cxxstd=%CXXSTD% - ..\..\..\b2 -j3 %ARGS% cxxstd=%CXXSTD%

23
test/Jamfile.v2
View File

@ -8,7 +8,6 @@
# the template defined in options_v2.jam. # the template defined in options_v2.jam.
# #
import feature ;
import testing ; import testing ;
project project
@ -115,23 +114,7 @@ obj has_clang_implicit_fallthrough : cmd_line_check.cpp :
explicit has_clang_implicit_fallthrough ; explicit has_clang_implicit_fallthrough ;
exe config_info_printer : config_info.cpp ; exe config_info_travis : config_info.cpp ;
explicit config_info_printer ; install config_info_travis_install : config_info_travis : <location>. ;
explicit config_info_travis_install ;
actions print-run
{
echo With Standard Version $(STANDARD:E=default)
echo =====================================================================
$(>)
}
rule print-run ( target : sources * : properties * )
{
STANDARD on $(target) = [ feature.get-values <cxxstd> : $(properties) ] ;
}
notfile print_config_info : @print-run : config_info_printer ;
explicit print_config_info ;
# Backwards compatibility:
alias config_info_travis : print_config_info ;
explicit config_info_travis ; explicit config_info_travis ;