Merge the v3 branch into separate namespace + fix Docker stuff (again)

I was getting tired of having to keep two branches up-to-date with the
latest developments, so decided to throw v3 into the same branch - just
different files (...which will get mostly rewritten again soon). The two
versions aren't very different in terms of dependencies, build system
and support code, so they can now properly share files. Added a section
to the README to avoid confusion.

This merge also makes it easier to quickly switch between the different
versions, which is handy for development. It's even possible to run both
at the same time, but my scripts use the same port so that needs a
workaround.

And it's amazing how often I break the Docker scripts.

1 files changed, 54 insertions, 0 deletions

diff --git a/lib/VN3/Prelude.pm b/lib/VN3/Prelude.pm
new file mode 100644
index 00000000..3e9465ef
--- /dev/null
+++ b/lib/VN3/Prelude.pm
@@ -0,0 +1,54 @@
+# Importing this module is equivalent to:
+#
+#  use strict;
+#  use warnings;
+#  use v5.10;
+#  use utf8;
+#
+#  use TUWF ':Html5', 'mkclass';
+#  use Exporter 'import';
+#  use Time::HiRes 'time';
+#
+#  use VNDBUtil;
+#  use VN3::HTML;
+#  use VN3::Auth;
+#  use VN3::DB;
+#  use VN3::Types;
+#  use VN3::Validation;
+#  use VN3::BBCode;
+#
+# WARNING: This should not be used from the above modules.
+package VN3::Prelude;
+
+use strict;
+use warnings;
+use utf8;
+use feature ':5.10';
+
+sub import {
+    my $c = caller;
+
+    strict->import;
+    warnings->import;
+    feature->import(':5.10');
+    utf8->import;
+
+    die $@ if !eval <<"    EOM;";
+    package $c;
+
+    use TUWF ':Html5', 'mkclass';
+    use Exporter 'import';
+    use Time::HiRes 'time';
+
+    use VNDBUtil;
+    use VN3::HTML;
+    use VN3::Auth;
+    use VN3::DB;
+    use VN3::Types;
+    use VN3::Validation;
+    use VN3::BBCode;
+    1;
+    EOM;
+}
+
+1;