From 84a2cd0ec701ce7fd930f5f035758f7edab16a63 Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Wed, 26 Jun 2019 18:50:38 -0400 Subject: [PATCH] Remove some old DIRPROJECT dead code. --- Makefile.in | 25 ------------------------- bin/verilator | 7 ------- bin/verilator_coverage | 7 ------- test_regress/driver.pl | 10 ---------- 4 files changed, 49 deletions(-) diff --git a/Makefile.in b/Makefile.in index e228a4ad6..bdc2b4d68 100644 --- a/Makefile.in +++ b/Makefile.in @@ -377,34 +377,9 @@ 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) -DIRPROJECT := $(shell project_dir --project) VERILATOR_CAD_DIR = $(CAD_DIR)/verilator/$(DISTNAMEREV)/$(DIRPROJECT_ARCH) INST_PROJ_CVS = cp_if_cvs_diff -install-project: dist - @echo "Install-project to $(DIRPROJECT)" - strip bin/verilator_bin* - strip bin/verilator_coverage_bin* - $(MAKE) install-project-quick - for p in $(VL_INST_MAN_FILES) ; do \ - $(INSTALL_DATA) $$p $(DIRPROJECT_PREFIX)/man/man1/$$p; \ - done - $(INST_PROJ_CVS) $(DISTNAME).tgz $(DIRPROJECT)/hw/utils/verilator/verilator.tgz - rm $(DISTNAME).tgz - -install-project-quick: -ifeq ($(CFG_WITH_DEFENV),yes) - @echo "%Error: Reconfigure with './configure --disable-defenv' to avoid hardcoded paths." - false -endif - @echo "Install-project-quick (no strip) to $(DIRPROJECT)" - for p in $(INST_PROJ_FILES) ; do \ - $(INST_PROJ_CVS) $$p $(DIRPROJECT)/hw/utils/verilator/$$p; \ - done - for p in $(INST_PROJ_BIN_FILES) ; do \ - $(INST_PROJ_CVS) $$p $(DIRPROJECT)/hw/utils/verilator/$$p-$(DIRPROJECT_ARCH); \ - done - install-cadtools: dist @echo "Install-project to $(CAD_DIR)" strip bin/verilator_bin* diff --git a/bin/verilator b/bin/verilator index 47c77e49b..d829af894 100755 --- a/bin/verilator +++ b/bin/verilator @@ -17,13 +17,6 @@ eval 'exec perl -wS $0 ${1+"$@"}' require 5.006_001; use warnings; -BEGIN { - if ($ENV{DIRPROJECT} && $ENV{DIRPROJECT_PERL_BOOT}) { - # Magic to allow author testing of perl packages in local directory - require $ENV{DIRPROJECT}."/".$ENV{DIRPROJECT_PERL_BOOT}; - } -} - use Getopt::Long; use FindBin qw($RealBin $RealScript); use IO::File; diff --git a/bin/verilator_coverage b/bin/verilator_coverage index ca3da0bd9..b71b4605c 100755 --- a/bin/verilator_coverage +++ b/bin/verilator_coverage @@ -17,13 +17,6 @@ eval 'exec perl -wS $0 ${1+"$@"}' require 5.006_001; use warnings; -BEGIN { - if ($ENV{DIRPROJECT} && $ENV{DIRPROJECT_PERL_BOOT}) { - # Magic to allow author testing of perl packages in local directory - require $ENV{DIRPROJECT}."/".$ENV{DIRPROJECT_PERL_BOOT}; - } -} - use Getopt::Long; use FindBin qw($RealBin $RealScript); use IO::File; diff --git a/test_regress/driver.pl b/test_regress/driver.pl index e8f62d55f..f00fa4d82 100755 --- a/test_regress/driver.pl +++ b/test_regress/driver.pl @@ -6,16 +6,6 @@ eval 'exec perl -wS $0 ${1+"$@"}' require 5.006_001; use Cwd; -BEGIN { - if ($ENV{DIRPROJECT} && $ENV{DIRPROJECT_PERL_BOOT}) { - # Magic to allow author testing of perl packages in local directory - require $ENV{DIRPROJECT}."/".$ENV{DIRPROJECT_PERL_BOOT}; - } - if (!$ENV{VERILATOR_ROOT} && -x "../bin/verilator") { - $ENV{VERILATOR_ROOT} = Cwd::getcwd()."/.."; - } -} - use Getopt::Long; use IO::File; use Pod::Usage;