9 files changed, 156 insertions, 80 deletions

diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile
index fc2c95f4bebb..68411dbd1d9b 100644
--- a/cad/astk-serveur/Makefile
+++ b/cad/astk-serveur/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	astk
-PORTVERSION=	1.8.4
+PORTVERSION=	1.10.4
 CATEGORIES=	cad
 .if !defined(CLIENT_SEUL)
 PKGNAMESUFFIX=	-serveur
@@ -123,6 +123,7 @@ SHIA=		ksh93
 SHIA=		zsh
 .endif
 SHIADEP=	${SHIA}
+BASH2RC=	asrun/calcul.py share/codeaster/asrun/data/mpirun_template
 
 .if !defined(WITH_ED)
 . if exists(${LOCALBASE}/bin/nedit)
@@ -230,6 +231,9 @@ do-configure:
 	${REINPLACE_CMD} -e 's|%%MAKE_JOBS_NUMBER%%|1|'	${WRKSRC}/asrun/system.py
 . endif
 	${REINPLACE_CMD} -e 's|bash|${SHIA}|' ${WRKSRC}/asrun/system_command.py
+. for sh in ${BASH2RC}
+	${REINPLACE_CMD} -e 's|/bin/bash|${SHELL_INSTALL_ASTER}|' ${WRKSRC}/${sh}
+. endfor
 	${REINPLACE_CMD} -e 's|/usr/bin/|${LOCALBASE}/bin/|;s|LINUX|FREEBSD|'	\
 		${WRKSRC}/asrun/core/configuration.py
 .else
diff --git a/cad/astk-serveur/files.client/patch-bin_astk b/cad/astk-serveur/files.client/patch-bin_astk
index 48826284a493..d28765d365b3 100644
--- a/cad/astk-serveur/files.client/patch-bin_astk
+++ b/cad/astk-serveur/files.client/patch-bin_astk
@@ -1,33 +1,27 @@
---- ./bin/astk.orig	2009-12-23 15:53:05.000000000 +0100
-+++ ./bin/astk	2010-02-02 19:30:34.000000000 +0100
-@@ -17,20 +17,14 @@
+--- bin/astk.orig	2011-12-20 13:33:00.000000000 +0100
++++ bin/astk	2012-05-08 12:31:09.000000000 +0200
+@@ -17,15 +17,9 @@
  #    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
  # ==============================================================================
  
 -set_prefix() {
--   local this=`readlink -n -f $1`
--   local bin=`dirname $this`
--   prefix=`dirname $bin`
+-    local this=`readlink -n -f $1`
+-    local bin=`dirname $this`
+-    prefix=`dirname $bin`
 -}
--
--set_prefix $0
 +prefix=%%inst_dir%%/ASTK_CLIENT
  
- # set environment
- if [ -f /etc/codeaster/profile.sh ]; then
-    . /etc/codeaster/profile.sh
- fi
--if [ -f $prefix/etc/codeaster/profile.sh ]; then
--   . $prefix/etc/codeaster/profile.sh
-+if [ -f ?ASTER_ROOT?/etc/codeaster/profile.sh ]; then
-+   . ?ASTER_ROOT?/etc/codeaster/profile.sh
- fi
- 
- # start tcl/tk interpreter
-@@ -38,5 +32,5 @@
+-set_prefix $0
+-
+-ASTER_ROOT=$prefix
++ASTER_ROOT=?ASTER_ROOT?
+ ASTER_ETC=$ASTER_ROOT/etc
+ if [ "$ASTER_ROOT" = "/usr" ]; then
+     ASTER_ETC=/etc
+@@ -43,5 +37,5 @@
     WISHEXECUTABLE=wish
  fi
  
--$WISHEXECUTABLE $prefix/lib/astk/astk.tcl -- $* &
+-$WISHEXECUTABLE $ASTER_ROOT/lib/astk/astk.tcl -- $* &
 +$WISHEXECUTABLE $prefix/lib/astk.tcl -- $* &
  
diff --git a/cad/astk-serveur/files.client/patch-bin_bsf b/cad/astk-serveur/files.client/patch-bin_bsf
index 0ececa6258c7..1bf48ad060f0 100644
--- a/cad/astk-serveur/files.client/patch-bin_bsf
+++ b/cad/astk-serveur/files.client/patch-bin_bsf
@@ -1,26 +1,20 @@
---- ./bin/bsf.orig	2009-12-23 15:53:05.000000000 +0100
-+++ ./bin/bsf	2010-02-02 19:30:16.000000000 +0100
-@@ -17,20 +17,14 @@
+--- ./bin/bsf.orig	2011-12-20 13:33:00.000000000 +0100
++++ ./bin/bsf	2012-01-02 22:28:16.000000000 +0100
+@@ -17,15 +17,9 @@
  #    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
  # ==============================================================================
  
 -set_prefix() {
--   local this=`readlink -n -f $1`
--   local bin=`dirname $this`
--   prefix=`dirname $bin`
+-    local this=`readlink -n -f $1`
+-    local bin=`dirname $this`
+-    prefix=`dirname $bin`
 -}
--
--set_prefix $0
 +prefix=%%inst_dir%%/ASTK_CLIENT
  
- # set environment
- if [ -f /etc/codeaster/profile.sh ]; then
-    . /etc/codeaster/profile.sh
- fi
--if [ -f $prefix/etc/codeaster/profile.sh ]; then
--   . $prefix/etc/codeaster/profile.sh
-+if [ -f ?ASTER_ROOT?/etc/codeaster/profile.sh ]; then
-+   . ?ASTER_ROOT?/etc/codeaster/profile.sh
- fi
- 
- # start tcl/tk interpreter
+-set_prefix $0
+-
+-ASTER_ROOT=$prefix
++ASTER_ROOT=?ASTER_ROOT?
+ ASTER_ETC=$ASTER_ROOT/etc
+ if [ "$ASTER_ROOT" = "/usr" ]; then
+     ASTER_ETC=/etc
diff --git a/cad/astk-serveur/files.client/patch-lib_init.tcl b/cad/astk-serveur/files.client/patch-lib_init.tcl
index 2c6703929dba..77646fb3e8a7 100644
--- a/cad/astk-serveur/files.client/patch-lib_init.tcl
+++ b/cad/astk-serveur/files.client/patch-lib_init.tcl
@@ -1,8 +1,17 @@
---- ./lib/init.tcl.orig	2009-12-23 15:53:05.000000000 +0100
-+++ ./lib/init.tcl	2010-01-26 23:25:44.000000000 +0100
-@@ -603,6 +603,7 @@
+--- lib/init.tcl.orig	2011-12-20 13:33:00.000000000 +0100
++++ lib/init.tcl	2012-05-08 12:55:11.000000000 +0200
+@@ -100,7 +100,7 @@
+    if { $prefix == "/usr" } {
+       set prefix "/"
+    }
+-   set ashare::prefix $prefix
++   set ashare::prefix [file join $prefix "ASTK_SERV"]
+    set ashare::astkrc_ref [file join $ashare::prefix "etc" "codeaster" "astkrc"]
+ 
+    #  numero de version de astk
+@@ -673,6 +673,7 @@
     set astk::ihm(pltf,WIN32) "Windows"
-    
+ 
     set astk::ihm(pltf,P_LINUX) "Linux x86"
 +   set astk::ihm(pltf,FREEBSD) "%%unamesm%%"
     set astk::ihm(pltf,TRU64) "OSF1 TRU64"
diff --git a/cad/astk-serveur/files/patch-asrun_installation.py b/cad/astk-serveur/files/patch-asrun_installation.py
index 708283b728bd..94bf30981899 100644
--- a/cad/astk-serveur/files/patch-asrun_installation.py
+++ b/cad/astk-serveur/files/patch-asrun_installation.py
@@ -1,11 +1,11 @@
---- ./asrun/installation.py.orig	2010-07-07 18:18:08.000000000 +0200
-+++ ./asrun/installation.py	2010-08-11 22:01:50.000000000 +0200
-@@ -19,7 +19,7 @@
+--- ./asrun/installation.py.orig	2011-12-20 13:33:00.000000000 +0100
++++ ./asrun/installation.py	2012-01-02 21:53:51.000000000 +0100
+@@ -21,7 +21,7 @@
  prefix = aster_root
  if aster_root == '/usr':
      prefix = '/'
--confdir = os.path.join(prefix, 'etc', 'codeaster')
-+confdir = os.path.join(aster_root, 'etc', 'codeaster')
+-confdir = osp.join(prefix, 'etc', 'codeaster')
++confdir = osp.join(aster_root, 'etc', 'codeaster')
  
- # directory containing data files
- datadir = os.path.join(aster_root, 'share', 'codeaster', 'asrun', 'data')
+ # confdir contains plugins directory
+ if confdir not in sys.path:
diff --git a/cad/astk-serveur/files/patch-bin_as_run b/cad/astk-serveur/files/patch-bin_as_run
index 70e444adf230..300356cf7915 100644
--- a/cad/astk-serveur/files/patch-bin_as_run
+++ b/cad/astk-serveur/files/patch-bin_as_run
@@ -1,17 +1,17 @@
---- bin/as_run.orig	2009-12-23 15:53:06.000000000 +0100
-+++ bin/as_run	2010-02-02 19:21:17.000000000 +0100
+--- bin/as_run.orig	2011-12-20 13:33:00.000000000 +0100
++++ bin/as_run	2012-01-02 21:56:27.000000000 +0100
 @@ -17,13 +17,7 @@
  #    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
  # ==============================================================================
  
 -set_prefix() {
--   local this=`readlink -n -f $1`
--   local bin=`dirname $this`
--   prefix=`dirname $bin`
+-    local this=`readlink -n -f $1`
+-    local bin=`dirname $this`
+-    prefix=`dirname $bin`
 -}
 -
 -set_prefix $0
 +prefix=?ASTER_ROOT?
  
- # set environment
- if [ -f /etc/codeaster/profile.sh ]; then
+ ASTER_ROOT=$prefix
+ ASTER_ETC=$ASTER_ROOT/etc
diff --git a/cad/astk-serveur/files/patch-bin_parallel_cp b/cad/astk-serveur/files/patch-bin_parallel_cp
index 1f30fb09a935..cf472a8fd718 100644
--- a/cad/astk-serveur/files/patch-bin_parallel_cp
+++ b/cad/astk-serveur/files/patch-bin_parallel_cp
@@ -1,17 +1,17 @@
---- bin/parallel_cp.orig	2009-12-23 15:53:06.000000000 +0100
-+++ bin/parallel_cp	2010-02-02 19:23:00.000000000 +0100
+--- bin/parallel_cp.orig	2011-12-20 13:33:00.000000000 +0100
++++ bin/parallel_cp	2012-01-02 22:01:50.000000000 +0100
 @@ -17,13 +17,7 @@
  #    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
  # ==============================================================================
  
 -set_prefix() {
--   local this=`readlink -n -f $1`
--   local bin=`dirname $this`
--   prefix=`dirname $bin`
+-    local this=`readlink -n -f $1`
+-    local bin=`dirname $this`
+-    prefix=`dirname $bin`
 -}
 -
 -set_prefix $0
 +prefix=?ASTER_ROOT?
  
- # set environment
- if [ -f /etc/codeaster/profile.sh ]; then
+ ASTER_ROOT=$prefix
+ ASTER_ETC=$ASTER_ROOT/etc
diff --git a/cad/astk-serveur/files/patch-etc_asrun b/cad/astk-serveur/files/patch-etc_asrun
index bdfef809a1b0..4da8462ea5f1 100644
--- a/cad/astk-serveur/files/patch-etc_asrun
+++ b/cad/astk-serveur/files/patch-etc_asrun
@@ -1,6 +1,6 @@
---- etc/asrun.orig	2010-12-21 19:08:32.000000000 +0100
-+++ etc/asrun	2010-12-27 21:42:25.000000000 +0100
-@@ -38,6 +38,10 @@
+--- etc/asrun.orig	2011-12-20 13:33:00.000000000 +0100
++++ etc/asrun	2012-01-02 22:07:53.000000000 +0100
+@@ -110,6 +110,10 @@
  # shared folders = for which remote copy is never necessary (comma separated)
  shared_folders :
  
@@ -11,13 +11,32 @@
  # choose True to create symbolic links instead of copying executable and catalogs
  symlink : True
  
-@@ -121,28 +125,28 @@
+@@ -176,12 +180,12 @@
+ # batch_kil : to delete jobs
+ 
+ # --- batch configuration (see examples below)
+-batch_nom : SunGE
+-batch_ini : /opt/SunGE6.0/default/common/settings.sh
+-batch_sub : /opt/SunGE6.0/bin/lx24-x86/qsub
+-batch_jid : JOB_ID
+-batch_job : /opt/SunGE6.0/bin/lx24-x86/qstat
+-batch_kil : /opt/SunGE6.0/bin/lx24-x86/qdel
++#batch_nom : SunGE
++#batch_ini : /opt/SunGE6.0/default/common/settings.sh
++#batch_sub : /opt/SunGE6.0/bin/lx24-x86/qsub
++#batch_jid : JOB_ID
++#batch_job : /opt/SunGE6.0/bin/lx24-x86/qstat
++#batch_kil : /opt/SunGE6.0/bin/lx24-x86/qdel
+ 
+ # --- Sun Grid Engine example
+ #batch_nom : SunGE
+@@ -200,28 +204,28 @@
  #batch_kil : /usr/share/lsf/6.2/linux2.6-glibc2.3-ia64/bin/bkill
  
  # --- PBS example
 -#batch_nom : PBS
 +batch_nom : PBS
- #batch_ini : 
+ #batch_ini :
 -#batch_sub : /usr/bin/qsub
 -#batch_jid : PBS_JOBID
 -#batch_job : /usr/bin/qstat
@@ -36,7 +55,7 @@
 +mpirun_cmd : ?MPIRUN? -np %(mpi_nbcpu)s %(program)s
  
  # file which contains list of hosts (REQUIRED even if it is not used in mpirun_cmd)
- mpi_hostfile : ?ASTER_CONFDIR?/aster-mpihosts
+ mpi_hostfile : $ASTER_ETC/codeaster/mpi_hostfile
  
  # command called to initialize MPI environment (for example for mpich2)
 -#mpi_ini : mpdboot --totalnum=%(mpi_nbnoeud)s --file=%(mpi_hostfile)s ; sleep 10
@@ -48,7 +67,7 @@
  
  # shell command to get processor id
  # LAM/MPI : echo $LAMRANK
-@@ -170,8 +174,11 @@
+@@ -250,8 +254,11 @@
  # ps commands : uncomment lines corresponding to your platform
  #ps_cpu : /bin/ps -e --width=512 -ocputime -ocommand
  #ps_pid : /bin/ps -e --width=512 -opid -ocommand
diff --git a/cad/astk-serveur/pkg-plist b/cad/astk-serveur/pkg-plist
index c8ab755bd937..c4567bfb9a5f 100644
--- a/cad/astk-serveur/pkg-plist
+++ b/cad/astk-serveur/pkg-plist
@@ -25,7 +25,10 @@
 %%CLIENT%%%%ASTKDIR%%/lib/HELP/FR/item_111.txt
 %%CLIENT%%%%ASTKDIR%%/lib/HELP/FR/item_190.txt
 %%CLIENT%%%%ASTKDIR%%/lib/HELP/FR/item_323.txt
-%%CLIENT%%%%ASTKDIR%%/lib/RELNOTES
+%%CLIENT%%%%ASTKDIR%%/lib/RELNOTES.ENG
+%%CLIENT%%%%ASTKDIR%%/lib/RELNOTES.ENG.html
+%%CLIENT%%%%ASTKDIR%%/lib/RELNOTES.FR
+%%CLIENT%%%%ASTKDIR%%/lib/RELNOTES.FR.html
 %%CLIENT%%%%ASTKDIR%%/lib/__pkginfo__.tcl
 %%CLIENT%%%%ASTKDIR%%/lib/aide.tcl
 %%CLIENT%%%%ASTKDIR%%/lib/appli.tcl
@@ -241,9 +244,15 @@
 %%SERV%%%%ASTKDIR%%/asrun/calcul.py
 %%SERV%%%%ASTKDIR%%/asrun/calcul.pyc
 %%SERV%%%%ASTKDIR%%/asrun/calcul.pyo
-%%SERV%%%%ASTKDIR%%/asrun/client.py
-%%SERV%%%%ASTKDIR%%/asrun/client.pyc
-%%SERV%%%%ASTKDIR%%/asrun/client.pyo
+%%SERV%%%%ASTKDIR%%/asrun/client/__init__.py
+%%SERV%%%%ASTKDIR%%/asrun/client/__init__.pyc
+%%SERV%%%%ASTKDIR%%/asrun/client/__init__.pyo
+%%SERV%%%%ASTKDIR%%/asrun/client/calcul_handler.py
+%%SERV%%%%ASTKDIR%%/asrun/client/calcul_handler.pyc
+%%SERV%%%%ASTKDIR%%/asrun/client/calcul_handler.pyo
+%%SERV%%%%ASTKDIR%%/asrun/client/config.py
+%%SERV%%%%ASTKDIR%%/asrun/client/config.pyc
+%%SERV%%%%ASTKDIR%%/asrun/client/config.pyo
 %%SERV%%%%ASTKDIR%%/asrun/common/__init__.py
 %%SERV%%%%ASTKDIR%%/asrun/common/__init__.pyc
 %%SERV%%%%ASTKDIR%%/asrun/common/__init__.pyo
@@ -292,6 +301,9 @@
 %%SERV%%%%ASTKDIR%%/asrun/core/default_configuration.py
 %%SERV%%%%ASTKDIR%%/asrun/core/default_configuration.pyc
 %%SERV%%%%ASTKDIR%%/asrun/core/default_configuration.pyo
+%%SERV%%%%ASTKDIR%%/asrun/core/server.py
+%%SERV%%%%ASTKDIR%%/asrun/core/server.pyc
+%%SERV%%%%ASTKDIR%%/asrun/core/server.pyo
 %%SERV%%%%ASTKDIR%%/asrun/ctl/__init__.py
 %%SERV%%%%ASTKDIR%%/asrun/ctl/__init__.pyc
 %%SERV%%%%ASTKDIR%%/asrun/ctl/__init__.pyo
@@ -322,9 +334,6 @@
 %%SERV%%%%ASTKDIR%%/asrun/job.py
 %%SERV%%%%ASTKDIR%%/asrun/job.pyc
 %%SERV%%%%ASTKDIR%%/asrun/job.pyo
-%%SERV%%%%ASTKDIR%%/asrun/logger.py
-%%SERV%%%%ASTKDIR%%/asrun/logger.pyc
-%%SERV%%%%ASTKDIR%%/asrun/logger.pyo
 %%SERV%%%%ASTKDIR%%/asrun/main.py
 %%SERV%%%%ASTKDIR%%/asrun/main.pyc
 %%SERV%%%%ASTKDIR%%/asrun/main.pyo
@@ -334,6 +343,9 @@
 %%SERV%%%%ASTKDIR%%/asrun/mpi.py
 %%SERV%%%%ASTKDIR%%/asrun/mpi.pyc
 %%SERV%%%%ASTKDIR%%/asrun/mpi.pyo
+%%SERV%%%%ASTKDIR%%/asrun/multiple.py
+%%SERV%%%%ASTKDIR%%/asrun/multiple.pyc
+%%SERV%%%%ASTKDIR%%/asrun/multiple.pyo
 %%SERV%%%%ASTKDIR%%/asrun/myconnect.py
 %%SERV%%%%ASTKDIR%%/asrun/myconnect.pyc
 %%SERV%%%%ASTKDIR%%/asrun/myconnect.pyo
@@ -349,6 +361,21 @@
 %%SERV%%%%ASTKDIR%%/asrun/parser.py
 %%SERV%%%%ASTKDIR%%/asrun/parser.pyc
 %%SERV%%%%ASTKDIR%%/asrun/parser.pyo
+%%SERV%%%%ASTKDIR%%/asrun/plugins/__init__.py
+%%SERV%%%%ASTKDIR%%/asrun/plugins/__init__.pyc
+%%SERV%%%%ASTKDIR%%/asrun/plugins/__init__.pyo
+%%SERV%%%%ASTKDIR%%/asrun/plugins/actions.py
+%%SERV%%%%ASTKDIR%%/asrun/plugins/actions.pyc
+%%SERV%%%%ASTKDIR%%/asrun/plugins/actions.pyo
+%%SERV%%%%ASTKDIR%%/asrun/plugins/default.py
+%%SERV%%%%ASTKDIR%%/asrun/plugins/default.pyc
+%%SERV%%%%ASTKDIR%%/asrun/plugins/default.pyo
+%%SERV%%%%ASTKDIR%%/asrun/plugins/rsh_server.py
+%%SERV%%%%ASTKDIR%%/asrun/plugins/rsh_server.pyc
+%%SERV%%%%ASTKDIR%%/asrun/plugins/rsh_server.pyo
+%%SERV%%%%ASTKDIR%%/asrun/plugins/server.py
+%%SERV%%%%ASTKDIR%%/asrun/plugins/server.pyc
+%%SERV%%%%ASTKDIR%%/asrun/plugins/server.pyo
 %%SERV%%%%ASTKDIR%%/asrun/profil.py
 %%SERV%%%%ASTKDIR%%/asrun/profil.pyc
 %%SERV%%%%ASTKDIR%%/asrun/profil.pyo
@@ -373,6 +400,9 @@
 %%SERV%%%%ASTKDIR%%/asrun/services.py
 %%SERV%%%%ASTKDIR%%/asrun/services.pyc
 %%SERV%%%%ASTKDIR%%/asrun/services.pyo
+%%SERV%%%%ASTKDIR%%/asrun/status.py
+%%SERV%%%%ASTKDIR%%/asrun/status.pyc
+%%SERV%%%%ASTKDIR%%/asrun/status.pyo
 %%SERV%%%%ASTKDIR%%/asrun/system.py
 %%SERV%%%%ASTKDIR%%/asrun/system.pyc
 %%SERV%%%%ASTKDIR%%/asrun/system.pyo
@@ -398,6 +428,7 @@
 %%SERV%%%%ASTKDIR%%/asrun/utils.pyc
 %%SERV%%%%ASTKDIR%%/asrun/utils.pyo
 %%SERV%%%%ASTKDIR%%/bin/as_run
+%%SERV%%%%ASTKDIR%%/bin/auto_update.cron
 %%SERV%%%%ASTKDIR%%/bin/parallel_cp
 %%SERV%%%%ASTKDIR%%/i18n/Makefile
 %%SERV%%%%ASTKDIR%%/i18n/asrun.fr.mo
@@ -409,6 +440,9 @@
 %%SERV%%%%ASTKDIR%%/share/codeaster/asrun/data/meshtool.comm
 %%SERV%%%%ASTKDIR%%/share/codeaster/asrun/data/mpirun_template
 %%SERV%%%%ASTKDIR%%/share/codeaster/asrun/data/stanley_post.comm
+%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/doc/dev_guide.html
+%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/doc/dev_guide.pdf
+%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/doc/dev_guide.rst
 %%SERV%%%%ASTKDIR%%/share/codeaster/asrun/examples/alamain.py
 %%SERV%%%%ASTKDIR%%/share/codeaster/asrun/examples/alamain.pyc
 %%SERV%%%%ASTKDIR%%/share/codeaster/asrun/examples/alamain.pyo
@@ -428,6 +462,9 @@
 %%SERV%%%%ASTKDIR%%/unittest/020_object.py
 %%SERV%%%%ASTKDIR%%/unittest/020_object.pyc
 %%SERV%%%%ASTKDIR%%/unittest/020_object.pyo
+%%SERV%%%%ASTKDIR%%/unittest/030_server.py
+%%SERV%%%%ASTKDIR%%/unittest/030_server.pyc
+%%SERV%%%%ASTKDIR%%/unittest/030_server.pyo
 %%SERV%%%%ASTKDIR%%/unittest/050_build_export.py
 %%SERV%%%%ASTKDIR%%/unittest/050_build_export.pyc
 %%SERV%%%%ASTKDIR%%/unittest/050_build_export.pyo
@@ -440,6 +477,9 @@
 %%SERV%%%%ASTKDIR%%/unittest/080_agla.py
 %%SERV%%%%ASTKDIR%%/unittest/080_agla.pyc
 %%SERV%%%%ASTKDIR%%/unittest/080_agla.pyo
+%%SERV%%%%ASTKDIR%%/unittest/090_devel.py
+%%SERV%%%%ASTKDIR%%/unittest/090_devel.pyc
+%%SERV%%%%ASTKDIR%%/unittest/090_devel.pyo
 %%SERV%%%%ASTKDIR%%/unittest/100_study.py
 %%SERV%%%%ASTKDIR%%/unittest/100_study.pyc
 %%SERV%%%%ASTKDIR%%/unittest/100_study.pyo
@@ -455,6 +495,9 @@
 %%SERV%%%%ASTKDIR%%/unittest/200_client.py
 %%SERV%%%%ASTKDIR%%/unittest/200_client.pyc
 %%SERV%%%%ASTKDIR%%/unittest/200_client.pyo
+%%SERV%%%%ASTKDIR%%/unittest/210_multi.py
+%%SERV%%%%ASTKDIR%%/unittest/210_multi.pyc
+%%SERV%%%%ASTKDIR%%/unittest/210_multi.pyo
 %%SERV%%%%ASTKDIR%%/unittest/300_development.py
 %%SERV%%%%ASTKDIR%%/unittest/300_development.pyc
 %%SERV%%%%ASTKDIR%%/unittest/300_development.pyo
@@ -467,6 +510,9 @@
 %%SERV%%%%ASTKDIR%%/unittest/320_astout_dvp.py
 %%SERV%%%%ASTKDIR%%/unittest/320_astout_dvp.pyc
 %%SERV%%%%ASTKDIR%%/unittest/320_astout_dvp.pyo
+%%SERV%%%%ASTKDIR%%/unittest/901_realistic.py
+%%SERV%%%%ASTKDIR%%/unittest/901_realistic.pyc
+%%SERV%%%%ASTKDIR%%/unittest/901_realistic.pyo
 %%SERV%%%%ASTKDIR%%/unittest/999_clean.py
 %%SERV%%%%ASTKDIR%%/unittest/999_clean.pyc
 %%SERV%%%%ASTKDIR%%/unittest/999_clean.pyo
@@ -485,6 +531,8 @@
 %%SERV%%%%ASTKDIR%%/unittest/datafiles/parametric.distr
 %%SERV%%%%ASTKDIR%%/unittest/datafiles/parametric.pre.include
 %%SERV%%%%ASTKDIR%%/unittest/datafiles/poursuite.comm
+%%SERV%%%%ASTKDIR%%/unittest/datafiles/sample.export
+%%SERV%%%%ASTKDIR%%/unittest/datafiles/sample2.export
 %%SERV%%%%ASTKDIR%%/unittest/datafiles/sleep.comm
 %%SERV%%%%ASTKDIR%%/unittest/datafiles/study.comm
 %%SERV%%%%ASTKDIR%%/unittest/datafiles/test_profile.sh
@@ -492,11 +540,16 @@
 %%SERV%%%%ASTKDIR%%/unittest/run_test.py
 %%SERV%%%%ASTKDIR%%/unittest/run_test.pyc
 %%SERV%%%%ASTKDIR%%/unittest/run_test.pyo
+%%SERV%%%%ASTKDIR%%/unittest/test_relocate.py
+%%SERV%%%%ASTKDIR%%/unittest/test_relocate.pyc
+%%SERV%%%%ASTKDIR%%/unittest/test_relocate.pyo
 %%SERV%%%%ETCDIR%%/asrun
 %%SERV%%%%ETCDIR%%/aster
 %%SERV%%%%ETCDIR%%/config_nodename
+%%SERV%%%%ETCDIR%%/plugins/__init__.py
 %%SERV%%%%ETCDIR%%/profile.csh
 %%SERV%%%%ETCDIR%%/profile.sh
+%%SERV%%@dirrm %%ETCDIR%%/plugins
 %%SERV%%@dirrm %%ETCDIR%%
 @dirrmtry aster/etc
 %%CLIENT%%@dirrm %%BWidget_DIR%%/images
@@ -505,6 +558,7 @@
 %%SERV%%@dirrm %%ASTKDIR%%/unittest/datafiles
 %%SERV%%@dirrm %%ASTKDIR%%/unittest
 %%SERV%%@dirrm %%ASTKDIR%%/share/codeaster/asrun/examples
+%%SERV%%@dirrm %%ASTKDIR%%/share/codeaster/asrun/doc
 %%SERV%%@dirrm %%ASTKDIR%%/share/codeaster/asrun/data
 %%SERV%%@dirrm %%ASTKDIR%%/share/codeaster/asrun
 %%SERV%%@dirrm %%ASTKDIR%%/share/codeaster
@@ -514,11 +568,13 @@
 %%SERV%%@dirrm %%ASTKDIR%%/i18n/locale
 %%SERV%%@dirrm %%ASTKDIR%%/i18n
 %%SERV%%@dirrm %%ASTKDIR%%/bin
+%%SERV%%@dirrm %%ASTKDIR%%/asrun/plugins
 %%SERV%%@dirrm %%ASTKDIR%%/asrun/dev
 %%SERV%%@dirrm %%ASTKDIR%%/asrun/ctl
 %%SERV%%@dirrm %%ASTKDIR%%/asrun/core
 %%SERV%%@dirrm %%ASTKDIR%%/asrun/contrib
 %%SERV%%@dirrm %%ASTKDIR%%/asrun/common
+%%SERV%%@dirrm %%ASTKDIR%%/asrun/client
 %%SERV%%@dirrm %%ASTKDIR%%/asrun
 %%CLIENT%%@dirrm %%ASTKDIR%%/lib/icons
 %%CLIENT%%@dirrm %%ASTKDIR%%/lib/HELP/FR