Upgrade to ASTK 1.7.0.

6 files changed, 166 insertions, 58 deletions

diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile
index 3a030eeb414b..8970bfe6591a 100644
--- a/cad/astk-serveur/Makefile
+++ b/cad/astk-serveur/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	astk
 DISTVERSIONPREFIX=	full-src-
-DISTVERSION=	1.6.2-1
+DISTVERSION=	1.7.0-1
 DISTVERSIONSUFFIX=	.noarch
 CATEGORIES=	cad
 MASTER_SITES=	http://www.code-aster.org/V2/UPLOAD/DOC/Telechargement/
@@ -35,19 +35,22 @@ COMMENT?=	Graphical interface for Code_Aster (server side)
 # for the server part, but it is not set to avoid circular dependences.
 RUN_DEPENDS+=	${SHELL_INSTALL_ASTER}:${PORTSDIR}/shells/${SHIADEP}
 
+.if !defined(CLIENT_SEUL)
 USE_PYTHON=	yes
+.endif
 NO_BUILD=	yes
 REINPLACE_ARGS=	-i ""
 
-ASTER_DISTVERSION=	${ASTER_VER}-2
+ASTER_DISTVERSION=	${ASTER_VER}-1
 EXTRACT_WRKSRC=	${WRKDIR}/aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION:S/-/./:R}/SRC
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 LINSTDIR=	aster/ASTK
 inst_dir=	${PREFIX}/${LINSTDIR}
 aster_dir=	${LOCALBASE}/aster/${vaster}
-S_SCRIPTS=	bin/as_run bin/as_serv lib/sub_script
-S_PYLIBS=	alamain.py as_config.py as_timer.py as_devtools.py user_filter.py
+S_SCRIPTS=	bin/as_run bin/as_serv bin/mpirun_template bin/sub_script
+S_PYLIBS=	lib/alamain.py lib/as_config.py lib/as_timer.py lib/as_devtools.py	\
+		lib/as_repart.py lib/user_filter.py bin/main.py bin/parallel_cp
 C_SCRIPTS=	bin/astk bin/bsf
 tools_dir=	${aster_dir}/outils
 conf_dir=	${WRKSRC}/lib/ASTK/astkrc
@@ -59,10 +62,20 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/ASTK_SERV
 PATCHDIR=	${MASTERDIR}/files
 PLIST_SUB=	ASTKDIR=${LINSTDIR}/ASTK_SERV SERV="" CLIENT="@comment "		\
 		vaster=${vaster}
-PATCH2RM=	conf/config lib/as_config.py lib/as_exec.py conf/aster_profile.sh
+PATCH2RM=	conf/config lib/as_config.py conf/aster_profile.sh
 . if exists(${LOCALBASE}/sbin/pbs_server)
 WITH_PBS=	yes
 . endif
+. if exists(${LOCALBASE}/mpich2/bin/mpirun)
+WITH_MPI=	yes
+. endif
+. if defined(WITH_MPI)
+RUN_DEPENDS+=	${HOME_MPI}/bin/mpirun:${PORTSDIR}/net/mpich2
+HOME_MPI=	${LOCALBASE}/mpich2
+PLIST_SUB+=	MPI=""
+. else
+PLIST_SUB+=	MPI="@comment "
+. endif
 . if defined(WITH_PBS)
 RUN_DEPENDS+=	qsub:${PORTSDIR}/sysutils/torque
 . endif
@@ -84,7 +97,7 @@ TCL_VER?=	${TK_VER}
 SHORT_TK_VER=	${TK_VER:S/.//}
 BWidget_VER=	1.7.0
 
-ASTER_VER=	9.3.0
+ASTER_VER=	9.4.0
 vaster=		STA${ASTER_VER:R}
 
 GIBI=		gibi2003
@@ -171,9 +184,14 @@ do-configure:
 			${WRKSRC}/bin/as_run
 . for scripts in ${S_SCRIPTS}
 	${REINPLACE_CMD} -e "s#?SHELL_EXECUTION?#${SHELL_INSTALL_ASTER}#"	\
-	-e "s#?ASTER_ROOT?#${PREFIX}/aster#;s#?HOME_ASTK?#${inst_dir}#"		\
-		${WRKSRC}/${scripts}
+		-e 's#?PYTHON_EXE?#${PYTHON_CMD}#'				\
+		-e "s#?ASTER_ROOT?#${PREFIX}/aster#"				\
+		-e "s#?HOME_ASTK?#${inst_dir}#"	${WRKSRC}/${scripts}
 . endfor
+. if defined(WITH_MPI)
+	${REINPLACE_CMD} -e "s|^#mpi_hostfile|mpi_hostfile|g"				\
+	-e "s#?MPIRUN?#${HOME_MPI}/bin/mpirun#" ${WRKSRC}/conf/config
+. endif
 	${REINPLACE_CMD} -e "s#?IFDEF?#${v_ifdef}#g"				\
 	-e "s#?ASTER_ROOT?#${LOCALBASE}/aster#g"				\
 	-e "s#?EDITOR?#${WITH_ED}#g"						\
@@ -182,10 +200,12 @@ do-configure:
 	-e "s#?vaster?#${vaster}#"						\
 	-e "s#LOCALBASE#${LOCALBASE}#"						\
 	-e "s#%%v_ifdef%%#${v_ifdef}#" ${WRKSRC}/conf/config
-.for libs in ${S_PYLIBS}
+. for libs in ${S_PYLIBS}
 	${REINPLACE_CMD} -e "s#/opt/aster/NEW9#${aster_dir}#"			\
-		-e "s#/opt/aster#${aster_dir}#"					\
-		-e "s#/opt/aster/ASTK#${inst_dir}#" ${WRKSRC}/lib/${libs}
+		-e 's#?PYTHON_EXE?#${PYTHON_CMD}#'				\
+		-e 's#?MAXCMDLEN?#16384#;s#?MULTITHREADING?#True#'		\
+		-e "s#/opt/aster/ASTK#${inst_dir}#"				\
+		-e "s#/opt/aster#${aster_dir}#" ${WRKSRC}/${libs}
 . endfor
 . if defined(WITH_PBS)
 	${REINPLACE_CMD} -e "s|batch : non|batch : oui|"			\
@@ -225,8 +245,16 @@ do-configure:
 do-install:
 	${MKDIR} ${inst_dir}
 	${CP} -R ${WRKSRC} ${inst_dir}
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${inst_dir}/ASTK_SERV/lib
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${inst_dir}/ASTK_SERV/lib
+.if !defined(CLIENT_SEUL)
+. for rep in bin lib unittest
+	@${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/ && ${PYTHON_CMD} ./config.py)
+. if defined(WITH_MPI)
+	${ECHO_CMD} "localhost" > ${PREFIX}/aster/aster-mpihosts
+. endif
+.endif
 
 post-install:
 	@${ECHO_MSG}
diff --git a/cad/astk-serveur/distinfo b/cad/astk-serveur/distinfo
index 8330bc57b081..0296de5d6e4c 100644
--- a/cad/astk-serveur/distinfo
+++ b/cad/astk-serveur/distinfo
@@ -1,3 +1,3 @@
-MD5 (aster-full-src-9.3.0-2.noarch.tar.gz) = ad4e5476fb4a1d3f02fcbaeebc54356c
-SHA256 (aster-full-src-9.3.0-2.noarch.tar.gz) = 53c5ea87cd21549b6bb7d2a5a51e79b082a3df2daaeb0fd2774d0a5696ca9d2d
-SIZE (aster-full-src-9.3.0-2.noarch.tar.gz) = 141387488
+MD5 (aster-full-src-9.4.0-1.noarch.tar.gz) = b6dbe112250aac2cf569da9ebf30b18b
+SHA256 (aster-full-src-9.4.0-1.noarch.tar.gz) = c475bca33c12ed0e1dcf7ff82f424aac87bf6968c820b5789d90842b1de5b107
+SIZE (aster-full-src-9.4.0-1.noarch.tar.gz) = 149931937
diff --git a/cad/astk-serveur/files.client/patch-lib::ASTK::astkrc::outils b/cad/astk-serveur/files.client/patch-lib::ASTK::astkrc::outils
index afe966eef04f..79d1c2ba1d02 100644
--- a/cad/astk-serveur/files.client/patch-lib::ASTK::astkrc::outils
+++ b/cad/astk-serveur/files.client/patch-lib::ASTK::astkrc::outils
@@ -1,6 +1,17 @@
---- ./lib/ASTK/astkrc/outils.orig	Mon Dec 13 14:34:29 2004
-+++ ./lib/ASTK/astkrc/outils	Sun Jan  9 23:33:55 2005
-@@ -19,7 +19,7 @@
+--- lib/ASTK/astkrc/outils.orig	2006-12-07 12:33:42.000000000 +0100
++++ lib/ASTK/astkrc/outils	2009-01-04 16:23:59.000000000 +0100
+@@ -8,13 +8,18 @@
+ ext : comm com0 com1 com2
+ dist : on
+ #
++nom : qtEficas
++cmde : ?TOOLS_DIR?/qtEficas (@F)
++ext : comm com0 com1 com2
++dist : on
++#
+ nom : Gmsh
+ cmde : ?TOOLS_DIR?/gmsh (@F)
+ ext : geo msh pos
  dist : on
  #
  nom : Gibi
@@ -9,13 +20,12 @@
  ext : datg dgibi
  dist : on
  #
-@@ -27,4 +27,9 @@
- cmde : ?TOOLS_DIR?/xmgrace (@F)
+@@ -23,3 +28,8 @@
  ext : dat
  dist : on
-+#
+ #
 +nom : Stanley
 +cmde : ?TOOLS_DIR?/../../?vaster?/bibpyt/Stanley/stanley.py
 +ext : _VIDE
 +dist : off
- #
++#
diff --git a/cad/astk-serveur/files/patch-conf::config b/cad/astk-serveur/files/patch-conf::config
index dd05ca62eb75..acd87932eebc 100644
--- a/cad/astk-serveur/files/patch-conf::config
+++ b/cad/astk-serveur/files/patch-conf::config
@@ -1,8 +1,8 @@
---- conf/config.orig	2008-06-25 15:43:23.000000000 +0200
-+++ conf/config	2008-07-06 18:16:37.000000000 +0200
-@@ -50,6 +50,10 @@
- # (used by mpi executions). For example : /export/tmp, /home/tmp...
- shared_tmp : /tmp
+--- conf/config.orig	2008-12-05 15:11:26.000000000 +0100
++++ conf/config	2009-01-11 11:49:58.000000000 +0100
+@@ -53,6 +53,10 @@
+ # shared folders = for which remote copy is never necessary (comma separated)
+ shared_folders :
  
 +# directories for tests
 +rep_test : /tmp
@@ -11,7 +11,7 @@
  # choose True to create symbolic links instead of copying executable and catalogs
  symlink : True
  
-@@ -80,6 +84,7 @@
+@@ -83,6 +87,7 @@
  # for each version a config.VVV file must be created.
  # DO NOT EDIT FOLLOWING LINE !
  #?vers : VVV?
@@ -19,7 +19,7 @@
  
  #-------------------------------------------------------------------------------
  # ----- batch/interactive configuration
-@@ -122,12 +127,12 @@
+@@ -125,12 +130,12 @@
  # batch_job : to display information about jobs
  # batch_kil : to delete jobs
  # --- Sun Grid Engine example
@@ -38,17 +38,17 @@
  
  # --- LSF example
  #batch_nom : LSF
-@@ -138,12 +143,12 @@
- #batch_kil : /usr/opt/lsf/4.2/alpha5/bin/bkill
+@@ -141,19 +146,19 @@
+ #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_sub : /local/openpbs-2.3.16/bin/qsub
+-#batch_sub : /usr/bin/qsub
 -#batch_jid : PBS_JOBID
--#batch_job : /local/openpbs-2.3.16/bin/qstat
--#batch_kil : /local/openpbs-2.3.16/bin/qdel
+-#batch_job : /usr/bin/qstat
+-#batch_kil : /usr/bin/qdel
 +batch_sub : LOCALBASE/bin/qsub
 +batch_jid : PBS_JOBID
 +batch_job : LOCALBASE/bin/qstat
@@ -56,7 +56,15 @@
  
  #-------------------------------------------------------------------------------
  # ----- MPI commands and parameters
-@@ -168,8 +173,11 @@
+ # mpirun
+ #    available arguments are : mpi_hostfile, mpi_nbnoeud, mpi_nbcpu
+ #    (use Python string formatting style)
+-mpirun_cmd : ?MPIRUN? -np %(mpi_nbcpu)s --hostfile %(mpi_hostfile)s %(program)s
++mpirun_cmd : ?MPIRUN? -np %(mpi_nbcpu)s %(program)s
+ 
+ # file which contains list of hosts
+ #mpi_hostfile : ?ASTER_ROOT?/aster-mpihosts
+@@ -183,8 +188,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
@@ -70,11 +78,16 @@
  
  #-------------------------------------------------------------------------------
  # debug command :
-@@ -181,7 +189,7 @@
- #cmd_post : gdb -batch --command=@D @E @C
- #cmd_dbg : ddd --debugger gdb --command=@D --exec=@E --core=@C
- cmd_post : ?DEBUGGER_COMMAND_POST?
+@@ -193,10 +201,10 @@
+ #  @D will be remplaced by the filename which contains "where+quit"
+ #  @d will be remplaced by the string 'where ; quit'
+ #
+-#cmd_post : gdb -batch --command=@D @E @C
++cmd_post : gdb -batch --command=@D @E @C
+ #cmd_dbg : ddd --debugger gdb --command=@D @E @C
+-cmd_post : ?DEBUGGER_COMMAND_POST?
 -cmd_dbg : ?DEBUGGER_COMMAND?
++#cmd_post : ?DEBUGGER_COMMAND_POST?
 +cmd_dbg : gdb --dbx --command=@D @E @C
  
  #-------------------------------------------------------------------------------
diff --git a/cad/astk-serveur/files/patch-lib__as_exec.py b/cad/astk-serveur/files/patch-lib__as_exec.py
deleted file mode 100644
index 54085bfcf8ab..000000000000
--- a/cad/astk-serveur/files/patch-lib__as_exec.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lib/as_exec.py.orig	Thu Oct 20 17:52:32 2005
-+++ ./lib/as_exec.py	Tue Jan 10 22:21:37 2006
-@@ -402,7 +402,7 @@
- --- Results :
- """)
-       info_start = ( nbtest, time.strftime('%c'),
--         os.path.join(REPREF, conf['SRCTEST'][0]), ', '.join(reptest), resutest,
-+         os.path.join(REPREF, conf['SRCTEST'][0]), reptest, resutest,
-          prof['version'][0], exetmp, cmdetmp, eletmp,
-          nbmaxnook, cpresok, facmtps )
-       print summary % info_start
diff --git a/cad/astk-serveur/pkg-plist b/cad/astk-serveur/pkg-plist
index 438b1eb825d3..a71a2666a4ff 100644
--- a/cad/astk-serveur/pkg-plist
+++ b/cad/astk-serveur/pkg-plist
@@ -1,3 +1,4 @@
+%%SERV%%%%MPI%%aster/aster-mpihosts
 %%CLIENT%%%%ASTKDIR%%/GPL.txt
 %%CLIENT%%%%ASTKDIR%%/bin/astk
 %%CLIENT%%%%ASTKDIR%%/bin/bsf
@@ -53,6 +54,7 @@
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/lance_calcul.tcl
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/meshtool.tcl
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/options.tcl
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/pref_config.tcl
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/tools.tcl
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/unites_logiques.tcl
 %%CLIENT%%%%ASTKDIR%%/lib/BSF/bsf.tcl
@@ -180,23 +182,44 @@
 %%SERV%%%%ASTKDIR%%/GPL.txt
 %%SERV%%%%ASTKDIR%%/bin/as_run
 %%SERV%%%%ASTKDIR%%/bin/as_serv
+%%SERV%%%%ASTKDIR%%/bin/main.py
+%%SERV%%%%ASTKDIR%%/bin/main.pyc
+%%SERV%%%%ASTKDIR%%/bin/main.pyo
+%%SERV%%%%ASTKDIR%%/bin/mpirun_template
+%%SERV%%%%ASTKDIR%%/bin/parallel_cp
+%%SERV%%%%ASTKDIR%%/bin/sub_script
 %%SERV%%%%ASTKDIR%%/conf/.mysql_connect_REX
 %%SERV%%%%ASTKDIR%%/conf/aster_profile.sh
 %%SERV%%%%ASTKDIR%%/conf/config
 %%SERV%%%%ASTKDIR%%/conf/config_nodename
 %%SERV%%%%ASTKDIR%%/lib/HELP_as_run.txt
+%%SERV%%%%ASTKDIR%%/lib/N__F.py
+%%SERV%%%%ASTKDIR%%/lib/N__F.pyc
+%%SERV%%%%ASTKDIR%%/lib/N__F.pyo
 %%SERV%%%%ASTKDIR%%/lib/alamain.py
 %%SERV%%%%ASTKDIR%%/lib/alamain.pyc
 %%SERV%%%%ASTKDIR%%/lib/alamain.pyo
+%%SERV%%%%ASTKDIR%%/lib/as_astout.py
+%%SERV%%%%ASTKDIR%%/lib/as_astout.pyc
+%%SERV%%%%ASTKDIR%%/lib/as_astout.pyo
 %%SERV%%%%ASTKDIR%%/lib/as_build.py
 %%SERV%%%%ASTKDIR%%/lib/as_build.pyc
 %%SERV%%%%ASTKDIR%%/lib/as_build.pyo
+%%SERV%%%%ASTKDIR%%/lib/as_calcul.py
+%%SERV%%%%ASTKDIR%%/lib/as_calcul.pyc
+%%SERV%%%%ASTKDIR%%/lib/as_calcul.pyo
+%%SERV%%%%ASTKDIR%%/lib/as_common_func.py
+%%SERV%%%%ASTKDIR%%/lib/as_common_func.pyc
+%%SERV%%%%ASTKDIR%%/lib/as_common_func.pyo
 %%SERV%%%%ASTKDIR%%/lib/as_config.py
 %%SERV%%%%ASTKDIR%%/lib/as_config.pyc
 %%SERV%%%%ASTKDIR%%/lib/as_config.pyo
 %%SERV%%%%ASTKDIR%%/lib/as_devtools.py
 %%SERV%%%%ASTKDIR%%/lib/as_devtools.pyc
 %%SERV%%%%ASTKDIR%%/lib/as_devtools.pyo
+%%SERV%%%%ASTKDIR%%/lib/as_distrib.py
+%%SERV%%%%ASTKDIR%%/lib/as_distrib.pyc
+%%SERV%%%%ASTKDIR%%/lib/as_distrib.pyo
 %%SERV%%%%ASTKDIR%%/lib/as_etude.py
 %%SERV%%%%ASTKDIR%%/lib/as_etude.pyc
 %%SERV%%%%ASTKDIR%%/lib/as_etude.pyo
@@ -212,9 +235,6 @@
 %%SERV%%%%ASTKDIR%%/lib/as_list.py
 %%SERV%%%%ASTKDIR%%/lib/as_list.pyc
 %%SERV%%%%ASTKDIR%%/lib/as_list.pyo
-%%SERV%%%%ASTKDIR%%/lib/as_mail.py
-%%SERV%%%%ASTKDIR%%/lib/as_mail.pyc
-%%SERV%%%%ASTKDIR%%/lib/as_mail.pyo
 %%SERV%%%%ASTKDIR%%/lib/as_maintenance.py
 %%SERV%%%%ASTKDIR%%/lib/as_maintenance.pyc
 %%SERV%%%%ASTKDIR%%/lib/as_maintenance.pyo
@@ -224,9 +244,15 @@
 %%SERV%%%%ASTKDIR%%/lib/as_option.py
 %%SERV%%%%ASTKDIR%%/lib/as_option.pyc
 %%SERV%%%%ASTKDIR%%/lib/as_option.pyo
+%%SERV%%%%ASTKDIR%%/lib/as_param.py
+%%SERV%%%%ASTKDIR%%/lib/as_param.pyc
+%%SERV%%%%ASTKDIR%%/lib/as_param.pyo
 %%SERV%%%%ASTKDIR%%/lib/as_profil.py
 %%SERV%%%%ASTKDIR%%/lib/as_profil.pyc
 %%SERV%%%%ASTKDIR%%/lib/as_profil.pyo
+%%SERV%%%%ASTKDIR%%/lib/as_repart.py
+%%SERV%%%%ASTKDIR%%/lib/as_repart.pyc
+%%SERV%%%%ASTKDIR%%/lib/as_repart.pyo
 %%SERV%%%%ASTKDIR%%/lib/as_rex.py
 %%SERV%%%%ASTKDIR%%/lib/as_rex.pyc
 %%SERV%%%%ASTKDIR%%/lib/as_rex.pyo
@@ -260,24 +286,29 @@
 %%SERV%%%%ASTKDIR%%/lib/histor.pyc
 %%SERV%%%%ASTKDIR%%/lib/histor.pyo
 %%SERV%%%%ASTKDIR%%/lib/meshtool.comm
-%%SERV%%%%ASTKDIR%%/lib/mpirun_template
 %%SERV%%%%ASTKDIR%%/lib/myconnect.py
 %%SERV%%%%ASTKDIR%%/lib/myconnect.pyc
 %%SERV%%%%ASTKDIR%%/lib/myconnect.pyo
 %%SERV%%%%ASTKDIR%%/lib/mystring.py
 %%SERV%%%%ASTKDIR%%/lib/mystring.pyc
 %%SERV%%%%ASTKDIR%%/lib/mystring.pyo
+%%SERV%%%%ASTKDIR%%/lib/old_astout.py
+%%SERV%%%%ASTKDIR%%/lib/old_astout.pyc
+%%SERV%%%%ASTKDIR%%/lib/old_astout.pyo
+%%SERV%%%%ASTKDIR%%/lib/profile_modifier.py
+%%SERV%%%%ASTKDIR%%/lib/profile_modifier.pyc
+%%SERV%%%%ASTKDIR%%/lib/profile_modifier.pyo
 %%SERV%%%%ASTKDIR%%/lib/progress.py
 %%SERV%%%%ASTKDIR%%/lib/progress.pyc
 %%SERV%%%%ASTKDIR%%/lib/progress.pyo
 %%SERV%%%%ASTKDIR%%/lib/sample_extension.py
 %%SERV%%%%ASTKDIR%%/lib/sample_extension.pyc
 %%SERV%%%%ASTKDIR%%/lib/sample_extension.pyo
+%%SERV%%%%ASTKDIR%%/lib/sample_hostfile_distrib
 %%SERV%%%%ASTKDIR%%/lib/schema.py
 %%SERV%%%%ASTKDIR%%/lib/schema.pyc
 %%SERV%%%%ASTKDIR%%/lib/schema.pyo
 %%SERV%%%%ASTKDIR%%/lib/stanley_post.comm
-%%SERV%%%%ASTKDIR%%/lib/sub_script
 %%SERV%%%%ASTKDIR%%/lib/sum_tps.awk
 %%SERV%%%%ASTKDIR%%/lib/user_filter.py
 %%SERV%%%%ASTKDIR%%/lib/user_filter.pyc
@@ -285,6 +316,33 @@
 %%SERV%%%%ASTKDIR%%/lib/utils.py
 %%SERV%%%%ASTKDIR%%/lib/utils.pyc
 %%SERV%%%%ASTKDIR%%/lib/utils.pyo
+%%SERV%%%%ASTKDIR%%/unittest/Makefile
+%%SERV%%%%ASTKDIR%%/unittest/Makefile.inc
+%%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/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/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/param/Makefile
+%%SERV%%%%ASTKDIR%%/unittest/param/param.distr
+%%SERV%%%%ASTKDIR%%/unittest/param/param.export.in
+%%SERV%%%%ASTKDIR%%/unittest/surcharge/Makefile
+%%SERV%%%%ASTKDIR%%/unittest/surcharge/surcharge.export.in
+%%SERV%%%%ASTKDIR%%/unittest/surcharge/surcharge_astout.export.in
 %%CLIENT%%@dirrm %%ASTKDIR%%/bin
 %%CLIENT%%@dirrm %%ASTKDIR%%/lib/ASJOB
 %%CLIENT%%@dirrm %%ASTKDIR%%/lib/ASTK/DOC
@@ -300,9 +358,19 @@
 %%CLIENT%%@dirrm %%BWidget_DIR%%/lang
 %%CLIENT%%@dirrm %%BWidget_DIR%%
 %%CLIENT%%@dirrm %%ASTKDIR%%/share
-%%SERV%%@dirrm %%ASTKDIR%%/bin
-%%SERV%%@dirrm %%ASTKDIR%%/conf
+%%SERV%%@dirrm %%ASTKDIR%%/unittest/surcharge
+%%SERV%%@dirrm %%ASTKDIR%%/unittest/param
+%%SERV%%@dirrm %%ASTKDIR%%/unittest/meshtool
+%%SERV%%@dirrm %%ASTKDIR%%/unittest/jobs
+%%SERV%%@dirrm %%ASTKDIR%%/unittest/etude
+%%SERV%%@dirrm %%ASTKDIR%%/unittest/compil
+%%SERV%%@dirrm %%ASTKDIR%%/unittest/catapy
+%%SERV%%@dirrm %%ASTKDIR%%/unittest/catalo
+%%SERV%%@dirrm %%ASTKDIR%%/unittest/astout
+%%SERV%%@dirrm %%ASTKDIR%%/unittest
 %%SERV%%@dirrm %%ASTKDIR%%/lib
+%%SERV%%@dirrm %%ASTKDIR%%/conf
+%%SERV%%@dirrm %%ASTKDIR%%/bin
 @dirrm %%ASTKDIR%%
 @dirrmtry aster/ASTK
 @dirrmtry aster