diff options
| author | Hannu Vuolasaho <vuokkosetae@gmail.com> | 2018-06-30 00:34:00 +0300 |
|---|---|---|
| committer | Hannu Vuolasaho <vuokkosetae@gmail.com> | 2018-06-30 00:38:46 +0300 |
| commit | f1bbe1639383cbb750667c1a3c542b176cf0ae46 (patch) | |
| tree | 6253acb59867a1b6954f3a709544b6a423d9c749 /libraries | |
| parent | b6c44a88705c534975db04143041ffa56eef4c45 (diff) | |
| download | ghdl-f1bbe1639383cbb750667c1a3c542b176cf0ae46.tar.gz ghdl-f1bbe1639383cbb750667c1a3c542b176cf0ae46.tar.bz2 ghdl-f1bbe1639383cbb750667c1a3c542b176cf0ae46.zip | |
Fixes for compile-altera.sh based on feedback
Diffstat (limited to 'libraries')
| -rwxr-xr-x | libraries/vendors/compile-altera.sh | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/libraries/vendors/compile-altera.sh b/libraries/vendors/compile-altera.sh index c075244e5..3de2789b3 100755 --- a/libraries/vendors/compile-altera.sh +++ b/libraries/vendors/compile-altera.sh @@ -524,9 +524,12 @@ if [ $STOPCOMPILING -eq 0 ] && [ "$COMPILE_CYCLONE" == "TRUE" ]; then # append absolute source path SourceFiles=() for File in ${Files[@]}; do + FullPath="$SourceDirectory/$File" #Don't put nonexisting files. - if [ -f "$SourceDirectory/$File" ]; then - SourceFiles+=("$SourceDirectory/$File") + if [ -f $FullPath ]; then + SourceFiles+=($FullPath) + elif [ $SUPPRESS_WARNINGS -eq 0 ] ; then + echo -e "${ANSI_YELLOW}File ${FullPath} not found.${ANSI_NOCOLOR}" fi done @@ -543,15 +546,18 @@ if [ $STOPCOMPILING -eq 0 ] && [ "$COMPILE_CYCLONE" == "TRUE" ]; then # append absolute source path SourceFiles=() for File in ${Files[@]}; do + FullPath="$SourceDirectory/$File" #Don't put nonexisting files. - if [ -f "$SourceDirectory/$File" ]; then - SourceFiles+=("$SourceDirectory/$File") + if [ -f $FullPath ]; then + SourceFiles+=($FullPath) + elif [ $SUPPRESS_WARNINGS -eq 0 ] ; then + echo -e "${ANSI_YELLOW}File ${FullPath} not found.${ANSI_NOCOLOR}" fi done GHDLCompilePackages fi -# compile Cyclone IIIlibrary +# compile Cyclone III library if [ $STOPCOMPILING -eq 0 ] && [ "$COMPILE_CYCLONE" == "TRUE" ]; then Library="cycloneiii" Files=( @@ -562,9 +568,12 @@ if [ $STOPCOMPILING -eq 0 ] && [ "$COMPILE_CYCLONE" == "TRUE" ]; then # append absolute source path SourceFiles=() for File in ${Files[@]}; do + FullPath="$SourceDirectory/$File" #Don't put nonexisting files. - if [ -f "$SourceDirectory/$File" ]; then - SourceFiles+=("$SourceDirectory/$File") + if [ -f $FullPath ]; then + SourceFiles+=($FullPath) + elif [ $SUPPRESS_WARNINGS -eq 0 ] ; then + echo -e "${ANSI_YELLOW}File ${FullPath} not found.${ANSI_NOCOLOR}" fi done @@ -639,8 +648,12 @@ if [ $STOPCOMPILING -eq 0 ] && [ "$COMPILE_CYCLONE" == "TRUE" ]; then # append absolute source path SourceFiles=() for File in ${Files[@]}; do - if [ -f "$SourceDirectory/$File" ]; then - SourceFiles+=("$SourceDirectory/$File") + FullPath="$SourceDirectory/$File" + #Don't put nonexisting files. + if [ -f $FullPath ]; then + SourceFiles+=($FullPath) + elif [ $SUPPRESS_WARNINGS -eq 0 ] ; then + echo -e "${ANSI_YELLOW}File ${FullPath} not found.${ANSI_NOCOLOR}" fi done |