Skip to content

Sanity checks. #407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Sanity checks. #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46e2e87
Sanity checks.
Jun 7, 2018
71577d0
Added submodule checkout to use --remote.
Jun 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions SDAccel/tools/create_sdaccel_afi.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ full_script=$(readlink -f $script)
script_name=$(basename $full_script)

source $AWS_FPGA_REPO_DIR/shared/bin/set_common_functions.sh
source $AWS_FPGA_REPO_DIR/shared/bin/set_common_env_vars.sh

debug=0

Expand Down Expand Up @@ -139,6 +140,19 @@ then
exit 1
fi

if [ "$HDK_DIR" == "" ]
then
err_msg "Env HDK_DIR not set"
exit 1
fi

if [ "$RELEASE_VER" == "" ]
then
err_msg "Env RELEASE_VER not set, did you `source sdaccel_setup.sh`?"
exit 1
fi


timestamp=$(date +"%y_%m_%d-%H%M%S")

#Steps
Expand Down
4 changes: 2 additions & 2 deletions sdaccel_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ fi
info_msg "Using SDx $RELEASE_VER"
if [[ $RELEASE_VER =~ .*2017\.4.* ]]; then
info_msg "Updating Xilinx SDAccel Examples 2017.4"
git submodule update --init -- SDAccel/examples/xilinx_2017.4
git submodule update --init --remote -- SDAccel/examples/xilinx_2017.4
export VIVADO_TOOL_VER=2017.4
if [ -e $SDACCEL_DIR/examples/xilinx ]; then
if [ ! -L $SDACCEL_DIR/examples/xilinx ]; then
Expand All @@ -171,7 +171,7 @@ if [[ $RELEASE_VER =~ .*2017\.4.* ]]; then
ln -s $SDACCEL_DIR/examples/xilinx_2017.4 $SDACCEL_DIR/examples/xilinx
else
info_msg "Updating Xilinx SDAccel Examples 2017.1"
git submodule update --init -- SDAccel/examples/xilinx_2017.1
git submodule update --init --remote -- SDAccel/examples/xilinx_2017.1
export VIVADO_TOOL_VER=2017.1
if [ -e $SDACCEL_DIR/examples/xilinx ]; then
if [ ! -L $SDACCEL_DIR/examples/xilinx ]; then
Expand Down
2 changes: 1 addition & 1 deletion shared/bin/set_common_env_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ info_msg "Setting up environment variables"
if [[ ":$AWS_FPGA_REPO_DIR" == ':' ]]; then
debug_msg "AWS_FPGA_REPO_DIR not set so setting to $script_dir"
export AWS_FPGA_REPO_DIR=$script_dir
elif [[ $AWS_FPGA_REPO_DIR != $script_dir ]]; then
elif [ -n "$script_dir" -a "$AWS_FPGA_REPO_DIR" != "$script_dir" ]; then
info_msg "Changing AWS_FPGA_REPO_DIR from $AWS_FPGA_REPO_DIR to $script_dir"
export AWS_FPGA_REPO_DIR=$script_dir
else
Expand Down