Merge pull request The-OpenROAD-Project#806 from habibayassin/make-issue

utils: make issue filter out variable

Author: vvbandeira

flow/util/makeIssue.sh

@@ -72,29 +72,29 @@ chmod +x ${RUN_ME_SCRIPT}
 echo "Creating ${VARS_BASENAME}.sh/tcl script"
 rm -f ${VARS_BASENAME}.sh ${VARS_BASENAME}.tcl ${VARS_BASENAME}.gdb || true
 
-EXCLUDED_VARS="MAKE|PYTHONPATH|PKG_CONFIG_PATH|PERL5LIB|PCP_DIR|PATH|MANPATH|LD_LIBRARY_PATH|INFOPATH|HOME|PWD|MAIL"
+# exclude system and CI variables
+EXCLUDED_VARS="MAKE|PYTHONPATH|PKG_CONFIG_PATH|PERL5LIB|PCP_DIR|PATH|MANPATH"
+EXCLUDED_VARS+="|LD_LIBRARY_PATH|INFOPATH|HOME|PWD|MAIL|TIME_CMD|QT_QPA_PLATFORM"
+
 printf '%s\n' "$ISSUE_VARIABLES" | while read -r V;
 do
     if [[ ! ${V%=*} =~ ^[[:digit:]] && ${V} == *"="* && ! -z ${V#*=} && ${V%=*} != *"MAKE"* && ! ${V%=*} =~ ^(${EXCLUDED_VARS})$ ]] ; then
         rhs=`sed -e 's/^"//' -e 's/"$//' <<<"${V#*=}"`
-        echo "export "${V%=*}"='"${rhs}"'" >> ${VARS_BASENAME}.sh ;
-        echo "set env("${V%=*}") \""${rhs}\""" >> ${VARS_BASENAME}.tcl ;
-        echo "set env "${V%=*}" "${rhs}"" >> ${VARS_BASENAME}.gdb ;
+        # handle special case where the variable needs to be splitted in Tcl code
+        if [[ "${V%=*}" == "GND_NETS_VOLTAGES" || "${V%=*}" == "PWR_NETS_VOLTAGES" ]]; then
+            echo "export "${V%=*}"='"\"${rhs}"\"'" >> ${VARS_BASENAME}.sh;
+        else
+            echo "export "${V%=*}"='"${rhs}"'" >> ${VARS_BASENAME}.sh;
+        fi
+        echo "set env("${V%=*}") \""${rhs}\""" >> ${VARS_BASENAME}.tcl;
+        echo "set env "${V%=*}" "${rhs}"" >> ${VARS_BASENAME}.gdb;
     fi
 done
 
 # remove variables starting with a dot
 sed -i -e '/export \./d' ${VARS_BASENAME}.sh
 sed -i -e '/set env(\./d' ${VARS_BASENAME}.tcl
 sed -i -e '/set env \./d' ${VARS_BASENAME}.gdb
-# remove non portable commands
-sed -i '/TIME_CMD/d' ${VARS_BASENAME}.sh
-sed -i '/TIME_CMD/d' ${VARS_BASENAME}.tcl
-sed -i '/TIME_CMD/d' ${VARS_BASENAME}.gdb
-# remove QT variable
-sed -i '/QT_QPA_PLATFORM/d' ${VARS_BASENAME}.sh
-sed -i '/QT_QPA_PLATFORM/d' ${VARS_BASENAME}.tcl
-sed -i '/QT_QPA_PLATFORM/d' ${VARS_BASENAME}.gdb
 
 echo "Archiving issue to $1_${ISSUE_TAG}.tar.gz"
 tar --ignore-failed-read -czhf $1_${ISSUE_TAG}.tar.gz \

flow/util/utils.mk

@@ -77,7 +77,7 @@ define \n
 
 endef
 
-export ISSUE_VARIABLES := $(foreach V, $(.VARIABLES),$(if $(filter-out environment% default automatic, $(origin $V)), $(if $(filter-out .% %QT_QPA_PLATFORM% %TIME_CMD% KLAYOUT%, $(V)),$V=$($V))${\n}))
+export ISSUE_VARIABLES := $(foreach V, $(.VARIABLES),$(if $(filter-out environment% default automatic, $(origin $V)), $(if $(filter-out .% %QT_QPA_PLATFORM% %TIME_CMD% KLAYOUT% GENERATE_ABSTRACT_RULE%, $(V)),$V=$($V))${\n}))
 
 $(foreach script,$(ISSUE_SCRIPTS),$(script)_issue): %_issue : versions.txt
 	$(UTILS_DIR)/makeIssue.sh $*