diff --git a/.travis.yml b/.travis.yml index 4efa9b0..04df287 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,28 +4,63 @@ notifications: email: recipients: - grafikrobot@gmail.com - on_success: change - on_failure: change irc: channels: - "chat.freenode.net#boost" template: - "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}" - on_success: change - on_failure: change -os: - - linux +sudo: required + +env: + matrix: + - TRAVIS_EMPTY_JOB_WORKAROUND=true matrix: + exclude: + - env: TRAVIS_EMPTY_JOB_WORKAROUND=true include: - env: TOOLSET=clang-3.4 + os: linux + dist: precise - env: TOOLSET=clang-3.5 + os: linux + dist: precise - env: TOOLSET=clang-3.6 + os: linux + dist: precise - env: TOOLSET=gcc-4.7 + os: linux + dist: precise - env: TOOLSET=gcc-4.8 + os: linux + dist: precise - env: TOOLSET=gcc-4.9 + os: linux + dist: precise - env: TOOLSET=gcc-5.1 + os: linux + dist: precise + - env: TOOLSET=xcode-6.1 + os: osx + - env: TOOLSET=xcode-6.2 + os: osx + osx_image: beta-xcode6.2 + - env: TOOLSET=xcode-6.3 + os: osx + osx_image: beta-xcode6.3 + - env: TOOLSET=xcode-6.4 + os: osx + osx_image: xcode6.4 + - env: TOOLSET=xcode-7.0 + os: osx + osx_image: xcode7 + - env: TOOLSET=xcode-7.1 + os: osx + osx_image: xcode7.1 + - env: TOOLSET=xcode-7.2 + os: osx + osx_image: xcode7.2 before_install: wget "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py" install: python script.py install diff --git a/check/predef.jam b/check/predef.jam index 6fec1f0..7042dc1 100644 --- a/check/predef.jam +++ b/check/predef.jam @@ -1,202 +1,17 @@ -# Copyright Rene Rivera 2015 +# Copyright Rene Rivera 2016 # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) -# Defines rules that provide requirements based on checking -# conditions using Boost Predef definitions and version numbers. - +# Hack, to reload check/predef.jam at its new location. import modules ; -import project ; -import feature ; -import string ; -import toolset ; -import modules ; -import path ; -import "class" : new ; -import regex ; - -# Create a project for our targets. -project.extension predef check ; - -# Feature to pass check expressions to check programs. -feature.feature predef-expression : : free ; - -# Checks the expressions and when used evaluates to the true-properties -# if the expressions are all true. Otherwise evaluates to the -# false-properties. -rule check ( expressions + : language ? : true-properties * : false-properties * ) +local _loaded_ ; +for local _module_ in [ modules.peek modules : .loaded ] { - # Default to C++ on the check context. - language ?= cpp ; - - local project_target = [ project.target $(__name__) ] ; - project.push-current $(project_target) ; - local terms ; - local result ; - for expression in $(expressions) + if $(_module_) != "predef" { - if $(expression:L) in "and" "or" - { - terms += $(expression:L) ; - } - else - { - # Create the check run if we don't have one yet. - local key = [ MD5 $(language)::$(expression) ] ; - if ! ( $(key) in $(_checks_) ) - { - _checks_ += $(key) ; - _message_(/check/predef//predef_check_cc_$(key)) = $(expression) ; - check_target $(language) $(key) : [ change_term_to_def $(expression) ] ; - } - - terms += /check/predef//predef_check_cc_$(key) ; - } - } - local instance = [ new check-expression-evaluator - $(terms) : $(true-properties) : $(false-properties) ] ; - result = @$(instance).check ; - project.pop-current ; - return $(result) ; -} - -# Checks the expressions and when used evaluates to no -# if the expressions are all false. Otherwise evaluates to the -# nothing. -rule require ( expressions + : language ? ) -{ - return [ check $(expressions) : $(language) : : no ] ; -} - -############################################################################# - -.c.ext = c ; -.cpp.ext = cpp ; -.objc.ext = m ; -.objcpp.ext = mm ; - -# Check targets. Each needs to be compiled for different languages -# even though they are all the same source code. -local rule check_target ( language key : requirements * ) -{ - # Need to use absolute paths because we don't know the - # context of the invocation which affects where the paths - # originate from. - local predef_jam - = [ modules.binding $(__name__) ] ; - local source_path - = $(predef_jam:D)/predef_check_cc_as_$(language).$(.$(language).ext) ; - local include_path - = $(predef_jam:D)/../include ; - obj predef_check_cc_$(key) - : $(source_path) - : $(include_path) $(requirements) ; - explicit predef_check_cc_$(key) ; - return predef_check_cc_$(key) ; -} - -local rule change_term_to_def ( term ) -{ - local parts = [ regex.split $(term) " " ] ; - if $(parts[3]) - { - local version_number = [ regex.split $(parts[3]) "[.]" ] ; - if ! $(version_number[3]) { version_number += "0" ; } - if ! $(version_number[3]) { version_number += "0" ; } - parts = $(parts[1-2]) BOOST_VERSION_NUMBER($(version_number:J=",")) ; - } - return CHECK=\"$(parts:J=" ")\" ; -} - -class check-expression-evaluator -{ - import configure ; - - rule __init__ ( expression + : true-properties * : false-properties * ) - { - self.expression = $(expression) ; - self.true-properties = $(true-properties) ; - self.false-properties = $(false-properties) ; - } - - rule check ( properties * ) - { - local to-eval ; - local tokens = "and" "or" ; - # Go through the expression and: eval the target values, - # and normalize to a full expression. - for local term in $(self.expression) - { - if ! ( $(term:L) in $(tokens) ) - { - # A value is a target reference that will evan to "true" - # or "false". - if $(to-eval[-1]:L) && ! ( $(to-eval[-1]:L) in $(tokens) ) - { - # Default to "and" operation. - to-eval += "and" ; - } - local message = [ modules.peek predef : _message_($(term)) ] ; - if [ configure.builds $(term) : $(properties) : $(message) ] - { - to-eval += "true" ; - } - else - { - to-eval += "false" ; - } - } - else - { - to-eval += $(term) ; - } - } - # Eval full the expression. - local eval-result = [ eval $(to-eval) ] ; - # And resolve true/false properties. - if $(eval-result) = "true" - { - return $(self.true-properties) ; - } - else - { - return $(self.false-properties) ; - } - } - - rule eval ( e * ) - { - local r ; - if $(e[1]) && $(e[2]) && $(e[3]) - { - if $(e[2]) = "and" - { - if $(e[1]) = "true" && $(e[3]) = "true" - { - r = [ eval "true" $(e[4-]) ] ; - } - else - { - r = [ eval "false" $(e[4-]) ] ; - } - } - else if $(e[2]) = "or" - { - if $(e[1]) = "true" || $(e[3]) = "true" - { - r = [ eval "true" $(e[4-]) ] ; - } - else - { - r = [ eval "false" $(e[4-]) ] ; - } - } - } - else - { - r = $(e[1]) ; - } - return $(r) ; + _loaded_ += $(_module_) ; } } +modules.poke modules : .loaded : $(_loaded_) ; +import ../tools/check/predef ; diff --git a/doc/build.jam b/doc/build.jam index 3965a08..79fe6ba 100644 --- a/doc/build.jam +++ b/doc/build.jam @@ -1,4 +1,4 @@ -# Copyright Rene Rivera 2011 +# Copyright Rene Rivera 2011-2016 # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) @@ -23,6 +23,9 @@ else local BOOST_PREDEF_HEADERS = [ path.glob-tree $(BOOST_PREDEF_INCLUDE_ROOT)/boost/predef : *.h ] ; +# Intermediate targets.. + +# Quickbok to boostbook target. xml predef : predef.qbk @@ -32,6 +35,15 @@ xml predef ; explicit predef ; +# HTML dependencies for standalone docs. +install images : [ glob $(BOOST_ROOT)/doc/src/images/*.png ] : html/images ; +explicit images ; +install callouts : [ glob $(BOOST_ROOT)/doc/src/images/callouts/*.png ] : html/images/callouts ; +explicit callouts ; +install css : [ glob $(BOOST_ROOT)/doc/src/*.css ] : html ; +explicit css ; + +# Default target builds standalone docs. boostbook standalone : predef @@ -46,9 +58,6 @@ boostbook standalone css ; -install images : [ glob $(BOOST_ROOT)/doc/src/images/*.png ] : html/images ; -explicit images ; -install callouts : [ glob $(BOOST_ROOT)/doc/src/images/callouts/*.png ] : html/images/callouts ; -explicit callouts ; -install css : [ glob $(BOOST_ROOT)/doc/src/*.css ] : html ; -explicit css ; +# Target for Boost global documentation integration. +alias boostdoc : predef : : : predef ; +explicit boostdoc ; diff --git a/doc/history.qbk b/doc/history.qbk index 6358e1d..45807e8 100644 --- a/doc/history.qbk +++ b/doc/history.qbk @@ -1,5 +1,5 @@ [/ -Copyright 2014-2015 Rene Rivera +Copyright 2014-2016 Rene Rivera Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -7,6 +7,11 @@ http://www.boost.org/LICENSE_1_0.txt) [section History] +[heading 1.4.1] + +* Small fixes for some redefinition errors, and mispelled macros. +* Slightly rearrangement of structure to comply with current library requirements. + [heading 1.4] * Add detection of SIMD hardware. With the addition of the `BOOST_HW_*` diff --git a/doc/html/index.html b/doc/html/index.html index 70c1348..a1e170a 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -1,10 +1,10 @@ -Predef 1.4 +Predef 1.4.1 - + @@ -13,12 +13,11 @@

-Predef 1.4

+Predef 1.4.1

Rene Rivera

-

Copyright © 2005, 2008-2015 Rene - Rivera

+

Copyright © 2005, 2008-2016 Rene Rivera

Copyright © 2015 Charly Chevalier

Copyright © 2015 Joel Falcou

@@ -57,7 +56,7 @@
- +

Last revised: October 15, 2015 at 04:09:31 GMT

Last revised: February 17, 2016 at 15:44:31 GMT
diff --git a/doc/html/predef/acknoledgements.html b/doc/html/predef/acknoledgements.html index ccf5767..766f45b 100644 --- a/doc/html/predef/acknoledgements.html +++ b/doc/html/predef/acknoledgements.html @@ -4,8 +4,8 @@ Acknoledgements - - + + @@ -35,8 +35,7 @@
-
Copyright © 2005, 2008-2015 Rene - Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

+

Copyright © 2005, 2008-2016 Rene Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/adding_new_predefs.html b/doc/html/predef/adding_new_predefs.html index d6aef51..5c949e6 100644 --- a/doc/html/predef/adding_new_predefs.html +++ b/doc/html/predef/adding_new_predefs.html @@ -4,8 +4,8 @@ Adding new predefs - - + + @@ -289,8 +289,7 @@ Documentation about what is detected.
-
Copyright © 2005, 2008-2015 Rene - Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

+

Copyright © 2005, 2008-2016 Rene Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/check_utilities.html b/doc/html/predef/check_utilities.html index eddfdac..6278336 100644 --- a/doc/html/predef/check_utilities.html +++ b/doc/html/predef/check_utilities.html @@ -4,8 +4,8 @@ Check Utilities - - + + @@ -73,7 +73,7 @@ gets built as part of your project based on the detailed version information available in Predef. The basic use is simple:

-
import path-to-predef-src/check/predef
+
import path-to-predef-src/tools/check/predef
     : check require
     : predef-check predef-require ;
 
@@ -85,7 +85,7 @@ exe my_windows_program : windows_source.cpp
       unless one is building for Windows. Like the direct predef_check
       you can pass mutiple expressions using relational comparisons. For example:
     

-
import path-to-predef-src/check/predef
+
import path-to-predef-src/tools/check/predef
     : check require
     : predef-check predef-require ;
 
@@ -106,7 +106,7 @@ lib my_special_lib : source.cpp
       The expression can also use explicit "and", "or" logical
       operators to for more complex checks:
     

-
import path-to-predef-src/check/predef
+
import path-to-predef-src/tools/check/predef
     : check require
     : predef-check predef-require ;
 
@@ -127,7 +127,7 @@ lib my_special_lib : source.cpp
       as requirements. For example you could use it to enable or disable features
       in your programs:
     

-
import path-to-predef-src/check/predef
+
import path-to-predef-src/tools/check/predef
     : check require
     : predef-check predef-require ;
 
@@ -145,8 +145,7 @@ exe my_special_exe : source.cpp
-
Copyright © 2005, 2008-2015 Rene - Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

+

Copyright © 2005, 2008-2016 Rene Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/history.html b/doc/html/predef/history.html index 255682d..047a55a 100644 --- a/doc/html/predef/history.html +++ b/doc/html/predef/history.html @@ -4,8 +4,8 @@ History - - + + @@ -19,6 +19,18 @@

+ 1.4.1 +

+
    +
  • + Small fixes for some redefinition errors, and mispelled macros. +
    • +
  • + Slightly rearrangement of structure to comply with current library requirements. +
    • +
+

+ 1.4

    @@ -39,7 +51,7 @@

- + 1.3

    @@ -67,7 +79,7 @@

- + 1.2

    @@ -91,7 +103,7 @@

- + 1.1

    @@ -133,8 +145,7 @@
-
Copyright © 2005, 2008-2015 Rene - Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

+

Copyright © 2005, 2008-2016 Rene Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/introduction.html b/doc/html/predef/introduction.html index 3418989..f9aa6f8 100644 --- a/doc/html/predef/introduction.html +++ b/doc/html/predef/introduction.html @@ -4,9 +4,9 @@ Introduction - - - + + + @@ -191,8 +191,7 @@
-
Copyright © 2005, 2008-2015 Rene - Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

+

Copyright © 2005, 2008-2016 Rene Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/reference.html b/doc/html/predef/reference.html index 196e70c..aa76740 100644 --- a/doc/html/predef/reference.html +++ b/doc/html/predef/reference.html @@ -4,8 +4,8 @@ Reference - - + + @@ -32,8 +32,7 @@
-
Copyright © 2005, 2008-2015 Rene - Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

+

Copyright © 2005, 2008-2016 Rene Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/reference/boost_arch_architecture_macros.html b/doc/html/predef/reference/boost_arch_architecture_macros.html index 96ce67d..47fb6d9 100644 --- a/doc/html/predef/reference/boost_arch_architecture_macros.html +++ b/doc/html/predef/reference/boost_arch_architecture_macros.html @@ -4,7 +4,7 @@ BOOST_ARCH architecture macros - + @@ -2137,8 +2137,7 @@
-
Copyright © 2005, 2008-2015 Rene - Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

+

Copyright © 2005, 2008-2016 Rene Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/reference/boost_comp_compiler_macros.html b/doc/html/predef/reference/boost_comp_compiler_macros.html index 200cbb0..33c5c19 100644 --- a/doc/html/predef/reference/boost_comp_compiler_macros.html +++ b/doc/html/predef/reference/boost_comp_compiler_macros.html @@ -4,7 +4,7 @@ BOOST_COMP compiler macros - + @@ -1789,8 +1789,7 @@
- @@ -692,7 +692,7 @@ @@ -704,7 +704,7 @@ @@ -716,7 +716,7 @@ @@ -728,7 +728,7 @@ @@ -1180,10 +1180,10 @@

- BOOST_HW_SIMD_X86_XOP_VERSION + BOOST_HW_SIMD_X86_FMA4_VERSION

- XOP + FMA4 x86 extension (AMD specific).

@@ -1191,7 +1191,7 @@

- BOOST_HW_SIMD_X86_XOP_VERSION + BOOST_HW_SIMD_X86_XOP_VERSION

XOP @@ -1283,8 +1283,7 @@

Copyright © 2005, 2008-2015 Rene - Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

+

Copyright © 2005, 2008-2016 Rene Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/reference/boost_hw_hardware_macros.html b/doc/html/predef/reference/boost_hw_hardware_macros.html index a291db7..1f38ffa 100644 --- a/doc/html/predef/reference/boost_hw_hardware_macros.html +++ b/doc/html/predef/reference/boost_hw_hardware_macros.html @@ -4,7 +4,7 @@ BOOST_HW hardware macros - + @@ -584,7 +584,7 @@

- BOOST_HW_SIMD_x86_AVX2_VERSION + BOOST_HW_SIMD_X86_AVX2_VERSION

- BOOST_HW_SIMD_x86_SSE4A_VERSION + BOOST_HW_SIMD_X86_SSE4A_VERSION

- BOOST_HW_SIMD_x86_FMA4_VERSION + BOOST_HW_SIMD_X86_FMA4_VERSION

- BOOST_HW_SIMD_x86_XOP_VERSION + BOOST_HW_SIMD_X86_XOP_VERSION

- BOOST_HW_SIMD_x86 + BOOST_HW_SIMD_X86

-
Copyright © 2005, 2008-2015 Rene - Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

+

Copyright © 2005, 2008-2016 Rene Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/reference/boost_lang_language_standards_ma.html b/doc/html/predef/reference/boost_lang_language_standards_ma.html index 63113ec..6899e9c 100644 --- a/doc/html/predef/reference/boost_lang_language_standards_ma.html +++ b/doc/html/predef/reference/boost_lang_language_standards_ma.html @@ -4,7 +4,7 @@ BOOST_LANG language standards macros - + @@ -320,8 +320,7 @@
-
Copyright © 2005, 2008-2015 Rene - Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

+

Copyright © 2005, 2008-2016 Rene Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/reference/boost_lib_library_macros.html b/doc/html/predef/reference/boost_lib_library_macros.html index dd1792a..4b5a736 100644 --- a/doc/html/predef/reference/boost_lib_library_macros.html +++ b/doc/html/predef/reference/boost_lib_library_macros.html @@ -4,7 +4,7 @@ BOOST_LIB library macros - + @@ -882,8 +882,7 @@
-
Copyright © 2005, 2008-2015 Rene - Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

+

Copyright © 2005, 2008-2016 Rene Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/reference/boost_os_operating_system_macros.html b/doc/html/predef/reference/boost_os_operating_system_macros.html index 616696a..0d9852a 100644 --- a/doc/html/predef/reference/boost_os_operating_system_macros.html +++ b/doc/html/predef/reference/boost_os_operating_system_macros.html @@ -4,7 +4,7 @@ BOOST_OS operating system macros - + @@ -1906,8 +1906,7 @@
-
Copyright © 2005, 2008-2015 Rene - Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

+

Copyright © 2005, 2008-2016 Rene Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/reference/boost_plat_platform_macros.html b/doc/html/predef/reference/boost_plat_platform_macros.html index 2369de8..96e54af 100644 --- a/doc/html/predef/reference/boost_plat_platform_macros.html +++ b/doc/html/predef/reference/boost_plat_platform_macros.html @@ -4,7 +4,7 @@ BOOST_PLAT platform macros - + @@ -262,8 +262,7 @@
-
Copyright © 2005, 2008-2015 Rene - Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

+

Copyright © 2005, 2008-2016 Rene Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/reference/other_macros.html b/doc/html/predef/reference/other_macros.html index 1dbb088..e5949ca 100644 --- a/doc/html/predef/reference/other_macros.html +++ b/doc/html/predef/reference/other_macros.html @@ -4,7 +4,7 @@ Other macros - + @@ -70,8 +70,7 @@
-
Copyright © 2005, 2008-2015 Rene - Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

+

Copyright © 2005, 2008-2016 Rene Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/reference/version_definition_macros.html b/doc/html/predef/reference/version_definition_macros.html index d36279d..617341e 100644 --- a/doc/html/predef/reference/version_definition_macros.html +++ b/doc/html/predef/reference/version_definition_macros.html @@ -4,7 +4,7 @@ Version definition macros - + @@ -173,8 +173,7 @@
-
Copyright © 2005, 2008-2015 Rene - Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

+

Copyright © 2005, 2008-2016 Rene Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/to_do.html b/doc/html/predef/to_do.html index 4537ee9..6d6991f 100644 --- a/doc/html/predef/to_do.html +++ b/doc/html/predef/to_do.html @@ -4,8 +4,8 @@ To Do - - + + @@ -28,8 +28,7 @@
-
Copyright © 2005, 2008-2015 Rene - Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

+

Copyright © 2005, 2008-2016 Rene Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/using_the_predefs.html b/doc/html/predef/using_the_predefs.html index b5996a0..bbfa497 100644 --- a/doc/html/predef/using_the_predefs.html +++ b/doc/html/predef/using_the_predefs.html @@ -4,8 +4,8 @@ Using the predefs - - + + @@ -219,8 +219,7 @@
-
Copyright © 2005, 2008-2015 Rene - Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

+

Copyright © 2005, 2008-2016 Rene Rivera
Copyright © 2015 Charly Chevalier
Copyright © 2015 Joel Falcou

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/predef.qbk b/doc/predef.qbk index 7ca4587..af232bb 100644 --- a/doc/predef.qbk +++ b/doc/predef.qbk @@ -1,8 +1,8 @@ [article Predef [quickbook 1.7] - [version 1.4] + [version 1.4.1] [authors [Rivera, Rene]] - [copyright 2005, 2008-2015 Rene Rivera] + [copyright 2005, 2008-2016 Rene Rivera] [copyright 2015 Charly Chevalier] [copyright 2015 Joel Falcou] [purpose Identification and specification of predefined macros.] @@ -619,7 +619,7 @@ version information available in Predef. The basic use is simple: [teletype] `` -import path-to-predef-src/check/predef +import path-to-predef-src/tools/check/predef : check require : predef-check predef-require ; @@ -635,7 +635,7 @@ For example: [teletype] `` -import path-to-predef-src/check/predef +import path-to-predef-src/tools/check/predef : check require : predef-check predef-require ; @@ -663,7 +663,7 @@ to for more complex checks: [teletype] `` -import path-to-predef-src/check/predef +import path-to-predef-src/tools/check/predef : check require : predef-check predef-require ; @@ -690,7 +690,7 @@ features in your programs: [teletype] `` -import path-to-predef-src/check/predef +import path-to-predef-src/tools/check/predef : check require : predef-check predef-require ; diff --git a/include/boost/predef/hardware/simd.h b/include/boost/predef/hardware/simd.h index 4de1e70..ac5c9da 100644 --- a/include/boost/predef/hardware/simd.h +++ b/include/boost/predef/hardware/simd.h @@ -77,12 +77,24 @@ http://www.boost.org/LICENSE_1_0.txt) # error "Multiple SIMD architectures detected, this cannot happen!" #endif -#if defined(BOOST_HW_SIMD_X86_AVAILABLE) -# define BOOST_HW_SIMD BOOST_HW_SIMD_X86 +#if defined(BOOST_HW_SIMD_X86_AVAILABLE) && defined(BOOST_HW_SIMD_X86_AMD_AVAILABLE) + // If both standard _X86 and _X86_AMD are available, + // then take the biggest version of the two! +# if BOOST_HW_SIMD_X86 >= BOOST_HW_SIMD_X86_AMD +# define BOOST_HW_SIMD BOOST_HW_SIMD_X86 +# else +# define BOOST_HW_SIMD BOOST_HW_SIMD_X86_AMD +# endif #endif -#if defined(BOOST_HW_SIMD_X86_AMD_AVAILABLE) -# define BOOST_HW_SIMD BOOST_HW_SIMD_X86_AMD +#if !defined(BOOST_HW_SIMD) + // At this point, only one of these two is defined +# if defined(BOOST_HW_SIMD_X86_AVAILABLE) +# define BOOST_HW_SIMD BOOST_HW_SIMD_X86 +# endif +# if defined(BOOST_HW_SIMD_X86_AMD_AVAILABLE) +# define BOOST_HW_SIMD BOOST_HW_SIMD_X86_AMD +# endif #endif #if defined(BOOST_HW_SIMD_ARM_AVAILABLE) diff --git a/include/boost/predef/hardware/simd/x86.h b/include/boost/predef/hardware/simd/x86.h index 0874bc4..88bd81e 100644 --- a/include/boost/predef/hardware/simd/x86.h +++ b/include/boost/predef/hardware/simd/x86.h @@ -67,7 +67,7 @@ http://www.boost.org/LICENSE_1_0.txt) [[`__FMA__`] [BOOST_HW_SIMD_X86_FMA3_VERSION]] - [[`__AVX2__`] [BOOST_HW_SIMD_x86_AVX2_VERSION]] + [[`__AVX2__`] [BOOST_HW_SIMD_X86_AVX2_VERSION]] ] */ @@ -99,10 +99,10 @@ http://www.boost.org/LICENSE_1_0.txt) #if !defined(BOOST_HW_SIMD_X86) && defined(__SSE3__) # define BOOST_HW_SIMD_X86 BOOST_HW_SIMD_X86_SSE3_VERSION #endif -#if !defined(BOOST_HW_SIMD_X86) && (defined(__SSE2__) || defined(_M_X64) || _M_IX86_FP >= 2) +#if !defined(BOOST_HW_SIMD_X86) && (defined(__SSE2__) || defined(_M_X64) || (defined(_M_IX86_FP) && _M_IX86_FP >= 2)) # define BOOST_HW_SIMD_X86 BOOST_HW_SIMD_X86_SSE2_VERSION #endif -#if !defined(BOOST_HW_SIMD_X86) && (defined(__SSE__) || defined(_M_X64) || _M_IX86_FP >= 1) +#if !defined(BOOST_HW_SIMD_X86) && (defined(__SSE__) || defined(_M_X64) || (defined(_M_IX86_FP) && _M_IX86_FP >= 1)) # define BOOST_HW_SIMD_X86 BOOST_HW_SIMD_X86_SSE_VERSION #endif #if !defined(BOOST_HW_SIMD_X86) && defined(__MMX__) diff --git a/include/boost/predef/hardware/simd/x86_amd.h b/include/boost/predef/hardware/simd/x86_amd.h index 60fd448..c80d1ce 100644 --- a/include/boost/predef/hardware/simd/x86_amd.h +++ b/include/boost/predef/hardware/simd/x86_amd.h @@ -33,13 +33,13 @@ http://www.boost.org/LICENSE_1_0.txt) [table [[__predef_symbol__] [__predef_version__]] - [[`__SSE4A__`] [BOOST_HW_SIMD_x86_SSE4A_VERSION]] + [[`__SSE4A__`] [BOOST_HW_SIMD_X86_SSE4A_VERSION]] - [[`__FMA4__`] [BOOST_HW_SIMD_x86_FMA4_VERSION]] + [[`__FMA4__`] [BOOST_HW_SIMD_X86_FMA4_VERSION]] - [[`__XOP__`] [BOOST_HW_SIMD_x86_XOP_VERSION]] + [[`__XOP__`] [BOOST_HW_SIMD_X86_XOP_VERSION]] - [[`BOOST_HW_SIMD_X86`] [BOOST_HW_SIMD_x86]] + [[`BOOST_HW_SIMD_X86`] [BOOST_HW_SIMD_X86]] ] [note This predef includes every other x86 SIMD extensions and also has other diff --git a/include/boost/predef/hardware/simd/x86_amd/versions.h b/include/boost/predef/hardware/simd/x86_amd/versions.h index a0a9e91..1115716 100644 --- a/include/boost/predef/hardware/simd/x86_amd/versions.h +++ b/include/boost/predef/hardware/simd/x86_amd/versions.h @@ -30,9 +30,9 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_HW_SIMD_X86_AMD_SSE4A_VERSION BOOST_VERSION_NUMBER(4, 0, 0) /*` - [heading `BOOST_HW_SIMD_X86_XOP_VERSION`] + [heading `BOOST_HW_SIMD_X86_FMA4_VERSION`] - [@https://en.wikipedia.org/wiki/XOP_instruction_set XOP] x86 extension (AMD specific). + [@https://en.wikipedia.org/wiki/FMA_instruction_set#FMA4_instruction_set FMA4] x86 extension (AMD specific). Version number is: *5.1.0*. */ diff --git a/include/boost/predef/os/cygwin.h b/include/boost/predef/os/cygwin.h index 1985c97..9d36f0f 100644 --- a/include/boost/predef/os/cygwin.h +++ b/include/boost/predef/os/cygwin.h @@ -29,7 +29,7 @@ http://www.boost.org/LICENSE_1_0.txt) defined(__CYGWIN__) \ ) # undef BOOST_OS_CYGWIN -# define BOOST_OS_CGYWIN BOOST_VERSION_NUMBER_AVAILABLE +# define BOOST_OS_CYGWIN BOOST_VERSION_NUMBER_AVAILABLE #endif #if BOOST_OS_CYGWIN diff --git a/include/boost/predef/version.h b/include/boost/predef/version.h index 2fcdefa..8745c94 100644 --- a/include/boost/predef/version.h +++ b/include/boost/predef/version.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2015 +Copyright Rene Rivera 2015-2016 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -10,6 +10,6 @@ http://www.boost.org/LICENSE_1_0.txt) #include -#define BOOST_PREDEF_VERSION BOOST_VERSION_NUMBER(1,4,0) +#define BOOST_PREDEF_VERSION BOOST_VERSION_NUMBER(1,4,1) #endif diff --git a/test/build.jam b/test/build.jam index cc1806e..74c658c 100755 --- a/test/build.jam +++ b/test/build.jam @@ -1,5 +1,5 @@ #!/usr/bin/env b2 -a --verbose-test -# Copyright Rene Rivera 2011-2013 +# Copyright Rene Rivera 2011-2016 # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) @@ -64,4 +64,12 @@ test-suite predef : # Minimal testing done for predef for CI. Since # we don't have many we can just do all of them. alias minimal : predef ; + +# Full testing target for regular regression tests. +alias full : predef ; + +# Extra's target. Nothing for Predef. +alias extra ; + explicit minimal ; +explicit extra ; diff --git a/test/check_value.cpp b/test/check_value.cpp index 86bed68..30ae806 100644 --- a/test/check_value.cpp +++ b/test/check_value.cpp @@ -19,7 +19,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define CHECK_VALUE "undefined" #endif -int main(int argc, const char ** argv) +int main() { std::cout << "CHECK_VALUE == " << CHECK_VALUE << "\n" ; return 0; diff --git a/test/predef_info.h b/test/predef_info.h index 2adb638..213d94b 100644 --- a/test/predef_info.h +++ b/test/predef_info.h @@ -6,7 +6,7 @@ http://www.boost.org/LICENSE_1_0.txt) */ #include -int main(int argc, const char ** argv) +int main() { unsigned x = 0; create_predef_entries(); diff --git a/check/build.jam b/tools/check/build.jam similarity index 100% rename from check/build.jam rename to tools/check/build.jam diff --git a/tools/check/predef.jam b/tools/check/predef.jam new file mode 100644 index 0000000..1863906 --- /dev/null +++ b/tools/check/predef.jam @@ -0,0 +1,202 @@ +# Copyright Rene Rivera 2015 +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + +# Defines rules that provide requirements based on checking +# conditions using Boost Predef definitions and version numbers. + +import modules ; +import project ; +import feature ; +import string ; +import toolset ; +import modules ; +import path ; +import "class" : new ; +import regex ; + +# Create a project for our targets. +project.extension predef check ; + +# Feature to pass check expressions to check programs. +feature.feature predef-expression : : free ; + +# Checks the expressions and when used evaluates to the true-properties +# if the expressions are all true. Otherwise evaluates to the +# false-properties. +rule check ( expressions + : language ? : true-properties * : false-properties * ) +{ + # Default to C++ on the check context. + language ?= cpp ; + + local project_target = [ project.target $(__name__) ] ; + project.push-current $(project_target) ; + local terms ; + local result ; + for expression in $(expressions) + { + if $(expression:L) in "and" "or" + { + terms += $(expression:L) ; + } + else + { + # Create the check run if we don't have one yet. + local key = [ MD5 $(language)::$(expression) ] ; + if ! ( $(key) in $(_checks_) ) + { + _checks_ += $(key) ; + _message_(/check/predef//predef_check_cc_$(key)) = $(expression) ; + check_target $(language) $(key) : [ change_term_to_def $(expression) ] ; + } + + terms += /check/predef//predef_check_cc_$(key) ; + } + } + local instance = [ new check-expression-evaluator + $(terms) : $(true-properties) : $(false-properties) ] ; + result = @$(instance).check ; + project.pop-current ; + return $(result) ; +} + +# Checks the expressions and when used evaluates to no +# if the expressions are all false. Otherwise evaluates to the +# nothing. +rule require ( expressions + : language ? ) +{ + return [ check $(expressions) : $(language) : : no ] ; +} + +############################################################################# + +.c.ext = c ; +.cpp.ext = cpp ; +.objc.ext = m ; +.objcpp.ext = mm ; + +# Check targets. Each needs to be compiled for different languages +# even though they are all the same source code. +local rule check_target ( language key : requirements * ) +{ + # Need to use absolute paths because we don't know the + # context of the invocation which affects where the paths + # originate from. + local predef_jam + = [ modules.binding $(__name__) ] ; + local source_path + = $(predef_jam:D)/predef_check_cc_as_$(language).$(.$(language).ext) ; + local include_path + = $(predef_jam:D)/../../include ; + obj predef_check_cc_$(key) + : $(source_path) + : $(include_path) $(requirements) ; + explicit predef_check_cc_$(key) ; + return predef_check_cc_$(key) ; +} + +local rule change_term_to_def ( term ) +{ + local parts = [ regex.split $(term) " " ] ; + if $(parts[3]) + { + local version_number = [ regex.split $(parts[3]) "[.]" ] ; + if ! $(version_number[3]) { version_number += "0" ; } + if ! $(version_number[3]) { version_number += "0" ; } + parts = $(parts[1-2]) BOOST_VERSION_NUMBER($(version_number:J=",")) ; + } + return CHECK=\"$(parts:J=" ")\" ; +} + +class check-expression-evaluator +{ + import configure ; + + rule __init__ ( expression + : true-properties * : false-properties * ) + { + self.expression = $(expression) ; + self.true-properties = $(true-properties) ; + self.false-properties = $(false-properties) ; + } + + rule check ( properties * ) + { + local to-eval ; + local tokens = "and" "or" ; + # Go through the expression and: eval the target values, + # and normalize to a full expression. + for local term in $(self.expression) + { + if ! ( $(term:L) in $(tokens) ) + { + # A value is a target reference that will evan to "true" + # or "false". + if $(to-eval[-1]:L) && ! ( $(to-eval[-1]:L) in $(tokens) ) + { + # Default to "and" operation. + to-eval += "and" ; + } + local message = [ modules.peek predef : _message_($(term)) ] ; + if [ configure.builds $(term) : $(properties) : $(message) ] + { + to-eval += "true" ; + } + else + { + to-eval += "false" ; + } + } + else + { + to-eval += $(term) ; + } + } + # Eval full the expression. + local eval-result = [ eval $(to-eval) ] ; + # And resolve true/false properties. + if $(eval-result) = "true" + { + return $(self.true-properties) ; + } + else + { + return $(self.false-properties) ; + } + } + + rule eval ( e * ) + { + local r ; + if $(e[1]) && $(e[2]) && $(e[3]) + { + if $(e[2]) = "and" + { + if $(e[1]) = "true" && $(e[3]) = "true" + { + r = [ eval "true" $(e[4-]) ] ; + } + else + { + r = [ eval "false" $(e[4-]) ] ; + } + } + else if $(e[2]) = "or" + { + if $(e[1]) = "true" || $(e[3]) = "true" + { + r = [ eval "true" $(e[4-]) ] ; + } + else + { + r = [ eval "false" $(e[4-]) ] ; + } + } + } + else + { + r = $(e[1]) ; + } + return $(r) ; + } +} diff --git a/check/predef_check.h b/tools/check/predef_check.h similarity index 100% rename from check/predef_check.h rename to tools/check/predef_check.h diff --git a/check/predef_check_as_c.c b/tools/check/predef_check_as_c.c similarity index 100% rename from check/predef_check_as_c.c rename to tools/check/predef_check_as_c.c diff --git a/check/predef_check_as_cpp.cpp b/tools/check/predef_check_as_cpp.cpp similarity index 100% rename from check/predef_check_as_cpp.cpp rename to tools/check/predef_check_as_cpp.cpp diff --git a/check/predef_check_as_objc.m b/tools/check/predef_check_as_objc.m similarity index 100% rename from check/predef_check_as_objc.m rename to tools/check/predef_check_as_objc.m diff --git a/check/predef_check_as_objcpp.mm b/tools/check/predef_check_as_objcpp.mm similarity index 100% rename from check/predef_check_as_objcpp.mm rename to tools/check/predef_check_as_objcpp.mm diff --git a/check/predef_check_cc.h b/tools/check/predef_check_cc.h similarity index 100% rename from check/predef_check_cc.h rename to tools/check/predef_check_cc.h diff --git a/check/predef_check_cc_as_c.c b/tools/check/predef_check_cc_as_c.c similarity index 100% rename from check/predef_check_cc_as_c.c rename to tools/check/predef_check_cc_as_c.c diff --git a/check/predef_check_cc_as_cpp.cpp b/tools/check/predef_check_cc_as_cpp.cpp similarity index 100% rename from check/predef_check_cc_as_cpp.cpp rename to tools/check/predef_check_cc_as_cpp.cpp diff --git a/check/predef_check_cc_as_objc.m b/tools/check/predef_check_cc_as_objc.m similarity index 100% rename from check/predef_check_cc_as_objc.m rename to tools/check/predef_check_cc_as_objc.m diff --git a/check/predef_check_cc_as_objcpp.mm b/tools/check/predef_check_cc_as_objcpp.mm similarity index 100% rename from check/predef_check_cc_as_objcpp.mm rename to tools/check/predef_check_cc_as_objcpp.mm