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

diff --git a/Linux/README.txt b/Linux/README.txt
index 9ab5b2ccd4d01584ffdf3b61853669dd8dc9840a..ae2743fd8425833e8931ad05705023ed70a6c2ab 100644 (file)
--- a/Linux/README.txt
+++ b/Linux/README.txt
@@ -34,8 +34,38 @@ Documentation for installscript
 
 Launch 'installscript' in command line to see the list of options.
 
+===== How to Install =======
+0) Not forget:
+   A. Install your ssh key: https://www.creatis.insa-lyon.fr/mywiki/SSH
+       Note: -Put your key in .ssh directory.
+             -Change de right of your 
+                  chmod ugo-rwx  id_dsa 
+                  chmod u+rwx id_dsa 
+   B. Send an email to the web master Fabrice Bellet <fabrice.bellet@creatis.insa-lyon.fr> 
+      to be include in the DataBase-GIT of Creatools.
+
+1)
+./installscript config
+
+2)
+./installscript 3rd
+
+3)
+./installscript creatools
+
+
+
+
+
+==========================================
+==========================================
+==========================================
+
+
+Exemples of differents configurations :
+
 
-===== How to Install (HTML VERSION)=======
+===== 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
 
@@ -46,7 +76,7 @@ Launch 'installscript' in command line to see the list of options.
 ./installscript creatools
 
 
-===== How to Install (GIT VERSION)=======
+===== How to Install - GIT VERSION =======
 0) Not forget:
    A. Install your ssh key: https://www.creatis.insa-lyon.fr/mywiki/SSH
        Note: -Put your key in .ssh directory.

diff --git a/Linux/installscript b/Linux/installscript
index 70fb2846b2fff369df4bc54e9d45b91e0d15c5bb..851dce2046dae9c5df81dc4c1ca7c72b558f5814 100755 (executable)
--- a/Linux/installscript
+++ b/Linux/installscript
@@ -149,14 +149,14 @@ generationdir=$HOME/CreatoolsGenerationDir
 installPrefixThird=
 installPrefix=
 docgeneration=OFF
-sourcesFrom=HTML
+sourcesFrom=GIT
 
 loginUserName=$USER
 loginGroupName=`groups | awk '{print $1}'`
-buildType=RelWithDebug
+buildType=Release
 gdcmVersion=GDCM1
 ITKVersion=ITK3
-export ETC_BASHRC=`getbashrc`
+export ETC_BASHRC=~/.bashrc
 
 
 
@@ -380,7 +380,6 @@ fi
 if [ `checkVal $command all 3rd 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx ` == true ] ; then
     bigDisplay "FINALIZE 3RD PARTY LIBRARY INSTALLATION"
     bash scripts/ThirdParty-install-Finalize.sh
-    source $ETC_BASHRC
     if [ `checkVal $command 3rd 3rd-vtk 3rd-itk 3rd-gdcm 3rd-wx ` == true ] ; then
         bigDisplay "Third Party Install Done" 
         bigDisplay "Please copy paste the following command or open a new terminal: source ~/.bashrc" 
@@ -399,7 +398,7 @@ fi
 if [ `checkVal $command all creatools creatools-cmp` == true ] ; then
     bigDisplay "COMPILE CREATOOLS"
     source $ETC_BASHRC
-   bash -x scripts/CreaTools-compile.sh
+    bash -x scripts/CreaTools-compile.sh
 
     # To allow (*very* aware) user to patch code, later
     if [ ! -e $generationdir/creatools_source ] ; then

diff --git a/Linux/scripts/ThirdParty-install-Base-Stuff.sh b/Linux/scripts/ThirdParty-install-Base-Stuff.sh
index 0ddc5de125f981640af44c2d66edb2cae7a95f58..ea2c386073df194f761a8199c34199146041cf9d 100644 (file)
--- a/Linux/scripts/ThirdParty-install-Base-Stuff.sh
+++ b/Linux/scripts/ThirdParty-install-Base-Stuff.sh
@@ -97,6 +97,7 @@ then
      urpmi gcc-c++
      urpmi git
      urpmi rpm-build
+     urpmi patch ### EED It's working ???
 
      ;;
   Fedora)
@@ -118,6 +119,7 @@ then
      yum install xerces-c-devel       -y
      yum install git                  -y
      yum install qtwebkit-devel       -y
+     yum install patch                -y
 
      ;;
   Ubuntu)
@@ -138,6 +140,7 @@ then
      apt-get --yes install libboost-all-dev #Boost
      apt-get --yes install libqt4-dev #QT4
      apt-get --yes install libxerces-c-dev
+     apt-get --yes install patch
      ## CLAIRE - JGRR
      apt-get --yes install qt4-qmake #QT4 qmake
      apt-get --yes install libsqlite0-dev