Skip to content

Commit a2b56f4

Browse files
authored
Merge pull request #643 from habibayassin/export-makevars
exporting all variables to bash
2 parents edd4529 + a7cdad0 commit a2b56f4

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

flow/util/makeIssue.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ echo "Creating ${VARS_BASENAME}.sh/tcl script"
7373
rm -f ${VARS_BASENAME}.sh ${VARS_BASENAME}.tcl ${VARS_BASENAME}.gdb || true
7474

7575
EXCLUDED_VARS="MAKE|PYTHONPATH|PKG_CONFIG_PATH|PERL5LIB|PCP_DIR|PATH|MANPATH|LD_LIBRARY_PATH|INFOPATH|HOME|PWD|MAIL"
76-
printenv | while read V;
76+
printf '%s\n' "$ISSUE_VARIABLES" | while read -r V;
7777
do
7878
if [[ ! ${V%=*} =~ ^[[:digit:]] && ${V} == *"="* && ! -z ${V#*=} && ${V%=*} != *"MAKE"* && ! ${V%=*} =~ ^(${EXCLUDED_VARS})$ ]] ; then
7979
rhs=`sed -e 's/^"//' -e 's/"$//' <<<"${V#*=}"`
@@ -83,7 +83,6 @@ do
8383
fi
8484
done
8585

86-
8786
# remove variables starting with a dot
8887
sed -i -e '/export \./d' ${VARS_BASENAME}.sh
8988
sed -i -e '/set env(\./d' ${VARS_BASENAME}.tcl

flow/util/utils.mk

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Utilities
22
#===============================================================================
3-
43
metadata: $(REPORTS_DIR)/metadata-$(FLOW_VARIANT)-check.log
54

65
clean_metadata:
@@ -73,6 +72,11 @@ clean_test:
7372
# Set the ISSUE_TAG variable to rename the generated tar file
7473
#-------------------------------------------------------------------------------
7574
ISSUE_SCRIPTS = $(patsubst %.tcl,%,$(notdir $(sort $(wildcard $(SCRIPTS_DIR)/*.tcl))))
75+
define \n
76+
77+
78+
endef
79+
export ISSUE_VARIABLES := $(foreach V, $(.VARIABLES),$(if $(filter-out environment% default automatic, $(origin $V)), $(if $(filter-out .% %QT_QPA_PLATFORM% %TIME_CMD%, $(V)),$V=$($V))${\n}))
7680

7781
$(foreach script,$(ISSUE_SCRIPTS),$(script)_issue): %_issue : versions.txt
7882
$(UTILS_DIR)/makeIssue.sh $*

0 commit comments

Comments
 (0)