Merge branch 'develop'

.github/workflows/gh-pages.yml

@@ -21,9 +21,13 @@ jobs:
           cd ..
           git clone --depth 1 https://github.com/boostorg/boost.git boost-root
           cd boost-root
-          cp -r $GITHUB_WORKSPACE/* libs/qvm
           git submodule update --init tools/build
           git submodule update --init libs/config
+          git submodule update --init libs/leaf
+          cd libs/leaf
+          git checkout master
+          git pull
+          cd ../..
           ./bootstrap.sh
 
       - name: Create user-config.jam

.vscode/tasks.json

@@ -18,7 +18,7 @@
 		{
 			"label": "Generate headers",
 			"type": "shell",
-			"command": "cd ${workspaceRoot} && python gen/generate_single_header.py -i include/boost/qvm/all.hpp -p ${workspaceRoot}/include -o ${workspaceRoot}/test/qvm.hpp boost/qvm && python gen/generate_single_header.py -i include/boost/qvm/lite.hpp -p ${workspaceRoot}/include -o ${workspaceRoot}/test/qvm_lite.hpp boost/qvm",
+			"command": "cd ${workspaceRoot} && python gen/generate_single_header.py -i include/boost/qvm.hpp -p ${workspaceRoot}/include -o ${workspaceRoot}/test/qvm.hpp boost/qvm && python gen/generate_single_header.py -i include/boost/qvm_lite.hpp -p ${workspaceRoot}/include -o ${workspaceRoot}/test/qvm_lite.hpp boost/qvm",
 			"problemMatcher": []
 		},
 		{

gen/generate_single_header.py

@@ -19,6 +19,8 @@
 import argparse
 import os
 import re
+from datetime import date
+import subprocess
 
 included = []
 
@@ -37,8 +39,7 @@ def append(input_file_name, input_file, output_file, regex_includes, include_fol
 				with open(os.path.join(include_folder, next_input_file_name), "r") as next_input_file:
 					output_file.write('// >>> %s#line 1 "%s"\n' % (line, next_input_file_name))
 					append(next_input_file_name, next_input_file, output_file, regex_includes, include_folder)
-					if not ('include/boost/qvm/detail/all.hpp' in input_file_name):
-						output_file.write('// <<< %s#line %d "%s"\n' % (line, line_count, input_file_name))
+					output_file.write('// <<< %s#line %d "%s"\n' % (line, line_count, input_file_name))
 		else:
 			if '///' in line:
 				continue
@@ -64,13 +65,20 @@ def _main():
 	print("Rebuilding %s:" % args.input)
 	with open(args.output, 'w') as output_file, open(args.input, 'r') as input_file:
 		output_file.write(
+			'// QVM single header distribution. Do not edit.\n'
+			'\n'
+			'// Generated from https://github.com/boostorg/qvm on ' + date.today().strftime("%B %d, %Y") + ',\n'
+			'// Git hash ' + subprocess.check_output(['git', 'rev-parse', 'HEAD']).decode().rstrip() + '.\n'
+			'\n'
+			'// Latest versions:\n'
+			'//      https://boostorg.github.io/qvm/qvm.hpp\n'
+			'//      https://boostorg.github.io/qvm/qvm_lite.hpp\n'
+			'\n'
 			'// Copyright (c) 2008-2021 Emil Dotchevski and Reverge Studios, Inc.\n'
-			'// Copyright (c) 2018-2019 agate-pris\n'
 			'\n'
 			'// Distributed under the Boost Software License, Version 1.0. (See accompanying\n'
 			'// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\n'
-			'\n'
-			'// This file was generated by a program. Do not edit manually.\n\n' )
+			'\n' )
 		append(args.input, input_file, output_file, regex_includes, args.path)
 
 if __name__ == "__main__":

include/boost/qvm.hpp

@@ -0,0 +1,11 @@
+#ifndef BOOST_QVM_HPP_INCLUDED
+#define BOOST_QVM_HPP_INCLUDED
+
+/// Copyright (c) 2008-2021 Emil Dotchevski and Reverge Studios, Inc.
+
+/// 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)
+
+#include <boost/qvm/all.hpp>
+
+#endif

include/boost/qvm/all.hpp

@@ -1,6 +1,3 @@
-#ifndef BOOST_QVM_ALL_HPP_INCLUDED
-#define BOOST_QVM_ALL_HPP_INCLUDED
-
 /// Copyright (c) 2008-2021 Emil Dotchevski and Reverge Studios, Inc.
 
 /// Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -8,5 +5,3 @@
 
 #include <boost/qvm/lite.hpp>
 #include <boost/qvm/swizzle.hpp>
-
-#endif

include/boost/qvm/lite.hpp

@@ -1,6 +1,3 @@
-#ifndef BOOST_QVM_LITE_HPP_INCLUDED
-#define BOOST_QVM_LITE_HPP_INCLUDED
-
 /// Copyright (c) 2008-2021 Emil Dotchevski and Reverge Studios, Inc.
 
 /// Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -28,5 +25,3 @@
 #include <boost/qvm/vec_register.hpp>
 #include <boost/qvm/map.hpp>
 #include <boost/qvm/to_string.hpp>
-
-#endif

include/boost/qvm_lite.hpp

@@ -0,0 +1,11 @@
+#ifndef BOOST_QVM_LITE_HPP_INCLUDED
+#define BOOST_QVM_LITE_HPP_INCLUDED
+
+/// Copyright (c) 2008-2021 Emil Dotchevski and Reverge Studios, Inc.
+
+/// 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)
+
+#include <boost/qvm/lite.hpp>
+
+#endif

meta/libraries.json

@@ -13,5 +13,6 @@
     ],
     "maintainers": [
         "Emil Dotchevski <emil@revergestudios.com>"
-    ]
+    ],
+    "cxxstd": "03"
 }