#2493 creaToolsTools Feature New Normal - Prepare and Install binary CreaTools...

diff --git a/Linux/README.txt b/Linux/README.txt
index ae2743fd8425833e8931ad05705023ed70a6c2ab..f89ed0ccd4bd9a47a67d86956a14f2f63cb5ef8b 100644 (file)
--- a/Linux/README.txt
+++ b/Linux/README.txt
@@ -67,7 +67,7 @@ Exemples of differents configurations :
 
 ===== How to Install - HTML VERSION =======
 1)
-./installscript -os Fedora -ncore 8 -gdir  $HOME/Creatis/creaTools -instprefix  $HOME/Creatis/creaTools/creatools_install -instprefix3  $HOME/Creatis/creaTools/thirdparty_install -build Release config
+./installscript -os Fedora -ncore 8 -gdir  $HOME/Creatis/creaTools -instprefix  $HOME/Creatis/creaTools/creatools_install -instprefix3  $HOME/Creatis/creaTools/thirdparty_install -html -build Release config
 
 2) As root
 ./installscript 3rd

diff --git a/Linux/installscript b/Linux/installscript
index 851dce2046dae9c5df81dc4c1ca7c72b558f5814..7c6530ac670b8aad07a93f5901c578255c4f4bfd 100755 (executable)
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -145,7 +145,7 @@ configureFile="scripts/CreaTools-configure.sh"
 # default configuration parameters
 OperatingSystem=`getDistrib`
 corenumber=`getncore`
-generationdir=$HOME/CreatoolsGenerationDir
+generationdir=$HOME/Creatis/creaTools
 installPrefixThird=
 installPrefix=
 docgeneration=OFF
@@ -175,7 +175,7 @@ function usage {
     echo "    as a normal user:" 
     echo "         config            : set the configuration parameters only" 
     echo "         "                 
-    echo "    as root:" 
+    echo "    need root password:" 
     echo "         3rd               : Get, Compile, Install all 3rd party library "
     echo "         3rd-base          : Install basic tools (cmake, doxygen...)"
     echo "         3rd-vtk           : Get, Compile, Install vtk"
@@ -207,6 +207,7 @@ function usage {
     echo "        -gdir <dir>           : generation directory (default $generationdir)"
     echo "        -instprefix <dir>     : creatools install prefix" 
     echo "        -instprefix3 <dir>    : 3rd party library install prefix" 
+    echo "        -html                 : get creatools from HTML"
     echo "        -git                  : get creatools from git (CREATIS user only)"
     echo "        -git-read-only        : get creatools from git (anonymously, no write access)"
     echo "        -build                : build type Release, RelWithDebug or Debug (default RelWithDebug)"
@@ -229,6 +230,7 @@ while [ $# -ge 1 ] ; do
         -instprefix)        installPrefix=$2;                          shift 2;;
         -instprefix3)       installPrefixThird=$2;                     shift 2;;
         -doc)               docgeneration=ON;                          shift 1;;
+        -html)              sourcesFrom=HTML;                          shift 1;;
         -git)               sourcesFrom=GIT;                           shift 1;;
         -git-read-only)     sourcesFrom=GIT-READ-ONLY;
 shift 1;;

diff --git a/Linux/scripts/CreaTools-compile.sh b/Linux/scripts/CreaTools-compile.sh
index 72b7311b4835b89832ef97c02e12869ba877ad84..58f38276c6e30b6f3b792b2325aafafe5c844592 100644 (file)
--- a/Linux/scripts/CreaTools-compile.sh
+++ b/Linux/scripts/CreaTools-compile.sh
@@ -121,7 +121,7 @@ fi
  then
     rm -rf creatools_bin
  fi
- mkdir creatools_bin
+ mkdir -p creatools_bin
 
 cd $scriptDir
 

diff --git a/Linux/scripts/CreaTools-install.sh b/Linux/scripts/CreaTools-install.sh
index d20555c2a5d2d9dffb1eb50632443934c527545d..cb415f2e21027ce7031e24644d45861dad248b0d 100644 (file)
--- a/Linux/scripts/CreaTools-install.sh
+++ b/Linux/scripts/CreaTools-install.sh
@@ -35,7 +35,7 @@
   then
      if [ ! -e $generationdir/creatools_install ]
      then
-       mkdir $generationdir/creatools_install
+       mkdir -p $generationdir/creatools_install
      fi
   else
    echo
@@ -69,8 +69,8 @@
   sed -i -e '/.*creatools_base_library_config.*/ d' $ETC_BASHRC
   sed -i -e '/installPrefixtmp*/ d' $ETC_BASHRC
 
-  mkdir $installPrefix
-  mkdir $installPrefix/share
+  mkdir -p $installPrefix
+  mkdir -p $installPrefix/share
   echo '## This file is call from .bashrc' > $installPrefix/share/creatools_base_library_config.sh
   bash installmodBash.sh $installPrefix
 

diff --git a/Linux/scripts/CreaTools-load.sh b/Linux/scripts/CreaTools-load.sh
index b8b983bb9e38ad71dd0db9f492b696ba17db591f..08112a875584e2dec4da6e69c17d8f1b13a2095a 100644 (file)
--- a/Linux/scripts/CreaTools-load.sh
+++ b/Linux/scripts/CreaTools-load.sh
@@ -69,10 +69,10 @@ fi
 
 if [ ! -e $generationdir ]
 then
-   mkdir $generationdir
-   mkdir $generationdir/creatools_source
-   mkdir $generationdir/creatools_bin
-   mkdir $generationdir/creatools_install   
+   mkdir -p $generationdir
+   mkdir -p $generationdir/creatools_source
+   mkdir -p $generationdir/creatools_bin
+   mkdir -p $generationdir/creatools_install   
 fi
 
 cd $generationdir
@@ -89,7 +89,7 @@ then
   rm -rf creatools_source
   rm -rf creatools_bin
   rm -rf creatools_install
-  mkdir $generationdir/creatools_source
+  mkdir -p $generationdir/creatools_source
 fi
 fi
 

diff --git a/Linux/scripts/ThirdParty-install-Base-Stuff.sh b/Linux/scripts/ThirdParty-install-Base-Stuff.sh
index ea2c386073df194f761a8199c34199146041cf9d..a548be6662590a4f879ed902d014413b6c459b6c 100644 (file)
--- a/Linux/scripts/ThirdParty-install-Base-Stuff.sh
+++ b/Linux/scripts/ThirdParty-install-Base-Stuff.sh
@@ -46,25 +46,25 @@ binDir=$generationdir/thirdparty_bin
 
 if [ ! -e $generationdir ]
 then
-   mkdir $generationdir
-   chown $loginUserName  $generationdir
-   chgrp $loginGroupName $generationdir
+   mkdir -p $generationdir
+   chown -R $loginUserName  $generationdir
+   chgrp -R $loginGroupName $generationdir
 fi
 
 if [ ! -e $sourcesDir ]
 then
-   mkdir $sourcesDir
+   mkdir -p $sourcesDir
    #was : (pb on MacOS?)
-   #chown $loginUserName:$loginGroupName $sourcesDir
-   chown $loginUserName  $sourcesDir
-   chgrp $loginGroupName $sourcesDir
+   #chown -R $loginUserName:$loginGroupName $sourcesDir
+   chown -R $loginUserName  $sourcesDir
+   chgrp -R $loginGroupName $sourcesDir
 fi
 
 if [ ! -e $binDir ]
 then
-   mkdir $binDir
-   chown $loginUserName  $binDir
-   chgrp $loginGroupName $binDir
+   mkdir -p $binDir
+   chown -R $loginUserName  $binDir
+   chgrp -R $loginGroupName $binDir
 fi
 
 # the following stupid test is used at debug time; Please don't remove!

diff --git a/Linux/scripts/ThirdParty-install-Finalize.sh b/Linux/scripts/ThirdParty-install-Finalize.sh
index 9ac09afa72366a84a5ce159f54d7c8bcd90c10f4..e5c752ed8073b83ba757f14568aefcdbf40d0d58 100644 (file)
--- a/Linux/scripts/ThirdParty-install-Finalize.sh
+++ b/Linux/scripts/ThirdParty-install-Finalize.sh
@@ -57,7 +57,7 @@ fi
 
 if [ ! -e $installPrefixThird/share ]
 then
-   mkdir $installPrefixThird/share
+   mkdir -p $installPrefixThird/share
 fi
 touch     $installPrefixThird/share/creatools_third_party_library_config.sh
 chmod 755 $installPrefixThird/share/creatools_third_party_library_config.sh

diff --git a/Linux/scripts/ThirdParty-install-ITK.sh b/Linux/scripts/ThirdParty-install-ITK.sh
index 2d5a71a665ffc87347eb77d85efa67bc985e85b3..89b2ac98368aa3f5183a735f3960d831f1e58a20 100644 (file)
--- a/Linux/scripts/ThirdParty-install-ITK.sh
+++ b/Linux/scripts/ThirdParty-install-ITK.sh
@@ -76,25 +76,25 @@ binDir=$generationdir/thirdparty_bin
 
 if [ ! -e $generationdir ]
 then
-   mkdir $generationdir
-   chown $loginUserName  $generationdir
-   chgrp $loginGroupName $generationdir
+   mkdir -p $generationdir
+   chown -R $loginUserName  $generationdir
+   chgrp -R $loginGroupName $generationdir
 
 fi
 if [ ! -e $sourcesDir ]
 then
-   mkdir $sourcesDir
+   mkdir -p $sourcesDir
    #was : (pb on MacOS?)
-   #chown $loginUserName:$loginGroupName $sourcesDir
-   chown $loginUserName  $sourcesDir
-   chgrp $loginGroupName $sourcesDir
+   #chown -R $loginUserName:$loginGroupName $sourcesDir
+   chown -R $loginUserName  $sourcesDir
+   chgrp -R $loginGroupName $sourcesDir
 fi
 
 if [ ! -e $binDir ]
 then
-   mkdir $binDir
-   chown $loginUserName  $binDir
-   chgrp $loginGroupName $binDir
+   mkdir -p $binDir
+   chown -R $loginUserName  $binDir
+   chgrp -R $loginGroupName $binDir
 fi
 
   echo "we remove old stuff"
@@ -147,7 +147,7 @@ then
 
   dirInstall=$binDir/$libname-Bin
   export ITK_DIR=$installPrefixThird/lib/InsightToolkit/
-  mkdir $dirInstall
+  mkdir -p $dirInstall
   cd $dirInstall
 
   cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/

diff --git a/Linux/scripts/ThirdParty-install-VTK.sh b/Linux/scripts/ThirdParty-install-VTK.sh
index 806296692adb3c3b1795369320d9e92b8eba8426..cc1f017d33c1f246429b93a753a6d996735aa08c 100644 (file)
--- a/Linux/scripts/ThirdParty-install-VTK.sh
+++ b/Linux/scripts/ThirdParty-install-VTK.sh
@@ -70,25 +70,25 @@ binDir=$generationdir/thirdparty_bin
 
 if [ ! -e $generationdir ]
 then
-   mkdir $generationdir
-   chown $loginUserName  $generationdir
-   chgrp $loginGroupName $generationdir
+   mkdir -p $generationdir
+   chown -R $loginUserName  $generationdir
+   chgrp -R $loginGroupName $generationdir
 
 fi
 if [ ! -e $sourcesDir ]
 then
-   mkdir $sourcesDir
+   mkdir -p $sourcesDir
    #was : (pb on MacOS?)
-   #chown $loginUserName:$loginGroupName $sourcesDir
-   chown $loginUserName  $sourcesDir
-   chgrp $loginGroupName $sourcesDir
+   #chown -R $loginUserName:$loginGroupName $sourcesDir
+   chown -R $loginUserName  $sourcesDir
+   chgrp -R $loginGroupName $sourcesDir
 fi
 
 if [ ! -e $binDir ]
 then
-   mkdir $binDir
-   chown $loginUserName  $binDir
-   chgrp $loginGroupName $binDir
+   mkdir -p $binDir
+   chown -R $loginUserName  $binDir
+   chgrp -R $loginGroupName $binDir
 fi
 
   echo "we remove old stuff"
@@ -148,7 +148,7 @@ then
 ##  export VTK_DIR=$installPrefixThird/lib/vtk-5.6/
   export VTK_DIR=$installPrefixThird/lib/vtk-5.10/
 
-  mkdir $dirInstall
+  mkdir -p $dirInstall
   echo "we prepare directories dirInstall " $dirInstall  " VTK_DIR " $installPrefixThird/lib/vtk-5.10.1/
   cd $dirInstall
 

diff --git a/Linux/scripts/ThirdParty-install-WX.sh b/Linux/scripts/ThirdParty-install-WX.sh
index 90c4b040a8bc65aea9dca72c73f045de2d105a8c..6164821a4edc216110348b02729a680e21a23955 100644 (file)
--- a/Linux/scripts/ThirdParty-install-WX.sh
+++ b/Linux/scripts/ThirdParty-install-WX.sh
@@ -70,25 +70,25 @@ binDir=$generationdir/thirdparty_bin
 
 if [ ! -e $generationdir ]
 then
-   mkdir $generationdir
-   chown $loginUserName  $generationdir
-   chgrp $loginGroupName $generationdir
+   mkdir -p $generationdir
+   chown -R $loginUserName  $generationdir
+   chgrp -R $loginGroupName $generationdir
 
 fi
 if [ ! -e $sourcesDir ]
 then
-   mkdir $sourcesDir
+   mkdir -p $sourcesDir
    #was : (pb on MacOS?)
-   #chown $loginUserName:$loginGroupName $sourcesDir
-   chown $loginUserName  $sourcesDir
-   chgrp $loginGroupName $sourcesDir
+   #chown -R $loginUserName:$loginGroupName $sourcesDir
+   chown -R $loginUserName  $sourcesDir
+   chgrp -R $loginGroupName $sourcesDir
 fi
 
 if [ ! -e $binDir ]
 then
-   mkdir $binDir
-   chown $loginUserName  $binDir
-   chgrp $loginGroupName $binDir
+   mkdir -p $binDir
+   chown -R $loginUserName  $binDir
+   chgrp -R $loginGroupName $binDir
 fi
 
   echo "we remove old stuff"
@@ -120,7 +120,7 @@ then
   libname=wxWidgets
   dirInstall=$installPrefixThird/lib/wx/
   export WX_DIR=$installPrefixThird/lib/wx/
-  mkdir $dirInstall
+  mkdir -p $dirInstall
   echo "we prepare directories dirInstall " $dirInstall  " wx_DIR " $installPrefixThird/lib/wx/
   #cd $dirInstall
 

diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh b/Linux/scripts/ThirdParty-install-gdcm.sh
index 18771acf05847046a24a0840e8934713444e0ef2..d89acab23d89cdbc5a940a513060f4acdfcce676 100644 (file)
--- a/Linux/scripts/ThirdParty-install-gdcm.sh
+++ b/Linux/scripts/ThirdParty-install-gdcm.sh
@@ -69,25 +69,25 @@ binDir=$generationdir/thirdparty_bin
 
 if [ ! -e $generationdir ]
 then
-   mkdir $generationdir
-   chown $loginUserName  $generationdir
-   chgrp $loginGroupName $generationdir
+   mkdir -p $generationdir
+   chown -R $loginUserName  $generationdir
+   chgrp -R $loginGroupName $generationdir
 
 fi
 if [ ! -e $sourcesDir ]
 then
-   mkdir $sourcesDir
+   mkdir -p $sourcesDir
    #was : (pb on MacOS?)
-   #chown $loginUserName:$loginGroupName $sourcesDir
-   chown $loginUserName  $sourcesDir
-   chgrp $loginGroupName $sourcesDir
+   #chown -R $loginUserName:$loginGroupName $sourcesDir
+   chown -R $loginUserName  $sourcesDir
+   chgrp -R $loginGroupName $sourcesDir
 fi
 
 if [ ! -e $binDir ]
 then
-   mkdir $binDir
-   chown $loginUserName  $binDir
-   chgrp $loginGroupName $binDir
+   mkdir -p $binDir
+   chown -R $loginUserName  $binDir
+   chgrp -R $loginGroupName $binDir
 fi
 
   echo "we remove old stuff"
@@ -121,7 +121,7 @@ then
   libname=gdcm
   dirInstall=$binDir/$libname-Bin
   export GDCM_DIR=$installPrefixThird/lib/gdcm/
-  mkdir $dirInstall
+  mkdir -p $dirInstall
   cd $dirInstall
 
   cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/

diff --git a/Linux/scripts/ThirdParty-install.sh b/Linux/scripts/ThirdParty-install.sh
index 059f2ae5e61a09920d24803ec5169b343b239a8e..a3ffec9c1dce34371e27d6273b4f063a556968ac 100644 (file)
--- a/Linux/scripts/ThirdParty-install.sh
+++ b/Linux/scripts/ThirdParty-install.sh
@@ -73,25 +73,25 @@ binDir=$generationdir/thirdparty_bin
 
 if [ ! -e $generationdir ]
 then
-   mkdir $generationdir
-   chown $loginUserName  $generationdir
-   chgrp $loginGroupName $generationdir
+   mkdir -p $generationdir
+   chown -R $loginUserName  $generationdir
+   chgrp -R $loginGroupName $generationdir
 fi
 
 if [ ! -e $sourcesDir ]
 then
-   mkdir $sourcesDir
+   mkdir -p $sourcesDir
    #was : (pb on MacOS?)
-   #chown $loginUserName:$loginGroupName $sourcesDir
-   chown $loginUserName  $sourcesDir
-   chgrp $loginGroupName $sourcesDir
+   #chown -R $loginUserName:$loginGroupName $sourcesDir
+   chown -R $loginUserName  $sourcesDir
+   chgrp -R $loginGroupName $sourcesDir
 fi
 
 if [ ! -e $binDir ]
 then
-   mkdir $binDir
-   chown $loginUserName  $binDir
-   chgrp $loginGroupName $binDir
+   mkdir -p $binDir
+   chown -R $loginUserName  $binDir
+   chgrp -R $loginGroupName $binDir
 fi
 
 

diff --git a/Linux/scripts/ThirdParty-install_no_compile.sh b/Linux/scripts/ThirdParty-install_no_compile.sh
index d16b103ced5e9e348586ca6ba1f373b4f2f34ebd..67e0fb758d66246bc734c45b9460ff34aef790bb 100644 (file)
--- a/Linux/scripts/ThirdParty-install_no_compile.sh
+++ b/Linux/scripts/ThirdParty-install_no_compile.sh
@@ -77,7 +77,7 @@ fi
 
 if [ ! -e $installPrefixThird/share ]
 then
-   mkdir $installPrefixThird/share
+   mkdir -p $installPrefixThird/share
 fi
 touch     $installPrefixThird/share/creatools_third_party_library_config.sh
 chmod 755 $installPrefixThird/share/creatools_third_party_library_config.sh

diff --git a/Linux/scripts/cmakemod.sh b/Linux/scripts/cmakemod.sh
index fabcc0921f17bdb10ac3833cbbb6d4d75662122e..a744f4e662f40e0a58a8bd5c2d1f457b7d2f211a 100644 (file)
--- a/Linux/scripts/cmakemod.sh
+++ b/Linux/scripts/cmakemod.sh
@@ -54,7 +54,7 @@ fi
 echo dirInstall
 echo $dirInstall
 
-mkdir $dirInstall
+mkdir -p $dirInstall
 cd $dirInstall
 echo -H$currentdir/creatools_source/$1
 echo -B$dirInstall/