From 0f0b3d2b027ef45cdd28ddfc47958b6a7aa9b333 Mon Sep 17 00:00:00 2001 From: Dmitri Smirnov Date: Thu, 15 Dec 2022 14:35:16 -0500 Subject: [PATCH] cons: Extend SKIP_DIRS to match arbitrary path This fix allows to skip top level dirs and/or their subdirs such as `OnlTools`, `asps`, etc. --- mgr/Construct | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mgr/Construct b/mgr/Construct index 12ea658ec62..d28592c5067 100644 --- a/mgr/Construct +++ b/mgr/Construct @@ -268,7 +268,7 @@ if ( defined($SKIP_DIRS) ) { } if ( $#items > -1){ - if (! $item) {$items = join("|",@items);} + if (!$items) {$items = join("|",@items);} else {$items .= "|" . join("|",@items);} print "SKIP_DIRS is now: $#items $items\n"; } @@ -399,12 +399,15 @@ if ($STAR_SYS !~ /x86_darwin/) { #print "sysdirlist = @sysdirlist \n subdirs = @subdirs\n"; +@skip_dirs = split(/\|/, $items); + foreach $dir(@sysdirlist , @subdirs ) { if ( -d $dir or -l $dir ) { # next if $param::include && $dir !~ /$param::include/o; # next if $param::exclude && $dir =~ /$param::exclude/o; print "Add dir : $dir\n" if $param::debug; #push @Targets, $OBJ . "/" . $dir . "/Conscript"; + next if grep($dir =~ m/$_/, @skip_dirs); push @packages, $dir; } }