From f732c03142bf69f3aba6df3f31f438996dc90ef8 Mon Sep 17 00:00:00 2001 From: Juan Prieto Date: Tue, 16 Nov 2010 13:26:32 +0000 Subject: [PATCH] Modification creaToolsThirdParty scripts EED-JCP --- Install_ThirdParty/install_thirdparty.sh_TEMPLATE | 10 +++++----- .../scripts/install_thirdparty_all.sh | 15 +++++++++++---- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Install_ThirdParty/install_thirdparty.sh_TEMPLATE b/Install_ThirdParty/install_thirdparty.sh_TEMPLATE index 7ee61f6..970a161 100644 --- a/Install_ThirdParty/install_thirdparty.sh_TEMPLATE +++ b/Install_ThirdParty/install_thirdparty.sh_TEMPLATE @@ -1,8 +1,8 @@ -USER : Modify the following lines ! +#USER : Modify the following lines ! creatoolsGeneration= -installPrefix=$creatoolsGeneration/creatools_install +installPrefix=$creatoolsGeneration/thirdparty_install # or #installPrefix=/usr/local @@ -10,14 +10,14 @@ buildType= OperatingSystem= -Example : - +#Example : +# #creatoolsGeneration=~/Creatis/All/thirdParty_creatools #installPrefix=$creatoolsGeneration/thirdparty_install #buildType=Debug #OperatingSystem=Linux -USER : Hand off! +#USER : Hand off! cd scripts sh install_thirdparty_all.sh $creatoolsGeneration $installPrefix $buildType $OperatingSystem diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.sh b/Install_ThirdParty/scripts/install_thirdparty_all.sh index 924c95b..8670910 100644 --- a/Install_ThirdParty/scripts/install_thirdparty_all.sh +++ b/Install_ThirdParty/scripts/install_thirdparty_all.sh @@ -21,18 +21,21 @@ echo $3 echo $4 echo "----------" + + if [ $# = 0 || $# != 4 ] then echo "Use it as :" echo "sh install_thirdparty_all.sh " echo "with 'OperatingSystem' in {Fedora, Ubuntu, MacOS}" - echo "with 'installPrefix' : /usr/local or + echo "with 'installPrefix' : /usr/local or " echo " " echo "ex : sh install_thirdparty_all.sh /tmp/gendir /tmp/gendir/thirdparty_install Debug Ubuntu" exit 0 fi - +echo $OS +echo 'ididid' generationdir=$1 installPrefix=$2 buildType=$3 @@ -46,11 +49,15 @@ mkdir $generationdir mkdir $sourcesDir mkdir $binDir + + + + # the following stupid test is used at debug time; Please don't remove! if [ true = true ] then - case $OS in + case "$OS" in Fedora) sudo yum install cmake -y sudo yum install cmake-gui -y @@ -100,7 +107,7 @@ then sudo port install mesa-libOSMesa-devel -y ;; *) - echo " '$OS' : Unknown (for us...) Operating Sytem " + #echo " '$OS' : Unknown (for us...) Operating Sytem " echo " Allowed values are (right now) Fedora, Ubuntu, MacOS " exit 0 ;; -- 2.45.1