X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=README.txt;h=55a5d59df6db93397f1e920fed332e2b9cc15526;hb=db8bd1248d117d5d42484aba40c24ac38175221f;hp=cbe59de25ed04714055a412b542ecf6d0842c7e3;hpb=f6b95df0319a551f98e27ed97de13896d2a86a9e;p=creaToolsTools.git

diff --git a/README.txt b/README.txt
index cbe59de..55a5d59 100644
--- a/README.txt
+++ b/README.txt
@@ -1,12 +1,58 @@
-=== === ===  UNIX / LINUX users === === ===
+=== === ===  NEW (new way) UNIX / LINUX / MacOS users === === ===
+
+0) cd Linux
+1) read the README.txt
+2) Action!
+
+=== === === WINDOWS users === === ===
 
 0) Make sure everything you'll need is properly installed :
+crea_Developers_tools, crea_ThirdParty_dlls, and VisualStudioExpress2008
+Have a look at :
+http://www.creatis.insa-lyon.fr/site/fr/CreatoolsDownload
+
+Change your CVS user in the file All.bat
+
+Copy all the .bat files into one directoy where the tests are going to be run
+execute All.bat
+
+Do not forget to run your ssh key with puttyAgent
+
+All the creatools projects are downloaded from the CVS, compiled and the CTest for the dashboard is run.
+
+
+
+
+
+
+
+
+Forget the following lines !
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+=== === ===   (new way) UNIX / LINUX users === === ===
+
+
+1) Make sure everything you'll need is properly installed :
 crea_Developers_tools, crea_ThirdParty_Libraries
+
 have a look at :
 http://www.creatis.insa-lyon.fr/site/fr/CreatoolsDownload
-
-1) Make sure you got the last version of creaToolsTools.
-cvs update -dP creaToolsTools
+and/or :
+cd Install_ThirdParty
+follow the Readme.txt
 
 2) make sure VTK_DIR environment variable is set properly :
 echo $VTK_DIR
@@ -18,19 +64,81 @@ echo $LATEX_COMPILER
 Set it, if not OK:
 export LATEX_COMPILER=/usr/bin/latex, for instance
 
-4) ssh-add
+4) Make sure you got the last version of creaToolsTools.
+cvs update -dP creaToolsTools
+
+a) cd Install
+
+b) cp configure.sh_TEMPLATE  configure.sh
+
+c) modify (only once) the file configure.sh, according to your preferences:
+vim configure.sh
+as follows :
+-- configure.sh ---------------------
+generationdir=<name of the Generation Directory>
+docgeneration=<Boolean For Doc Generation> : ON / OFF
+cvsUserName=<user Name For CVS>
+installPrefix=<installPrefix> : /usr/local or $generationdir/creatools_install
+buildType=<buildType> : Release / Debug
+gdcmVersion=<GDCM Version> : GDCM1 / GDCM2
+sourcesFrom=<where do you want to get them from> : CVS / HTML
+--------------------------------------
+
+
+d) if you choosed  'sourcesFrom=CVS' :
+ssh-add
 <type your cvs password>
 
-5) sudo configuration
+e) sh scripts/make.sh
+
+f) make sure everything is OK
+
+g) switch as root
+
+h) sh scripts/make-install.sh
+
+
+
+
+
+
+=== === ===  (old way) UNIX / LINUX users === === ===
+
+0)  Make sure you are a 'sudoer'.
+have a look at :
+--sudo configuration--
 https://fedoraproject.org/wiki/Configuring_Sudo
 
+1) ssh-add
+<type your cvs password>
+
+2) Make sure you got the last version of creaToolsTools.
+cvs update -dP creaToolsTools
+
+3) Make sure everything you'll need is properly installed :
+crea_Developers_tools, crea_ThirdParty_Libraries
+have a look at :
+http://www.creatis.insa-lyon.fr/site/fr/CreatoolsDownload
+and/or :
+cd Install_ThirdParty
+follow the Readme.txt
+
+4) make sure VTK_DIR environment variable is set properly :
+echo $VTK_DIR
+Set it, if not OK:
+export VTK_DIR=/usr/local/lib/vtk-5.4, for instance
+
+5) make sure LATEX_COMPILER environment variable is set properly :
+echo $LATEX_COMPILER 
+Set it, if not OK:
+export LATEX_COMPILER=/usr/bin/latex, for instance
+
 6)cd Install
 cp creatools.sh_TEMPLATE creatools.sh
 
 7) modify the file creatools.sh, according to your preferences, modify (only once) creatools.sh
 vim creatools.sh
 as follows :
-
 -- creatools.sh ---------------------
 creatoolsGeneration=<directory you want to generate in>
 installPrefix=<your Install dir> or </usr/local> 
@@ -54,24 +162,6 @@ export LD_LIBRARY_PATH
 
 
 
-=== === === WINDOWS users === === ===
-
-
-
-0) Make sure everything you'll need is properly installed :
-crea_Developers_tools, crea_ThirdParty_dlls, and VisualStudioExpress2008
-Have a look at :
-http://www.creatis.insa-lyon.fr/site/fr/CreatoolsDownload
-
-Change your CVS user in the file All.bat
-
-Copy all the .bat files into one directoy where the tests are going to be run
-execute All.bat
-
-Not forget to run your ssh key with puttyAgent
-
-All the creatools projects are downloaded from the CVS, compiled and the CTest for the dashboard is run.
-