[Fudaa-cvs-commit] fudaa_devel/fudaa distribution.xml,1.3,1.4 build.xml,1.2,1.3 .cvsignore,1.3,1.4

[<de...@us...>]

Update of /cvsroot/fudaa/fudaa_devel/fudaa
In directory sc8-pr-cvs1:/tmp/cvs-serv18014

Modified Files:
	distribution.xml build.xml .cvsignore 
Log Message:
les jar sont realises a l'aide de GenJar


Index: distribution.xml
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/distribution.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** distribution.xml	1 Apr 2003 15:56:25 -0000	1.3
--- distribution.xml	4 Jul 2003 16:07:34 -0000	1.4
***************
*** 74,77 ****
--- 74,87 ----
    <echo message="Vous devez utiliser java 1.3"/>
    <echo message="version utilisee: ${ant.java.version}"/>
+   
+     <path id="fudaaDist.classpath.id">
+      <pathelement path="${fudaa.dist.classes.dir}"/>
+      <fileset dir="${ctulu.lib.dir}" includes="*.jar"/>
+   </path>
+   <property name="fudaaDist.classpath" refid="fudaaDist.classpath.id"/>
+     <patternset id="ressources.fic"
+   excludes="*.properties,*.xml,**/*.txt,**/*.log,**/*.old,**/*.bck,**/.xvpics/**,
+   **/CVS/**,**/Cvs/**,**/cvs/**,**/*.class,**/*.NEW" />
+   <taskdef resource="genjar.properties"/>
  </target>
  
***************
*** 208,212 ****
  
  
! <target name="jar_lido" depends="build"
  description="cree fudaa_lido.jar">
  <property name="fudaa.lido.jar.file" value="${fudaa.dist.jar.dir}/fudaa_lido.jar"/>
--- 218,222 ----
  
  
! <target name="jar_lido" depends=".initialisationCheck"
  description="cree fudaa_lido.jar">
  <property name="fudaa.lido.jar.file" value="${fudaa.dist.jar.dir}/fudaa_lido.jar"/>
***************
*** 216,262 ****
    <mkdir dir="${fudaa.dist.jar.dir}"/>
    <delete file="${fudaa.lido.jar.file}"/>
!   <jar jarfile="${fudaa.lido.jar.file}" compress="true" update="false">
  
      <fileset dir="${fudaa.dist.classes.dir}">
!       <!-- ctulu -->
!       <include name="com/memoire/"/>
!       <include name="com/diaam/"/>
!       <exclude name="com/memoire/alma/"/>
!       <exclude name="com/memoire/agl/"/>
!       <exclude name="com/memoire/ant/"/>
!       <exclude name="com/memoire/vacvs/"/>
!       <exclude name="com/memoire/jedit/"/>
!       <exclude name="com/jdistro/"/>
!       <!-- dodico -->
!       <exclude name="org/fudaa/dodico/test"/>
!       <include name="org/fudaa/dodico/fortran/"/>
!       <include name="org/omg/"/>
!       <include name="org/fudaa/dodico/**/base/"/>
!       <include name="org/fudaa/dodico/**/calcul/"/>
!       <include name="org/fudaa/dodico/**/evenement/"/>
!       <include name="org/fudaa/dodico/**/association/"/>
!       <include name="org/fudaa/dodico/**/collection/"/>
!       <include name="org/fudaa/dodico/commun/"/>
!       <include name="org/fudaa/dodico/**/usine/"/>
!       <include name="org/fudaa/dodico/**/objet/"/>
!       <include name="org/fudaa/dodico/**/lido/"/>
!       <!-- ebli -->
!       <include name="org/fudaa/ebli/"/>
!       <exclude name="org/fudaa/ebli/test/"/>
!       <exclude name="org/fudaa/ebli/volume/"/>
!       <!-- fudaa -->
!       <include name="org/fudaa/fudaa/lido/"/>
!       <include name="org/fudaa/fudaa/commun/"/>
!       <include name="org/fudaa/fudaa/ressource/"/>
!     </fileset>
!     <fileset dir="${fudaa.dist.classes.dir}">
!       <include name="org/fudaa/dodico/corba/**/I*.class"/>
!       <exclude name="org/fudaa/dodico/corba/**/I*_*.class"/>
!       <exclude name="org/fudaa/dodico/corba/**/I*Holder.class"/>
!       <exclude name="org/fudaa/dodico/corba/**/I*Helper.class"/>
      </fileset>
!     <!-- librairies -->
!     <zipfileset src="${ctulu.lib.dir}/koml.jar" includes="**/**"/>
!   </jar>
  </target>
  
--- 226,288 ----
    <mkdir dir="${fudaa.dist.jar.dir}"/>
    <delete file="${fudaa.lido.jar.file}"/>
!   <genjar jarfile="${fudaa.lido.jar.file}">
!     <classpath path="${fudaaDist.classpath}"/>
!     <class name="org.fudaa.fudaa.lido.Lido"/>
  
+     <class>
      <fileset dir="${fudaa.dist.classes.dir}">
!       <include name="org/fudaa/dodico/corba/base/*.class"/>
!       <include name="org/fudaa/dodico/corba/calcul/*.class"/>
!       <include name="org/fudaa/dodico/corba/association/*.class"/>
!       <include name="org/fudaa/dodico/corba/evenement/*.class"/>
!       <include name="org/fudaa/dodico/corba/objet/*.class"/>
!       <include name="org/fudaa/dodico/corba/lido/*.class"/>
!       <include name="org/fudaa/dodico/corba/usine/*.class"/>
      </fileset>
!     </class>
!     
!       <resource>
!         <fileset dir="${fudaa.dist.classes.dir}">
!           <patternset refid="ressources.fic"/>
!           <include name="com/memoire/bu/"/>
!           <include name="org/fudaa/ebli/ressource/"/>
!           <include name="org/fudaa/fudaa/ressource/"/>
!           
!           <include name="org/fudaa/fudaa/lido/"/>
!         </fileset>
!       </resource>
!       
!      <classfilter>
!       <exclude name="org.fudaa.dodico.corba."/>
!       <exclude name="org.fudaa.dodico."/>
!       
!       <include name="org.fudaa.dodico.corba.base."/>
! 
!       <include name="org.fudaa.dodico.corba.calcul."/>
!       <include name="org.fudaa.dodico.calcul."/>
!       
!       <include name="org.fudaa.dodico.corba.evenement."/>
!       <include name="org.fudaa.dodico.evenement."/>
! 
!       <include name="org.fudaa.dodico.corba.association."/>
!       <include name="org.fudaa.dodico.association."/>
! 
!       <include name="org.fudaa.dodico.corba.usine."/>
!       <include name="org.fudaa.dodico.usine."/>
! 
!       <include name="org.fudaa.dodico.corba.objet."/>
!       <include name="org.fudaa.dodico.objet."/>
! 
!       <include name="org.fudaa.dodico.fortran."/>
!       <include name="org.fudaa.dodico.commun."/>
!       
!       <include name="org.fudaa.dodico.corba.lido."/>
!       <include name="org.fudaa.dodico.lido."/>
!     </classfilter>
!       
!       
! 
!   </genjar>
!   
  </target>
  

Index: build.xml
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build.xml	1 Apr 2003 15:54:32 -0000	1.2
--- build.xml	4 Jul 2003 16:07:34 -0000	1.3
***************
*** 80,84 ****
    <!--definition des pattern-->
    <patternset id="ressources.fic"
!   excludes="*.properties,*.xml,**/*.log,**/*.old,**/*.bck,**/*.xvpics,
    **/CVS/**,**/Cvs/**,**/cvs/**,**/*.java,**/*.NEW" />
    <condition property="sourcesAvailable">
--- 80,84 ----
    <!--definition des pattern-->
    <patternset id="ressources.fic"
!   excludes="*.properties,*.xml,**/*.log,**/*.old,**/*.bck,**/.xvpics/**,
    **/CVS/**,**/Cvs/**,**/cvs/**,**/*.java,**/*.NEW" />
    <condition property="sourcesAvailable">

Index: .cvsignore
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** .cvsignore	4 Feb 2003 17:41:44 -0000	1.3
--- .cvsignore	4 Jul 2003 16:07:34 -0000	1.4
***************
*** 11,12 ****
--- 11,15 ----
  purge
  uncvs
+ .uml
+ .project
+ .classpath