From a3bc68b4e92b4bb9d3ee0461c4c9e84b0b0c2e2d Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Wed, 4 Nov 2020 20:26:51 -0500
Subject: [PATCH] Issue #1677 - Part 2: Add build files

---
 js/moz.configure        | 13 +++++++++++++
 js/src/moz.build        |  3 +++
 js/src/regexp/moz.build | 31 +++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100644 js/src/regexp/moz.build

diff --git a/js/moz.configure b/js/moz.configure
index 7687731f99..3bbaf01a3b 100644
--- a/js/moz.configure
+++ b/js/moz.configure
@@ -246,3 +246,16 @@ with only_when('--enable-compile-environment'):
 
     set_config('LIBFUZZER', enable_libfuzzer)
     set_define('LIBFUZZER', enable_libfuzzer)
+
+# Initial support for new regexp engine
+# ==================================================
+
+js_option('--enable-new-regexp', default=False, help='Enable new regexp engine')
+
+@depends('--enable-new-regexp')
+def enable_new_regexp(value):
+    if value:
+        return True
+
+set_config('JS_NEW_REGEXP', enable_new_regexp)
+set_define('JS_NEW_REGEXP', enable_new_regexp)
diff --git a/js/src/moz.build b/js/src/moz.build
index f9e5233a9f..a6ee7b7375 100644
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -122,6 +122,9 @@ if CONFIG['JS_HAS_CTYPES']:
 if CONFIG['JS_BUNDLED_EDITLINE']:
     DIRS += ['editline']
 
+if CONFIG['JS_NEW_REGEXP']:
+    DIRS += ['regexp']
+
 if not CONFIG['JS_DISABLE_SHELL']:
     DIRS += ['shell']
 
diff --git a/js/src/regexp/moz.build b/js/src/regexp/moz.build
new file mode 100644
index 0000000000..f8fc99921e
--- /dev/null
+++ b/js/src/regexp/moz.build
@@ -0,0 +1,31 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+include('../js-config.mozbuild')
+include('../js-cxxflags.mozbuild')
+
+FINAL_LIBRARY = "js"
+
+# Includes should be relative to parent path
+LOCAL_INCLUDES += ["!..", ".."]
+
+SOURCES += [
+    'regexp-ast.cc',
+    'regexp-bytecode-generator.cc',
+    'regexp-bytecode-peephole.cc',
+    'regexp-bytecodes.cc',
+    'regexp-compiler-tonode.cc',
+    'regexp-compiler.cc',
+    'regexp-dotprinter.cc',
+    'regexp-interpreter.cc',
+    'regexp-macro-assembler-tracer.cc',
+    'regexp-macro-assembler.cc',
+    'regexp-parser.cc',
+    'regexp-stack.cc',
+]
+
+if CONFIG['ENABLE_INTL_API']:
+    CXXFLAGS += ['-DV8_INTL_SUPPORT']
+    SOURCES += ['property-sequences.cc']
\ No newline at end of file