Skip to content

Commit 75d8d7d

Browse files
committed
Skip toc_interface_filter for externals
1 parent 5fc8ce7 commit 75d8d7d

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

release.sh

+6-4
Original file line numberDiff line numberDiff line change
@@ -1382,8 +1382,9 @@ copy_directory_tree() {
13821382
_cdt_do_not_package=
13831383
_cdt_unchanged_patterns=
13841384
_cdt_classic=
1385+
_cdt_external=
13851386
OPTIND=1
1386-
while getopts :adi:lnpu:c: _cdt_opt "$@"; do
1387+
while getopts :adi:lnpu:c:e _cdt_opt "$@"; do
13871388
# shellcheck disable=2220
13881389
case $_cdt_opt in
13891390
a) _cdt_alpha="true" ;;
@@ -1396,13 +1397,14 @@ copy_directory_tree() {
13961397
p) _cdt_do_not_package="true" ;;
13971398
u) _cdt_unchanged_patterns=$OPTARG ;;
13981399
c) _cdt_classic=$OPTARG ;;
1400+
e) _cdt_external="true" ;;
13991401
esac
14001402
done
14011403
shift $((OPTIND - 1))
14021404
_cdt_srcdir=$1
14031405
_cdt_destdir=$2
14041406

1405-
if [ -z "$_external_dir" ]; then
1407+
if [ -z "$_cdt_external" ]; then
14061408
start_group "Copying files into ${_cdt_destdir#$topdir/}:" "copy"
14071409
else # don't nest groups
14081410
echo "Copying files into ${_cdt_destdir#$topdir/}:"
@@ -1497,7 +1499,7 @@ copy_directory_tree() {
14971499
_cdt_filters+="|toc_filter version-retail ${_cdt_classic:+true}"
14981500
_cdt_filters+="|toc_filter version-classic $([[ -z "$_cdt_classic" || "$_cdt_classic" == "bcc" ]] && echo "true")"
14991501
_cdt_filters+="|toc_filter version-bcc $([[ -z "$_cdt_classic" || "$_cdt_classic" == "classic" ]] && echo "true")"
1500-
_cdt_filters+="|toc_interface_filter"
1502+
[ -z "$_cdt_external" ] && _cdt_filters+="|toc_interface_filter"
15011503
[ -n "$_cdt_localization" ] && _cdt_filters+="|localization_filter"
15021504
;;
15031505
esac
@@ -1663,7 +1665,7 @@ checkout_external() {
16631665
fi
16641666
# If a .pkgmeta file is present, process it for an "ignore" list.
16651667
parse_ignore "$_cqe_checkout_dir/.pkgmeta" "$_external_dir"
1666-
copy_directory_tree -dnp -i "$ignore" "$_cqe_checkout_dir" "$pkgdir/$_external_dir"
1668+
copy_directory_tree -dnpe -i "$ignore" "$_cqe_checkout_dir" "$pkgdir/$_external_dir"
16671669
)
16681670
# Remove the ".checkout" subdirectory containing the full checkout.
16691671
if [ -d "$_cqe_checkout_dir" ]; then

0 commit comments

Comments
 (0)