X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2FREADME.txt;h=4873a469a6b58c938c555a131079eca6663a2456;hb=92e2861847038124e273a60c80c9a85a821e9a55;hp=cbab0d5779a50aa09dd85a7e208a916ded68ed4b;hpb=ad3162bceb1cbf58006ce6d0a5c8945468755130;p=creaToolsTools.git

diff --git a/Linux/README.txt b/Linux/README.txt
index cbab0d5..4873a46 100644
--- a/Linux/README.txt
+++ b/Linux/README.txt
@@ -1,32 +1,59 @@
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------  
+
+
 
 #######################################
-two solution to install the creatools under Linux:
--- the new install script (called installscript) 
--- the old interactive script (menu.sh) (obsolete will disappear in a near future)
+To install the CreaTools under Linux, use installscript.
+menu.sh is deprecated. This script should not be used. (It will disappear in a near future.)
 
 
 ===================================
-doc for installscript
+Documentation for installscript
 ===================================
 
--- some example:
+Launch 'installscript' in command line to see the list of options.
+
+-- Some examples:
 
 # to configure only
 ./installscript -gdir $HOME/work/creatools/creainstall config
 or
-./installscript -cvs sdika -ncore 4 -gdir $HOME/work/creatools/creainstall config
+./installscript -git sdika -ncore 4 -gdir $HOME/work/creatools/creainstall config
 
 # to configure / compile-install all packages and the creatools themselves 
-./installscript -cvs sdika -ncore 4 -gdir $HOME/work/creatools/creainstall all
+./installscript -git sdika -ncore 4 -gdir $HOME/work/creatools/creainstall all
 
 # compile-install only one part (vtk  for example) ONCE CONFIG HAS BEEN RUN 
 ./installscript 3rd-vtk
 
 
+-- If you choose Git: 
+You must have shared your public key on CREATIS server.
 
 
 ===================================
-doc for menu.sh
+Documentation for menu.sh
 ===================================
 WARNING :
 Use always bash (never use sh!)
@@ -39,7 +66,7 @@ You will be prompted to say what you want to do :
  Install Third Party Libraries :....1 (as root)
  Get and Install the 'CreaTools':...2
  or
- Get the 'CreaTools' source files :.2.1 (CVS : as user!)
+ Get the 'CreaTools' source files :.2.1 (GIT : as user!)
  Compile   the CreaTools :..........2.2
  Install   the CreaTools :..........2.3
  
@@ -61,14 +88,12 @@ You will be prompted to give your preferences :
 "Number of Cores"
 "Name of the Generation Directory"
 "Boolean for Doc Generation : YES/NO"
-"Where do you want to get source files from : CVS/HTML"
+"Where do you want to get source files from : GIT/HTML"
 
--> if you chose CVS: 
+-> if you chose GIT: 
 1/ you must have shared your public key on CREATIS server
-2/ you have to set properly the CVSROOT environment variable
-(see https://www.creatis.insa-lyon.fr/mywiki/Utiliser_CVS_avec_la_ligne_de_commande)
 
-"CVS User name"
+"GIT User name"
 "Login 'User' name"
 "Login 'Group' name"
 "Build type : Release/Debug"