Merge pull request #1410 from Pinata-Consulting/makefile-make-issue-fixes

Makefile make issue fixes

Author: maliberty

flow/util/generate-vars.sh

@@ -9,6 +9,7 @@ EXCLUDED_VARS='MAKE|MAKEFLAGS|PERL5LIB|QT_QPA_PLATFORM'
 EXCLUDED_VARS+='|RESULTS_ODB|PUBLIC|ISSUE_SCRIPTS'
 EXCLUDED_VARS+='|HOME|PWD|MAIL|SHELL|NPROC|NUM_CORES|FLOW_HOME|\\n'
 EXCLUDED_VARS+='|UNSET_VARIABLES_NAMES|do-step|get_variables|do-copy'
+EXCLUDED_VARS+='|CURDIR|OPEN_GUI|OPEN_GUI_SHORTCUT'
 
 EXCLUDED_PATTERNS="_EXE$|PATH$|_CMD$|\."
 

flow/util/makeIssue.sh

@@ -69,9 +69,9 @@ cat > ${RUN_ME_SCRIPT} <<EOF
 #!/usr/bin/env bash
 source ${VARS_BASENAME}.sh
 if [[ ! -z \${GDB+x} ]]; then
-    gdb --args openroad -no_init ${SCRIPTS_DIR}/$1.tcl
+    gdb --args openroad -no_init \${SCRIPTS_DIR}/$1.tcl
 else
-    openroad -no_init ${SCRIPTS_DIR}/$1.tcl
+    openroad -no_init \${SCRIPTS_DIR}/$1.tcl
 fi
 EOF
 chmod +x ${RUN_ME_SCRIPT}
@@ -84,6 +84,7 @@ $DIR/generate-vars.sh ${VARS_BASENAME}
 echo "Archiving issue to $1_${ISSUE_TAG}.tar.gz"
 tar --ignore-failed-read -czhf $1_${ISSUE_TAG}.tar.gz \
     --transform="s|^|$1_${ISSUE_TAG}/|S" \
+    --transform="s|^$1_${ISSUE_TAG}${FLOW_HOME}/|$1_${ISSUE_TAG}/|S" \
     $LOG_DIR \
     $OBJECTS_DIR \
     $REPORTS_DIR \

flow/util/utils.mk

@@ -86,7 +86,7 @@ define \n
 endef
 
 define get_variables
-$(foreach V, $(.VARIABLES),$(if $(filter-out $(1), $(origin $V)), $(if $(filter-out .% %QT_QPA_PLATFORM% %TIME_CMD% KLAYOUT% GENERATE_ABSTRACT_RULE% do-step% do-copy%, $(V)), $V$ )))
+$(foreach V, $(.VARIABLES),$(if $(filter-out $(1), $(origin $V)), $(if $(filter-out .% %QT_QPA_PLATFORM% %TIME_CMD% KLAYOUT% GENERATE_ABSTRACT_RULE% do-step% do-copy% OPEN_GUI% OPEN_GUI_SHORTCUT%, $(V)), $V$ )))
 endef
 
 export UNSET_VARIABLES_NAMES := $(call get_variables,command% line environment% default automatic)