Bundle PCRE2.

Author: eerimoq

.github/workflows/cygwin.bat

@@ -87,8 +87,7 @@ python38,^
 python38-pip,^
 python38-devel,^
 libsqlite3-devel,^
-libuv-devel,^
-libpcre2-devel
+libuv-devel
 
 ECHO.
 ECHO Cygwin Installed

.gitignore

@@ -132,12 +132,9 @@ a.out
 /foo*
 .test_*.toml
 build_*
-!build_pcre2
-!build_libuv
 *.gch
 /install
 !/mys/cli/templates/build
-/mys/lib/pcre2/
 mys/lib/3pp/bin/
 mys/lib/3pp/include/
 mys/lib/3pp/lib/

docs/user-guide/installation.rst

@@ -4,8 +4,8 @@ Installation
 Linux
 ^^^^^
 
-#. Install recent versions of ``g++``, ``make``, ``ccache``,
-   ``libuv1-dev`` and ``libpcre2-dev``.
+#. Install recent versions of ``g++``, ``make``, ``ccache`` and
+   ``libuv1-dev``.
 
 #. Install Python 3.8 or later, and then install Mys using ``pip``.
 
@@ -22,8 +22,8 @@ Linux
 macOS
 ^^^^^
 
-#. Install recent versions of ``ccache``, ``libuv``, ``pcre2`` and
-   ``pkg-config`` using ``brew``.
+#. Install recent versions of ``ccache``, ``libuv`` and ``pkg-config``
+   using ``brew``.
 
 #. Install Python 3.8 or later, and then install Mys using ``pip``.
 
@@ -41,8 +41,8 @@ Windows
 ^^^^^^^
 
 #. Install `Cygwin`_. Required packages are ``gcc-g++``, ``make``,
-   ``python38``, ``python38-pip``, ``python38-devel``, ``ccache``,
-   ``libuv-devel``, and ``libpcre2-devel``.
+   ``python38``, ``python38-pip``, ``python38-devel``, ``ccache`` and
+   ``libuv-devel``.
 
 #. Start Cygwin and install Mys.
 

mys/cli/templates/build/Makefile

@@ -1,17 +1,19 @@
-.PHONY: all test
+.PHONY: pcre2 all test
 
-LIB = {mys_dir}/lib
-#export CCACHE_BASEDIR = {mys_dir}
+MYS_DIR = {mys_dir}
+LIB = $(MYS_DIR)/lib
+#export CCACHE_BASEDIR = $(MYS_DIR)
 export CCACHE_SLOPPINESS = pch_defines,time_macros,include_file_mtime,include_file_ctime
 
 STATUS_PATH ?= {status_path}
 BUILD := {build}
 GCH := $(BUILD)/mys_pre_
 MYS_CXX ?= {ccache}$(CXX)
 MYS ?= {mys}
+CFLAGS += -I$(BUILD)/pcre2/src
 CFLAGS += $(CFLAGS_EXTRA)
 CFLAGS += -I$(LIB)
-CFLAGS += $(shell pkg-config libpcre2-32 libuv --cflags)
+CFLAGS += $(shell pkg-config libuv --cflags)
 CFLAGS += -I$(BUILD)/cpp/include
 CFLAGS += {cflags}
 # CFLAGS += -Wall
@@ -52,24 +54,31 @@ OBJ_SUFFIX = o
 EXE = $(BUILD)/app
 endif
 LDFLAGS += $(LDFLAGS_EXTRA)
+LDFLAGS += -L$(BUILD)/pcre2
 LDFLAGS += -std=c++17
 # LDFLAGS += -static
 # LDFLAGS += -Wl,--gc-sections
 LDFLAGS += -fdiagnostics-color=always
-LIBS += $(shell pkg-config libpcre2-32 libuv --libs)
+LIBS += $(shell pkg-config libuv --libs)
+LIBS += -lpcre2
 LIBS += -lpthread
 LIBS += {libs}
 {transpiled_cpp}
 {objs}
 
-all:
+all: pcre2
+	$(MAKE) -f $(BUILD)/Makefile $(BUILD)/transpile {hpps}
 	$(MAKE) -f $(BUILD)/Makefile $(BUILD)/transpile {hpps}
 	$(MAKE) -f $(BUILD)/Makefile {all_deps} {assets}
 
-test:
+test: pcre2
 	$(MAKE) -f $(BUILD)/Makefile $(BUILD)/transpile {hpps}
 	$(MAKE) -f $(BUILD)/Makefile $(EXE) {assets}
 
+pcre2:
+	rsync -tr $(MYS_DIR)/pcre2 $(BUILD)
+	env CC="{ccache}$(CC)" $(MAKE) -C $(BUILD)/pcre2
+
 $(BUILD)/transpile: {transpile_srcs_paths}
 	@echo "> Transpiling {number_of_modules} modules" >> $(STATUS_PATH)
 	$(MYS) $(TRANSPILE_DEBUG) transpile $(TRANSPILE_COVERAGE) \

mys/pcre2/AUTHORS

@@ -0,0 +1,36 @@
+THE MAIN PCRE2 LIBRARY CODE
+---------------------------
+
+Written by:       Philip Hazel
+Email local part: Philip.Hazel
+Email domain:     gmail.com
+
+Retired from University of Cambridge Computing Service,
+Cambridge, England.
+
+Copyright (c) 1997-2021 University of Cambridge
+All rights reserved
+
+
+PCRE2 JUST-IN-TIME COMPILATION SUPPORT
+--------------------------------------
+
+Written by:       Zoltan Herczeg
+Email local part: hzmester
+Emain domain:     freemail.hu
+
+Copyright(c) 2010-2021 Zoltan Herczeg
+All rights reserved.
+
+
+STACK-LESS JUST-IN-TIME COMPILER
+--------------------------------
+
+Written by:       Zoltan Herczeg
+Email local part: hzmester
+Emain domain:     freemail.hu
+
+Copyright(c) 2009-2021 Zoltan Herczeg
+All rights reserved.
+
+####

mys/pcre2/COPYING

@@ -0,0 +1,5 @@
+PCRE2 LICENCE
+
+Please see the file LICENCE in the PCRE2 distribution for licensing details.
+
+End