Bug 1382697 - Remove --no-symlinks argument from process_install_manifest; r=glandium
This is a partial revert of dd4cbc33bad4 (
bug 1143421).
This commit will break some consumers of the SpiderMonkey build system.
Upcoming commits will restore the functionality but will do so using
a different mechanism. It is easier to remove this code now so we
don't have to deal with the complexity later.
MozReview-Commit-ID: 6dV7x0qaiYr
--- a/js/src/build/Makefile.in
+++ b/js/src/build/Makefile.in
@@ -65,17 +65,17 @@ install:: ../js-config.h
# js/src/ds/* public headers
# gc/
# js/src/gc/* public headers
# mozilla/
# mfbt headers
#
install::
- $(call py_action,process_install_manifest,--no-remove --no-symlinks $(DESTDIR)$(includedir) $(DEPTH)/_build_manifests/install/dist_include)
+ $(call py_action,process_install_manifest,--no-remove $(DESTDIR)$(includedir) $(DEPTH)/_build_manifests/install/dist_include)
#
# END SpiderMonkey header installation
#############################################
install:: $(SCRIPTS)
$(SYSINSTALL) $^ $(DESTDIR)$(bindir)
--- a/python/mozbuild/mozbuild/action/process_install_manifest.py
+++ b/python/mozbuild/mozbuild/action/process_install_manifest.py
@@ -14,31 +14,29 @@ from mozpack.copier import (
FileRegistry,
)
from mozpack.files import (
BaseFile,
FileFinder,
)
from mozpack.manifests import (
InstallManifest,
- InstallManifestNoSymlinks,
)
from mozbuild.util import DefinesAction
COMPLETE = 'Elapsed: {elapsed:.2f}s; From {dest}: Kept {existing} existing; ' \
'Added/updated {updated}; ' \
'Removed {rm_files} files and {rm_dirs} directories.'
def process_manifest(destdir, paths, track=None,
remove_unaccounted=True,
remove_all_directory_symlinks=True,
remove_empty_directories=True,
- no_symlinks=False,
defines={}):
if track:
if os.path.exists(track):
# We use the same format as install manifests for the tracking
# data.
manifest = InstallManifest(path=track)
remove_unaccounted = FileRegistry()
@@ -51,20 +49,19 @@ def process_manifest(destdir, paths, tra
else:
# If tracking is enabled and there is no file, we don't want to
# be removing anything.
remove_unaccounted=False
remove_empty_directories=False
remove_all_directory_symlinks=False
- manifest_cls = InstallManifestNoSymlinks if no_symlinks else InstallManifest
- manifest = manifest_cls()
+ manifest = InstallManifest()
for path in paths:
- manifest |= manifest_cls(path=path)
+ manifest |= InstallManifest(path=path)
copier = FileCopier()
manifest.populate_registry(copier, defines_override=defines)
result = copier.copy(destdir,
remove_unaccounted=remove_unaccounted,
remove_all_directory_symlinks=remove_all_directory_symlinks,
remove_empty_directories=remove_empty_directories)
@@ -81,33 +78,30 @@ def main(argv):
parser.add_argument('destdir', help='Destination directory.')
parser.add_argument('manifests', nargs='+', help='Path to manifest file(s).')
parser.add_argument('--no-remove', action='store_true',
help='Do not remove unaccounted files from destination.')
parser.add_argument('--no-remove-all-directory-symlinks', action='store_true',
help='Do not remove all directory symlinks from destination.')
parser.add_argument('--no-remove-empty-directories', action='store_true',
help='Do not remove empty directories from destination.')
- parser.add_argument('--no-symlinks', action='store_true',
- help='Do not install symbolic links. Always copy files')
parser.add_argument('--track', metavar="PATH",
help='Use installed files tracking information from the given path.')
parser.add_argument('-D', action=DefinesAction,
dest='defines', metavar="VAR[=VAL]",
help='Define a variable to override what is specified in the manifest')
args = parser.parse_args(argv)
start = time.time()
result = process_manifest(args.destdir, args.manifests,
track=args.track, remove_unaccounted=not args.no_remove,
remove_all_directory_symlinks=not args.no_remove_all_directory_symlinks,
remove_empty_directories=not args.no_remove_empty_directories,
- no_symlinks=args.no_symlinks,
defines=args.defines)
elapsed = time.time() - start
print(COMPLETE.format(
elapsed=elapsed,
dest=args.destdir,
existing=result.existing_files_count,