10 files changed, 251 insertions, 124 deletions

diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile
index ef3c1aed3aaf..ab0b5786fb7e 100644
--- a/cad/astk-serveur/Makefile
+++ b/cad/astk-serveur/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	astk
-PORTVERSION=	1.8.0
+PORTVERSION=	1.8.1
 DISTVERSIONPREFIX=	full-src-
 DISTVERSIONSUFFIX=	.noarch
 CATEGORIES=	cad
@@ -41,7 +41,7 @@ USE_PYTHON=	yes
 NO_BUILD=	yes
 REINPLACE_ARGS=	-i ""
 
-ASTER_DISTVERSION=	${ASTER_VER}-4
+ASTER_DISTVERSION=	${ASTER_VER}-1
 EXTRACT_WRKSRC=	${WRKDIR}/aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION:S/-/./:R}/SRC
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -51,9 +51,8 @@ aster_dir=	${LOCALBASE}/aster/${vaster}
 S_SCRIPTS=	bin/as_run bin/parallel_cp asrun/installation.py	\
 		share/codeaster/asrun/data/mpirun_template
 S_PYLIBS=	share/codeaster/asrun/examples/alamain.py		\
-		asrun/installation.py asrun/devtools.py asrun/repart.py	\
-		unittest/client/config_serveurs.in			\
-		unittest/others/deprecate.py	unittest/README
+		unittest/data/config_serveurs unittest/010_misc.py	\
+		unittest/015_package.py unittest/run_test.py
 C_SCRIPTS=	bin/astk bin/bsf
 tools_dir=	${LOCALBASE}/aster/outils
 conf_dir=	${WRKSRC}/etc/astkrc
@@ -66,7 +65,8 @@ PATCHDIR=	${MASTERDIR}/files
 PLIST_SUB=	ASTKDIR=${LINSTDIR}/ASTK_SERV SERV="" CLIENT="@comment "		\
 		vaster=${vaster}
 PATCH2RM=	bin/as_run bin/parallel_cp etc/asrun etc/profile.csh etc/profile.sh	\
-		asrun/config.py
+		asrun/config.py asrun/installation.py asrun/system.py			\
+		asrun/common/sysutils.py asrun/system_command.py
 . if exists(${LOCALBASE}/sbin/pbs_server)
 WITH_PBS=	yes
 . endif
@@ -101,7 +101,7 @@ TCL_VER?=	${TK_VER}
 SHORT_TK_VER=	${TK_VER:S/.//}
 BWidget_VER=	1.7.0
 
-ASTER_VER=	10.1.0
+ASTER_VER=	10.2.0
 vaster=		STA${ASTER_VER:R}
 ETCDIR=		${PREFIX}/aster/etc/codeaster
 
@@ -184,7 +184,7 @@ do-configure:
 	${REINPLACE_CMD} -e "s|?SHELL_EXECUTION?|${SHELL_INSTALL_ASTER}|"	\
 		-e "s|?ASTER_ROOT?|${PREFIX}/aster|" ${WRKSRC}/${scripts}
 . endfor
-	${REINPLACE_CMD} -e "s|?ASTER_VERSION?|${ASTER_VER}|"			\
+	${REINPLACE_CMD} -e "s|?ASTER_VERSION?|${vaster}|"			\
 		 -e 's|#?vers : VVV?|vers : ${vaster}|'				\
 		${WRKSRC}/etc/aster
 . if defined(WITH_MPI)
@@ -201,7 +201,7 @@ do-configure:
 		${WRKSRC}/etc/${sc}
 . endfor
 . for sh in sh csh
-	${REINPLACE_CMD} -e "s|?ASTER_ROOT?|${LOCALBASE}/aster|"			\
+	${REINPLACE_CMD} -e "s|?ASTER_ROOT?|${LOCALBASE}/aster|"		\
 		-e 's|?HOME_PYTHON?|${PYTHONBASE}|'				\
 		-e 's|?ASRUN_SITE_PKG?|${PREFIX}/${LINSTDIR}/ASTK_SERV|'	\
 		-e 's|?PYTHON_EXE?|${PYTHON_CMD}|'				\
@@ -214,14 +214,23 @@ do-configure:
 	${REINPLACE_CMD} -e "s|/opt/aster/NEW9|${aster_dir}|"			\
 		 -e "s|/opt/aster/NEW10|${aster_dir}|"				\
 		-e "s|/opt/aster/ASTK|${inst_dir}|"				\
+		-e "s|/opt/aster/etc|${LOCALBASE}/aster/etc|"			\
 		-e "s|/opt/aster|${aster_dir}|" ${WRKSRC}/${libs}
 . endfor
 . if defined(WITH_PBS)
-.   for cf in etc/asrun unittest/client/config_serveurs.in
+.   for cf in etc/asrun unittest/data/config_serveurs
 	${REINPLACE_CMD} -e "s|batch : non|batch : oui|"			\
 		${WRKSRC}/${cf}
 .   endfor
 . endif
+. if defined(MAKE_JOBS_NUMBER) && ! defined(PACKAGE_BUILDING)
+	${REINPLACE_CMD}	\
+		-e "s|%%MAKE_JOBS_NUMBER%%|self.Shell('${ECHO_CMD} ${MAKE_JOBS_NUMBER}', mach, user)|" \
+		${WRKSRC}/asrun/system.py
+. else
+	${REINPLACE_CMD} -e 's|%%MAKE_JOBS_NUMBER%%|1|'	${WRKSRC}/asrun/system.py
+. endif
+	${REINPLACE_CMD} -e 's|bash|${SHIA}|' ${WRKSRC}/asrun/system_command.py
 .else
 # CLIENT_SEUL
 . for scripts in ${C_SCRIPTS}
@@ -230,7 +239,7 @@ do-configure:
 		-e "s|wish|wish${TK_VER}|;s|%%inst_dir%%|${inst_dir}|"		\
 		${WRKSRC}/${scripts}
 . endfor
-	${REINPLACE_CMD} -e "s|?vaster?|${vaster}|"					\
+	${REINPLACE_CMD} -e "s|?vaster?|${vaster}|"				\
 		-e "s|?TOOLS_DIR?|${tools_dir}|" ${conf_dir}/outils
 	${REINPLACE_CMD} -e "s#?HOME_ASTK?#${inst_dir}#"			\
 		-e "s#?TERMINAL?#${LOCALBASE}/bin/xterm#"			\
@@ -260,8 +269,6 @@ do-install:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${inst_dir}/ASTK_SERV/${rep}
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${inst_dir}/ASTK_SERV/${rep}
 . endfor
-	(cd ${inst_dir}/ASTK_SERV/unittest/ &&		\
-	${SETENV} PYTHONPATH=${PREFIX}/${LINSTDIR}/ASTK_SERV ${PYTHON_CMD} ./config.py)
 . if defined(WITH_MPI)
 	${ECHO_CMD} "localhost" > ${PREFIX}/aster/aster-mpihosts
 . endif
diff --git a/cad/astk-serveur/distinfo b/cad/astk-serveur/distinfo
index 74854df498b7..da93a363feb7 100644
--- a/cad/astk-serveur/distinfo
+++ b/cad/astk-serveur/distinfo
@@ -1,3 +1,3 @@
-MD5 (aster-full-src-10.1.0-4.noarch.tar.gz) = 49fe55a0a46491124c16965a2db59c5e
-SHA256 (aster-full-src-10.1.0-4.noarch.tar.gz) = c72f82abadb627925cbc5cbf9909f969e4c60f29325a62d78664eb03a860468a
-SIZE (aster-full-src-10.1.0-4.noarch.tar.gz) = 163690307
+MD5 (aster-full-src-10.2.0-1.noarch.tar.gz) = b2ba78c4d41d40933a98e21f16f3ec3d
+SHA256 (aster-full-src-10.2.0-1.noarch.tar.gz) = 99fe143121ffde6089335163902a75805ba61fe559c3176846db1452491b5d48
+SIZE (aster-full-src-10.2.0-1.noarch.tar.gz) = 181662707
diff --git a/cad/astk-serveur/files.client/patch-lib_tkselecteur.tcl b/cad/astk-serveur/files.client/patch-lib_tkselecteur.tcl
index b8c9512dcdd8..be4fc766aeb8 100644
--- a/cad/astk-serveur/files.client/patch-lib_tkselecteur.tcl
+++ b/cad/astk-serveur/files.client/patch-lib_tkselecteur.tcl
@@ -1,16 +1,16 @@
---- ./lib/tkselecteur.tcl.orig	2009-12-23 15:53:05.000000000 +0100
-+++ ./lib/tkselecteur.tcl	2010-01-26 23:31:01.000000000 +0100
-@@ -1925,10 +1925,10 @@
+--- ./lib/tkselecteur.tcl.orig	2010-07-07 18:18:08.000000000 +0200
++++ ./lib/tkselecteur.tcl	2010-08-11 22:57:14.000000000 +0200
+@@ -1923,10 +1923,10 @@
     set ExecCmde_shell $ini
- 	radiobutton $fen.sh.sh   -font $astk::ihm(font,lab) -text /bin/sh   -value /bin/sh   -variable ExecCmde_shell
- 	radiobutton $fen.sh.csh  -font $astk::ihm(font,lab) -text /bin/csh  -value /bin/csh  -variable ExecCmde_shell
--	radiobutton $fen.sh.ksh  -font $astk::ihm(font,lab) -text /bin/ksh  -value /bin/ksh  -variable ExecCmde_shell
--	radiobutton $fen.sh.bash -font $astk::ihm(font,lab) -text /bin/bash -value /bin/bash -variable ExecCmde_shell
-+	radiobutton $fen.sh.ksh  -font $astk::ihm(font,lab) -text %%LOCALBASE%%/bin/ksh  -value %%LOCALBASE%%/bin/ksh  -variable ExecCmde_shell
-+	radiobutton $fen.sh.bash -font $astk::ihm(font,lab) -text %%LOCALBASE%%/bin/bash -value %%LOCALBASE%%/bin/bash -variable ExecCmde_shell
- 	radiobutton $fen.sh.tcsh -font $astk::ihm(font,lab) -text /bin/tcsh -value /bin/tcsh -variable ExecCmde_shell
--	radiobutton $fen.sh.zsh  -font $astk::ihm(font,lab) -text /bin/zsh  -value /bin/zsh  -variable ExecCmde_shell
-+	radiobutton $fen.sh.zsh  -font $astk::ihm(font,lab) -text %%LOCALBASE%%/bin/zsh  -value %%LOCALBASE%%/bin/zsh  -variable ExecCmde_shell
+     radiobutton $fen.sh.sh   -font $astk::ihm(font,lab) -text /bin/sh   -value /bin/sh   -variable ExecCmde_shell
+     radiobutton $fen.sh.csh  -font $astk::ihm(font,lab) -text /bin/csh  -value /bin/csh  -variable ExecCmde_shell
+-    radiobutton $fen.sh.ksh  -font $astk::ihm(font,lab) -text /bin/ksh  -value /bin/ksh  -variable ExecCmde_shell
+-    radiobutton $fen.sh.bash -font $astk::ihm(font,lab) -text /bin/bash -value /bin/bash -variable ExecCmde_shell
++    radiobutton $fen.sh.ksh  -font $astk::ihm(font,lab) -text %%LOCALBASE%%/bin/ksh  -value %%LOCALBASE%%/bin/ksh  -variable ExecCmde_shell
++    radiobutton $fen.sh.bash -font $astk::ihm(font,lab) -text %%LOCALBASE%%/bin/bash -value %%LOCALBASE%%/bin/bash -variable ExecCmde_shell
+     radiobutton $fen.sh.tcsh -font $astk::ihm(font,lab) -text /bin/tcsh -value /bin/tcsh -variable ExecCmde_shell
+-    radiobutton $fen.sh.zsh  -font $astk::ihm(font,lab) -text /bin/zsh  -value /bin/zsh  -variable ExecCmde_shell
++    radiobutton $fen.sh.zsh  -font $astk::ihm(font,lab) -text %%LOCALBASE%%/bin/zsh  -value %%LOCALBASE%%/bin/zsh  -variable ExecCmde_shell
  
     pack $fen.txt -fill x -expand 1
     pack $fen.txt.lbl -padx 10 -pady 5 -side left -anchor w
diff --git a/cad/astk-serveur/files/patch-asrun_common_sysutils.py b/cad/astk-serveur/files/patch-asrun_common_sysutils.py
new file mode 100644
index 000000000000..5e5195bc6390
--- /dev/null
+++ b/cad/astk-serveur/files/patch-asrun_common_sysutils.py
@@ -0,0 +1,20 @@
+--- ./asrun/common/sysutils.py.orig	2010-07-07 18:18:08.000000000 +0200
++++ ./asrun/common/sysutils.py	2010-08-13 19:24:59.000000000 +0200
+@@ -67,7 +67,7 @@
+ 
+ def on_linux():
+     """Tell if it's running on a linux platform"""
+-    return not on_windows()
++    return sys.platform in ("linux")
+ 
+ def on_64bits():
+     """Tell if it's running on a 64 bits platform"""
+@@ -125,7 +125,7 @@
+         and fill properties = user, passwd, mach, path
+         """
+         # windows : only work on local files
+-        if not on_linux():
++        if on_windows():
+             self.path = pathname
+         # posix
+         if type(pathname) not in (str, unicode):
diff --git a/cad/astk-serveur/files/patch-asrun_config.py b/cad/astk-serveur/files/patch-asrun_config.py
index 808cd3f2673a..39d899134c65 100644
--- a/cad/astk-serveur/files/patch-asrun_config.py
+++ b/cad/astk-serveur/files/patch-asrun_config.py
@@ -1,13 +1,13 @@
---- ./asrun/config.py.orig	2009-12-23 15:53:06.000000000 +0100
-+++ ./asrun/config.py	2010-01-12 21:31:18.000000000 +0100
-@@ -68,8 +68,8 @@
-          'SRCHIST'         : ['histor'],
-          # name of "binaries" (as results of a make)
-          'MAKE'            : ['debug nodebug'],
--         'BIN_NODBG'       : ['asteru.exe'],
--         'BIN_DBG'         : ['asterd.exe'],
-+         'BIN_NODBG'       : ['asteru'],
-+         'BIN_DBG'         : ['asterd'],
-          'BINCMDE'         : ['commande'],
-          'BINELE'          : ['elements'],
-          'BINPICKLED'      : ['cata_ele.pickled'],
+--- ./asrun/config.py.orig	2010-07-07 18:18:08.000000000 +0200
++++ ./asrun/config.py	2010-08-11 19:03:21.000000000 +0200
+@@ -66,8 +66,8 @@
+             'SRCHIST'         : ['histor'],
+             # name of "binaries" (as results of a make)
+             'MAKE'            : ['debug nodebug'],
+-            'BIN_NODBG'       : ['asteru.exe'],
+-            'BIN_DBG'         : ['asterd.exe'],
++            'BIN_NODBG'       : ['asteru'],
++            'BIN_DBG'         : ['asterd'],
+             'BINCMDE'         : ['commande'],
+             'BINELE'          : ['elements'],
+             'BINPICKLED'      : ['cata_ele.pickled'],
diff --git a/cad/astk-serveur/files/patch-asrun_installation.py b/cad/astk-serveur/files/patch-asrun_installation.py
new file mode 100644
index 000000000000..708283b728bd
--- /dev/null
+++ b/cad/astk-serveur/files/patch-asrun_installation.py
@@ -0,0 +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 @@
+ prefix = aster_root
+ if aster_root == '/usr':
+     prefix = '/'
+-confdir = os.path.join(prefix, 'etc', 'codeaster')
++confdir = os.path.join(aster_root, 'etc', 'codeaster')
+ 
+ # directory containing data files
+ datadir = os.path.join(aster_root, 'share', 'codeaster', 'asrun', 'data')
diff --git a/cad/astk-serveur/files/patch-asrun_system.py b/cad/astk-serveur/files/patch-asrun_system.py
new file mode 100644
index 000000000000..ed7f01ce09f3
--- /dev/null
+++ b/cad/astk-serveur/files/patch-asrun_system.py
@@ -0,0 +1,25 @@
+--- ./asrun/system.py.orig	2010-07-07 18:18:08.000000000 +0200
++++ ./asrun/system.py	2010-08-16 20:51:28.000000000 +0200
+@@ -137,10 +137,10 @@
+     var = os.environ.get("TMPDIR") or os.environ.get('TEMP') or os.environ.get('TMP')
+     if var:
+         return var
+-    if on_linux():
+-        return "/tmp"
+-    else:
++    if on_windows():
+         return osp.join(os.environ.get("%systemroot%", "c:\\windows"), "temp")
++    else:
++        return "/tmp"
+ 
+ 
+ def split_path(path):
+@@ -818,6 +818,8 @@
+                     num = max([int(i) for i in l_ids]) + 1
+             elif on_windows():
+                 num = 1
++            else:
++                num = %%MAKE_JOBS_NUMBER%%
+             self._cpuinfo_cache[what+mach+user] = num
+             self._dbg("GetCpuInfo '%s' returns : %s" % (what, num))
+             return num
diff --git a/cad/astk-serveur/files/patch-asrun_system_command.py b/cad/astk-serveur/files/patch-asrun_system_command.py
new file mode 100644
index 000000000000..0b83e8ca9924
--- /dev/null
+++ b/cad/astk-serveur/files/patch-asrun_system_command.py
@@ -0,0 +1,23 @@
+--- ./asrun/system_command.py.orig	2010-07-07 18:18:08.000000000 +0200
++++ ./asrun/system_command.py	2010-08-16 21:09:31.000000000 +0200
+@@ -21,9 +21,9 @@
+ This module defines syntaxes to run command lines.
+ """
+ 
+-from asrun.common.sysutils import on_linux
++from asrun.common.sysutils import on_windows
+ 
+-if on_linux():
++if not on_windows():
+     COMMAND = {
+         'background' : '( %(cmd)s ) > %(output)s 2>&1 &',
+         'follow_with_stderr' : '( %(cmd)s ; echo %(var)s=$? ) 2>&1 | tee %(output)s',
+@@ -32,7 +32,7 @@
+         'not_follow_separ_stderr' : '( %(cmd)s ) > %(output)s 2> %(error)s',
+         'rm_file' : '\\rm -f %(args)s',
+         'rm_dirs' : '\\rm -rf %(args)s',
+-        'copy' : 'cp -L -r %(args)s',
++        'copy' : 'cp -L -R %(args)s',
+         'ping' : 'ping -c 1 -W %(timeout)s %(host)s',
+         'shell_cmd' : "bash -c",
+     }
diff --git a/cad/astk-serveur/files/patch-etc_profile.sh b/cad/astk-serveur/files/patch-etc_profile.sh
index a7b12659aaa4..93970272f83a 100644
--- a/cad/astk-serveur/files/patch-etc_profile.sh
+++ b/cad/astk-serveur/files/patch-etc_profile.sh
@@ -1,14 +1,5 @@
---- etc/profile.sh.orig	2009-12-23 15:53:06.000000000 +0100
-+++ etc/profile.sh	2010-02-03 18:56:19.000000000 +0100
-@@ -26,7 +26,7 @@
-    export LD_LIBRARY_PATH=?HOME_PYTHON?/lib:$LD_LIBRARY_PATH
- fi
- 
--if [ -z "$PATH" ]; then
-+if [ -z "$PYTHONPATH" ]; then
-    export PYTHONPATH=?ASRUN_SITE_PKG?
- else
-    export PYTHONPATH=?ASRUN_SITE_PKG?:$PYTHONPATH
+--- etc/profile.sh.orig	2010-07-07 18:18:08.000000000 +0200
++++ etc/profile.sh	2010-08-11 19:07:22.000000000 +0200
 @@ -37,6 +37,13 @@
  # this should not be usefull...
  #export PYTHONHOME=?HOME_PYTHON?
diff --git a/cad/astk-serveur/pkg-plist b/cad/astk-serveur/pkg-plist
index 9f0deec781e4..2274ab575372 100644
--- a/cad/astk-serveur/pkg-plist
+++ b/cad/astk-serveur/pkg-plist
@@ -212,15 +212,48 @@
 %%SERV%%%%ASTKDIR%%/asrun/client.py
 %%SERV%%%%ASTKDIR%%/asrun/client.pyc
 %%SERV%%%%ASTKDIR%%/asrun/client.pyo
+%%SERV%%%%ASTKDIR%%/asrun/common/__init__.py
+%%SERV%%%%ASTKDIR%%/asrun/common/__init__.pyc
+%%SERV%%%%ASTKDIR%%/asrun/common/__init__.pyo
+%%SERV%%%%ASTKDIR%%/asrun/common/i18n.py
+%%SERV%%%%ASTKDIR%%/asrun/common/i18n.pyc
+%%SERV%%%%ASTKDIR%%/asrun/common/i18n.pyo
+%%SERV%%%%ASTKDIR%%/asrun/common/rcfile.py
+%%SERV%%%%ASTKDIR%%/asrun/common/rcfile.pyc
+%%SERV%%%%ASTKDIR%%/asrun/common/rcfile.pyo
+%%SERV%%%%ASTKDIR%%/asrun/common/sysutils.py
+%%SERV%%%%ASTKDIR%%/asrun/common/sysutils.pyc
+%%SERV%%%%ASTKDIR%%/asrun/common/sysutils.pyo
+%%SERV%%%%ASTKDIR%%/asrun/common/utils.py
+%%SERV%%%%ASTKDIR%%/asrun/common/utils.pyc
+%%SERV%%%%ASTKDIR%%/asrun/common/utils.pyo
 %%SERV%%%%ASTKDIR%%/asrun/common_func.py
 %%SERV%%%%ASTKDIR%%/asrun/common_func.pyc
 %%SERV%%%%ASTKDIR%%/asrun/common_func.pyo
 %%SERV%%%%ASTKDIR%%/asrun/config.py
 %%SERV%%%%ASTKDIR%%/asrun/config.pyc
 %%SERV%%%%ASTKDIR%%/asrun/config.pyo
-%%SERV%%%%ASTKDIR%%/asrun/devtools.py
-%%SERV%%%%ASTKDIR%%/asrun/devtools.pyc
-%%SERV%%%%ASTKDIR%%/asrun/devtools.pyo
+%%SERV%%%%ASTKDIR%%/asrun/contrib/Fichier.py
+%%SERV%%%%ASTKDIR%%/asrun/contrib/Fichier.pyc
+%%SERV%%%%ASTKDIR%%/asrun/contrib/Fichier.pyo
+%%SERV%%%%ASTKDIR%%/asrun/contrib/Ligne.py
+%%SERV%%%%ASTKDIR%%/asrun/contrib/Ligne.pyc
+%%SERV%%%%ASTKDIR%%/asrun/contrib/Ligne.pyo
+%%SERV%%%%ASTKDIR%%/asrun/contrib/OutputParser.py
+%%SERV%%%%ASTKDIR%%/asrun/contrib/OutputParser.pyc
+%%SERV%%%%ASTKDIR%%/asrun/contrib/OutputParser.pyo
+%%SERV%%%%ASTKDIR%%/asrun/contrib/__init__.py
+%%SERV%%%%ASTKDIR%%/asrun/contrib/__init__.pyc
+%%SERV%%%%ASTKDIR%%/asrun/contrib/__init__.pyo
+%%SERV%%%%ASTKDIR%%/asrun/ctl/__init__.py
+%%SERV%%%%ASTKDIR%%/asrun/ctl/__init__.pyc
+%%SERV%%%%ASTKDIR%%/asrun/ctl/__init__.pyo
+%%SERV%%%%ASTKDIR%%/asrun/dev/__init__.py
+%%SERV%%%%ASTKDIR%%/asrun/dev/__init__.pyc
+%%SERV%%%%ASTKDIR%%/asrun/dev/__init__.pyo
+%%SERV%%%%ASTKDIR%%/asrun/dev/messages.py
+%%SERV%%%%ASTKDIR%%/asrun/dev/messages.pyc
+%%SERV%%%%ASTKDIR%%/asrun/dev/messages.pyo
 %%SERV%%%%ASTKDIR%%/asrun/distrib.py
 %%SERV%%%%ASTKDIR%%/asrun/distrib.pyc
 %%SERV%%%%ASTKDIR%%/asrun/distrib.pyo
@@ -233,15 +266,15 @@
 %%SERV%%%%ASTKDIR%%/asrun/histor.py
 %%SERV%%%%ASTKDIR%%/asrun/histor.pyc
 %%SERV%%%%ASTKDIR%%/asrun/histor.pyo
-%%SERV%%%%ASTKDIR%%/asrun/i18n.py
-%%SERV%%%%ASTKDIR%%/asrun/i18n.pyc
-%%SERV%%%%ASTKDIR%%/asrun/i18n.pyo
 %%SERV%%%%ASTKDIR%%/asrun/installation.py
 %%SERV%%%%ASTKDIR%%/asrun/installation.pyc
 %%SERV%%%%ASTKDIR%%/asrun/installation.pyo
 %%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
@@ -257,15 +290,15 @@
 %%SERV%%%%ASTKDIR%%/asrun/mystring.py
 %%SERV%%%%ASTKDIR%%/asrun/mystring.pyc
 %%SERV%%%%ASTKDIR%%/asrun/mystring.pyo
-%%SERV%%%%ASTKDIR%%/asrun/option.py
-%%SERV%%%%ASTKDIR%%/asrun/option.pyc
-%%SERV%%%%ASTKDIR%%/asrun/option.pyo
 %%SERV%%%%ASTKDIR%%/asrun/parallel_cp.py
 %%SERV%%%%ASTKDIR%%/asrun/parallel_cp.pyc
 %%SERV%%%%ASTKDIR%%/asrun/parallel_cp.pyo
 %%SERV%%%%ASTKDIR%%/asrun/parametric.py
 %%SERV%%%%ASTKDIR%%/asrun/parametric.pyc
 %%SERV%%%%ASTKDIR%%/asrun/parametric.pyo
+%%SERV%%%%ASTKDIR%%/asrun/parser.py
+%%SERV%%%%ASTKDIR%%/asrun/parser.pyc
+%%SERV%%%%ASTKDIR%%/asrun/parser.pyo
 %%SERV%%%%ASTKDIR%%/asrun/profil.py
 %%SERV%%%%ASTKDIR%%/asrun/profil.pyc
 %%SERV%%%%ASTKDIR%%/asrun/profil.pyo
@@ -275,9 +308,6 @@
 %%SERV%%%%ASTKDIR%%/asrun/progress.py
 %%SERV%%%%ASTKDIR%%/asrun/progress.pyc
 %%SERV%%%%ASTKDIR%%/asrun/progress.pyo
-%%SERV%%%%ASTKDIR%%/asrun/rcfile.py
-%%SERV%%%%ASTKDIR%%/asrun/rcfile.pyc
-%%SERV%%%%ASTKDIR%%/asrun/rcfile.pyo
 %%SERV%%%%ASTKDIR%%/asrun/repart.py
 %%SERV%%%%ASTKDIR%%/asrun/repart.pyc
 %%SERV%%%%ASTKDIR%%/asrun/repart.pyo
@@ -296,6 +326,9 @@
 %%SERV%%%%ASTKDIR%%/asrun/system.py
 %%SERV%%%%ASTKDIR%%/asrun/system.pyc
 %%SERV%%%%ASTKDIR%%/asrun/system.pyo
+%%SERV%%%%ASTKDIR%%/asrun/system_command.py
+%%SERV%%%%ASTKDIR%%/asrun/system_command.pyc
+%%SERV%%%%ASTKDIR%%/asrun/system_command.pyo
 %%SERV%%%%ASTKDIR%%/asrun/testlist.py
 %%SERV%%%%ASTKDIR%%/asrun/testlist.pyc
 %%SERV%%%%ASTKDIR%%/asrun/testlist.pyo
@@ -336,55 +369,78 @@
 %%SERV%%%%ASTKDIR%%/share/codeaster/asrun/examples/user_filter.py
 %%SERV%%%%ASTKDIR%%/share/codeaster/asrun/examples/user_filter.pyc
 %%SERV%%%%ASTKDIR%%/share/codeaster/asrun/examples/user_filter.pyo
-%%SERV%%%%ASTKDIR%%/unittest/Makefile
-%%SERV%%%%ASTKDIR%%/unittest/Makefile.inc
-%%SERV%%%%ASTKDIR%%/unittest/README
-%%SERV%%%%ASTKDIR%%/unittest/astout/Makefile
-%%SERV%%%%ASTKDIR%%/unittest/astout/astout.export.in
-%%SERV%%%%ASTKDIR%%/unittest/astout/hostfile
-%%SERV%%%%ASTKDIR%%/unittest/catalo/Makefile
-%%SERV%%%%ASTKDIR%%/unittest/catalo/catalo.export.in
-%%SERV%%%%ASTKDIR%%/unittest/catapy/Makefile
-%%SERV%%%%ASTKDIR%%/unittest/catapy/catapy.export.in
-%%SERV%%%%ASTKDIR%%/unittest/client/Makefile
-%%SERV%%%%ASTKDIR%%/unittest/client/client.py
-%%SERV%%%%ASTKDIR%%/unittest/client/client.pyc
-%%SERV%%%%ASTKDIR%%/unittest/client/client.pyo
-%%SERV%%%%ASTKDIR%%/unittest/client/config_serveurs.in
-%%SERV%%%%ASTKDIR%%/unittest/compil/Makefile
-%%SERV%%%%ASTKDIR%%/unittest/compil/compil.export.in
-%%SERV%%%%ASTKDIR%%/unittest/config.py
-%%SERV%%%%ASTKDIR%%/unittest/config.pyc
-%%SERV%%%%ASTKDIR%%/unittest/config.pyo
-%%SERV%%%%ASTKDIR%%/unittest/etude/Makefile
-%%SERV%%%%ASTKDIR%%/unittest/etude/etude.export.in
-%%SERV%%%%ASTKDIR%%/unittest/etude/stanley.py.in
-%%SERV%%%%ASTKDIR%%/unittest/etude/test.py.in
-%%SERV%%%%ASTKDIR%%/unittest/jobs/Makefile
-%%SERV%%%%ASTKDIR%%/unittest/jobs/jobs.export.in
-%%SERV%%%%ASTKDIR%%/unittest/meshtool/Makefile
-%%SERV%%%%ASTKDIR%%/unittest/meshtool/meshtool.export.in
-%%SERV%%%%ASTKDIR%%/unittest/others/Makefile
-%%SERV%%%%ASTKDIR%%/unittest/others/agla.py
-%%SERV%%%%ASTKDIR%%/unittest/others/agla.pyc
-%%SERV%%%%ASTKDIR%%/unittest/others/agla.pyo
-%%SERV%%%%ASTKDIR%%/unittest/others/deprecate.py
-%%SERV%%%%ASTKDIR%%/unittest/others/deprecate.pyc
-%%SERV%%%%ASTKDIR%%/unittest/others/deprecate.pyo
-%%SERV%%%%ASTKDIR%%/unittest/others/scroll.py
-%%SERV%%%%ASTKDIR%%/unittest/others/scroll.pyc
-%%SERV%%%%ASTKDIR%%/unittest/others/scroll.pyo
-%%SERV%%%%ASTKDIR%%/unittest/others/thread.py
-%%SERV%%%%ASTKDIR%%/unittest/others/thread.pyc
-%%SERV%%%%ASTKDIR%%/unittest/others/thread.pyo
-%%SERV%%%%ASTKDIR%%/unittest/others/unig.py.in
-%%SERV%%%%ASTKDIR%%/unittest/param/Makefile
-%%SERV%%%%ASTKDIR%%/unittest/param/param.export.in
-%%SERV%%%%ASTKDIR%%/unittest/param/poursuite.export.in
-%%SERV%%%%ASTKDIR%%/unittest/param/test_param.py.in
-%%SERV%%%%ASTKDIR%%/unittest/surcharge/Makefile
-%%SERV%%%%ASTKDIR%%/unittest/surcharge/surcharge.export.in
-%%SERV%%%%ASTKDIR%%/unittest/surcharge/surcharge_astout.export.in
+%%SERV%%%%ASTKDIR%%/unittest/010_misc.py
+%%SERV%%%%ASTKDIR%%/unittest/010_misc.pyc
+%%SERV%%%%ASTKDIR%%/unittest/010_misc.pyo
+%%SERV%%%%ASTKDIR%%/unittest/015_package.py
+%%SERV%%%%ASTKDIR%%/unittest/015_package.pyc
+%%SERV%%%%ASTKDIR%%/unittest/015_package.pyo
+%%SERV%%%%ASTKDIR%%/unittest/020_object.py
+%%SERV%%%%ASTKDIR%%/unittest/020_object.pyc
+%%SERV%%%%ASTKDIR%%/unittest/020_object.pyo
+%%SERV%%%%ASTKDIR%%/unittest/050_build_export.py
+%%SERV%%%%ASTKDIR%%/unittest/050_build_export.pyc
+%%SERV%%%%ASTKDIR%%/unittest/050_build_export.pyo
+%%SERV%%%%ASTKDIR%%/unittest/060_thread.py
+%%SERV%%%%ASTKDIR%%/unittest/060_thread.pyc
+%%SERV%%%%ASTKDIR%%/unittest/060_thread.pyo
+%%SERV%%%%ASTKDIR%%/unittest/065_system.py
+%%SERV%%%%ASTKDIR%%/unittest/065_system.pyc
+%%SERV%%%%ASTKDIR%%/unittest/065_system.pyo
+%%SERV%%%%ASTKDIR%%/unittest/080_agla.py
+%%SERV%%%%ASTKDIR%%/unittest/080_agla.pyc
+%%SERV%%%%ASTKDIR%%/unittest/080_agla.pyo
+%%SERV%%%%ASTKDIR%%/unittest/100_study.py
+%%SERV%%%%ASTKDIR%%/unittest/100_study.pyc
+%%SERV%%%%ASTKDIR%%/unittest/100_study.pyo
+%%SERV%%%%ASTKDIR%%/unittest/110_server.py
+%%SERV%%%%ASTKDIR%%/unittest/110_server.pyc
+%%SERV%%%%ASTKDIR%%/unittest/110_server.pyo
+%%SERV%%%%ASTKDIR%%/unittest/150_astout.py
+%%SERV%%%%ASTKDIR%%/unittest/150_astout.pyc
+%%SERV%%%%ASTKDIR%%/unittest/150_astout.pyo
+%%SERV%%%%ASTKDIR%%/unittest/160_parametric.py
+%%SERV%%%%ASTKDIR%%/unittest/160_parametric.pyc
+%%SERV%%%%ASTKDIR%%/unittest/160_parametric.pyo
+%%SERV%%%%ASTKDIR%%/unittest/200_client.py
+%%SERV%%%%ASTKDIR%%/unittest/200_client.pyc
+%%SERV%%%%ASTKDIR%%/unittest/200_client.pyo
+%%SERV%%%%ASTKDIR%%/unittest/300_development.py
+%%SERV%%%%ASTKDIR%%/unittest/300_development.pyc
+%%SERV%%%%ASTKDIR%%/unittest/300_development.pyo
+%%SERV%%%%ASTKDIR%%/unittest/301_development_long.py
+%%SERV%%%%ASTKDIR%%/unittest/301_development_long.pyc
+%%SERV%%%%ASTKDIR%%/unittest/301_development_long.pyo
+%%SERV%%%%ASTKDIR%%/unittest/310_study_dvp.py
+%%SERV%%%%ASTKDIR%%/unittest/310_study_dvp.pyc
+%%SERV%%%%ASTKDIR%%/unittest/310_study_dvp.pyo
+%%SERV%%%%ASTKDIR%%/unittest/320_astout_dvp.py
+%%SERV%%%%ASTKDIR%%/unittest/320_astout_dvp.pyc
+%%SERV%%%%ASTKDIR%%/unittest/320_astout_dvp.pyo
+%%SERV%%%%ASTKDIR%%/unittest/999_clean.py
+%%SERV%%%%ASTKDIR%%/unittest/999_clean.pyc
+%%SERV%%%%ASTKDIR%%/unittest/999_clean.pyo
+%%SERV%%%%ASTKDIR%%/unittest/common.py
+%%SERV%%%%ASTKDIR%%/unittest/common.pyc
+%%SERV%%%%ASTKDIR%%/unittest/common.pyo
+%%SERV%%%%ASTKDIR%%/unittest/data.py
+%%SERV%%%%ASTKDIR%%/unittest/data.pyc
+%%SERV%%%%ASTKDIR%%/unittest/data.pyo
+%%SERV%%%%ASTKDIR%%/unittest/data/astout.list
+%%SERV%%%%ASTKDIR%%/unittest/data/astout_dvp.list
+%%SERV%%%%ASTKDIR%%/unittest/data/chg_capy.comm
+%%SERV%%%%ASTKDIR%%/unittest/data/config_serveurs
+%%SERV%%%%ASTKDIR%%/unittest/data/forma01a.mmed
+%%SERV%%%%ASTKDIR%%/unittest/data/hostfile
+%%SERV%%%%ASTKDIR%%/unittest/data/parametric.distr
+%%SERV%%%%ASTKDIR%%/unittest/data/parametric.pre.include
+%%SERV%%%%ASTKDIR%%/unittest/data/poursuite.comm
+%%SERV%%%%ASTKDIR%%/unittest/data/sleep.comm
+%%SERV%%%%ASTKDIR%%/unittest/data/study.comm
+%%SERV%%%%ASTKDIR%%/unittest/data/with_win_CR.export
+%%SERV%%%%ASTKDIR%%/unittest/run_test.py
+%%SERV%%%%ASTKDIR%%/unittest/run_test.pyc
+%%SERV%%%%ASTKDIR%%/unittest/run_test.pyo
 %%SERV%%%%ETCDIR%%/asrun
 %%SERV%%%%ETCDIR%%/aster
 %%SERV%%%%ETCDIR%%/config_nodename
@@ -395,17 +451,7 @@
 %%CLIENT%%@dirrm %%BWidget_DIR%%/images
 %%CLIENT%%@dirrm %%BWidget_DIR%%/lang
 %%CLIENT%%@dirrm %%BWidget_DIR%%
-%%SERV%%@dirrm %%ASTKDIR%%/unittest/surcharge
-%%SERV%%@dirrm %%ASTKDIR%%/unittest/param
-%%SERV%%@dirrm %%ASTKDIR%%/unittest/others
-%%SERV%%@dirrm %%ASTKDIR%%/unittest/meshtool
-%%SERV%%@dirrm %%ASTKDIR%%/unittest/jobs
-%%SERV%%@dirrm %%ASTKDIR%%/unittest/etude
-%%SERV%%@dirrm %%ASTKDIR%%/unittest/compil
-%%SERV%%@dirrm %%ASTKDIR%%/unittest/client
-%%SERV%%@dirrm %%ASTKDIR%%/unittest/catapy
-%%SERV%%@dirrm %%ASTKDIR%%/unittest/catalo
-%%SERV%%@dirrm %%ASTKDIR%%/unittest/astout
+%%SERV%%@dirrm %%ASTKDIR%%/unittest/data
 %%SERV%%@dirrm %%ASTKDIR%%/unittest
 %%SERV%%@dirrm %%ASTKDIR%%/share/codeaster/asrun/examples
 %%SERV%%@dirrm %%ASTKDIR%%/share/codeaster/asrun/data
@@ -417,6 +463,10 @@
 %%SERV%%@dirrm %%ASTKDIR%%/i18n/locale
 %%SERV%%@dirrm %%ASTKDIR%%/i18n
 %%SERV%%@dirrm %%ASTKDIR%%/bin
+%%SERV%%@dirrm %%ASTKDIR%%/asrun/dev
+%%SERV%%@dirrm %%ASTKDIR%%/asrun/ctl
+%%SERV%%@dirrm %%ASTKDIR%%/asrun/contrib
+%%SERV%%@dirrm %%ASTKDIR%%/asrun/common
 %%SERV%%@dirrm %%ASTKDIR%%/asrun
 %%CLIENT%%@dirrm %%ASTKDIR%%/lib/icons
 %%CLIENT%%@dirrm %%ASTKDIR%%/lib/HELP/FR