From 1b615c04a26337f0170ecff49b0a6c2522b49eaf Mon Sep 17 00:00:00 2001
From: AlexisWilke
Date: Fri, 13 Nov 2020 20:01:35 -0800
Subject: [PATCH 01/64] Updated csspp to compile against the newest version of
advgetopt.
---
debian/changelog | 6 ++++++
src/csspp.cpp | 1 +
2 files changed, 7 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index fa81917..9177c01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+csspp (1.0.27.0~xenial) xenial; urgency=high
+
+ * Updated csspp to compile against the newest version of advgetopt.
+
+ -- Alexis Wilke Fri, 13 Nov 2020 20:01:29 -0800
+
csspp (1.0.26.0~xenial) xenial; urgency=high
* Fixed the advgetopt exception names.
diff --git a/src/csspp.cpp b/src/csspp.cpp
index f2afa03..03369d5 100644
--- a/src/csspp.cpp
+++ b/src/csspp.cpp
@@ -353,6 +353,7 @@ constexpr advgetopt::option g_options[] =
advgetopt::options_environment const g_options_environment =
{
.f_project_name = "csspp",
+ .f_group_name = nullptr,
.f_options = g_options,
.f_options_files_directory = nullptr,
.f_environment_variable_name = "CSSPPFLAGS",
From 58419e1ff6121e857544703f7fdd4f7365bf605e Mon Sep 17 00:00:00 2001
From: AlexisWilke
Date: Fri, 13 Nov 2020 20:44:19 -0800
Subject: [PATCH 02/64] Adjusted version for advgetopt
---
debian/changelog | 7 +++++++
debian/control | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 9177c01..4dacbae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+csspp (1.0.27.1~xenial) xenial; urgency=high
+
+ * Bump version for a rebuild.
+ * Adjusted version for advgetopt (min. needed is 2.0.14 now).
+
+ -- Alexis Wilke Fri, 13 Nov 2020 20:44:08 -0800
+
csspp (1.0.27.0~xenial) xenial; urgency=high
* Updated csspp to compile against the newest version of advgetopt.
diff --git a/debian/control b/debian/control
index 428568f..553d2d0 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Build-Depends: catch (>= 1.0),
debhelper,
doxygen,
graphviz,
- libadvgetopt-dev (>= 2.0.4.0~xenial),
+ libadvgetopt-dev (>= 2.0.14.0~xenial),
libboost-dev,
libexcept-dev (>= 1.0.5.0~xenial),
libutf8-dev (>= 1.0.6.0~xenial),
From 8f37032b2f0930e51ccedab4f4a2aa8d776aeae9 Mon Sep 17 00:00:00 2001
From: AlexisWilke
Date: Fri, 15 Jan 2021 20:39:03 -0800
Subject: [PATCH 03/64] Bumped version to recompile.
---
debian/changelog | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 4dacbae..0c9925f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+csspp (1.0.27.2~xenial) xenial; urgency=high
+
+ * Bump version for a rebuild for newer cppthread.
+
+ -- Alexis Wilke Fri, 15 Jan 2021 20:38:56 -0800
+
csspp (1.0.27.1~xenial) xenial; urgency=high
* Bump version for a rebuild.
From 10a8f9a7bb6d955ffa561ba948ce887dff72b679 Mon Sep 17 00:00:00 2001
From: AlexisWilke
Date: Mon, 15 Mar 2021 23:10:08 -0700
Subject: [PATCH 04/64] Updated the copyright notices.
---
CMakeLists.txt | 2 +-
debian/changelog | 7 +++++++
dev/MasterCMakeLists.txt | 2 +-
dev/build-release | 2 +-
dev/coverage | 2 +-
dev/pack | 2 +-
dev/version | 2 +-
doc/CMakeLists.txt | 2 +-
doc/pages/compiler-at-keywords.cpp | 2 +-
doc/pages/compiler-expression-by-type.cpp | 2 +-
doc/pages/compiler-expression-page.cpp | 2 +-
doc/pages/compiler-page.cpp | 2 +-
doc/pages/compiler-selectors-rules.cpp | 2 +-
doc/pages/lexer-page.cpp | 4 ++--
doc/pages/main.cpp | 2 +-
doc/pages/parser-page.cpp | 2 +-
include/CMakeLists.txt | 2 +-
include/csspp/assembler.h | 2 +-
include/csspp/color.h | 2 +-
include/csspp/compiler.h | 2 +-
include/csspp/csspp.h.in | 2 +-
include/csspp/error.h | 2 +-
include/csspp/exceptions.h | 2 +-
include/csspp/expression.h | 2 +-
include/csspp/lexer.h | 2 +-
include/csspp/node.h | 2 +-
include/csspp/nth_child.h | 2 +-
include/csspp/parser.h | 2 +-
include/csspp/position.h | 2 +-
include/csspp/unicode_range.h | 2 +-
lib/CMakeLists.txt | 2 +-
lib/CSSPPConfig.cmake.in | 2 +-
lib/CSSPPConfigVersion.cmake.in | 2 +-
lib/assembler.cpp | 2 +-
lib/color.cpp | 2 +-
lib/compiler.cpp | 2 +-
lib/csspp.cpp | 2 +-
lib/error.cpp | 2 +-
lib/expr_additive.cpp | 2 +-
lib/expr_conditional.cpp | 2 +-
lib/expr_equality.cpp | 2 +-
lib/expr_list.cpp | 2 +-
lib/expr_logical_and.cpp | 2 +-
lib/expr_logical_or.cpp | 2 +-
lib/expr_multiplicative.cpp | 2 +-
lib/expr_power.cpp | 2 +-
lib/expr_relational.cpp | 2 +-
lib/expr_unary.cpp | 2 +-
lib/expression.cpp | 2 +-
lib/internal_functions.cpp | 2 +-
lib/lexer.cpp | 2 +-
lib/node.cpp | 2 +-
lib/nth_child.cpp | 2 +-
lib/parser.cpp | 2 +-
lib/position.cpp | 2 +-
lib/unicode_range.cpp | 2 +-
scripts/CMakeLists.txt | 2 +-
scripts/system/close.scss | 2 +-
scripts/system/constants.scss | 2 +-
scripts/system/functions.scss | 2 +-
scripts/system/init.scss | 2 +-
scripts/system/logo.scss | 2 +-
scripts/system/selectors.scss | 2 +-
scripts/system/version.scss.in | 2 +-
scripts/validation/countries.scss | 2 +-
scripts/validation/has-font-metrics.scss | 2 +-
scripts/validation/languages.scss | 2 +-
scripts/validation/pseudo-classes.scss | 2 +-
scripts/validation/pseudo-elements.scss | 2 +-
scripts/validation/pseudo-functions.scss | 2 +-
scripts/validation/pseudo-nth-functions.scss | 2 +-
scripts/validation/slash-separator.scss | 2 +-
src/CMakeLists.txt | 2 +-
src/csspp.cpp | 2 +-
tests/CMakeLists.txt | 2 +-
tests/catch_assembler.cpp | 22 ++++++++++----------
tests/catch_color.cpp | 2 +-
tests/catch_compiler.cpp | 2 +-
tests/catch_csspp.cpp | 2 +-
tests/catch_error.cpp | 2 +-
tests/catch_expr_additive.cpp | 2 +-
tests/catch_expr_conditional.cpp | 2 +-
tests/catch_expr_equality.cpp | 2 +-
tests/catch_expr_list.cpp | 2 +-
tests/catch_expr_logical_and.cpp | 2 +-
tests/catch_expr_logical_or.cpp | 2 +-
tests/catch_expr_multiplicative.cpp | 2 +-
tests/catch_expr_power.cpp | 2 +-
tests/catch_expr_relational.cpp | 2 +-
tests/catch_expr_unary.cpp | 2 +-
tests/catch_internal_functions.cpp | 2 +-
tests/catch_lexer.cpp | 2 +-
tests/catch_node.cpp | 2 +-
tests/catch_nth_child.cpp | 2 +-
tests/catch_parser.cpp | 6 +++---
tests/catch_position.cpp | 2 +-
tests/catch_tests.cpp | 2 +-
tests/catch_tests.h | 2 +-
tests/catch_unicode_range.cpp | 2 +-
99 files changed, 118 insertions(+), 111 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf10526..e0b3112 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@
#
# License:
# csspp -- a CSS Preprocessor
-# Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+# Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
#
# https://snapwebsites.org/
# contact@m2osw.com
diff --git a/debian/changelog b/debian/changelog
index 0c9925f..86c33aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+csspp (1.0.27.3~xenial) xenial; urgency=high
+
+ * Bump version for a rebuild for newer cppthread.
+ * Updated the copyright notices.
+
+ -- Alexis Wilke Mon, 15 Mar 2021 23:08:31 -0700
+
csspp (1.0.27.2~xenial) xenial; urgency=high
* Bump version for a rebuild for newer cppthread.
diff --git a/dev/MasterCMakeLists.txt b/dev/MasterCMakeLists.txt
index 3f1a8a4..1064931 100644
--- a/dev/MasterCMakeLists.txt
+++ b/dev/MasterCMakeLists.txt
@@ -11,7 +11,7 @@
# See the CMake documentation.
#
# License:
-# Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+# Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
#
# https://snapwebsites.org/
# contact@m2osw.com
diff --git a/dev/build-release b/dev/build-release
index fd51220..1177ff1 100755
--- a/dev/build-release
+++ b/dev/build-release
@@ -12,7 +12,7 @@
#
# License:
# csspp -- a CSS Preprocessor
-# Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+# Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
#
# https://snapwebsites.org/
# contact@m2osw.com
diff --git a/dev/coverage b/dev/coverage
index 9cac22a..25ea5a3 100755
--- a/dev/coverage
+++ b/dev/coverage
@@ -11,7 +11,7 @@
#
# License:
# csspp -- a CSS Preprocessor
-# Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+# Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
#
# https://snapwebsites.org/
# contact@m2osw.com
diff --git a/dev/pack b/dev/pack
index 5395f6b..d3a94c1 100755
--- a/dev/pack
+++ b/dev/pack
@@ -14,7 +14,7 @@
#
# License:
# csspp -- a CSS Preprocessor
-# Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+# Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
#
# https://snapwebsites.org/project/csspp
# contact@m2osw.com
diff --git a/dev/version b/dev/version
index 0500df3..19e2afd 100755
--- a/dev/version
+++ b/dev/version
@@ -11,7 +11,7 @@
#
# License:
# csspp -- a CSS Preprocessor
-# Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+# Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
#
# https://snapwebsites.org/
# contact@m2osw.com
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index a20f79c..bdcafc8 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -10,7 +10,7 @@
#
# License:
# csspp -- a CSS Preprocessor
-# Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+# Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
#
# https://snapwebsites.org/
# contact@m2osw.com
diff --git a/doc/pages/compiler-at-keywords.cpp b/doc/pages/compiler-at-keywords.cpp
index 87e83b3..c919702 100644
--- a/doc/pages/compiler-at-keywords.cpp
+++ b/doc/pages/compiler-at-keywords.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/doc/pages/compiler-expression-by-type.cpp b/doc/pages/compiler-expression-by-type.cpp
index ecbb045..aa899e1 100644
--- a/doc/pages/compiler-expression-by-type.cpp
+++ b/doc/pages/compiler-expression-by-type.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/doc/pages/compiler-expression-page.cpp b/doc/pages/compiler-expression-page.cpp
index a7e41c2..0350082 100644
--- a/doc/pages/compiler-expression-page.cpp
+++ b/doc/pages/compiler-expression-page.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/doc/pages/compiler-page.cpp b/doc/pages/compiler-page.cpp
index 20dcd46..5f77d4f 100644
--- a/doc/pages/compiler-page.cpp
+++ b/doc/pages/compiler-page.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/doc/pages/compiler-selectors-rules.cpp b/doc/pages/compiler-selectors-rules.cpp
index a1f4146..1992ef6 100644
--- a/doc/pages/compiler-selectors-rules.cpp
+++ b/doc/pages/compiler-selectors-rules.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/doc/pages/lexer-page.cpp b/doc/pages/lexer-page.cpp
index bd1afb4..128d143 100644
--- a/doc/pages/lexer-page.cpp
+++ b/doc/pages/lexer-page.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -298,7 +298,7 @@
*
* \code
* // CSS Preprocessor
- * // Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+ * // Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
* //
* // @preserve
* \endcode
diff --git a/doc/pages/main.cpp b/doc/pages/main.cpp
index f85d4d2..416aeb9 100644
--- a/doc/pages/main.cpp
+++ b/doc/pages/main.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/doc/pages/parser-page.cpp b/doc/pages/parser-page.cpp
index 5ee8303..42a2d3c 100644
--- a/doc/pages/parser-page.cpp
+++ b/doc/pages/parser-page.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 972f390..129a257 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -9,7 +9,7 @@
# See the CMake documentation.
#
# License:
-# Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+# Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
#
# https://snapwebsites.org/
# contact@m2osw.com
diff --git a/include/csspp/assembler.h b/include/csspp/assembler.h
index 0294a89..0d1cbb1 100644
--- a/include/csspp/assembler.h
+++ b/include/csspp/assembler.h
@@ -1,7 +1,7 @@
#ifndef CSSPP_ASSEMBLER_H
#define CSSPP_ASSEMBLER_H
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/include/csspp/color.h b/include/csspp/color.h
index 5e1d37a..ced78cc 100644
--- a/include/csspp/color.h
+++ b/include/csspp/color.h
@@ -1,7 +1,7 @@
#ifndef CSSPP_COLOR_H
#define CSSPP_COLOR_H
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/include/csspp/compiler.h b/include/csspp/compiler.h
index b49676c..797a87d 100644
--- a/include/csspp/compiler.h
+++ b/include/csspp/compiler.h
@@ -1,7 +1,7 @@
#ifndef CSSPP_COMPILER_H
#define CSSPP_COMPILER_H
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/include/csspp/csspp.h.in b/include/csspp/csspp.h.in
index 7638b22..53b4519 100644
--- a/include/csspp/csspp.h.in
+++ b/include/csspp/csspp.h.in
@@ -1,7 +1,7 @@
#ifndef CSSPP_CSSPP_H
#define CSSPP_CSSPP_H
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/include/csspp/error.h b/include/csspp/error.h
index a0fa556..3d781e6 100644
--- a/include/csspp/error.h
+++ b/include/csspp/error.h
@@ -1,7 +1,7 @@
#ifndef CSSPP_ERROR_H
#define CSSPP_ERROR_H
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/include/csspp/exceptions.h b/include/csspp/exceptions.h
index 09f2656..98b4edd 100644
--- a/include/csspp/exceptions.h
+++ b/include/csspp/exceptions.h
@@ -1,7 +1,7 @@
#ifndef CSSPP_EXCEPTIONS_H
#define CSSPP_EXCEPTIONS_H
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/include/csspp/expression.h b/include/csspp/expression.h
index ea9f7fb..0ab53bd 100644
--- a/include/csspp/expression.h
+++ b/include/csspp/expression.h
@@ -1,7 +1,7 @@
#ifndef CSSPP_EXPRESSION_H
#define CSSPP_EXPRESSION_H
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/include/csspp/lexer.h b/include/csspp/lexer.h
index dfd8b9e..fd31a24 100644
--- a/include/csspp/lexer.h
+++ b/include/csspp/lexer.h
@@ -1,7 +1,7 @@
#ifndef CSSPP_LEXER_H
#define CSSPP_LEXER_H
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/include/csspp/node.h b/include/csspp/node.h
index a12d85d..7fd5846 100644
--- a/include/csspp/node.h
+++ b/include/csspp/node.h
@@ -1,7 +1,7 @@
#ifndef CSSPP_NODE_H
#define CSSPP_NODE_H
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/include/csspp/nth_child.h b/include/csspp/nth_child.h
index 1f54326..a3fb951 100644
--- a/include/csspp/nth_child.h
+++ b/include/csspp/nth_child.h
@@ -1,7 +1,7 @@
#ifndef CSSPP_NTH_CHILD_H
#define CSSPP_NTH_CHILD_H
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/include/csspp/parser.h b/include/csspp/parser.h
index 9a058ba..c69c8b4 100644
--- a/include/csspp/parser.h
+++ b/include/csspp/parser.h
@@ -1,7 +1,7 @@
#ifndef CSSPP_PARSER_H
#define CSSPP_PARSER_H
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/include/csspp/position.h b/include/csspp/position.h
index e4096b2..1159575 100644
--- a/include/csspp/position.h
+++ b/include/csspp/position.h
@@ -1,7 +1,7 @@
#ifndef CSSPP_POSITION_H
#define CSSPP_POSITION_H
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/include/csspp/unicode_range.h b/include/csspp/unicode_range.h
index 25b5ba4..d9f6c65 100644
--- a/include/csspp/unicode_range.h
+++ b/include/csspp/unicode_range.h
@@ -1,7 +1,7 @@
#ifndef CSSPP_UNICODE_RANGE_H
#define CSSPP_UNICODE_RANGE_H
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 2c3e75f..8102710 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -9,7 +9,7 @@
# See the CMake documentation.
#
# License:
-# Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+# Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
#
# https://snapwebsites.org/
# contact@m2osw.com
diff --git a/lib/CSSPPConfig.cmake.in b/lib/CSSPPConfig.cmake.in
index 4a1b7ef..814355f 100644
--- a/lib/CSSPPConfig.cmake.in
+++ b/lib/CSSPPConfig.cmake.in
@@ -8,7 +8,7 @@
# CSSPP_DEFINITIONS - Compiler switches required for linking against csspp
#
# License:
-# Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+# Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/CSSPPConfigVersion.cmake.in b/lib/CSSPPConfigVersion.cmake.in
index e5ff346..07c253b 100644
--- a/lib/CSSPPConfigVersion.cmake.in
+++ b/lib/CSSPPConfigVersion.cmake.in
@@ -1,7 +1,7 @@
# Verify CSS Preprocessor version validity.
#
# License:
-# Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+# Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/lib/assembler.cpp b/lib/assembler.cpp
index de8a03a..adf1cda 100644
--- a/lib/assembler.cpp
+++ b/lib/assembler.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/lib/color.cpp b/lib/color.cpp
index 10ebe4a..6313243 100644
--- a/lib/color.cpp
+++ b/lib/color.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/lib/compiler.cpp b/lib/compiler.cpp
index 059e0d2..3ee0fb2 100644
--- a/lib/compiler.cpp
+++ b/lib/compiler.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/lib/csspp.cpp b/lib/csspp.cpp
index 626874d..0f08b01 100644
--- a/lib/csspp.cpp
+++ b/lib/csspp.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/lib/error.cpp b/lib/error.cpp
index dbc7609..6925c84 100644
--- a/lib/error.cpp
+++ b/lib/error.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/lib/expr_additive.cpp b/lib/expr_additive.cpp
index 4d45770..4a61b8e 100644
--- a/lib/expr_additive.cpp
+++ b/lib/expr_additive.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/lib/expr_conditional.cpp b/lib/expr_conditional.cpp
index b6c11ba..0601348 100644
--- a/lib/expr_conditional.cpp
+++ b/lib/expr_conditional.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/lib/expr_equality.cpp b/lib/expr_equality.cpp
index b422588..0e4b27a 100644
--- a/lib/expr_equality.cpp
+++ b/lib/expr_equality.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/lib/expr_list.cpp b/lib/expr_list.cpp
index 0091668..760444b 100644
--- a/lib/expr_list.cpp
+++ b/lib/expr_list.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/lib/expr_logical_and.cpp b/lib/expr_logical_and.cpp
index 26a30c5..cd461f0 100644
--- a/lib/expr_logical_and.cpp
+++ b/lib/expr_logical_and.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/lib/expr_logical_or.cpp b/lib/expr_logical_or.cpp
index 29938d6..6c32091 100644
--- a/lib/expr_logical_or.cpp
+++ b/lib/expr_logical_or.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/lib/expr_multiplicative.cpp b/lib/expr_multiplicative.cpp
index 0a0674c..2dfa742 100644
--- a/lib/expr_multiplicative.cpp
+++ b/lib/expr_multiplicative.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/lib/expr_power.cpp b/lib/expr_power.cpp
index d02a377..0be7aa8 100644
--- a/lib/expr_power.cpp
+++ b/lib/expr_power.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/lib/expr_relational.cpp b/lib/expr_relational.cpp
index 3275704..5e9895b 100644
--- a/lib/expr_relational.cpp
+++ b/lib/expr_relational.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/lib/expr_unary.cpp b/lib/expr_unary.cpp
index 4458b89..2f6848d 100644
--- a/lib/expr_unary.cpp
+++ b/lib/expr_unary.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/lib/expression.cpp b/lib/expression.cpp
index 68baf81..63b61b5 100644
--- a/lib/expression.cpp
+++ b/lib/expression.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/lib/internal_functions.cpp b/lib/internal_functions.cpp
index e5f804d..ad57e7c 100644
--- a/lib/internal_functions.cpp
+++ b/lib/internal_functions.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/lib/lexer.cpp b/lib/lexer.cpp
index 9786e9e..603279e 100644
--- a/lib/lexer.cpp
+++ b/lib/lexer.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/lib/node.cpp b/lib/node.cpp
index 7d9d224..411e9ef 100644
--- a/lib/node.cpp
+++ b/lib/node.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/lib/nth_child.cpp b/lib/nth_child.cpp
index 7090f8b..d191839 100644
--- a/lib/nth_child.cpp
+++ b/lib/nth_child.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/lib/parser.cpp b/lib/parser.cpp
index 3ae7c88..21d9837 100644
--- a/lib/parser.cpp
+++ b/lib/parser.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/lib/position.cpp b/lib/position.cpp
index 593fa9b..45b77c4 100644
--- a/lib/position.cpp
+++ b/lib/position.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/lib/unicode_range.cpp b/lib/unicode_range.cpp
index 0861179..18f4b91 100644
--- a/lib/unicode_range.cpp
+++ b/lib/unicode_range.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 4492e34..4d918e9 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -10,7 +10,7 @@
#
# License:
# csspp -- a CSS Preprocessor
-# Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+# Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
#
# https://snapwebsites.org/
# contact@m2osw.com
diff --git a/scripts/system/close.scss b/scripts/system/close.scss
index 0b801df..fcf5a01 100644
--- a/scripts/system/close.scss
+++ b/scripts/system/close.scss
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/scripts/system/constants.scss b/scripts/system/constants.scss
index 0bfe6e6..55f48ab 100644
--- a/scripts/system/constants.scss
+++ b/scripts/system/constants.scss
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/scripts/system/functions.scss b/scripts/system/functions.scss
index 5904dc2..93b41b2 100644
--- a/scripts/system/functions.scss
+++ b/scripts/system/functions.scss
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/scripts/system/init.scss b/scripts/system/init.scss
index 951c348..a13771f 100644
--- a/scripts/system/init.scss
+++ b/scripts/system/init.scss
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/scripts/system/logo.scss b/scripts/system/logo.scss
index aa9346c..804b9bb 100644
--- a/scripts/system/logo.scss
+++ b/scripts/system/logo.scss
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/scripts/system/selectors.scss b/scripts/system/selectors.scss
index f55c784..45a447a 100644
--- a/scripts/system/selectors.scss
+++ b/scripts/system/selectors.scss
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/scripts/system/version.scss.in b/scripts/system/version.scss.in
index 3bcef7a..dcd1f91 100644
--- a/scripts/system/version.scss.in
+++ b/scripts/system/version.scss.in
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/scripts/validation/countries.scss b/scripts/validation/countries.scss
index 0bc35e4..5cb4713 100644
--- a/scripts/validation/countries.scss
+++ b/scripts/validation/countries.scss
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/scripts/validation/has-font-metrics.scss b/scripts/validation/has-font-metrics.scss
index 9b7134f..cdbd4d7 100644
--- a/scripts/validation/has-font-metrics.scss
+++ b/scripts/validation/has-font-metrics.scss
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/scripts/validation/languages.scss b/scripts/validation/languages.scss
index 11b15a9..1cd3918 100644
--- a/scripts/validation/languages.scss
+++ b/scripts/validation/languages.scss
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/scripts/validation/pseudo-classes.scss b/scripts/validation/pseudo-classes.scss
index 99209be..69811a7 100644
--- a/scripts/validation/pseudo-classes.scss
+++ b/scripts/validation/pseudo-classes.scss
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/scripts/validation/pseudo-elements.scss b/scripts/validation/pseudo-elements.scss
index bc90a86..52b2ff2 100644
--- a/scripts/validation/pseudo-elements.scss
+++ b/scripts/validation/pseudo-elements.scss
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/scripts/validation/pseudo-functions.scss b/scripts/validation/pseudo-functions.scss
index ce88aed..eefcb12 100644
--- a/scripts/validation/pseudo-functions.scss
+++ b/scripts/validation/pseudo-functions.scss
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/scripts/validation/pseudo-nth-functions.scss b/scripts/validation/pseudo-nth-functions.scss
index 6d9275d..32db331 100644
--- a/scripts/validation/pseudo-nth-functions.scss
+++ b/scripts/validation/pseudo-nth-functions.scss
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/scripts/validation/slash-separator.scss b/scripts/validation/slash-separator.scss
index 13127b5..9b83395 100644
--- a/scripts/validation/slash-separator.scss
+++ b/scripts/validation/slash-separator.scss
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5b0d168..a1ba9c8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,7 +10,7 @@
#
# License:
# csspp -- a CSS Preprocessor
-# Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+# Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
#
# https://snapwebsites.org/
# contact@m2osw.com
diff --git a/src/csspp.cpp b/src/csspp.cpp
index 03369d5..69162b9 100644
--- a/src/csspp.cpp
+++ b/src/csspp.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f67dc79..7cc05aa 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -10,7 +10,7 @@
#
# License:
# CSS Preprocessor -- Test Suite
-# Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+# Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
#
# https://snapwebsites.org/
# contact@m2osw.com
diff --git a/tests/catch_assembler.cpp b/tests/catch_assembler.cpp
index b36e75c..3997a95 100644
--- a/tests/catch_assembler.cpp
+++ b/tests/catch_assembler.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor -- Test Suite
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -2431,7 +2431,7 @@ TEST_CASE("Assemble C++ comment", "[assembler] [comment]")
++i)
{
std::stringstream ss;
- ss << "// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved. -- Assembler Test Version {$_csspp_version} -- @preserve\n"
+ ss << "// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved. -- Assembler Test Version {$_csspp_version} -- @preserve\n"
<< "body.error { color: red }\n";
csspp::position pos("test.css");
csspp::lexer::pointer_t l(new csspp::lexer(ss, pos));
@@ -2462,7 +2462,7 @@ TEST_CASE("Assemble C++ comment", "[assembler] [comment]")
{
case csspp::output_mode_t::COMPACT:
REQUIRE(out.str() ==
-"/* Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved. -- Assembler Test Version " CSSPP_VERSION " -- @preserve */\n"
+"/* Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved. -- Assembler Test Version " CSSPP_VERSION " -- @preserve */\n"
"body.error { color: red }\n"
+ csspp_test::get_close_comment()
);
@@ -2470,7 +2470,7 @@ TEST_CASE("Assemble C++ comment", "[assembler] [comment]")
case csspp::output_mode_t::COMPRESSED:
REQUIRE(out.str() ==
-"/* Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved. -- Assembler Test Version " CSSPP_VERSION " -- @preserve */\n"
+"/* Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved. -- Assembler Test Version " CSSPP_VERSION " -- @preserve */\n"
"body.error{color:red}\n"
+ csspp_test::get_close_comment()
);
@@ -2478,7 +2478,7 @@ TEST_CASE("Assemble C++ comment", "[assembler] [comment]")
case csspp::output_mode_t::EXPANDED:
REQUIRE(out.str() ==
-"/* Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved. -- Assembler Test Version " CSSPP_VERSION " -- @preserve */\n"
+"/* Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved. -- Assembler Test Version " CSSPP_VERSION " -- @preserve */\n"
"body.error\n"
"{\n"
" color: red;\n"
@@ -2489,7 +2489,7 @@ TEST_CASE("Assemble C++ comment", "[assembler] [comment]")
case csspp::output_mode_t::TIDY:
REQUIRE(out.str() ==
-"/* Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved. -- Assembler Test Version" CSSPP_VERSION " -- @preserve */\n"
+"/* Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved. -- Assembler Test Version" CSSPP_VERSION " -- @preserve */\n"
"body.error{color:red}\n"
+ csspp_test::get_close_comment()
);
@@ -2506,7 +2506,7 @@ TEST_CASE("Assemble C++ comment", "[assembler] [comment]")
++i)
{
std::stringstream ss;
- ss << "// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved.\n"
+ ss << "// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved.\n"
<< "// Assembler Test\n"
<< "// @preserve\n"
<< "body.error { color: red }\n";
@@ -2539,7 +2539,7 @@ TEST_CASE("Assemble C++ comment", "[assembler] [comment]")
{
case csspp::output_mode_t::COMPACT:
REQUIRE(out.str() ==
-"/* Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved.\n"
+"/* Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved.\n"
" * Assembler Test\n"
" * @preserve\n"
" */\n"
@@ -2550,7 +2550,7 @@ TEST_CASE("Assemble C++ comment", "[assembler] [comment]")
case csspp::output_mode_t::COMPRESSED:
REQUIRE(out.str() ==
-"/* Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved.\n"
+"/* Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved.\n"
" * Assembler Test\n"
" * @preserve\n"
" */\n"
@@ -2561,7 +2561,7 @@ TEST_CASE("Assemble C++ comment", "[assembler] [comment]")
case csspp::output_mode_t::EXPANDED:
REQUIRE(out.str() ==
-"/* Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved.\n"
+"/* Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved.\n"
" * Assembler Test\n"
" * @preserve\n"
" */\n"
@@ -2575,7 +2575,7 @@ TEST_CASE("Assemble C++ comment", "[assembler] [comment]")
case csspp::output_mode_t::TIDY:
REQUIRE(out.str() ==
-"/* Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved.\n"
+"/* Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved.\n"
" * Assembler Test\n"
" * @preserve\n"
" */\n"
diff --git a/tests/catch_color.cpp b/tests/catch_color.cpp
index cc1ae28..40e97cf 100644
--- a/tests/catch_color.cpp
+++ b/tests/catch_color.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor -- Test Suite
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/tests/catch_compiler.cpp b/tests/catch_compiler.cpp
index f45f142..3430d07 100644
--- a/tests/catch_compiler.cpp
+++ b/tests/catch_compiler.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor -- Test Suite
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/tests/catch_csspp.cpp b/tests/catch_csspp.cpp
index 7751ca0..e22e563 100644
--- a/tests/catch_csspp.cpp
+++ b/tests/catch_csspp.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor -- Test Suite
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/tests/catch_error.cpp b/tests/catch_error.cpp
index 6ac75c5..1e2682e 100644
--- a/tests/catch_error.cpp
+++ b/tests/catch_error.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor -- Test Suite
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/tests/catch_expr_additive.cpp b/tests/catch_expr_additive.cpp
index ad3a4cc..9550959 100644
--- a/tests/catch_expr_additive.cpp
+++ b/tests/catch_expr_additive.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor -- Test Suite
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/tests/catch_expr_conditional.cpp b/tests/catch_expr_conditional.cpp
index 7726403..eab6147 100644
--- a/tests/catch_expr_conditional.cpp
+++ b/tests/catch_expr_conditional.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor -- Test Suite
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/tests/catch_expr_equality.cpp b/tests/catch_expr_equality.cpp
index bbb6ed5..1f6a352 100644
--- a/tests/catch_expr_equality.cpp
+++ b/tests/catch_expr_equality.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor -- Test Suite
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/tests/catch_expr_list.cpp b/tests/catch_expr_list.cpp
index 559aceb..8fd5a47 100644
--- a/tests/catch_expr_list.cpp
+++ b/tests/catch_expr_list.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor -- Test Suite
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/tests/catch_expr_logical_and.cpp b/tests/catch_expr_logical_and.cpp
index cd78cae..c9616cb 100644
--- a/tests/catch_expr_logical_and.cpp
+++ b/tests/catch_expr_logical_and.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor -- Test Suite
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/tests/catch_expr_logical_or.cpp b/tests/catch_expr_logical_or.cpp
index 0f59136..e96e565 100644
--- a/tests/catch_expr_logical_or.cpp
+++ b/tests/catch_expr_logical_or.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor -- Test Suite
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/tests/catch_expr_multiplicative.cpp b/tests/catch_expr_multiplicative.cpp
index dd02b87..a452894 100644
--- a/tests/catch_expr_multiplicative.cpp
+++ b/tests/catch_expr_multiplicative.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor -- Test Suite
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/tests/catch_expr_power.cpp b/tests/catch_expr_power.cpp
index e0485f0..e1bf948 100644
--- a/tests/catch_expr_power.cpp
+++ b/tests/catch_expr_power.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor -- Test Suite
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/tests/catch_expr_relational.cpp b/tests/catch_expr_relational.cpp
index dfd35fa..9f7b02b 100644
--- a/tests/catch_expr_relational.cpp
+++ b/tests/catch_expr_relational.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor -- Test Suite
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/tests/catch_expr_unary.cpp b/tests/catch_expr_unary.cpp
index b0b300a..fc4460b 100644
--- a/tests/catch_expr_unary.cpp
+++ b/tests/catch_expr_unary.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor -- Test Suite
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/tests/catch_internal_functions.cpp b/tests/catch_internal_functions.cpp
index e66db9e..e9f5d02 100644
--- a/tests/catch_internal_functions.cpp
+++ b/tests/catch_internal_functions.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor -- Test Suite
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/tests/catch_lexer.cpp b/tests/catch_lexer.cpp
index 6db8108..e938f7b 100644
--- a/tests/catch_lexer.cpp
+++ b/tests/catch_lexer.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor -- Test Suite
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/tests/catch_node.cpp b/tests/catch_node.cpp
index 0c6b8b1..4825b92 100644
--- a/tests/catch_node.cpp
+++ b/tests/catch_node.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor -- Test Suite
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/tests/catch_nth_child.cpp b/tests/catch_nth_child.cpp
index c814c18..b374bf3 100644
--- a/tests/catch_nth_child.cpp
+++ b/tests/catch_nth_child.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor -- Test Suite
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/tests/catch_parser.cpp b/tests/catch_parser.cpp
index d9cda2d..fc0e51e 100644
--- a/tests/catch_parser.cpp
+++ b/tests/catch_parser.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor -- Test Suite
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -200,7 +200,7 @@ TEST_CASE("Simple stylesheets", "[parser] [stylesheet] [rules]")
std::stringstream ss;
ss << "// $Id: ...$\n"
<< "div { border: 1px; }\n"
- << "/* @preserve Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved. */";
+ << "/* @preserve Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved. */";
csspp::position pos("test.css");
csspp::lexer::pointer_t l(new csspp::lexer(ss, pos));
@@ -223,7 +223,7 @@ TEST_CASE("Simple stylesheets", "[parser] [stylesheet] [rules]")
" COLON\n"
" WHITESPACE\n"
" INTEGER \"px\" I:1\n"
-" COMMENT \"@preserve Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved.\" I:1\n"
+" COMMENT \"@preserve Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved.\" I:1\n"
);
diff --git a/tests/catch_position.cpp b/tests/catch_position.cpp
index 74a483e..14d8729 100644
--- a/tests/catch_position.cpp
+++ b/tests/catch_position.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor -- Test Suite
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/tests/catch_tests.cpp b/tests/catch_tests.cpp
index 4248987..185ddea 100644
--- a/tests/catch_tests.cpp
+++ b/tests/catch_tests.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor -- Test Suite
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/tests/catch_tests.h b/tests/catch_tests.h
index db47145..867c18a 100644
--- a/tests/catch_tests.h
+++ b/tests/catch_tests.h
@@ -1,7 +1,7 @@
#ifndef CSSPP_TESTS_H
#define CSSPP_TESTS_H
// CSS Preprocessor -- Test Suite
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
diff --git a/tests/catch_unicode_range.cpp b/tests/catch_unicode_range.cpp
index 38243f8..ae0c8fe 100644
--- a/tests/catch_unicode_range.cpp
+++ b/tests/catch_unicode_range.cpp
@@ -1,5 +1,5 @@
// CSS Preprocessor -- Test Suite
-// Copyright (c) 2015-2019 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
From 701133ae74eb3f2cd937dde7f23b71817c474306 Mon Sep 17 00:00:00 2001
From: AlexisWilke
Date: Thu, 29 Apr 2021 18:07:00 -0700
Subject: [PATCH 05/64] Removed the DOT_FONTNAME value.
---
doc/csspp.doxy.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/csspp.doxy.in b/doc/csspp.doxy.in
index b1d3904..7ad4a6c 100644
--- a/doc/csspp.doxy.in
+++ b/doc/csspp.doxy.in
@@ -2178,7 +2178,7 @@ DOT_NUM_THREADS = 0
# The default value is: Helvetica.
# This tag requires that the tag HAVE_DOT is set to YES.
-DOT_FONTNAME = FreeSans
+DOT_FONTNAME =
# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
# dot graphs.
From eac5e1321e3e0e707ed30d5d1ce8ceb6b176597a Mon Sep 17 00:00:00 2001
From: AlexisWilke
Date: Mon, 10 May 2021 17:12:47 -0700
Subject: [PATCH 06/64] Updated the dev/pack script. We have many dependencies
now.
---
INSTALL.txt | 24 +++------
README.md | 4 +-
debian/changelog | 6 +++
dev/INSTALL | 20 --------
dev/INSTALL.md | 44 ++++++++++++++++
dev/MasterCMakeLists.txt | 60 ++++++++++++++++++----
dev/pack | 106 ++++++++++++++++++++++++++++++++-------
7 files changed, 197 insertions(+), 67 deletions(-)
delete mode 100644 dev/INSTALL
create mode 100644 dev/INSTALL.md
diff --git a/INSTALL.txt b/INSTALL.txt
index 69a51d8..b7009e3 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,21 +1,9 @@
-To build csspp, use cmake:
+With the current setup, compiling csspp should be done from within the
+snapcpp environment or using the standalone tarball (see dev/INSTALL.md
+for details about that other option).
- tar xf csspp.tar.gz
- mkdir BUILD
- cd BUILD
- cmake ../csspp
- make
- make install
-
-The csspp directory is likely to include a version by default. Change the
-references in that script as required.
-
-The creation of the documentation requires doxygen:
-
- sudo apt-get install doxygen
-
-The creation of the tests require catch.hpp, under Ubuntu:
-
- sudo apt-get install catch
+The csspp project is also available pre-compiled on launchpad, which is
+probably you best/easiest option if you have Ubuntu or some other Debian
+flavor system.
diff --git a/README.md b/README.md
index 712efe9..c6e0ef1 100644
--- a/README.md
+++ b/README.md
@@ -40,8 +40,8 @@ generated.
# Compile the library and `csspp` command line tool
-The INSTALL in the root directory tells you how to generate the
-distribution directory (or dev/INSTALL in the `csspp` project itself.)
+The `INSTALL.md` in the root directory tells you how to generate the
+distribution directory (or `dev/INSTALL.md` in the standalone `csspp` project).
We will be looking at making this simpler with time... for now, the
environment is a bit convoluted.
diff --git a/debian/changelog b/debian/changelog
index 86c33aa..58f11d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+csspp (1.0.27.4~xenial) xenial; urgency=high
+
+ * Updated the dev/pack script. We have many dependencies now.
+
+ -- Alexis Wilke Mon, 10 May 2021 17:12:42 -0700
+
csspp (1.0.27.3~xenial) xenial; urgency=high
* Bump version for a rebuild for newer cppthread.
diff --git a/dev/INSTALL b/dev/INSTALL
deleted file mode 100644
index b44af2b..0000000
--- a/dev/INSTALL
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Note: at this point we only support Linux although everything compiles as
- is under cygwin. The library is likely to compile and work under
- other OSes though, especially Unices.
-
-To generate csspp from its tarball, you need cmake and a C++ compiler,
-then run the following commands:
-
- mkdir BUILD
- cd BUILD
- cmake ..
- make
-
-The results will be under the "dist" directory. However, that is "installed"
-meaning that it won't know how to find shared libraries (works under cygwin
-since the DLL appears along the EXE). You may, however, immediately test the
-binary "csspp/src/csspp".
-
-The dist directory is otherwise ready to be installed under /usr.
-
diff --git a/dev/INSTALL.md b/dev/INSTALL.md
new file mode 100644
index 0000000..6347946
--- /dev/null
+++ b/dev/INSTALL.md
@@ -0,0 +1,44 @@
+
+**Note:** at this point we only support Linux.
+
+This installation documentation applies to the _packed_ version (a.k.a. a
+standalong tarball). See also the `dev/pack` script and `MasterCMakeLists.txt`
+file.
+
+To generate csspp from its tarball, you need cmake and a C++ compiler
+and a few other dependencies. We suggest to run the following commands:
+
+ tar xf csspp-all_1.0.27.3~xenial.tar.gz
+ sudo csspp/ubuntu-depdendencies.sh
+ mkdir BUILD
+ cd BUILD
+ cmake -DCMAKE_BUILD_TYPE=Debug \
+ -DCMAKE_PREFIX_PATH=../csspp/cmake/Modules/ \
+ ../csspp
+ make
+
+The `ubuntu-depdendencies.sh` script will install all the necessary
+dependencies.
+
+The `CMAKE_BUILD_TYPE` can be set to `Release` as well.
+
+The cmake command can also use a number of processors to run the make in
+parallel:
+
+ ... -DMAKEFLAGS=-j`nproc` ...
+
+(Keep in mind that parallel compilation uses a lot of memory so you may want
+to limit that number if you're low on RAM.)
+
+The results will be under the "dist" directory. However, that is "installed"
+meaning that it won't know how to find shared libraries (it would works under
+cygwin since the DLL appears along the EXE, but I don't think it still compiles
+on Win32). You may, however, immediately test the binary without installing
+to a final destination with:
+
+ BUILD/csspp/src/csspp --help
+
+The dist directory is otherwise ready to be installed under `/usr`. Many files
+are not really required, but that's up to you to decide how to handle that
+part.
+
diff --git a/dev/MasterCMakeLists.txt b/dev/MasterCMakeLists.txt
index 1064931..5fe78cf 100644
--- a/dev/MasterCMakeLists.txt
+++ b/dev/MasterCMakeLists.txt
@@ -55,18 +55,60 @@ find_package( SnapBuild REQUIRED )
################################################################################
# Snap libraries
#
-ConfigureMakeProject( PROJECT_NAME cmake )
+ConfigureMakeProject(
+ PROJECT_NAME
+ advgetopt
+ COMPONENT
+ contrib
+)
+
+ConfigureMakeProject(
+ PROJECT_NAME
+ cmake
+ COMPONENT
+ contrib
+)
+
+ConfigureMakeProject(
+ PROJECT_NAME
+ cppthread
+ COMPONENT
+ contrib
+)
+
+ConfigureMakeProject(
+ PROJECT_NAME
+ csspp
+ COMPONENT
+ contrib
+)
+
+ConfigureMakeProject(
+ PROJECT_NAME
+ libexcept
+ COMPONENT
+ contrib
+)
+
+ConfigureMakeProject(
+ PROJECT_NAME
+ libutf8
+ COMPONENT
+ contrib
+)
-ConfigureMakeProject( PROJECT_NAME advgetopt
- CONFIG_ARGS
- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
- DEPENDS cmake
+ConfigureMakeProject(
+ PROJECT_NAME
+ snapcatch2
+ COMPONENT
+ contrib
)
-ConfigureMakeProject( PROJECT_NAME csspp
- CONFIG_ARGS
- -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
- DEPENDS cmake advgetopt
+ConfigureMakeProject(
+ PROJECT_NAME
+ snapdev
+ COMPONENT
+ contrib
)
get_property( BUILD_TARGETS GLOBAL PROPERTY BUILD_TARGETS )
diff --git a/dev/pack b/dev/pack
index d3a94c1..7593b91 100755
--- a/dev/pack
+++ b/dev/pack
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
#
# File:
# dev/pack
@@ -38,19 +38,32 @@ set -e
SOURCE_REPO=../../../sources-repo
+echo "-- verify clean source availability"
if ! test -d $SOURCE_REPO
then
+ echo "ERROR:"
echo "To use this script, we expect you to have a directory named"
echo "sources-repo, which is a pristine copy of the git repository."
echo "Create that directory like any other git repository and place"
- echo "it in the parent of the csspp directory. The script will update"
- echo "the files on each run."
+ echo "it in the parent of the snapcpp directory. The script will"
+ echo "automatically update the files on each run."
+ echo
+ echo " cd ../../.."
+ echo " git clone --recursive https://github.com/m2osw/snapcpp.git sources-repo"
+ exit 1
+fi
+
+echo "-- verify version"
+if ! test -x dev/version
+then
+ echo "ERROR:"
+ echo "Are you in the top directory of the project?"
exit 1
fi
# Get both versions
. dev/version
-DEBIAN_VERSION=`dpkg-parsechangelog --show-field Version | sed -e s/~.*// -e s/\.0$//`
+DEBIAN_VERSION=`dpkg-parsechangelog --show-field Version | sed -e s/~.*// -e 's/\(^[0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/'`
if test "$FULL_VERSION" != "$DEBIAN_VERSION"
then
@@ -59,25 +72,82 @@ then
exit 1;
fi
+echo "-- prepare package directory"
cd $SOURCE_REPO
-mkdir -p ../packages
-git pull origin master
-rm -f snapcmakemodules_*.tar.gz advgetopt_*.tar.gz csspp_*.tar.gz
-dpkg-source -b cmake
-cp snapcmakemodules_*.tar.gz ../packages
-cd contrib
-dpkg-source -b advgetopt
-dpkg-source -b csspp
-cp advgetopt_*.tar.gz csspp_*.tar.gz ../../packages
-cd ../..
+SOURCE_REPO=`pwd`
+cd ..
+rm -rf packages
+mkdir packages
+cd packages
+PACKAGES_DIR=`pwd`
+cd $SOURCE_REPO
+
+# this top folder probably doesn't need to be updated, but for cleanliness
+#
+echo "-- update top folder"
+MAIN=`git branch --list main`
+if test "${MAIN}" != ""
+then
+ git pull origin main
+else
+ git pull origin master
+fi
+
+# For list of dependencies, see ../../../BUILD/clean-dependencies.svg
+
+DEPENDENCIES="
+ advgetopt
+ cmake
+ cppthread
+ csspp
+ libexcept
+ libutf8
+ snapcatch2
+ snapdev
+ "
+
+for p in ${DEPENDENCIES}
+do
+ (
+ echo "-- process project \"${p}\""
+ name=$p
+ if test "$p" = "cmake"
+ then
+ name=snapcmakemodules
+ else
+ cd contrib
+ fi
+
+ # We use submodules now, make sure to update each one of them individually
+ (
+ cd $p
+ MAIN=`git branch --list main`
+ if test "${MAIN}" != ""
+ then
+ git pull origin main
+ else
+ git pull origin master
+ fi
+ )
+
+ rm -f ${p}_*.tar.gz
+ echo "-- process project \"${p}\" [dpkg-source -b $name]"
+ dpkg-source -b $p
+ mv ${name}_*.tar.gz $PACKAGES_DIR
+ )
+done
+
+cd ..
rm -rf tmp/csspp
mkdir -p tmp/csspp
cd tmp/csspp
-tar xf ../../sources-repo/snapcmakemodules_*.tar.gz
-tar xf ../../sources-repo/contrib/advgetopt_*.tar.gz
-tar xf ../../sources-repo/contrib/csspp_*.tar.gz
+for f in ../../packages/*.tar.gz
+do
+ tar xf $f
+done
cp csspp/dev/MasterCMakeLists.txt CMakeLists.txt
-cp csspp/dev/INSTALL INSTALL
+cp csspp/dev/INSTALL.md .
+cp csspp/dev/ubuntu-dependencies.sh .
cd csspp
VERSION=`dpkg-parsechangelog --show-field Version`
cd ../..
From e8cfe07186bb71d80b631c8a562b35d892f184a7 Mon Sep 17 00:00:00 2001
From: AlexisWilke
Date: Mon, 10 May 2021 17:13:51 -0700
Subject: [PATCH 07/64] Missed adding the new script too.
---
dev/ubuntu-dependencies.sh | 42 ++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
create mode 100755 dev/ubuntu-dependencies.sh
diff --git a/dev/ubuntu-dependencies.sh b/dev/ubuntu-dependencies.sh
new file mode 100755
index 0000000..a875ab3
--- /dev/null
+++ b/dev/ubuntu-dependencies.sh
@@ -0,0 +1,42 @@
+#!/bin/sh -e
+#
+# Install the dependencies required by that project
+
+apt-get install \
+ cmake \
+ dpkg-dev \
+ g++ \
+ libboost-all-dev \
+
+
+
+#apt-get install \
+# catch \
+# dh-systemd \
+# freeglut3-dev \
+# gcc \
+# libhiredis-dev \
+# libicu-dev \
+# libmagic-dev \
+# libmagick++-dev \
+# libncurses-dev \
+# libprocps-dev \
+# libqrencode-dev \
+# libqt5script5 \
+# libqt5scripttools5 \
+# libqt5x11extras5-dev \
+# libqt5xmlpatterns5-dev \
+# libqt5webkit5-dev \
+# libreadline-dev \
+# libssl-dev \
+# libxml2-utils \
+# libyaml-cpp-dev \
+# mysql-server \
+# qt5-default \
+# qtscript5-dev \
+# uuid-dev \
+# zip \
+# zlib1g-dev
+
+
+# vim: ts=4 sw=4 et
From 073031cfdb3437cc9e4020cd2da28941cc897a18 Mon Sep 17 00:00:00 2001
From: AlexisWilke
Date: Thu, 13 May 2021 22:16:48 -0700
Subject: [PATCH 08/64] Fixed the color which would become int instead of uint.
---
tests/catch_color.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/catch_color.cpp b/tests/catch_color.cpp
index 40e97cf..44faa13 100644
--- a/tests/catch_color.cpp
+++ b/tests/catch_color.cpp
@@ -864,19 +864,19 @@ TEST_CASE("Color to string", "[color] [output]")
static_cast(0xFF));
switch(c.get_color())
{
- case (255 << 0) | (0 << 8) | (0 << 16) | (255 << 24):
+ case (255U << 0) | (0U << 8) | (0U << 16) | (255U << 24):
REQUIRE(c.to_string() == "red");
break;
- case (0 << 0) | (255 << 8) | (0 << 16) | (255 << 24):
+ case (0U << 0) | (255U << 8) | (0U << 16) | (255U << 24):
REQUIRE(c.to_string() == "lime");
break;
- case (0 << 0) | (0 << 8) | (255 << 16) | (255 << 24):
+ case (0U << 0) | (0U << 8) | (255U << 16) | (255U << 24):
REQUIRE(c.to_string() == "blue");
break;
- case (0 << 0) | (255 << 8) | (255 << 16) | (255 << 24):
+ case (0U << 0) | (255U << 8) | (255U << 16) | (255U << 24):
REQUIRE(c.to_string() == "aqua");
break;
From 3ab86137dea3ce6ba9ab994fa2e1ca4d42c814a3 Mon Sep 17 00:00:00 2001
From: AlexisWilke
Date: Fri, 14 May 2021 09:28:39 -0700
Subject: [PATCH 09/64] Moved the cmake files to the cmake folder.
Updated the CMakeLists.txt accordingly.
---
CMakeLists.txt | 5 +-
cmake/CMakeLists.txt | 50 ++++++++++++++++++++
{lib => cmake}/CSSPPConfig.cmake.in | 12 +++--
{lib => cmake}/CSSPPConfigVersion.cmake.in | 0
lib/CMakeLists.txt | 54 ++++++----------------
5 files changed, 76 insertions(+), 45 deletions(-)
create mode 100644 cmake/CMakeLists.txt
rename {lib => cmake}/CSSPPConfig.cmake.in (92%)
rename {lib => cmake}/CSSPPConfigVersion.cmake.in (100%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0b3112..5120a86 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,8 +75,9 @@ include_directories(
##
add_subdirectory(include) # public headers
add_subdirectory(lib) # csspp library
-add_subdirectory(scripts) # command line tools
-add_subdirectory(src) # command line tools
+add_subdirectory(cmake) # cmake include files
+add_subdirectory(scripts) # command line tools as scripts
+add_subdirectory(src) # command line tools as binaries
add_subdirectory(tests) # tests
add_subdirectory(doc) # library API documentation
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
new file mode 100644
index 0000000..6cdeff8
--- /dev/null
+++ b/cmake/CMakeLists.txt
@@ -0,0 +1,50 @@
+#
+# Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+#
+# https://snapwebsites.org/
+# contact@m2osw.com
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+
+project(csspp)
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/CSSPPConfig.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/CSSPPConfig.cmake
+ @ONLY
+)
+
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/CSSPPConfigVersion.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/CSSPPConfigVersion.cmake
+ @ONLY
+)
+
+install(
+ FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/CSSPPConfig.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/CSSPPConfigVersion.cmake
+
+ DESTINATION
+ share/cmake/CSSPP
+)
+
+# Local Variables:
+# indent-tabs-mode: nil
+# tab-width: 4
+# End:
+
+# vim: ts=4 sw=4 et nocindent
diff --git a/lib/CSSPPConfig.cmake.in b/cmake/CSSPPConfig.cmake.in
similarity index 92%
rename from lib/CSSPPConfig.cmake.in
rename to cmake/CSSPPConfig.cmake.in
index 814355f..8bb17a0 100644
--- a/lib/CSSPPConfig.cmake.in
+++ b/cmake/CSSPPConfig.cmake.in
@@ -1,4 +1,4 @@
-# - Try to find the CSS Preprocessor development files (libcsspp.so)
+# Try to find the CSS Preprocessor development files
#
# Once done this will define
#
@@ -48,9 +48,15 @@ mark_as_advanced(CSSPP_INCLUDE_DIR CSSPP_LIBRARY)
set(CSSPP_INCLUDE_DIRS ${CSSPP_INCLUDE_DIR})
set(CSSPP_LIBRARIES ${CSSPP_LIBRARY})
-include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set CSSPP_FOUND to TRUE
# if all listed variables are TRUE
-find_package_handle_standard_args(csspp DEFAULT_MSG CSSPP_INCLUDE_DIR CSSPP_LIBRARY)
+#
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+ CSSPP
+ DEFAULT_MSG
+ CSSPP_INCLUDE_DIR
+ CSSPP_LIBRARY
+)
# vim: ts=4 sw=4 et
diff --git a/lib/CSSPPConfigVersion.cmake.in b/cmake/CSSPPConfigVersion.cmake.in
similarity index 100%
rename from lib/CSSPPConfigVersion.cmake.in
rename to cmake/CSSPPConfigVersion.cmake.in
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 8102710..07f5fb2 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,43 +1,26 @@
#
-# File:
-# lib/CMakeLists.txt
+# Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
#
-# Description:
-# The csspp library.
+# https://snapwebsites.org/
+# contact@m2osw.com
#
-# Documentation:
-# See the CMake documentation.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
-# License:
-# Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# https://snapwebsites.org/
-# contact@m2osw.com
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
project(csspp)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CSSPPConfig.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/CSSPPConfig.cmake
- @ONLY)
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CSSPPConfigVersion.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/CSSPPConfigVersion.cmake
- @ONLY)
add_library( ${PROJECT_NAME} SHARED
assembler.cpp # Write the nodes back out
@@ -65,10 +48,6 @@ add_library( ${PROJECT_NAME} SHARED
unicode_range.cpp # Handle a Unicode Range value
)
-#target_link_libraries( ${PROJECT_NAME}
-# ${LIBTLD_LIBRARIES}
-#)
-
set_target_properties( ${PROJECT_NAME} PROPERTIES
VERSION ${CSSPP_VERSION_MAJOR}.${CSSPP_VERSION_MINOR}
SOVERSION ${CSSPP_VERSION_MAJOR}
@@ -81,11 +60,6 @@ install(
ARCHIVE DESTINATION lib
)
-install(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/CSSPPConfig.cmake
- ${CMAKE_CURRENT_BINARY_DIR}/CSSPPConfigVersion.cmake
- DESTINATION share/cmake/CSSPP
-)
# Local Variables:
# indent-tabs-mode: nil
From 4c3284069fb1327a7565ce98b3338a074f5e7c83 Mon Sep 17 00:00:00 2001
From: AlexisWilke
Date: Sat, 15 May 2021 11:03:16 -0700
Subject: [PATCH 10/64] Adding an Hirsute version.
---
debian/changelog | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 58f11d9..71a17b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+csspp (1.0.28.0~xenial) xenial; urgency=high
+
+ * Adding an Hirsute version.
+ * Fixed the library name in the CSSPPFind.cmake file.
+
+ -- Alexis Wilke Sat, 15 May 2021 11:02:18 -0700
+
csspp (1.0.27.4~xenial) xenial; urgency=high
* Updated the dev/pack script. We have many dependencies now.
From ebf8b62d73940293b9b3a226f34043a21725880f Mon Sep 17 00:00:00 2001
From: AlexisWilke
Date: Sat, 29 May 2021 18:30:00 -0700
Subject: [PATCH 11/64] Bumped version to recompile.
---
debian/changelog | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 71a17b2..680f740 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+csspp (1.0.28.1~xenial) xenial; urgency=high
+
+ * Bump version to rebuild against latest.
+
+ -- Alexis Wilke Sat, 29 May 2021 18:28:35 -0700
+
csspp (1.0.28.0~xenial) xenial; urgency=high
* Adding an Hirsute version.
From 674874ce2e9a5d0d18b90838968f2c189f0bfbaa Mon Sep 17 00:00:00 2001
From: AlexisWilke
Date: Fri, 4 Jun 2021 13:54:15 -0700
Subject: [PATCH 12/64] Updated the mk script.
---
mk | 60 +++++++++++++++++++++++++++++++-----------------------------
1 file changed, 31 insertions(+), 29 deletions(-)
diff --git a/mk b/mk
index baaa16e..bcc7038 100755
--- a/mk
+++ b/mk
@@ -1,33 +1,35 @@
#!/bin/sh
-set -e
-if test "$1" = "-d"
+#
+# See the snapcmakemodules project for details about this script
+# https://github.com/m2osw/snapcmakemodules
+
+if test -x ../../cmake/scripts/mk
then
- . dev/version
- rm -f ../../../BUILD/contrib/csspp/doc/csspp-doc-${VERSION}.tar.gz
- make -C ../../../BUILD/contrib/csspp/ csspp_Documentation
-elif test "$1" = "-t"
-then
- make -C ../../../BUILD/contrib/csspp/
- shift
- TEST="$1"
- if test -n "$TEST"
- then
- shift
- echo run with \"$TEST\"
- fi
- ../../../BUILD/contrib/csspp/tests/csspp_tests --scripts scripts --version-script ../../../BUILD/contrib/csspp/scripts "$TEST" $*
-elif test "$1" = "-i"
-then
- make -C ../../../BUILD/contrib/csspp install
-elif test "$1" = "-c"
-then
- if test -z "$2"
- then
- echo "the -c option requires a second option with the name of the tag"
- exit 1
- fi
- make -C ../../../BUILD/contrib/csspp install
- ../../../BUILD/contrib/csspp/tests/csspp_tests --scripts ../../../BUILD/dist/lib/csspp/scripts --show-errors "[$2]" 2>&1 | less
+ export TEST_OPTIONS="--scripts scripts --version-script ../../BUILD/Debug/contrib/csspp/scripts --show-errors"
+ ../../cmake/scripts/mk $*
else
- make -C ../../../BUILD/contrib/csspp
+ echo "error: could not locate the cmake mk script"
+ exit 1
fi
+
+#if test "$1" = "-t"
+#then
+# make -C ../../../BUILD/contrib/csspp/
+# shift
+# TEST="$1"
+# if test -n "$TEST"
+# then
+# shift
+# echo run with \"$TEST\"
+# fi
+# ../../../BUILD/contrib/csspp/tests/csspp_tests --scripts scripts --version-script ../../../BUILD/contrib/csspp/scripts "$TEST" $*
+#elif test "$1" = "-c"
+#then
+# if test -z "$2"
+# then
+# echo "the -c option requires a second option with the name of the tag"
+# exit 1
+# fi
+# make -C ../../../BUILD/contrib/csspp install
+# ../../../BUILD/contrib/csspp/tests/csspp_tests --scripts ../../../BUILD/dist/lib/csspp/scripts --show-errors "[$2]" 2>&1 | less
+#fi
From ea659eb13a691c82ac2cb1015d415dfac1b20359 Mon Sep 17 00:00:00 2001
From: AlexisWilke
Date: Fri, 4 Jun 2021 21:07:24 -0700
Subject: [PATCH 13/64] Bumped build version to rebuild on Launchpad.
---
debian/changelog | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 680f740..57d025c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+csspp (1.0.28.2~bionic) bionic; urgency=high
+
+ * Bumped build version to rebuild on Launchpad.
+
+ -- Alexis Wilke Fri, 04 Jun 2021 21:07:22 -0700
+
csspp (1.0.28.1~xenial) xenial; urgency=high
* Bump version to rebuild against latest.
From 99deda2640d7eb887534e3d6e562b4f003c2e7cd Mon Sep 17 00:00:00 2001
From: AlexisWilke
Date: Tue, 24 Aug 2021 16:59:23 -0700
Subject: [PATCH 14/64] Bumped build version to rebuild on Launchpad.
---
debian/changelog | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 57d025c..09d6639 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+csspp (1.0.28.3~bionic) bionic; urgency=high
+
+ * Bumped build version to rebuild on Launchpad.
+
+ -- Alexis Wilke Tue, 24 Aug 2021 16:59:22 -0700
+
csspp (1.0.28.2~bionic) bionic; urgency=high
* Bumped build version to rebuild on Launchpad.
From 3c2ce1cdae620985c1e2058e10d4e1e061f0790d Mon Sep 17 00:00:00 2001
From: AlexisWilke
Date: Sun, 29 Aug 2021 15:24:53 -0700
Subject: [PATCH 15/64] Bumped build version to rebuild on Launchpad.
---
debian/changelog | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 09d6639..bfa955a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+csspp (1.0.28.4~bionic) bionic; urgency=high
+
+ * Bumped build version to rebuild on Launchpad.
+
+ -- Alexis Wilke Sun, 29 Aug 2021 15:24:51 -0700
+
csspp (1.0.28.3~bionic) bionic; urgency=high
* Bumped build version to rebuild on Launchpad.
From 83c58ea8e9f61c086d0187d6ce9e8abf94629581 Mon Sep 17 00:00:00 2001
From: AlexisWilke
Date: Fri, 12 Nov 2021 18:16:16 -0800
Subject: [PATCH 16/64] Bumped cmake minimum required version.
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5120a86..0835f53 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@
##
## Initialization
##
-cmake_minimum_required(VERSION 2.8.4)
+cmake_minimum_required(VERSION 3.10.2)
project( csspp_project )
From 6d2e271db29c32bdaaf449538ede783ac326a968 Mon Sep 17 00:00:00 2001
From: AlexisWilke
Date: Sun, 16 Jan 2022 06:27:38 -0800
Subject: [PATCH 17/64] Added a separate script to upload the website.
Cleaned up some copyright notices.
---
CMakeLists.txt | 40 ++++++++++++++--------------------------
TODO.txt | 4 ++++
cmake/CMakeLists.txt | 11 +++++------
dev/upload-website.sh | 41 +++++++++++++++++++++++++++++++++++++++++
doc/CMakeLists.txt | 40 ++++++++++++++--------------------------
include/CMakeLists.txt | 39 ++++++++++++++-------------------------
scripts/CMakeLists.txt | 40 ++++++++++++++--------------------------
src/CMakeLists.txt | 40 ++++++++++++++--------------------------
src/csspp.cpp | 9 ++++-----
tests/CMakeLists.txt | 40 ++++++++++++++--------------------------
10 files changed, 138 insertions(+), 166 deletions(-)
create mode 100755 dev/upload-website.sh
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0835f53..2aea8b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,33 +1,21 @@
+# Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
#
-# File:
-# CMakeLists.txt
+# https://snapwebsites.org/project/csspp
+# contact@m2osw.com
#
-# Description:
-# Definitions to create the build environment with cmake
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
-# Documentation:
-# See the CMake documentation.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# License:
-# csspp -- a CSS Preprocessor
-# Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
-#
-# https://snapwebsites.org/
-# contact@m2osw.com
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
##
diff --git a/TODO.txt b/TODO.txt
index 4245001..3f387fb 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,4 +1,8 @@
+. Move includes along the source and rename the src folder as csspp.
+. Make sure the include_directories(...) in cmake files are correct.
+
+
To be closer to what SASS supports, we shall implement the following
additional features:
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 6cdeff8..aaac618 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -1,7 +1,6 @@
+# Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
#
-# Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
-#
-# https://snapwebsites.org/
+# https://snapwebsites.org/project/csspp
# contact@m2osw.com
#
# This program is free software; you can redistribute it and/or modify
@@ -14,9 +13,9 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
project(csspp)
diff --git a/dev/upload-website.sh b/dev/upload-website.sh
new file mode 100755
index 0000000..deed579
--- /dev/null
+++ b/dev/upload-website.sh
@@ -0,0 +1,41 @@
+#!/bin/sh -e
+#
+
+URL=csspp.org
+
+while test -n "$1"
+do
+ case "$1" in
+ "--help"|"-h")
+ echo "Usage: $0 "
+ echo "where is:"
+ echo " --help | -h print out this help screen"
+ echo " --url change the default destination URL"
+ exit 1
+ ;;
+
+ "--url")
+ shift
+ URL="$1"
+ shift
+ ;;
+
+ *)
+ echo "error: unknown option \"${1}\"."
+ exit 1
+ ;;
+
+ esac
+done
+
+echo "info: uploading website (will fail unless you are me)."
+echo "info: you must build once to get the index.html file."
+echo
+
+# TODO: review how to handle this path, it won't work for everyone like this...
+scp ../../BUILD/Debug/contrib/csspp/doc/front-page.html ${URL}:/var/www/csspp/public_html/index.html
+
+scp doc/favicon.ico ${URL}:/var/www/csspp/public_html/favicon.ico
+scp doc/images/csspp-logo.png ${URL}:/var/www/csspp/public_html/images/csspp-logo.png
+scp doc/images/open-source-initiative-logo.png ${URL}:/var/www/csspp/public_html/images/open-source-initiative-logo.png
+
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index bdcafc8..33798c6 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,33 +1,21 @@
+# Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
#
-# File:
-# doc/CMakeLists.txt
+# https://snapwebsites.org/project/csspp
+# contact@m2osw.com
#
-# Description:
-# Definitions to create the build environment with cmake
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
-# Documentation:
-# See the CMake documentation.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# License:
-# csspp -- a CSS Preprocessor
-# Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
-#
-# https://snapwebsites.org/
-# contact@m2osw.com
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
##
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 129a257..bc231ac 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -1,32 +1,21 @@
+# Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
#
-# File:
-# include/CMakeLists.txt
+# https://snapwebsites.org/project/csspp
+# contact@m2osw.com
#
-# Description:
-# Definitions to create the build environment with cmake
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
-# Documentation:
-# See the CMake documentation.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# License:
-# Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
-#
-# https://snapwebsites.org/
-# contact@m2osw.com
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
project(csspp_include)
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 4d918e9..6705c2b 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -1,33 +1,21 @@
+# Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
#
-# File:
-# scripts/CMakeLists.txt
+# https://snapwebsites.org/project/csspp
+# contact@m2osw.com
#
-# Description:
-# Definitions to create the build environment with cmake
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
-# Documentation:
-# See the CMake documentation.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# License:
-# csspp -- a CSS Preprocessor
-# Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
-#
-# https://snapwebsites.org/
-# contact@m2osw.com
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
project(csspp_scripts)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a1ba9c8..e573f16 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,33 +1,21 @@
+# Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
#
-# File:
-# src/CMakeLists.txt
+# https://snapwebsites.org/project/csspp
+# contact@m2osw.com
#
-# Description:
-# Definitions to create the build environment with cmake
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
#
-# Documentation:
-# See the CMake documentation.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# License:
-# csspp -- a CSS Preprocessor
-# Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
-#
-# https://snapwebsites.org/
-# contact@m2osw.com
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
project(csspp-tool)
diff --git a/src/csspp.cpp b/src/csspp.cpp
index 69162b9..5cb3214 100644
--- a/src/csspp.cpp
+++ b/src/csspp.cpp
@@ -1,5 +1,4 @@
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -11,9 +10,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
/** \file
* \brief Implementation of the CSS Preprocessor command line tool.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 7cc05aa..6515475 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,33 +1,21 @@
+# Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
#
-# File:
-# tests/CMakeLists.txt
+# https://snapwebsites.org/project/csspp
+# contact@m2osw.com
#
-# Description:
-# Build csspp tests.
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
#
-# Documentation:
-# See the CMake documentation.
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
#
-# License:
-# CSS Preprocessor -- Test Suite
-# Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
-#
-# https://snapwebsites.org/
-# contact@m2osw.com
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU Lesser General Public License along
+# with this library; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
find_package( Catch )
From 8b1b6e2f6a38a8c2792bfedf6bce0a491c15f8e9 Mon Sep 17 00:00:00 2001
From: AlexisWilke
Date: Sun, 16 Jan 2022 07:07:40 -0800
Subject: [PATCH 18/64] Moved headers along library code.
Renamed the "lib" directory "csspp" so the #include work as expected.
Renamed the test "unittest" like our mk script expects.
---
CMakeLists.txt | 27 ++++++------
TODO.txt | 3 --
{lib => csspp}/CMakeLists.txt | 54 ++++++++++++++++++++----
{lib => csspp}/assembler.cpp | 9 ++--
{include/csspp => csspp}/assembler.h | 9 ++--
{lib => csspp}/color.cpp | 9 ++--
{include/csspp => csspp}/color.h | 9 ++--
{lib => csspp}/compiler.cpp | 9 ++--
{include/csspp => csspp}/compiler.h | 9 ++--
{lib => csspp}/csspp.cpp | 9 ++--
{include/csspp => csspp}/csspp.h.in | 9 ++--
{lib => csspp}/error.cpp | 9 ++--
{include/csspp => csspp}/error.h | 9 ++--
{include/csspp => csspp}/exceptions.h | 9 ++--
{lib => csspp}/expr_additive.cpp | 9 ++--
{lib => csspp}/expr_conditional.cpp | 9 ++--
{lib => csspp}/expr_equality.cpp | 9 ++--
{lib => csspp}/expr_list.cpp | 9 ++--
{lib => csspp}/expr_logical_and.cpp | 9 ++--
{lib => csspp}/expr_logical_or.cpp | 9 ++--
{lib => csspp}/expr_multiplicative.cpp | 9 ++--
{lib => csspp}/expr_power.cpp | 9 ++--
{lib => csspp}/expr_relational.cpp | 9 ++--
{lib => csspp}/expr_unary.cpp | 9 ++--
{lib => csspp}/expression.cpp | 9 ++--
{include/csspp => csspp}/expression.h | 9 ++--
{lib => csspp}/internal_functions.cpp | 9 ++--
{lib => csspp}/lexer.cpp | 9 ++--
{include/csspp => csspp}/lexer.h | 9 ++--
{lib => csspp}/node.cpp | 9 ++--
{include/csspp => csspp}/node.h | 9 ++--
{lib => csspp}/nth_child.cpp | 9 ++--
{include/csspp => csspp}/nth_child.h | 9 ++--
{lib => csspp}/parser.cpp | 9 ++--
{include/csspp => csspp}/parser.h | 9 ++--
{lib => csspp}/position.cpp | 9 ++--
{include/csspp => csspp}/position.h | 9 ++--
{lib => csspp}/unicode_range.cpp | 9 ++--
{include/csspp => csspp}/unicode_range.h | 9 ++--
debian/changelog | 7 +++
include/CMakeLists.txt | 40 ------------------
scripts/CMakeLists.txt | 18 +++++---
src/CMakeLists.txt | 12 +++---
tests/CMakeLists.txt | 17 +++++---
44 files changed, 238 insertions(+), 264 deletions(-)
rename {lib => csspp}/CMakeLists.txt (75%)
rename {lib => csspp}/assembler.cpp (99%)
rename {include/csspp => csspp}/assembler.h (90%)
rename {lib => csspp}/color.cpp (98%)
rename {include/csspp => csspp}/color.h (92%)
rename {lib => csspp}/compiler.cpp (99%)
rename {include/csspp => csspp}/compiler.h (96%)
rename {lib => csspp}/csspp.cpp (94%)
rename {include/csspp => csspp}/csspp.h.in (92%)
rename {lib => csspp}/error.cpp (96%)
rename {include/csspp => csspp}/error.h (94%)
rename {include/csspp => csspp}/exceptions.h (91%)
rename {lib => csspp}/expr_additive.cpp (97%)
rename {lib => csspp}/expr_conditional.cpp (92%)
rename {lib => csspp}/expr_equality.cpp (97%)
rename {lib => csspp}/expr_list.cpp (98%)
rename {lib => csspp}/expr_logical_and.cpp (92%)
rename {lib => csspp}/expr_logical_or.cpp (89%)
rename {lib => csspp}/expr_multiplicative.cpp (99%)
rename {lib => csspp}/expr_power.cpp (96%)
rename {lib => csspp}/expr_relational.cpp (95%)
rename {lib => csspp}/expr_unary.cpp (97%)
rename {lib => csspp}/expression.cpp (94%)
rename {include/csspp => csspp}/expression.h (97%)
rename {lib => csspp}/internal_functions.cpp (99%)
rename {lib => csspp}/lexer.cpp (99%)
rename {include/csspp => csspp}/lexer.h (94%)
rename {lib => csspp}/node.cpp (99%)
rename {include/csspp => csspp}/node.h (97%)
rename {lib => csspp}/nth_child.cpp (97%)
rename {include/csspp => csspp}/nth_child.h (88%)
rename {lib => csspp}/parser.cpp (99%)
rename {include/csspp => csspp}/parser.h (91%)
rename {lib => csspp}/position.cpp (85%)
rename {include/csspp => csspp}/position.h (86%)
rename {lib => csspp}/unicode_range.cpp (95%)
rename {include/csspp => csspp}/unicode_range.h (85%)
delete mode 100644 include/CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2aea8b1..a742f01 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,46 +23,45 @@
##
cmake_minimum_required(VERSION 3.10.2)
-project( csspp_project )
+project(csspp_project)
-enable_language( CXX )
+enable_language(CXX)
enable_testing()
## Include support modules
##
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
-find_package( AdvGetOpt REQUIRED )
-find_package( LibExcept REQUIRED )
-find_package( LibUtf8 REQUIRED )
-find_package( SnapCMakeModules REQUIRED )
-find_package( SnapDoxygen )
+find_package(AdvGetOpt REQUIRED)
+find_package(LibExcept REQUIRED)
+find_package(LibUtf8 REQUIRED)
+find_package(SnapCMakeModules REQUIRED)
+find_package(SnapDoxygen )
SnapGetVersion( CSSPP ${CMAKE_CURRENT_SOURCE_DIR} )
if( "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" )
message("Debug is in effect for csspp!")
- add_definitions( -DDEBUG -D_DEBUG )
+ add_definitions(-DDEBUG -D_DEBUG)
else()
message("Debug is turned OFF")
- add_definitions( -DNDEBUG )
+ add_definitions(-DNDEBUG)
endif()
# A few extra warnings specifically for snapwebsites libraries and tools
# You can also play with -Weffc++ although we are definitively not compliant
# (especially we do not define all the auto-initialized variables!)
# -Wconversion -- would be nice, a few things are still not cooperating with that one
-set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wold-style-cast -Wnoexcept" )
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wold-style-cast -Wnoexcept")
include_directories(
- ${PROJECT_SOURCE_DIR}/include
- ${PROJECT_BINARY_DIR}/include
+ ${PROJECT_SOURCE_DIR}
+ ${PROJECT_BINARY_DIR}
)
##
## Compiling
##
-add_subdirectory(include) # public headers
-add_subdirectory(lib) # csspp library
+add_subdirectory(csspp) # csspp library
add_subdirectory(cmake) # cmake include files
add_subdirectory(scripts) # command line tools as scripts
add_subdirectory(src) # command line tools as binaries
diff --git a/TODO.txt b/TODO.txt
index 3f387fb..d526158 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,7 +1,4 @@
-. Move includes along the source and rename the src folder as csspp.
-. Make sure the include_directories(...) in cmake files are correct.
-
To be closer to what SASS supports, we shall implement the following
additional features:
diff --git a/lib/CMakeLists.txt b/csspp/CMakeLists.txt
similarity index 75%
rename from lib/CMakeLists.txt
rename to csspp/CMakeLists.txt
index 07f5fb2..28f3a63 100644
--- a/lib/CMakeLists.txt
+++ b/csspp/CMakeLists.txt
@@ -1,7 +1,6 @@
+# Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
#
-# Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
-#
-# https://snapwebsites.org/
+# https://snapwebsites.org/project/csspp
# contact@m2osw.com
#
# This program is free software; you can redistribute it and/or modify
@@ -21,8 +20,12 @@
project(csspp)
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/csspp.h.in
+ ${CMAKE_CURRENT_BINARY_DIR}/csspp.h
+)
-add_library( ${PROJECT_NAME} SHARED
+add_library(${PROJECT_NAME} SHARED
assembler.cpp # Write the nodes back out
csspp.cpp # Some basics about the library
color.cpp # Manager RGBA colors
@@ -48,16 +51,49 @@ add_library( ${PROJECT_NAME} SHARED
unicode_range.cpp # Handle a Unicode Range value
)
-set_target_properties( ${PROJECT_NAME} PROPERTIES
+target_include_directories(${PROJECT_NAME}
+ PUBLIC
+ ${ADVGETOPT_INCLUDE_DIRS}
+ ${LIBEXCEPT_INCLUDE_DIRS}
+)
+
+set_target_properties(${PROJECT_NAME} PROPERTIES
VERSION ${CSSPP_VERSION_MAJOR}.${CSSPP_VERSION_MINOR}
SOVERSION ${CSSPP_VERSION_MAJOR}
)
install(
- TARGETS ${PROJECT_NAME}
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib
+ TARGETS
+ ${PROJECT_NAME}
+
+ RUNTIME DESTINATION
+ bin
+
+ LIBRARY DESTINATION
+ lib
+
+ ARCHIVE DESTINATION
+ lib
+)
+
+install(
+ FILES
+ assembler.h
+ color.h
+ compiler.h
+ ${CMAKE_CURRENT_BINARY_DIR}/csspp.h
+ error.h
+ exceptions.h
+ expression.h
+ lexer.h
+ node.h
+ nth_child.h
+ parser.h
+ position.h
+ unicode_range.h
+
+ DESTINATION
+ include/csspp
)
diff --git a/lib/assembler.cpp b/csspp/assembler.cpp
similarity index 99%
rename from lib/assembler.cpp
rename to csspp/assembler.cpp
index adf1cda..bd2953d 100644
--- a/lib/assembler.cpp
+++ b/csspp/assembler.cpp
@@ -1,5 +1,4 @@
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -11,9 +10,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
/** \file
* \brief Implementation of the CSS Preprocessor assembler.
diff --git a/include/csspp/assembler.h b/csspp/assembler.h
similarity index 90%
rename from include/csspp/assembler.h
rename to csspp/assembler.h
index 0d1cbb1..b867e3f 100644
--- a/include/csspp/assembler.h
+++ b/csspp/assembler.h
@@ -1,7 +1,6 @@
#ifndef CSSPP_ASSEMBLER_H
#define CSSPP_ASSEMBLER_H
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -13,9 +12,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "csspp/node.h"
diff --git a/lib/color.cpp b/csspp/color.cpp
similarity index 98%
rename from lib/color.cpp
rename to csspp/color.cpp
index 6313243..664f542 100644
--- a/lib/color.cpp
+++ b/csspp/color.cpp
@@ -1,5 +1,4 @@
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -11,9 +10,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
/** \file
* \brief Implementation of the CSS Preprocessor color class.
diff --git a/include/csspp/color.h b/csspp/color.h
similarity index 92%
rename from include/csspp/color.h
rename to csspp/color.h
index ced78cc..b3e5d61 100644
--- a/include/csspp/color.h
+++ b/csspp/color.h
@@ -1,7 +1,6 @@
#ifndef CSSPP_COLOR_H
#define CSSPP_COLOR_H
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -13,9 +12,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include
#include
diff --git a/lib/compiler.cpp b/csspp/compiler.cpp
similarity index 99%
rename from lib/compiler.cpp
rename to csspp/compiler.cpp
index 3ee0fb2..e4efaac 100644
--- a/lib/compiler.cpp
+++ b/csspp/compiler.cpp
@@ -1,5 +1,4 @@
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -11,9 +10,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
/** \file
* \brief Implementation of the CSS Preprocessor compiler.
diff --git a/include/csspp/compiler.h b/csspp/compiler.h
similarity index 96%
rename from include/csspp/compiler.h
rename to csspp/compiler.h
index 797a87d..d311b11 100644
--- a/include/csspp/compiler.h
+++ b/csspp/compiler.h
@@ -1,7 +1,6 @@
#ifndef CSSPP_COMPILER_H
#define CSSPP_COMPILER_H
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -13,9 +12,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "csspp/expression.h"
diff --git a/lib/csspp.cpp b/csspp/csspp.cpp
similarity index 94%
rename from lib/csspp.cpp
rename to csspp/csspp.cpp
index 0f08b01..33369d0 100644
--- a/lib/csspp.cpp
+++ b/csspp/csspp.cpp
@@ -1,5 +1,4 @@
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -11,9 +10,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
/** \file
* \brief Implementation of the CSS Preprocessor library.
diff --git a/include/csspp/csspp.h.in b/csspp/csspp.h.in
similarity index 92%
rename from include/csspp/csspp.h.in
rename to csspp/csspp.h.in
index 53b4519..04310ac 100644
--- a/include/csspp/csspp.h.in
+++ b/csspp/csspp.h.in
@@ -1,7 +1,6 @@
#ifndef CSSPP_CSSPP_H
#define CSSPP_CSSPP_H
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -13,9 +12,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "csspp/exceptions.h"
diff --git a/lib/error.cpp b/csspp/error.cpp
similarity index 96%
rename from lib/error.cpp
rename to csspp/error.cpp
index 6925c84..452862c 100644
--- a/lib/error.cpp
+++ b/csspp/error.cpp
@@ -1,5 +1,4 @@
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -11,9 +10,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
/** \file
* \brief Implementation of the CSS Preprocessor error handling.
diff --git a/include/csspp/error.h b/csspp/error.h
similarity index 94%
rename from include/csspp/error.h
rename to csspp/error.h
index 3d781e6..01da07b 100644
--- a/include/csspp/error.h
+++ b/csspp/error.h
@@ -1,7 +1,6 @@
#ifndef CSSPP_ERROR_H
#define CSSPP_ERROR_H
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -13,9 +12,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "csspp/position.h"
diff --git a/include/csspp/exceptions.h b/csspp/exceptions.h
similarity index 91%
rename from include/csspp/exceptions.h
rename to csspp/exceptions.h
index 98b4edd..60788b1 100644
--- a/include/csspp/exceptions.h
+++ b/csspp/exceptions.h
@@ -1,7 +1,6 @@
#ifndef CSSPP_EXCEPTIONS_H
#define CSSPP_EXCEPTIONS_H
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -13,9 +12,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include
diff --git a/lib/expr_additive.cpp b/csspp/expr_additive.cpp
similarity index 97%
rename from lib/expr_additive.cpp
rename to csspp/expr_additive.cpp
index 4a61b8e..a17f841 100644
--- a/lib/expr_additive.cpp
+++ b/csspp/expr_additive.cpp
@@ -1,5 +1,4 @@
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -11,9 +10,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
/** \file
* \brief Implementation of the CSS Preprocessor expression.
diff --git a/lib/expr_conditional.cpp b/csspp/expr_conditional.cpp
similarity index 92%
rename from lib/expr_conditional.cpp
rename to csspp/expr_conditional.cpp
index 0601348..f1256a2 100644
--- a/lib/expr_conditional.cpp
+++ b/csspp/expr_conditional.cpp
@@ -1,5 +1,4 @@
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -11,9 +10,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
/** \file
* \brief Implementation of the CSS Preprocessor expression.
diff --git a/lib/expr_equality.cpp b/csspp/expr_equality.cpp
similarity index 97%
rename from lib/expr_equality.cpp
rename to csspp/expr_equality.cpp
index 0e4b27a..57b9317 100644
--- a/lib/expr_equality.cpp
+++ b/csspp/expr_equality.cpp
@@ -1,5 +1,4 @@
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -11,9 +10,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
/** \file
* \brief Implementation of the CSS Preprocessor expression.
diff --git a/lib/expr_list.cpp b/csspp/expr_list.cpp
similarity index 98%
rename from lib/expr_list.cpp
rename to csspp/expr_list.cpp
index 760444b..19bd3ab 100644
--- a/lib/expr_list.cpp
+++ b/csspp/expr_list.cpp
@@ -1,5 +1,4 @@
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -11,9 +10,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
/** \file
* \brief Implementation of the CSS Preprocessor expression.
diff --git a/lib/expr_logical_and.cpp b/csspp/expr_logical_and.cpp
similarity index 92%
rename from lib/expr_logical_and.cpp
rename to csspp/expr_logical_and.cpp
index cd461f0..62a6b5e 100644
--- a/lib/expr_logical_and.cpp
+++ b/csspp/expr_logical_and.cpp
@@ -1,5 +1,4 @@
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -11,9 +10,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
/** \file
* \brief Implementation of the CSS Preprocessor expression.
diff --git a/lib/expr_logical_or.cpp b/csspp/expr_logical_or.cpp
similarity index 89%
rename from lib/expr_logical_or.cpp
rename to csspp/expr_logical_or.cpp
index 6c32091..1d93edb 100644
--- a/lib/expr_logical_or.cpp
+++ b/csspp/expr_logical_or.cpp
@@ -1,5 +1,4 @@
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -11,9 +10,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
/** \file
* \brief Implementation of the CSS Preprocessor expression.
diff --git a/lib/expr_multiplicative.cpp b/csspp/expr_multiplicative.cpp
similarity index 99%
rename from lib/expr_multiplicative.cpp
rename to csspp/expr_multiplicative.cpp
index 2dfa742..1567e32 100644
--- a/lib/expr_multiplicative.cpp
+++ b/csspp/expr_multiplicative.cpp
@@ -1,5 +1,4 @@
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -11,9 +10,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
/** \file
* \brief Implementation of the CSS Preprocessor expression.
diff --git a/lib/expr_power.cpp b/csspp/expr_power.cpp
similarity index 96%
rename from lib/expr_power.cpp
rename to csspp/expr_power.cpp
index 0be7aa8..0b30f9c 100644
--- a/lib/expr_power.cpp
+++ b/csspp/expr_power.cpp
@@ -1,5 +1,4 @@
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -11,9 +10,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
/** \file
* \brief Implementation of the CSS Preprocessor expression.
diff --git a/lib/expr_relational.cpp b/csspp/expr_relational.cpp
similarity index 95%
rename from lib/expr_relational.cpp
rename to csspp/expr_relational.cpp
index 5e9895b..cbbb121 100644
--- a/lib/expr_relational.cpp
+++ b/csspp/expr_relational.cpp
@@ -1,5 +1,4 @@
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -11,9 +10,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
/** \file
* \brief Implementation of the CSS Preprocessor expression.
diff --git a/lib/expr_unary.cpp b/csspp/expr_unary.cpp
similarity index 97%
rename from lib/expr_unary.cpp
rename to csspp/expr_unary.cpp
index 2f6848d..156f1a7 100644
--- a/lib/expr_unary.cpp
+++ b/csspp/expr_unary.cpp
@@ -1,5 +1,4 @@
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -11,9 +10,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
/** \file
* \brief Implementation of the CSS Preprocessor expression.
diff --git a/lib/expression.cpp b/csspp/expression.cpp
similarity index 94%
rename from lib/expression.cpp
rename to csspp/expression.cpp
index 63b61b5..7ffc99d 100644
--- a/lib/expression.cpp
+++ b/csspp/expression.cpp
@@ -1,5 +1,4 @@
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -11,9 +10,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
/** \file
* \brief Implementation of the CSS Preprocessor expression.
diff --git a/include/csspp/expression.h b/csspp/expression.h
similarity index 97%
rename from include/csspp/expression.h
rename to csspp/expression.h
index 0ab53bd..12fbe72 100644
--- a/include/csspp/expression.h
+++ b/csspp/expression.h
@@ -1,7 +1,6 @@
#ifndef CSSPP_EXPRESSION_H
#define CSSPP_EXPRESSION_H
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -13,9 +12,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "csspp/node.h"
diff --git a/lib/internal_functions.cpp b/csspp/internal_functions.cpp
similarity index 99%
rename from lib/internal_functions.cpp
rename to csspp/internal_functions.cpp
index ad57e7c..2301a7e 100644
--- a/lib/internal_functions.cpp
+++ b/csspp/internal_functions.cpp
@@ -1,5 +1,4 @@
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -11,9 +10,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
/** \file
* \brief Implementation of the CSS Preprocessor expression.
diff --git a/lib/lexer.cpp b/csspp/lexer.cpp
similarity index 99%
rename from lib/lexer.cpp
rename to csspp/lexer.cpp
index 603279e..24359a8 100644
--- a/lib/lexer.cpp
+++ b/csspp/lexer.cpp
@@ -1,5 +1,4 @@
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -11,9 +10,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
/** \file
* \brief Implementation of the CSS Preprocessor lexer.
diff --git a/include/csspp/lexer.h b/csspp/lexer.h
similarity index 94%
rename from include/csspp/lexer.h
rename to csspp/lexer.h
index fd31a24..7e1f7d8 100644
--- a/include/csspp/lexer.h
+++ b/csspp/lexer.h
@@ -1,7 +1,6 @@
#ifndef CSSPP_LEXER_H
#define CSSPP_LEXER_H
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -13,9 +12,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "csspp/node.h"
diff --git a/lib/node.cpp b/csspp/node.cpp
similarity index 99%
rename from lib/node.cpp
rename to csspp/node.cpp
index 411e9ef..b1ba888 100644
--- a/lib/node.cpp
+++ b/csspp/node.cpp
@@ -1,5 +1,4 @@
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -11,9 +10,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
/** \file
* \brief Implementation of the CSS Preprocessor node.
diff --git a/include/csspp/node.h b/csspp/node.h
similarity index 97%
rename from include/csspp/node.h
rename to csspp/node.h
index 7fd5846..94d5b4c 100644
--- a/include/csspp/node.h
+++ b/csspp/node.h
@@ -1,7 +1,6 @@
#ifndef CSSPP_NODE_H
#define CSSPP_NODE_H
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -13,9 +12,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include
#include
diff --git a/lib/nth_child.cpp b/csspp/nth_child.cpp
similarity index 97%
rename from lib/nth_child.cpp
rename to csspp/nth_child.cpp
index d191839..7521faa 100644
--- a/lib/nth_child.cpp
+++ b/csspp/nth_child.cpp
@@ -1,5 +1,4 @@
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -11,9 +10,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
/** \file
* \brief Implementation of the CSS Preprocessor nth-child handling.
diff --git a/include/csspp/nth_child.h b/csspp/nth_child.h
similarity index 88%
rename from include/csspp/nth_child.h
rename to csspp/nth_child.h
index a3fb951..d6aacce 100644
--- a/include/csspp/nth_child.h
+++ b/csspp/nth_child.h
@@ -1,7 +1,6 @@
#ifndef CSSPP_NTH_CHILD_H
#define CSSPP_NTH_CHILD_H
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -13,9 +12,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "csspp/csspp.h"
diff --git a/lib/parser.cpp b/csspp/parser.cpp
similarity index 99%
rename from lib/parser.cpp
rename to csspp/parser.cpp
index 21d9837..b30a16c 100644
--- a/lib/parser.cpp
+++ b/csspp/parser.cpp
@@ -1,5 +1,4 @@
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -11,9 +10,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
/** \file
* \brief Implementation of the CSS Preprocessor parser.
diff --git a/include/csspp/parser.h b/csspp/parser.h
similarity index 91%
rename from include/csspp/parser.h
rename to csspp/parser.h
index c69c8b4..331a7da 100644
--- a/include/csspp/parser.h
+++ b/csspp/parser.h
@@ -1,7 +1,6 @@
#ifndef CSSPP_PARSER_H
#define CSSPP_PARSER_H
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -13,9 +12,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "csspp/lexer.h"
diff --git a/lib/position.cpp b/csspp/position.cpp
similarity index 85%
rename from lib/position.cpp
rename to csspp/position.cpp
index 45b77c4..f00114e 100644
--- a/lib/position.cpp
+++ b/csspp/position.cpp
@@ -1,5 +1,4 @@
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -11,9 +10,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "csspp/position.h"
diff --git a/include/csspp/position.h b/csspp/position.h
similarity index 86%
rename from include/csspp/position.h
rename to csspp/position.h
index 1159575..f83e93d 100644
--- a/include/csspp/position.h
+++ b/csspp/position.h
@@ -1,7 +1,6 @@
#ifndef CSSPP_POSITION_H
#define CSSPP_POSITION_H
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -13,9 +12,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "csspp/csspp.h"
diff --git a/lib/unicode_range.cpp b/csspp/unicode_range.cpp
similarity index 95%
rename from lib/unicode_range.cpp
rename to csspp/unicode_range.cpp
index 18f4b91..b0bbb4a 100644
--- a/lib/unicode_range.cpp
+++ b/csspp/unicode_range.cpp
@@ -1,5 +1,4 @@
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -11,9 +10,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "csspp/unicode_range.h"
diff --git a/include/csspp/unicode_range.h b/csspp/unicode_range.h
similarity index 85%
rename from include/csspp/unicode_range.h
rename to csspp/unicode_range.h
index d9f6c65..f4b31af 100644
--- a/include/csspp/unicode_range.h
+++ b/csspp/unicode_range.h
@@ -1,7 +1,6 @@
#ifndef CSSPP_UNICODE_RANGE_H
#define CSSPP_UNICODE_RANGE_H
-// CSS Preprocessor
-// Copyright (c) 2015-2021 Made to Order Software Corp. All Rights Reserved
+// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -13,9 +12,9 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include
diff --git a/debian/changelog b/debian/changelog
index bfa955a..1b6834b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+csspp (1.0.29.0~bionic) bionic; urgency=high
+
+ * Moved the headers along the code and renamed the directory csspp.
+ * Started some clean up of the copyright notice.
+
+ -- Alexis Wilke Sun, 16 Jan 2022 07:06:15 -0800
+
csspp (1.0.28.4~bionic) bionic; urgency=high
* Bumped build version to rebuild on Launchpad.
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
deleted file mode 100644
index bc231ac..0000000
--- a/include/CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
-#
-# https://snapwebsites.org/project/csspp
-# contact@m2osw.com
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-
-project(csspp_include)
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/csspp/csspp.h.in ${CMAKE_CURRENT_BINARY_DIR}/csspp/csspp.h)
-
-install(
- DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/csspp
- DESTINATION include
-)
-
-install(
- DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/csspp
- DESTINATION include
-)
-
-# Local Variables:
-# indent-tabs-mode: nil
-# tab-width: 4
-# End:
-
-# vim: ts=4 sw=4 et nocindent
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 6705c2b..fcc39d5 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -26,14 +26,22 @@ configure_file(
)
install(
- DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- DESTINATION lib/csspp
- FILES_MATCHING PATTERN "*.scss"
+ DIRECTORY
+ ${CMAKE_CURRENT_SOURCE_DIR}
+
+ DESTINATION
+ lib/csspp
+
+ FILES_MATCHING PATTERN
+ "*.scss"
)
install(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/system/version.scss
- DESTINATION lib/csspp/scripts/system
+ FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/system/version.scss
+
+ DESTINATION
+ lib/csspp/scripts/system
)
# Local Variables:
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e573f16..b54d4f5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,20 +20,20 @@
project(csspp-tool)
-include_directories(
- ${ADVGETOPT_INCLUDE_DIRS}
- ${LIBEXCEPT_INCLUDE_DIRS}
-)
-
add_executable(${PROJECT_NAME}
csspp.cpp
)
+target_include_directories(${PROJECT_NAME}
+ PUBLIC
+ ${ADVGETOPT_INCLUDE_DIRS}
+ ${LIBEXCEPT_INCLUDE_DIRS}
+)
+
target_link_libraries(${PROJECT_NAME}
csspp
${ADVGETOPT_LIBRARIES}
${LIBEXCEPT_LIBRARIES}
- ${LIBUTF8_LIBRARIES}
)
set_target_properties(${PROJECT_NAME} PROPERTIES
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6515475..1526ef8 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -22,11 +22,7 @@ find_package( Catch )
if(CATCH_FOUND)
- project( csspp_tests )
-
- include_directories(
- ${CATCH_INCLUDE_DIR}
- )
+ project(unittest)
add_executable( ${PROJECT_NAME}
catch_tests.cpp
@@ -54,12 +50,19 @@ if(CATCH_FOUND)
catch_unicode_range.cpp
)
- target_link_libraries( ${PROJECT_NAME} csspp )
+ target_include_directories(${PROJECT_NAME}
+ PUBLIC
+ ${CATCH_INCLUDE_DIR}
+ )
+
+ target_link_libraries(${PROJECT_NAME}
+ csspp
+ )
# You can use the --success command line option to see all the tests
# as they run; it is a LOT of output though, thus by default we don't
# use it
- add_test( csspp_tests ${PROJECT_NAME} )
+ add_test(unittest ${PROJECT_NAME})
else(CATCH_FOUND)
From 75e72799fde61d49fea6c788aa26675f6f034bdd Mon Sep 17 00:00:00 2001
From: AlexisWilke
Date: Sat, 22 Jan 2022 23:27:07 -0800
Subject: [PATCH 19/64] Updated the tests to work with Catch2 v3.
This version uses the CATCH_... macro introducer.
Removed the emacs comments. No need here at this point.
Renamed the main test "main" instead of "tests".
---
csspp/assembler.h | 18 +-
csspp/color.h | 20 +-
csspp/compiler.h | 17 +-
csspp/csspp.h.in | 27 +-
csspp/error.h | 25 +-
csspp/exceptions.h | 16 +-
csspp/expression.h | 18 +-
csspp/lexer.h | 18 +-
csspp/node.h | 27 +-
csspp/nth_child.h | 18 +-
csspp/parser.h | 18 +-
csspp/position.h | 19 +-
csspp/unicode_range.h | 15 +-
tests/CMakeLists.txt | 30 +-
tests/catch_assembler.cpp | 527 +--
tests/catch_color.cpp | 420 +--
tests/catch_compiler.cpp | 1757 +++++-----
tests/catch_csspp.cpp | 183 +-
tests/catch_error.cpp | 295 +-
tests/catch_expr_additive.cpp | 528 +--
tests/catch_expr_conditional.cpp | 123 +-
tests/catch_expr_equality.cpp | 366 ++-
tests/catch_expr_list.cpp | 247 +-
tests/catch_expr_logical_and.cpp | 81 +-
tests/catch_expr_logical_or.cpp | 81 +-
tests/catch_expr_multiplicative.cpp | 1147 ++++---
tests/catch_expr_power.cpp | 248 +-
tests/catch_expr_relational.cpp | 298 +-
tests/catch_expr_unary.cpp | 130 +-
tests/catch_internal_functions.cpp | 1094 ++++---
tests/catch_lexer.cpp | 3593 +++++++++++----------
tests/{catch_tests.cpp => catch_main.cpp} | 56 +-
tests/{catch_tests.h => catch_main.h} | 44 +-
tests/catch_node.cpp | 1086 +++----
tests/catch_nth_child.cpp | 249 +-
tests/catch_parser.cpp | 487 +--
tests/catch_position.cpp | 163 +-
tests/catch_unicode_range.cpp | 145 +-
38 files changed, 7079 insertions(+), 6555 deletions(-)
rename tests/{catch_tests.cpp => catch_main.cpp} (97%)
rename tests/{catch_tests.h => catch_main.h} (74%)
diff --git a/csspp/assembler.h b/csspp/assembler.h
index b867e3f..654ee7e 100644
--- a/csspp/assembler.h
+++ b/csspp/assembler.h
@@ -1,5 +1,3 @@
-#ifndef CSSPP_ASSEMBLER_H
-#define CSSPP_ASSEMBLER_H
// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
@@ -15,8 +13,12 @@
// You should have received a copy of the GNU General Public License along
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#pragma once
+
+// self
+//
+#include "csspp/node.h"
-#include "csspp/node.h"
namespace csspp
{
@@ -58,14 +60,4 @@ class assembler
std::ostream & operator << (std::ostream & out, csspp::output_mode_t const type);
-#endif
-// #ifndef CSSPP_ASSEMBLER_H
-
-// Local Variables:
-// mode: cpp
-// indent-tabs-mode: nil
-// c-basic-offset: 4
-// tab-width: 4
-// End:
-
// vim: ts=4 sw=4 et
diff --git a/csspp/color.h b/csspp/color.h
index b3e5d61..eab759e 100644
--- a/csspp/color.h
+++ b/csspp/color.h
@@ -1,5 +1,3 @@
-#ifndef CSSPP_COLOR_H
-#define CSSPP_COLOR_H
// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
@@ -15,9 +13,13 @@
// You should have received a copy of the GNU General Public License along
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#pragma once
+
+// C++ lib
+//
+#include
+#include
-#include
-#include
namespace csspp
{
@@ -66,14 +68,4 @@ class color
};
} // namespace csspp
-#endif
-// #ifndef CSSPP_COLOR_H
-
-// Local Variables:
-// mode: cpp
-// indent-tabs-mode: nil
-// c-basic-offset: 4
-// tab-width: 4
-// End:
-
// vim: ts=4 sw=4 et
diff --git a/csspp/compiler.h b/csspp/compiler.h
index d311b11..f39ed0b 100644
--- a/csspp/compiler.h
+++ b/csspp/compiler.h
@@ -1,5 +1,3 @@
-#ifndef CSSPP_COMPILER_H
-#define CSSPP_COMPILER_H
// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
@@ -15,8 +13,11 @@
// You should have received a copy of the GNU General Public License along
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#pragma once
-#include "csspp/expression.h"
+// self
+//
+#include "csspp/expression.h"
namespace csspp
{
@@ -129,14 +130,4 @@ class compiler
};
} // namespace csspp
-#endif
-// #ifndef CSSPP_COMPILER_H
-
-// Local Variables:
-// mode: cpp
-// indent-tabs-mode: nil
-// c-basic-offset: 4
-// tab-width: 4
-// End:
-
// vim: ts=4 sw=4 et
diff --git a/csspp/csspp.h.in b/csspp/csspp.h.in
index 04310ac..aad64a6 100644
--- a/csspp/csspp.h.in
+++ b/csspp/csspp.h.in
@@ -1,5 +1,3 @@
-#ifndef CSSPP_CSSPP_H
-#define CSSPP_CSSPP_H
// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
@@ -15,12 +13,19 @@
// You should have received a copy of the GNU General Public License along
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#pragma once
-#include "csspp/exceptions.h"
+// self
+//
+#include "csspp/exceptions.h"
+
+
+// C++ lib
+//
+#include
+#include
+#include
-#include
-#include
-#include
#ifdef __CYGWIN__
namespace std
@@ -115,14 +120,4 @@ private:
};
} // namespace csspp
-#endif
-// #ifndef CSSPP_CSSPP_H
-
-// Local Variables:
-// mode: cpp
-// indent-tabs-mode: nil
-// c-basic-offset: 4
-// tab-width: 4
-// End:
-
// vim: ts=4 sw=4 et
diff --git a/csspp/error.h b/csspp/error.h
index 01da07b..9ae031e 100644
--- a/csspp/error.h
+++ b/csspp/error.h
@@ -1,5 +1,3 @@
-#ifndef CSSPP_ERROR_H
-#define CSSPP_ERROR_H
// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
@@ -15,11 +13,18 @@
// You should have received a copy of the GNU General Public License along
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#pragma once
-#include "csspp/position.h"
+// self
+//
+#include "csspp/position.h"
+
+
+// C++ lib
+//
+#include
+#include
-#include
-#include
namespace csspp
{
@@ -127,14 +132,4 @@ class error_happened_t
std::ostream & operator << (std::ostream & out, csspp::error_mode_t const type);
-#endif
-// #ifndef CSSPP_LEXER_H
-
-// Local Variables:
-// mode: cpp
-// indent-tabs-mode: nil
-// c-basic-offset: 4
-// tab-width: 4
-// End:
-
// vim: ts=4 sw=4 et
diff --git a/csspp/exceptions.h b/csspp/exceptions.h
index 60788b1..a621c8e 100644
--- a/csspp/exceptions.h
+++ b/csspp/exceptions.h
@@ -1,5 +1,3 @@
-#ifndef CSSPP_EXCEPTIONS_H
-#define CSSPP_EXCEPTIONS_H
// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
@@ -15,9 +13,13 @@
// You should have received a copy of the GNU General Public License along
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#pragma once
+// C++ lib
+//
#include
+
namespace csspp
{
@@ -75,14 +77,4 @@ class csspp_exception_exit : public csspp_exception_runtime
};
} // namespace csspp
-#endif
-// #ifndef CSSPP_EXCEPTIONS_H
-
-// Local Variables:
-// mode: cpp
-// indent-tabs-mode: nil
-// c-basic-offset: 4
-// tab-width: 4
-// End:
-
// vim: ts=4 sw=4 et
diff --git a/csspp/expression.h b/csspp/expression.h
index 12fbe72..8df7173 100644
--- a/csspp/expression.h
+++ b/csspp/expression.h
@@ -1,5 +1,3 @@
-#ifndef CSSPP_EXPRESSION_H
-#define CSSPP_EXPRESSION_H
// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
@@ -15,8 +13,12 @@
// You should have received a copy of the GNU General Public License along
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#pragma once
+
+// self
+//
+#include "csspp/node.h"
-#include "csspp/node.h"
namespace csspp
{
@@ -158,14 +160,4 @@ class expression
#pragma GCC diagnostic pop
} // namespace csspp
-#endif
-// #ifndef CSSPP_LEXER_H
-
-// Local Variables:
-// mode: cpp
-// indent-tabs-mode: nil
-// c-basic-offset: 4
-// tab-width: 4
-// End:
-
// vim: ts=4 sw=4 et
diff --git a/csspp/lexer.h b/csspp/lexer.h
index 7e1f7d8..00938de 100644
--- a/csspp/lexer.h
+++ b/csspp/lexer.h
@@ -1,5 +1,3 @@
-#ifndef CSSPP_LEXER_H
-#define CSSPP_LEXER_H
// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
@@ -15,8 +13,12 @@
// You should have received a copy of the GNU General Public License along
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#pragma once
+
+// self
+//
+#include "csspp/node.h"
-#include "csspp/node.h"
namespace csspp
{
@@ -129,14 +131,4 @@ class lexer
};
} // namespace csspp
-#endif
-// #ifndef CSSPP_LEXER_H
-
-// Local Variables:
-// mode: cpp
-// indent-tabs-mode: nil
-// c-basic-offset: 4
-// tab-width: 4
-// End:
-
// vim: ts=4 sw=4 et
diff --git a/csspp/node.h b/csspp/node.h
index 94d5b4c..7188a03 100644
--- a/csspp/node.h
+++ b/csspp/node.h
@@ -1,5 +1,3 @@
-#ifndef CSSPP_NODE_H
-#define CSSPP_NODE_H
// Copyright (c) 2015-2022 Made to Order Software Corp. All Rights Reserved
//
// This program is free software; you can redistribute it and/or modify
@@ -15,12 +13,19 @@
// You should have received a copy of the GNU General Public License along
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#pragma once
-#include
-#include
+// self
+//
+#include "csspp/color.h"
+#include "csspp/error.h"
+
+
+// C++ lib
+//
+#include