#3446 vtk8itk5wx3-macos in Linux

[creaToolsTools.git] / Linux / installscript

diff --git a/Linux/installscript b/Linux/installscript
index cac6ea6760b1a861e9846e8eaa67631ce9627d4e..70923a20445dc8c083870434eadfcf40107db897 100755 (executable)
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -23,16 +23,37 @@
 
 #!/bin/bash -e
 
-#EED 2018-08-26
+#   <<<<<<< HEAD
+#   
+#   #This code is for Mac
+#   function EEDreadlink() {
+#     DIR="${1%/*}"
+#     (cd "$DIR" && echo "$(pwd -P)")
+#   }
+#   
+#   
+#   #EED 2120-08-25  This code is not working in MacOS so we use EEDreadlink()
+#   #EED scriptDirName=$(dirname $(Ereadlink -f $0) )
+#   scriptDirName=$(dirname $(Ereadlink  $0) )/Linux
+#   =======
+#   #EED 2018-08-26
+#   
+#   #scriptDirName=$(dirname $(readlink -f $0) )
+#   scriptDirName=$(pwd)
+#   >>>>>>> origin/vtk8itk5wx3-mingw64
+   scriptDirName=$(pwd)
 
-#scriptDirName=$(dirname $(readlink -f $0) )
-scriptDirName=$(pwd)
 
 #########################################################################
 ############     Local Functions  #######################################
 #########################################################################
 
 
+echo scriptDirName $scriptDirName
+
+
+
+
 source scripts/LocalFunctions.sh
 
 configureFile="scripts/CreaTools-configure.sh"
@@ -41,8 +62,7 @@ configureFile="scripts/CreaTools-configure.sh"
 # default configuration parameters
 OperatingSystem=`getDistrib`
 corenumber=`getncore`
-echo "hola1"
-generationdir=$HOME/Creatis/creaTools
+generationdir=$HOME/Creatis/C11
 installPrefixThird=
 installPrefix=
 docgeneration=OFF
@@ -55,6 +75,7 @@ buildType=Release
 gdcmVersion=GDCM1
 ITKVersion=ITK4
 export ETC_BASHRC=`getbashrc`
+TDx=OFF
 
 
 function usage {
@@ -175,7 +196,7 @@ fi
 
 ##################################################################################
 ############################ check configuration parameters
-# check distrib
+# check distribÒ
 checkDistrib $OperatingSystem
 
 # complete default install prefix
@@ -212,6 +233,7 @@ if [ `checkVal $command config all` == true ] ; then
     echo "gdcmVersion=$gdcmVersion"               >> $configureFile
     echo "ITKVersion=$ITKVersion"                 >> $configureFile
     echo "ETC_BASHRC=$ETC_BASHRC"                 >> $configureFile
+    echo "TDx=$TDx"                               >> $configureFile
 fi
 
 
@@ -244,7 +266,7 @@ fi
 # install packaged dependencies as root
 if [ `checkVal $command all 3rd 3rd-base` == true ] ; then
     bigDisplay "INSTALL PACKAGES DEPENDENCIES"
-    source scripts/CreaTools-configure.sh
+    bash scripts/CreaTools-configure.sh
     cd scripts
     source ThirdParty-install-Base-Stuff.sh $OperatingSystem
     cd ..
@@ -253,15 +275,17 @@ fi
 
 # vtk
 if [ `checkVal $command all 3rd 3rd-vtk` == true ] ; then
-           bigDisplay "INSTALL VTK"
-               source scripts/ThirdParty-install-VTK.sh
-       cd $scriptDirName
+    bigDisplay "INSTALL VTK"
+    bash scripts/ThirdParty-install-VTK.sh
+    cd $scriptDirName
 fi
 
 # gdcm
 if [ `checkVal $command all 3rd 3rd-gdcm` == true ] ; then
     bigDisplay "INSTALL $gdcmVersion"
-    source scripts/ThirdParty-install-gdcm.sh
+    bash scripts/ThirdParty-install-gdcm.sh
+    pwd
+    echo $scriptDirName 
     cd $scriptDirName
 fi
 
@@ -275,7 +299,7 @@ fi
 # wt
 if [ `checkVal $command all 3rd 3rd-wt` == true ] ; then
     bigDisplay "INSTALL WT"
-    source scripts/ThirdParty-install-WT.sh
+    bash scripts/ThirdParty-install-WT.sh
     cd $scriptDirName
 fi