From 08264571869e92cb7e6dcee5facfedbf0bedce68 Mon Sep 17 00:00:00 2001
From: 1138-4EB <1138-4EB@users.noreply.github.com>
Date: Sun, 26 Feb 2017 22:59:38 +0100
Subject: Use single VM in .travis.yml to speed-up launching builds. Container
 are launched in parallel threads. The output of each thread is saved to a
 log. All of them are printed in order, after all the threads have finished.
 Shared ANSI color codes between libraries/vendors and dist/linux. The common
 file to be sourced is dist/ansi_color.sh

---
 libraries/vendors/compile-altera.sh        | 5 +++--
 libraries/vendors/compile-lattice.sh       | 5 +++--
 libraries/vendors/compile-osvvm.sh         | 5 +++--
 libraries/vendors/compile-uvvm.sh          | 5 +++--
 libraries/vendors/compile-vunit.sh         | 5 +++--
 libraries/vendors/compile-xilinx-ise.sh    | 5 +++--
 libraries/vendors/compile-xilinx-vivado.sh | 5 +++--
 libraries/vendors/shared.sh                | 9 ---------
 8 files changed, 21 insertions(+), 23 deletions(-)

(limited to 'libraries')

diff --git a/libraries/vendors/compile-altera.sh b/libraries/vendors/compile-altera.sh
index c3daf4d94..46cccfde1 100755
--- a/libraries/vendors/compile-altera.sh
+++ b/libraries/vendors/compile-altera.sh
@@ -44,8 +44,9 @@ ScriptDir="$(dirname $0)"
 ScriptDir="$($READLINK -f $ScriptDir)"
 
 # source configuration file from GHDL's 'vendors' library directory
-source $ScriptDir/config.sh
-source $ScriptDir/shared.sh
+. $ScriptDir/../ansi_color.sh
+. $ScriptDir/config.sh
+. $ScriptDir/shared.sh
 
 # command line argument processing
 NO_COMMAND=1
diff --git a/libraries/vendors/compile-lattice.sh b/libraries/vendors/compile-lattice.sh
index b32871d00..3a5478c42 100755
--- a/libraries/vendors/compile-lattice.sh
+++ b/libraries/vendors/compile-lattice.sh
@@ -48,8 +48,9 @@ ScriptDir="$($READLINK -f $ScriptDir)"
 DeviceList="ec ecp ecp2 ecp3 ecp5u lptm lptm2 machxo machxo2 machxo3l sc scm xp xp2"
 
 # source configuration file from GHDL's 'vendors' library directory
-source $ScriptDir/config.sh
-source $ScriptDir/shared.sh
+. $ScriptDir/../ansi_color.sh
+. $ScriptDir/config.sh
+. $ScriptDir/shared.sh
 
 # command line argument processing
 NO_COMMAND=1
diff --git a/libraries/vendors/compile-osvvm.sh b/libraries/vendors/compile-osvvm.sh
index 9d2070c59..1ff747804 100755
--- a/libraries/vendors/compile-osvvm.sh
+++ b/libraries/vendors/compile-osvvm.sh
@@ -43,8 +43,9 @@ ScriptDir="$(dirname $0)"
 ScriptDir="$($READLINK -f $ScriptDir)"
 
 # source configuration file from GHDL's 'vendors' library directory
-source $ScriptDir/config.sh
-source $ScriptDir/shared.sh
+. $ScriptDir/../ansi_color.sh
+. $ScriptDir/config.sh
+. $ScriptDir/shared.sh
 
 # command line argument processing
 NO_COMMAND=1
diff --git a/libraries/vendors/compile-uvvm.sh b/libraries/vendors/compile-uvvm.sh
index 94485421e..1a601df60 100644
--- a/libraries/vendors/compile-uvvm.sh
+++ b/libraries/vendors/compile-uvvm.sh
@@ -43,8 +43,9 @@ ScriptDir="$(dirname $0)"
 ScriptDir="$($READLINK -f $ScriptDir)"
 
 # source configuration file from GHDL's 'vendors' library directory
-source $ScriptDir/config.sh
-source $ScriptDir/shared.sh
+. $ScriptDir/../ansi_color.sh
+. $ScriptDir/config.sh
+. $ScriptDir/shared.sh
 
 # command line argument processing
 NO_COMMAND=1
diff --git a/libraries/vendors/compile-vunit.sh b/libraries/vendors/compile-vunit.sh
index 277ec47ef..ae567f1d7 100755
--- a/libraries/vendors/compile-vunit.sh
+++ b/libraries/vendors/compile-vunit.sh
@@ -43,8 +43,9 @@ ScriptDir="$(dirname $0)"
 ScriptDir="$($READLINK -f $ScriptDir)"
 
 # source configuration file from GHDL's 'vendors' library directory
-source $ScriptDir/config.sh
-source $ScriptDir/shared.sh
+. $ScriptDir/../ansi_color.sh
+. $ScriptDir/config.sh
+. $ScriptDir/shared.sh
 
 # command line argument processing
 NO_COMMAND=1
diff --git a/libraries/vendors/compile-xilinx-ise.sh b/libraries/vendors/compile-xilinx-ise.sh
index efe361b34..c53faa0ab 100755
--- a/libraries/vendors/compile-xilinx-ise.sh
+++ b/libraries/vendors/compile-xilinx-ise.sh
@@ -44,8 +44,9 @@ ScriptDir="$(dirname $0)"
 ScriptDir="$($READLINK -f $ScriptDir)"
 
 # source configuration file from GHDL's 'vendors' library directory
-source $ScriptDir/config.sh
-source $ScriptDir/shared.sh
+. $ScriptDir/../ansi_color.sh
+. $ScriptDir/config.sh
+. $ScriptDir/shared.sh
 
 # command line argument processing
 NO_COMMAND=1
diff --git a/libraries/vendors/compile-xilinx-vivado.sh b/libraries/vendors/compile-xilinx-vivado.sh
index 5d14e8110..784546a40 100755
--- a/libraries/vendors/compile-xilinx-vivado.sh
+++ b/libraries/vendors/compile-xilinx-vivado.sh
@@ -44,8 +44,9 @@ ScriptDir="$(dirname $0)"
 ScriptDir="$($READLINK -f $ScriptDir)"
 
 # source configuration file from GHDL's 'vendors' library directory
-source $ScriptDir/config.sh
-source $ScriptDir/shared.sh
+. $ScriptDir/../ansi_color.sh
+. $ScriptDir/config.sh
+. $ScriptDir/shared.sh
 
 # command line argument processing
 NO_COMMAND=1
diff --git a/libraries/vendors/shared.sh b/libraries/vendors/shared.sh
index 6b613ab17..6b77b2f5e 100644
--- a/libraries/vendors/shared.sh
+++ b/libraries/vendors/shared.sh
@@ -30,15 +30,6 @@
 #	02111-1307, USA.
 # ==============================================================================
 
-ANSI_RED="\e[31m"
-ANSI_GREEN="\e[32m"
-ANSI_YELLOW="\e[33m"
-ANSI_BLUE="\e[34m"
-ANSI_MAGENTA="\e[35m"
-ANSI_CYAN="\e[36;1m"
-ANSI_DARKCYAN="\e[36m"
-ANSI_NOCOLOR="\e[0m"
-
 # red texts
 COLORED_ERROR="$ANSI_RED[ERROR]$ANSI_NOCOLOR"
 COLORED_FAILED="$ANSI_RED[FAILED]$ANSI_NOCOLOR"
-- 
cgit v1.2.3