From 24003d856ffe0f7d73c987db33e5ca7d26697fd4 Mon Sep 17 00:00:00 2001 From: davial Date: Thu, 1 Jan 2015 11:08:03 +0100 Subject: [PATCH] #2493 creaToolsTools Feature New Normal - Prepare and Install binary CreaTools version - Linux --- Linux/installscript | 6 ++++-- Linux/scripts/CreaTools-compile.sh | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Linux/installscript b/Linux/installscript index df066e1..9b4bdc0 100755 --- a/Linux/installscript +++ b/Linux/installscript @@ -346,9 +346,9 @@ fi if [ `checkVal $command all 3rd 3rd-base` == true ] ; then bigDisplay "INSTALL PACKAGES DEPENDENCIES" source scripts/CreaTools-configure.sh - cd scripts + cd scripts source ThirdParty-install-Base-Stuff.sh $OperatingSystem - cd .. + cd .. bash scripts/ThirdParty-install.sh fi @@ -391,6 +391,8 @@ fi # compile creatools if [ `checkVal $command all creatools creatools-cmp` == true ] ; then bigDisplay "COMPILE CREATOOLS" +echo "EED installscript compile creatools" +echo $ETC_BASHRC source $ETC_BASHRC bash -x scripts/CreaTools-compile.sh diff --git a/Linux/scripts/CreaTools-compile.sh b/Linux/scripts/CreaTools-compile.sh index 58f3827..7797dce 100644 --- a/Linux/scripts/CreaTools-compile.sh +++ b/Linux/scripts/CreaTools-compile.sh @@ -69,9 +69,9 @@ fi echo $start_point echo "------" -if [ ! -f $installPrefixThird/share/creatools_third_party_library_config.sh ] +if [ ! -f $installPrefixThird/share/creatools/creatools_third_party_library_config.sh ] then - echo missing $installPrefixThird/share/creatools_third_party_library_config.sh + echo missing $installPrefixThird/share/creatools/creatools_third_party_library_config.sh echo echo "..ERROR.." echo "===================================================" @@ -101,9 +101,9 @@ fi fi -if [ ! -f $installPrefixThird/share/creatools_third_party_library_config.sh ] +if [ ! -f $installPrefixThird/share/creatools/creatools_third_party_library_config.sh ] then - echo missing $installPrefixThird/share/creatools_third_party_library_config.sh + echo missing $installPrefixThird/share/creatools/creatools_third_party_library_config.sh echo echo "..ERROR.." echo "===================================================" -- 2.47.1