diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP deleted file mode 100644 index 4a964bc40..000000000 --- a/MANIFEST.SKIP +++ /dev/null @@ -1,76 +0,0 @@ -\.ccache/ -\.clang-format -\.clang-tidy -\.git/ -\.git$ -\.github/ -\.svn/ -\.(bak|old)/ -\.(bak|old)$ -\.tar\. -.*\.tgz -.*\.log -\..*\.swp -.*\.tmp -.*\.tidy -.*\.tex -.*\.key -.*\.vcd -.*\.1 -\.codacy\.yml -\.travis\.yml -/_build/ -/build/ -/obj_dbg/ -/obj_dir/ -/obj_dist/ -/obj_iv/ -/obj_ms/ -/obj_nc/ -/obj_opt/ -/obj_vcs/ -/obj_vlt/ -/obj_vltmt/ -INCA_libs/ -/cov_work/ -/logs/ -^Makefile$ -README.html -bin/verilator_bin.* -bin/verilator_coverage_bin.* -docs/.*\.html$ -docs/_build/ -docs/clang-format.txt$ -docs/doxygen-doc/.* -docs/spelling.txt -examples/xml_py/copied/ -examples/xml_py/graph.* -sonar-project.properties -src/Makefile$ -src/Makefile_obj$ -include/verilated.mk$ -test_regress/.gdbinit$ -test_regress/transcript -codecov.yml -config.cache$ -config.status$ -verilator\.log -verilator\.tex -verilator-config.cmake$ -verilator-config-version.cmake$ -verilator.pc$ -verilator_bin.* -verilator_coverage_bin.* -.vcsmx_rebuild$ -ncverilog.history -autom4te\.cache/ -nodist/ -ci/ -/simv$ -/simv.daidir/ -/vc_hdrs.h$ -/csrc/ -obj_dir.* -TAGS -gmon.out -.*~ diff --git a/Makefile.in b/Makefile.in index 38c73b19d..7b09873c8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -118,81 +118,6 @@ INFOS = verilator.html verilator.pdf INFOS_OLD = README README.html README.pdf -# Files that can be generated, but should be up to date for a distribution. -DISTDEP = info Makefile - -DISTFILES1 = $(INFOS) .gitignore \ - *.in *.ac \ - Artistic \ - Changes \ - LICENSE \ - MANIFEST.SKIP \ - README.rst \ - verilator-config.cmake.in \ - verilator-config-version.cmake.in \ - bin/verilator \ - bin/verilator_ccache_report \ - bin/verilator_coverage \ - bin/verilator_difftree \ - bin/verilator_gantt \ - bin/verilator_includer \ - bin/verilator_profcfunc \ - docs/.gitignore \ - docs/CONTRIBUTING.rst \ - docs/CONTRIBUTORS \ - docs/Makefile \ - docs/_static/*.png \ - docs/_static/css/* \ - docs/bin/* \ - docs/gen/* \ - docs/guide/*.py \ - docs/guide/*.rst \ - docs/guide/figures/* \ - docs/install.rst \ - docs/internals.rst \ - docs/internals.rst \ - docs/verilated.dox \ - docs/xml.rst \ - install-sh configure *.pod \ - include/*.[chv]* \ - include/*.in \ - include/.*ignore \ - include/gtkwave/*.[chv]* \ - include/vltstd/*.[chv]* \ - .*attributes */.*attributes */*/.*attributes \ - src/.*ignore src/*.in src/*.cpp src/*.[chly] \ - src/astgen src/bisonpre src/*fix src/cppcheck_filtered \ - src/config_rev \ - src/vlcovgen src/mkinstalldirs \ - src/.gdbinit \ - src/*.pl src/*.pod \ - examples/*/.*ignore examples/*/Makefile* \ - examples/*/*.[chv]* examples/*/vl_* \ - examples/*/CMakeLists.txt \ - -DISTFILES2 = \ - test_*/.*ignore test_*/Makefile* test_*/*.cpp \ - test_*/*.pl test_*/*.v test_*/*.vc test_*/*.vh \ - test_regress/*.pl \ - test_regress/Makefile \ - test_regress/Makefile_obj \ - test_regress/input.vc \ - test_regress/CMakeLists.txt \ - test_regress/t/t*/*.sv* \ - test_regress/t/t*/*.v* \ - test_regress/t/t*/*/*.sv* \ - test_regress/t/t*/*/*.v* \ - test_regress/t/t*/*.cpp \ - test_regress/t/t*/CMakeLists.txt \ - test_regress/t/*.cpp \ - test_regress/t/*.h \ - test_regress/t/*.dat \ - test_regress/t/*.mem \ - test_regress/t/*.out \ - test_regress/t/*.pl \ - test_regress/t/*.pf \ - test_regress/t/*.v* \ - INST_PROJ_FILES = \ bin/verilator \ bin/verilator_ccache_report \ @@ -386,44 +311,7 @@ uninstall: install: all_nomsg install-all install-all: installbin installman installdata install-msg -install-here: installman ftp - -ifeq ($(VERILATOR_AUTHOR_SITE),1) # Local... Else don't burden users -DISTNAMEREV = $(shell sed -e '/DTVERSION/!d' -e 's/.*verilator_\([^"]*\).*/\1/' -e q ${srcdir}/src/config_rev.h) - -VERILATOR_CAD_DIR = $(CAD_DIR)/verilator/$(DISTNAMEREV)/$(DIRPROJECT_ARCH) -INST_PROJ_CVS = cp_if_cvs_diff - -install-cadtools: dist - @echo "Install-project to $(CAD_DIR)" - strip bin/verilator_bin* - strip bin/verilator_coverage_bin* - $(MAKE) install-cadtools-quick - $(MKINSTALLDIRS) $(VERILATOR_CAD_DIR)/man/man1 - for p in $(VL_INST_MAN_FILES) ; do \ - $(INSTALL_DATA) $$p $(VERILATOR_CAD_DIR)/man/man1/$$p; \ - done - $(INST_PROJ_CVS) $(DISTNAME).tgz $(VERILATOR_CAD_DIR)/verilator.tgz - rm $(DISTNAME).tgz - -install-cadtools-quick: -ifeq ($(CFG_WITH_DEFENV),yes) - @echo "%Error: Reconfigure with './configure --disable-defenv' to avoid hardcoded paths." - false -endif - @echo "Install-cadtools-quick (no strip) to $(VERILATOR_CAD_DIR)" - $(MKINSTALLDIRS) $(VERILATOR_CAD_DIR)/include/gtkwave - $(MKINSTALLDIRS) $(VERILATOR_CAD_DIR)/include/vltstd - $(MKINSTALLDIRS) $(VERILATOR_CAD_DIR)/bin - for p in $(INST_PROJ_FILES) ; do \ - $(INST_PROJ_CVS) $$p $(VERILATOR_CAD_DIR)/$$p; \ - done - for p in $(INST_PROJ_BIN_FILES) ; do \ - $(INST_PROJ_CVS) $$p $(VERILATOR_CAD_DIR)/$$p; \ - done - -# VERILATOR_AUTHOR_SITE -endif +install-here: installman info # Use --xml flag to see the cppcheck code to use for suppression CPPCHECK_CPP = $(wildcard \ @@ -524,9 +412,6 @@ lint-py: format-pl-exec: -chmod a+x test_regress/t/*.pl - -ftp: info - install-msg: @echo @echo "Installed binaries to $(DESTDIR)$(bindir)/verilator" @@ -597,15 +482,6 @@ TAGS: $(TAGFILES) doxygen: $(MAKE) -C docs doxygen -###################################################################### -# Test targets - -dist-file-list: - @echo "begin-dist-file-list:"; # Scripts look for this - @echo $(wildcard $(DISTFILES1)) - @echo $(wildcard $(DISTFILES2)) - @echo "end-dist-file-list:"; # Scripts look for this - ###################################################################### # Distributions @@ -613,36 +489,16 @@ DISTTITLE := Verilator $(word 1,$(PACKAGE_VERSION)) DISTNAME := verilator-$(word 1,$(PACKAGE_VERSION)) DISTDATEPRE := $(word 2,$(PACKAGE_VERSION)) DISTDATE := $(subst /,-,$(DISTDATEPRE)) - DISTTAGNAME := $(subst .,_,$(subst -,_,$(DISTNAME))) tag: svnorcvs tag $(DISTTAGNAME) -# Don't depend on DISTFILES because there's no rule for "standards.info*". -dist: $(DISTDEP) maintainer-copy - -rm -fr $(DISTNAME) - for file in $(DISTFILES1); do \ - mkdir -p `dirname $(DISTNAME)/$$file` >/dev/null ; \ - ln $$file $(DISTNAME)/$$file \ - || { echo copying $$file instead; cp -p $$file $(DISTNAME)/$$file;}; \ - done; true; - for file in $(DISTFILES2); do \ - mkdir -p `dirname $(DISTNAME)/$$file` >/dev/null ; \ - ln $$file $(DISTNAME)/$$file \ - || { echo copying $$file instead; cp -p $$file $(DISTNAME)/$$file;}; \ - done; true; - chmod -R a+r $(DISTNAME) - tar chf $(DISTNAME).tar $(DISTNAME) - gzip --force --best $(DISTNAME).tar - mv $(DISTNAME).tar.gz $(DISTNAME).tgz - rm -fr $(DISTNAME) - maintainer-diff: svnorcvs diff $(DISTTAGNAME) preexist: svnorcvs nexists $(DISTTAGNAME) -maintainer-dist: preexist dist tag - svnorcvs release $(DISTNAME).tgz +maintainer-dist: preexist tag + svnorcvs release $(DISTTAGNAME) diff --git a/test_regress/t/t_dist_manifest.pl b/test_regress/t/t_dist_manifest.pl deleted file mode 100755 index dcd6ef8f3..000000000 --- a/test_regress/t/t_dist_manifest.pl +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/env perl -if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); die; } -# DESCRIPTION: Verilator: Verilog Test driver/expect definition -# -# Copyright 2003 by Wilson Snyder. This program is free software; you -# can redistribute it and/or modify it under the terms of either the GNU -# Lesser General Public License Version 3 or the Perl Artistic License -# Version 2.0. -# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0 - -scenarios(dist => 1); - -my $root = ".."; - -### Must trim output before and after our file list -my %files = %{get_manifest_files($root)}; - -my $all_files = `cd $root && find . -type f -print`; -foreach my $file (split /\s+/,$all_files) { - next if $file eq ''; - $file =~ s!^\./!!; - $files{$file} |= 2; -} - -my %file_regexps; -my $skip = file_contents("$root/MANIFEST.SKIP"); -foreach my $file (sort keys %files) { - foreach my $skip (split /\s+/,$skip) { - if ($file =~ /$skip/) { - $files{$file} |= 4; - $file_regexps{$file} = $skip; - } - } -} - -# The repo may be a Git worktree -my $git_dir = `cd $root ; git rev-parse --git-common-dir`; -chomp $git_dir; -if (! -d $git_dir) { - $git_dir = ".git"; -} - -# Ignore files locally excluded -my $git_exclude = `cd $root && git ls-files --others --ignored --exclude-from $git_dir/info/exclude`; -foreach my $exclude (split /\s+/, $git_exclude) { - if (exists $files{$exclude}) { - $files{$exclude} |= 8; - } -} - -my %warns; -foreach my $file (sort keys %files) { - my $tar = $files{$file}&1; - my $dir = $files{$file}&2; - my $skip = $files{$file}&4; - my $exclude = $files{$file}&8; - - print +(($tar ? "TAR ":" ") - .($dir ? "DIR ":" ") - .($skip ? "SKIP ":" ") - .($exclude ? "EXCL ":" ") - ." $file\n") if $Self->{verbose}; - - if ($dir && !$tar && !$skip && !$exclude) { - $warns{$file} = "File not in manifest or MANIFEST.SKIP: $file"; - } elsif (!$dir && $tar && !$skip) { - $warns{$file} = "File in manifest, but not directory: $file"; - } elsif ($dir && $tar && $skip) { - $warns{$file} = "File in manifest and also MANIFEST.SKIP, too general skip regexp '$file_regexps{$file}'?: $file"; - } -} - -if (keys %warns) { - # First warning lists everything as that's shown in the driver summary - error("Files mismatch with manifest: ",join(' ',sort keys %warns)); - foreach my $file (sort keys %warns) { - error($warns{$file}); - } -} - -ok(1); -1; - -sub get_manifest_files { - my $root = shift; - `cd $root && $ENV{MAKE} dist-file-list`; - my $manifest_files = `cd $root && $ENV{MAKE} dist-file-list`; - $manifest_files =~ s!.*begin-dist-file-list:!!sg; - $manifest_files =~ s!end-dist-file-list:.*$!!sg; - print "MF $manifest_files\n" if $Self->{verbose}; - my %files; - foreach my $file (split /\s+/,$manifest_files) { - next if $file eq ''; - $files{$file} |= 1; - } - return \%files; -}