Skip to content

Commit 6107786

Browse files
authored
Merge pull request #1771 from vvbandeira/fix-tar-issue
util: add design and platform files to make issue
2 parents 0ea2309 + 99a1609 commit 6107786

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

flow/util/makeIssue.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,19 @@ fi
9191

9292
echo "Using $COMPRESS to compress tar file"
9393

94+
# Save all files inside design and platform folders
95+
if [ -v FULL_ISSUE ]; then
96+
DESIGN_PLATFORM_FILES="$DESIGN_DIR $PLATFORM_DIR"
97+
else
98+
DESIGN_PLATFORM_FILES="$DESIGN_DIR/config.mk $PLATFORM_DIR/config.mk"
99+
fi
100+
101+
set -x
94102
tar --use-compress-program=${COMPRESS} \
95103
--ignore-failed-read -chf $1_${ISSUE_TAG}.tar.gz \
96104
--transform="s|^|$1_${ISSUE_TAG}/|S" \
97105
--transform="s|^$1_${ISSUE_TAG}${FLOW_HOME}/|$1_${ISSUE_TAG}/|S" \
106+
$DESIGN_PLATFORM_FILES \
98107
$LOG_DIR \
99108
$OBJECTS_DIR \
100109
$REPORTS_DIR \
@@ -105,7 +114,7 @@ tar --use-compress-program=${COMPRESS} \
105114
if [ -v EXCLUDE_PLATFORM ]; then
106115
# Remove liberty and lef files from tar file
107116
gunzip -f $1_${ISSUE_TAG}.tar.gz
108-
tar --list --file $1_${ISSUE_TAG}.tar | grep -iE "*.(lib|lef|tlef)$$" | xargs -r tar --delete --file $1_${ISSUE_TAG}.tar
117+
tar --list --file $1_${ISSUE_TAG}.tar | grep -iE "*.(lib|lef|tlef)$" | xargs -r tar --delete --file $1_${ISSUE_TAG}.tar
109118
gzip $1_${ISSUE_TAG}.tar
110119
fi
111120

flow/util/utils.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ endef
9292
export UNSET_VARIABLES_NAMES := $(call get_variables,command% line environment% default automatic)
9393
export ISSUE_VARIABLES_NAMES := $(call get_variables,environment% default automatic)
9494
export ISSUE_VARIABLES := $(foreach V, $(ISSUE_VARIABLES_NAMES), $(if $($V),$V=$($V),$V='')${\n})
95-
9695
export COMMAND_LINE_ARGS := $(foreach V,$(.VARIABLES),$(if $(filter command% line, $(origin $V)),$(V)))
9796

9897
$(foreach script,$(ISSUE_SCRIPTS),$(script)_issue): %_issue : versions.txt

0 commit comments

Comments
 (0)