Merge pull request #79 from brunocodutra/develop

Relicense under the MIT
brunocodutra · Apr 16, 2018 · f98e014 · f98e014
2 parents 3e0364b + 353e7bd
commit f98e014
Show file tree

Hide file tree

Showing 241 changed files with 65 additions and 1,016 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,3 @@
-# Copyright Bruno Dutra 2015-2018
-# Distributed under the Boost Software License, Version 1.0.
-# See accompanying file LICENSE.txt or copy at http://boost.org/LICENSE_1_0.txt
-
 sudo: required
 language: cpp
 
@@ -304,7 +300,7 @@ jobs:
             allow-empty-commit: true
             local-dir: install/include
             on:
-                branch: master
+                tags: true
           - provider: pages
             target-branch: gh-pages
             github-token: $GITHUB_TOKEN
@@ -313,7 +309,7 @@ jobs:
             allow-empty-commit: true
             local-dir: install/share/Metal/doc
             on:
-                branch: master
+                tags: true
 
 before_install:
   - SOURCE_PATH="${TRAVIS_BUILD_DIR}"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,3 @@
-# Copyright Bruno Dutra 2015-2018
-# Distributed under the Boost Software License, Version 1.0.
-# See accompanying file LICENSE.txt or copy at http://boost.org/LICENSE_1_0.txt
-
 cmake_minimum_required(VERSION 3.8)
 
 include(cmake/Deploy.cmake)
@@ -27,7 +23,7 @@ set(METAL_VERSION "${METAL_MAJOR}.${METAL_MINOR}.${METAL_PATCH}")
 
 message(STATUS "Configuring Metal ${METAL_VERSION}")
 
-add_header_library(Metal "${METAL_INCLUDE_DIR}/metal.hpp")
+add_header_library(Metal "${METAL_INCLUDE_DIR}/metal.hpp" "LICENSE")
 set_target_properties(Metal PROPERTIES
     INTERFACE_LIB_VERSION ${METAL_VERSION}
     INTERFACE_COMPILE_FEATURES cxx_std_11

diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2018 Bruno Dutra
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/README.md b/README.md
@@ -119,10 +119,10 @@ The following compilers are continuously tested at
 
 The complete up to date documentation is available [online][documentation].
 
+
 ## License
 
-Metal is distributed under the
-[Boost Software License, Version 1.0][boost.license].
+This project is licensed under the [MIT][license].
 
 [version]:          http://badge.fury.io/gh/brunocodutra%2Fmetal.svg
 [semver]:           http://semver.org
@@ -141,12 +141,11 @@ Metal is distributed under the
 [godbolt.metal]:    http://godbolt.org/g/RFwvic
 [godbolt.badge]:    http://img.shields.io/badge/try%20it-on%20godbolt-222266.svg
 
-[boost.license]:    http://boost.org/LICENSE_1_0.txt
-
 [CMake]:            http://cmake.org/
 [Doxygen]:          http://doxygen.org/
 [metaben.ch]:       http://metaben.ch/
 
+[license]:          https://github.com/brunocodutra/metal/blob/master/LICENSE
 [releases]:         http://github.com/brunocodutra/metal/releases
 [documentation]:    http://brunocodutra.github.io/metal
 [examples]:         http://brunocodutra.github.io/metal/#examples

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,7 +1,3 @@
-# Copyright Bruno Dutra 2015-2018
-# Distributed under the Boost Software License, Version 1.0.
-# See accompanying file LICENSE.txt or copy at http://boost.org/LICENSE_1_0.txt
-
 environment:
     matrix:
       - DEPLOY: true

diff --git a/cmake/Deploy.cmake b/cmake/Deploy.cmake
@@ -1,33 +1,25 @@
-# Copyright Bruno Dutra 2015-2017
-# Distributed under the Boost Software License, Version 1.0.
-# See accompanying file LICENSE.txt or copy at http://boost.org/LICENSE_1_0.txt
-
 set(THIS_FILE ${CMAKE_CURRENT_LIST_FILE})
 
+function(copyright _license _output)
+    set(output "${${_output}}")
+    file(STRINGS ${_license} lines NEWLINE_CONSUME)
+    string(REGEX REPLACE "\n$" "" lines "${lines}")
+    string(REGEX REPLACE "\n" "\n// " output "// ${lines}")
+    set(${_output} "${output}\n\n" PARENT_SCOPE)
+endfunction()
+
 function(bundle _entry _output)
     set(options)
     set(one_value_args EXCLUDED)
-    set(multi_value_args EXCLUDE INCLUDE_DIRS)
+    set(multi_value_args EXCLUDE)
     cmake_parse_arguments(ARGS "${options}" "${one_value_args}" "${multi_value_args}" ${ARGN})
 
-    if(NOT IS_ABSOLUTE ${_entry})
-        set(_entry "${CMAKE_CURRENT_SOURCE_DIR}/${_entry}")
-    endif()
-
     set(exclude)
     if(ARGS_EXCLUDE)
         set(exclude ${ARGS_EXCLUDE})
     endif()
 
-    get_filename_component(include_dirs ${_entry} DIRECTORY)
-    if(ARGS_INCLUDE_DIRS)
-        foreach(dir ${ARGS_INCLUDE_DIRS})
-            if(NOT IS_ABSOLUTE ${dir})
-                set(dir "${CMAKE_CURRENT_SOURCE_DIR}/${dir}")
-            endif()
-            list(APPEND include_dirs ${dir})
-        endforeach()
-    endif()
+    get_filename_component(include_dir ${_entry} DIRECTORY)
 
     set(output "${${_output}}")
     file(STRINGS ${_entry} lines NEWLINE_CONSUME)
@@ -38,23 +30,16 @@ function(bundle _entry _output)
         set(regex "^[ \t]*#[ \t]*include[ \t]*[\"<]([^\">]*)[\">]")
         if(line MATCHES ${regex})
             string(REGEX REPLACE ${regex} "\\1" include "${line}")
-            foreach(dir ${include_dirs})
-                if(EXISTS "${dir}/${include}")
-                    set(next "${dir}/${include}")
-                    get_filename_component(next "${next}" ABSOLUTE)
-                    break()
-                endif()
-            endforeach()
+            if(NOT IS_ABSOLUTE "${include}" AND EXISTS "${include_dir}/${include}")
+                set(next "${include_dir}/${include}")
+                get_filename_component(next "${next}" ABSOLUTE)
+            endif()
         endif()
 
         if(next)
             if(NOT next IN_LIST exclude)
                 list(APPEND exclude ${next})
-                bundle(${next} output
-                    EXCLUDE ${exclude}
-                    EXCLUDED exclude
-                    INCLUDE_DIRS ${ARGS_INCLUDE_DIRS}
-                )
+                bundle(${next} output EXCLUDE ${exclude} EXCLUDED exclude)
             endif()
         else()
             set(output "${output}${line}\n")
@@ -68,7 +53,15 @@ function(bundle _entry _output)
     set(${_output} "${output}" PARENT_SCOPE)
 endfunction()
 
-function(add_header_library _name _entry)
+function(add_header_library _name _entry _license)
+    if(NOT IS_ABSOLUTE ${_entry})
+        set(_entry "${CMAKE_CURRENT_SOURCE_DIR}/${_entry}")
+    endif()
+
+    if(NOT IS_ABSOLUTE ${_license})
+        set(_license "${CMAKE_CURRENT_SOURCE_DIR}/${_license}")
+    endif()
+
     get_filename_component(output ${_entry} NAME)
     set(output_dir "${CMAKE_BINARY_DIR}/${_name}/include")
     set(output "${output_dir}/${output}")
@@ -80,8 +73,9 @@ function(add_header_library _name _entry)
     file(WRITE ${bundle} "\
 cmake_minimum_required(VERSION ${CMAKE_VERSION})
 include(${THIS_FILE})
-bundle(${_entry} single INCLUDE_DIRS ${include_dir})
-file(WRITE \"${output}\" \"\${single}\")
+copyright(${_license} output)
+bundle(${_entry} output)
+file(WRITE \"${output}\" \"\${output}\")
 "
     )
 
@@ -92,11 +86,16 @@ file(WRITE \"${output}\" \"\${single}\")
         DEPENDS ${headers}
     )
 
-    add_custom_target(${_name}.bundle ALL DEPENDS ${output} SOURCES ${headers})
+    add_custom_target(${_name}.bundle DEPENDS ${output} SOURCES ${headers})
 
     add_library(${_name} INTERFACE)
     target_include_directories(${_name} INTERFACE $<BUILD_INTERFACE:${output_dir}>)
 
+    if (NOT TARGET bundle)
+        add_custom_target(bundle ALL)
+    endif()
+
+    add_dependencies(bundle ${_name}.bundle)
     add_dependencies(${_name} ${_name}.bundle)
 endfunction()
 

diff --git a/cmake/Test.cmake b/cmake/Test.cmake
@@ -1,7 +1,3 @@
-# Copyright Bruno Dutra 2015-2017
-# Distributed under the Boost Software License, Version 1.0.
-# See accompanying file LICENSE.txt or copy at http://boost.org/LICENSE_1_0.txt
-
 enable_testing()
 
 find_program(CLANG_TIDY NAMES clang-tidy)

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -1,7 +1,3 @@
-# Copyright Bruno Dutra 2015-2018
-# Distributed under the Boost Software License, Version 1.0.
-# See accompanying file LICENSE.txt or copy at http://boost.org/LICENSE_1_0.txt
-
 find_package(Doxygen)
 if(NOT DOXYGEN_FOUND)
     message(WARNING "doxygen not found - target 'doc' will be unavailable.")

diff --git a/doc/css/metal.css b/doc/css/metal.css
@@ -1,8 +1,3 @@
-/* Copyright Bruno Dutra 2015-2016
- * Distributed under the Boost Software License, Version 1.0.
- * See accompanying file LICENSE.txt or copy at http://boost.org/LICENSE_1_0.txt
- */
-
 html, body {
     height: 100%;
     color: #464646;

diff --git a/doc/footer.html b/doc/footer.html
@@ -9,11 +9,11 @@
               <li><iframe class="github-btn" src="https://ghbtns.com/github-btn.html?user=brunocodutra&amp;repo=metal&amp;type=watch&amp;count=true" title="Star on GitHub"></iframe></li>
               <li><iframe class="github-btn" src="https://ghbtns.com/github-btn.html?user=brunocodutra&amp;repo=metal&amp;type=fork&amp;count=true" title="Fork on GitHub"></iframe></li>
             </ul>
-            &copy; Copyright 2015-$year
+            &copy; Copyright 2018-$year
             <a href="https://github.com/brunocodutra">Bruno Dutra</a>,
             <span class="hidden-xs">Distributed under the</span>
-            <a href="http://www.boost.org/LICENSE_1_0.txt">
-              Boost Software License, Version 1.0
+            <a href="https://github.com/brunocodutra/metal/blob/master/LICENSE">
+              MIT
             </a>
           </div>
         </div>

diff --git a/doc/js/metal.js b/doc/js/metal.js
@@ -1,7 +1,3 @@
-// Copyright Bruno Dutra 2015-2016
-// Distributed under the Boost Software License, Version 1.0.
-// See accompanying file LICENSE.txt or copy at http://boost.org/LICENSE_1_0.txt
-
 $(function() {
   var page = window.location.pathname.split("/").pop();
   if(!page.length)

diff --git a/doc/layout.xml b/doc/layout.xml
@@ -1,9 +1,3 @@
-<!--
-Copyright Bruno Dutra 2015-2016
-Distributed under the Boost Software License, Version 1.0.
-See accompanying file LICENSE.txt or copy at http://boost.org/LICENSE_1_0.txt
--->
-
 <doxygenlayout version="1.0">
   <navindex>
     <tab type="mainpage" visible="yes" title="Documentation"/>

diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
@@ -1,7 +1,3 @@
-# Copyright Bruno Dutra 2015-2018
-# Distributed under the Boost Software License, Version 1.0.
-# See accompanying file LICENSE.txt or copy at http://boost.org/LICENSE_1_0.txt
-
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/")
 
 find_package(Boost)

diff --git a/example/include/example.hpp b/example/include/example.hpp
@@ -1,7 +1,3 @@
-// Copyright Bruno Dutra 2015-2018
-// Distributed under the Boost Software License, Version 1.0.
-// See accompanying file LICENSE.txt or copy at http://boost.org/LICENSE_1_0.txt
-
 #ifndef METAL_EXAMPLE_HPP
 #define METAL_EXAMPLE_HPP
 

diff --git a/example/src/church.cpp b/example/src/church.cpp
@@ -1,7 +1,3 @@
-// Copyright Bruno Dutra 2015-2018
-// Distributed under the Boost Software License, Version 1.0.
-// See accompanying file LICENSE.txt or copy at http://boost.org/LICENSE_1_0.txt
-
 #include <metal.hpp>
 
 #include "example.hpp"

diff --git a/example/src/expression.cpp b/example/src/expression.cpp
@@ -1,7 +1,3 @@
-// Copyright Bruno Dutra 2015-2018
-// Distributed under the Boost Software License, Version 1.0.
-// See accompanying file LICENSE.txt or copy at http://boost.org/LICENSE_1_0.txt
-
 #include <metal.hpp>
 
 #include "example.hpp"

diff --git a/example/src/lambda.cpp b/example/src/lambda.cpp
@@ -1,7 +1,3 @@
-// Copyright Bruno Dutra 2015-2018
-// Distributed under the Boost Software License, Version 1.0.
-// See accompanying file LICENSE.txt or copy at http://boost.org/LICENSE_1_0.txt
-
 #include <metal.hpp>
 
 #include "example.hpp"

diff --git a/example/src/list.cpp b/example/src/list.cpp
@@ -1,7 +1,3 @@
-// Copyright Bruno Dutra 2015-2018
-// Distributed under the Boost Software License, Version 1.0.
-// See accompanying file LICENSE.txt or copy at http://boost.org/LICENSE_1_0.txt
-
 #include <metal.hpp>
 
 #include <cstdint>

diff --git a/example/src/literal.cpp b/example/src/literal.cpp
@@ -1,7 +1,3 @@
-// Copyright Bruno Dutra 2015-2018
-// Distributed under the Boost Software License, Version 1.0.
-// See accompanying file LICENSE.txt or copy at http://boost.org/LICENSE_1_0.txt
-
 #include <metal.hpp>
 
 #include <cassert>

diff --git a/example/src/map.cpp b/example/src/map.cpp
@@ -1,7 +1,3 @@
-// Copyright Bruno Dutra 2015-2018
-// Distributed under the Boost Software License, Version 1.0.
-// See accompanying file LICENSE.txt or copy at http://boost.org/LICENSE_1_0.txt
-
 #include <metal.hpp>
 
 #include <map>

diff --git a/example/src/mpl.cpp b/example/src/mpl.cpp
@@ -1,7 +1,3 @@
-// Copyright Bruno Dutra 2015-2018
-// Distributed under the Boost Software License, Version 1.0.
-// See accompanying file LICENSE.txt or copy at http://boost.org/LICENSE_1_0.txt
-
 #include <metal.hpp>
 
 #include "example.hpp"

diff --git a/example/src/number.cpp b/example/src/number.cpp
@@ -1,7 +1,3 @@
-// Copyright Bruno Dutra 2015-2018
-// Distributed under the Boost Software License, Version 1.0.
-// See accompanying file LICENSE.txt or copy at http://boost.org/LICENSE_1_0.txt
-
 #include <metal.hpp>
 
 #include "example.hpp"

diff --git a/example/src/pair.cpp b/example/src/pair.cpp
@@ -1,7 +1,3 @@
-// Copyright Bruno Dutra 2015-2018
-// Distributed under the Boost Software License, Version 1.0.
-// See accompanying file LICENSE.txt or copy at http://boost.org/LICENSE_1_0.txt
-
 #include <metal.hpp>
 
 #include <memory>

diff --git a/example/src/sfinae.cpp b/example/src/sfinae.cpp
@@ -1,7 +1,3 @@
-// Copyright Bruno Dutra 2015-2018
-// Distributed under the Boost Software License, Version 1.0.
-// See accompanying file LICENSE.txt or copy at http://boost.org/LICENSE_1_0.txt
-
 #include <metal.hpp>
 
 #include "example.hpp"