github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-04-30 20:46:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make old site-specific configuration more generic,

Browse Source 
set DIRPROJECT_PERL_BOOT to a script for bin/verilator to call to do setup.
This commit is contained in:
Wilson Snyder 2009-06-21 13:17:12 -04:00
parent 02d162858f
commit 96b23f6edd
4 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.in
View File

@ -87,6 +87,9 @@ pkgdatadir = @pkgdatadir@
# Directory in which to install data across multiple architectures # Directory in which to install data across multiple architectures
datarootdir = @datarootdir@ datarootdir = @datarootdir@
# Compile options
CFG_WITH_DEFENV = @CFG_WITH_DEFENV@
#### End of system configuration section. #### #### End of system configuration section. ####
###################################################################### ######################################################################
@ -271,6 +274,10 @@ install-project: dist
rm $(DISTNAME).tgz rm $(DISTNAME).tgz
install-project-quick: 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)" @echo "Install-project-quick (no strip) to $(DIRPROJECT)"
for p in $(INST_PROJ_FILES) ; do \ for p in $(INST_PROJ_FILES) ; do \
$(INST_PROJ_CVS) $$p $(DIRPROJECT)/hw/utils/verilator/$$p; \ $(INST_PROJ_CVS) $$p $(DIRPROJECT)/hw/utils/verilator/$$p; \

4
bin/verilator
View File

@ -18,9 +18,9 @@ eval 'exec perl -wS $0 ${1+"$@"}'
require 5.006_001; require 5.006_001;
use warnings; use warnings;
BEGIN { BEGIN {
if (my $Project=($ENV{DIRPROJECT}||$ENV{PROJECT})) { if ($ENV{DIRPROJECT} && $ENV{DIRPROJECT_PERL_BOOT}) {
# Magic to allow author testing of perl packages in local directory # Magic to allow author testing of perl packages in local directory
require "$Project/hw/utils/perltools/boot.pl"; require $ENV{DIRPROJECT}."/".$ENV{DIRPROJECT_PERL_BOOT};
} }
} }

11
src/V3Options.cpp
View File

@ -369,17 +369,6 @@ string V3Options::getenvSYSTEMPERLGuts() {
var = DEFENV_SYSTEMPERL; var = DEFENV_SYSTEMPERL;
setenvStr("SYSTEMPERL", var, "Hardcoded at build time"); setenvStr("SYSTEMPERL", var, "Hardcoded at build time");
} }
// Only correct or check it if we really need the value
if (v3Global.opt.usingSystemPerlLibs()) {
if (var == "") {
string testdir = V3Options::getenvW() + "/hw/utils/perltools/SystemC"; // Hack for internal testing
if (V3Options::fileStatDir(testdir)) {
var = testdir;
setenvStr ("SYSTEMPERL", var, "From W");
}
}
// Test for correctness in SYSTEMPERL_INCLUDE
}
return var; return var;
} }

4
test_regress/driver.pl
View File

@ -4,9 +4,9 @@
require 5.006_001; require 5.006_001;
BEGIN { BEGIN {
if (my $Project=($ENV{DIRPROJECT}||$ENV{PROJECT})) { if ($ENV{DIRPROJECT} && $ENV{DIRPROJECT_PERL_BOOT}) {
# Magic to allow author testing of perl packages in local directory # Magic to allow author testing of perl packages in local directory
require "$Project/hw/utils/perltools/boot.pl"; require $ENV{DIRPROJECT}."/".$ENV{DIRPROJECT_PERL_BOOT};
} }
} }