Issue #1676 - Part 7: Split frontend sources out of js/src/moz.build

2 files changed, 28 insertions, 16 deletions

diff --git a/js/src/frontend/moz.build b/js/src/frontend/moz.build
new file mode 100644
index 0000000000..55037dd5a4
--- /dev/null
+++ b/js/src/frontend/moz.build
@@ -0,0 +1,27 @@
+# -*- 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 += [
+    'BytecodeCompiler.cpp',
+    'BytecodeEmitter.cpp',
+    'FoldConstants.cpp',
+    'NameFunctions.cpp',
+    'ParseNode.cpp',
+    'Parser.cpp',
+    'TokenStream.cpp',
+]
+
+GENERATED_FILES += ['ReservedWordsGenerated.h']
+ReservedWordsGenerated = GENERATED_FILES['ReservedWordsGenerated.h']
+ReservedWordsGenerated.script = 'GenerateReservedWords.py'
+ReservedWordsGenerated.inputs += ['ReservedWords.h']
\ No newline at end of file
diff --git a/js/src/moz.build b/js/src/moz.build
index ca8d95b643..bcf7680650 100644
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -13,6 +13,7 @@ DIRS += [
     'builtin',
     'devtools',
     'ds',
+    'frontend',
 ]
 
 if CONFIG['JS_BUNDLED_EDITLINE']:
@@ -117,12 +118,6 @@ EXPORTS.js += [
 ]
 
 SOURCES += [
-    'frontend/BytecodeCompiler.cpp',
-    'frontend/BytecodeEmitter.cpp',
-    'frontend/FoldConstants.cpp',
-    'frontend/NameFunctions.cpp',
-    'frontend/ParseNode.cpp',
-    'frontend/TokenStream.cpp',
     'gc/Allocator.cpp',
     'gc/Barrier.cpp',
     'gc/GCTrace.cpp',
@@ -328,8 +323,6 @@ SOURCES += [
 
 # jsarray.cpp and jsatom.cpp cannot be built in unified mode because
 # xpcshell is broken during packaging when compiled with gcc-4.8.2
-# frontend/Parser.cpp cannot be built in unified mode because of explicit
-# template instantiations.
 # jsdtoa.cpp cannot be built in unified mode because we want to suppress
 # compiler warnings in third-party dtoa.c.
 # jsmath.cpp cannot be built in unified mode because it needs to pull rand_s
@@ -340,7 +333,6 @@ SOURCES += [
 # instantiations may or may not be needed depending on what it gets bundled
 # with.
 SOURCES += [
-    'frontend/Parser.cpp',
     'gc/StoreBuffer.cpp',
     'jsarray.cpp',
     'jsatom.cpp',
@@ -550,13 +542,6 @@ else:
         'perf/pm_stub.cpp'
     ]
 
-GENERATED_FILES += ['frontend/ReservedWordsGenerated.h']
-ReservedWordsGenerated = GENERATED_FILES['frontend/ReservedWordsGenerated.h']
-ReservedWordsGenerated.script = 'frontend/GenerateReservedWords.py'
-ReservedWordsGenerated.inputs += [
-    'frontend/ReservedWords.h'
-]
-
 # JavaScript must be built shared, even for static builds, as it is used by
 # other modules which are always built shared. Failure to do so results in
 # the js code getting copied into xpinstall and jsd as well as mozilla-bin,