Modification creaToolsThirdParty scripts EED-JCP

diff --git a/Install_ThirdParty/install_thirdparty.sh_TEMPLATE b/Install_ThirdParty/install_thirdparty.sh_TEMPLATE
index 7ee61f6b94b781d7229790ab3afa9db01b096329..970a161bf0bf5f41607d49971cd3abcde276d5c8 100644 (file)
--- 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=<directory where you want to generate>
 
-installPrefix=$creatoolsGeneration/creatools_install
+installPrefix=$creatoolsGeneration/thirdparty_install
 #      or
 #installPrefix=/usr/local
 
@@ -10,14 +10,14 @@ buildType=<Release|Debug>
 
 OperatingSystem=<Fedora | Ubuntu | MacOS>
 
-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 924c95b1e28b73cc736437d68c58649b6483b7db..86709106da3b19ac54c4050a678be4abc067ba57 100644 (file)
--- 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 <nameOfTheGenerationDirectory> <installPrefix> <buildType> <OperatingSystem>"
   echo "with 'OperatingSystem' in {Fedora, Ubuntu, MacOS}"
-  echo "with 'installPrefix' : /usr/local or <directory where you want to install>  
+  echo "with 'installPrefix' : /usr/local or <directory where you want to install> " 
   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
      ;;