From 36f1016f3194c6568888c44c8b22d6aa3dce176c Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Sat, 9 Jul 2016 14:19:47 +0100 Subject: [PATCH] wmakeFunctions: Added a faster bash version of 'depToSource' --- wmake/scripts/wmakeFunctions | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/wmake/scripts/wmakeFunctions b/wmake/scripts/wmakeFunctions index 63cbb9f16d..d2c48a98b3 100755 --- a/wmake/scripts/wmakeFunctions +++ b/wmake/scripts/wmakeFunctions @@ -102,12 +102,25 @@ findObjectDir() fi } -depToSource() -{ - sourceFile=$(echo ${depFile%.dep} | \ - sed -e s%platforms/${WM_OPTIONS}/%% -e s%Make/${WM_OPTIONS}/%% \ - -e s%platforms/${WM_OPTIONS}${WM_MPLIB}/%% \ - -e s%Make/${WM_OPTIONS}${WM_MPLIB}/%% ) -} +if [ -n "$BASH_VERSION" ]; then + depToSource() + { + sourceFile=${depFile%.dep} + sourceFile="${sourceFile/platforms\/${WM_OPTIONS}\//}" + sourceFile="${sourceFile/Make\/${WM_OPTIONS}\//}" + sourceFile="${sourceFile/platforms\/${WM_OPTIONS}${WM_MPLIB}\//}" + sourceFile="${sourceFile/Make\/${WM_OPTIONS}${WM_MPLIB}\//}" + } +else + depToSource + { + sourceFile=$(echo ${depFile%.dep} | \ + sed -e s%platforms/${WM_OPTIONS}/%% \ + -e s%Make/${WM_OPTIONS}/%% \ + -e s%platforms/${WM_OPTIONS}${WM_MPLIB}/%% \ + -e s%Make/${WM_OPTIONS}${WM_MPLIB}/%% ) + } +fi + #------------------------------------------------------------------------------