mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-10-20 22:27:31 +09:00
Revert "Issue #1676 - Part 7: Split frontend sources out of js/src/moz.build"
This reverts commit 1396383aeed414c23b3dce639932987000412be0.
This commit is contained in:
parent
5f23cd3017
commit
cd3c43e614
2 changed files with 16 additions and 28 deletions
|
|
@ -1,27 +0,0 @@
|
||||||
# -*- 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']
|
|
||||||
|
|
@ -11,7 +11,6 @@ DIRS += [
|
||||||
'builtin',
|
'builtin',
|
||||||
'devtools',
|
'devtools',
|
||||||
'ds',
|
'ds',
|
||||||
'frontend',
|
|
||||||
]
|
]
|
||||||
|
|
||||||
if CONFIG['JS_BUNDLED_EDITLINE']:
|
if CONFIG['JS_BUNDLED_EDITLINE']:
|
||||||
|
|
@ -119,6 +118,12 @@ EXPORTS.js += [
|
||||||
]
|
]
|
||||||
|
|
||||||
SOURCES += [
|
SOURCES += [
|
||||||
|
'frontend/BytecodeCompiler.cpp',
|
||||||
|
'frontend/BytecodeEmitter.cpp',
|
||||||
|
'frontend/FoldConstants.cpp',
|
||||||
|
'frontend/NameFunctions.cpp',
|
||||||
|
'frontend/ParseNode.cpp',
|
||||||
|
'frontend/TokenStream.cpp',
|
||||||
'gc/Allocator.cpp',
|
'gc/Allocator.cpp',
|
||||||
'gc/Barrier.cpp',
|
'gc/Barrier.cpp',
|
||||||
'gc/GCTrace.cpp',
|
'gc/GCTrace.cpp',
|
||||||
|
|
@ -324,6 +329,8 @@ SOURCES += [
|
||||||
|
|
||||||
# jsarray.cpp and jsatom.cpp cannot be built in unified mode because
|
# jsarray.cpp and jsatom.cpp cannot be built in unified mode because
|
||||||
# xpcshell is broken during packaging when compiled with gcc-4.8.2
|
# 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
|
# jsdtoa.cpp cannot be built in unified mode because we want to suppress
|
||||||
# compiler warnings in third-party dtoa.c.
|
# compiler warnings in third-party dtoa.c.
|
||||||
# jsmath.cpp cannot be built in unified mode because it needs to pull rand_s
|
# jsmath.cpp cannot be built in unified mode because it needs to pull rand_s
|
||||||
|
|
@ -334,6 +341,7 @@ SOURCES += [
|
||||||
# instantiations may or may not be needed depending on what it gets bundled
|
# instantiations may or may not be needed depending on what it gets bundled
|
||||||
# with.
|
# with.
|
||||||
SOURCES += [
|
SOURCES += [
|
||||||
|
'frontend/Parser.cpp',
|
||||||
'gc/StoreBuffer.cpp',
|
'gc/StoreBuffer.cpp',
|
||||||
'jsarray.cpp',
|
'jsarray.cpp',
|
||||||
'jsatom.cpp',
|
'jsatom.cpp',
|
||||||
|
|
@ -543,6 +551,13 @@ else:
|
||||||
'perf/pm_stub.cpp'
|
'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
|
# 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
|
# 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,
|
# the js code getting copied into xpinstall and jsd as well as mozilla-bin,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue