[Fudaa-cvs-commit] fudaa_devel/fudaa distribution.xml,1.11,1.12

[<jm_...@us...>]

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

Modified Files:
	distribution.xml 
Log Message:
modification de la cible jar_mascaret


Index: distribution.xml
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/fudaa/distribution.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** distribution.xml	19 Dec 2003 16:31:39 -0000	1.11
--- distribution.xml	7 Jan 2004 13:19:29 -0000	1.12
***************
*** 56,60 ****
    <property name="fudaa.dist.javadocAll.dir" location="${fudaa.dist.dir}/doc/fudaa_javadoc"/>
    <property name="fudaa.dist.javadocAll.link" location="http://java.sun.com/j2se/1.3/docs/api/"/>
!   
  
  
--- 56,60 ----
    <property name="fudaa.dist.javadocAll.dir" location="${fudaa.dist.dir}/doc/fudaa_javadoc"/>
    <property name="fudaa.dist.javadocAll.link" location="http://java.sun.com/j2se/1.3/docs/api/"/>
! 
  
  
***************
*** 76,80 ****
    <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}"/>
--- 76,80 ----
    <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}"/>
***************
*** 178,182 ****
    <mkdir dir="${fudaa.dist.dir}"/>
    <delete file="${fudaa.zip.file}"/>
!   
    <tar destfile="${fudaa.zip.file}"  longfile="gnu" compression="gzip">
      <tarfileset dir="${projet.dir}" prefix="fudaa_devel">
--- 178,182 ----
    <mkdir dir="${fudaa.dist.dir}"/>
    <delete file="${fudaa.zip.file}"/>
! 
    <tar destfile="${fudaa.zip.file}"  longfile="gnu" compression="gzip">
      <tarfileset dir="${projet.dir}" prefix="fudaa_devel">
***************
*** 245,249 ****
      	<include name="**/dist.sh"/>
  	</tarfileset>
! 	
    </tar>
    </target>
--- 245,249 ----
      	<include name="**/dist.sh"/>
  	</tarfileset>
! 
    </tar>
    </target>
***************
*** 273,277 ****
      </fileset>
      </class>
!     
        <resource>
          <fileset dir="${fudaa.dist.classes.dir}">
--- 273,277 ----
      </fileset>
      </class>
! 
        <resource>
          <fileset dir="${fudaa.dist.classes.dir}">
***************
*** 280,297 ****
            <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."/>
--- 280,297 ----
            <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."/>
***************
*** 308,322 ****
        <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>
!   <target name="jar_mascaret" depends=".initialisationCheck"
  description="cree fudaa_mascaret.jar">
  <property name="fudaa.mascaret.jar.file" value="${fudaa.dist.jar.dir}/fudaa_mascaret.jar"/>
--- 308,322 ----
        <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>
! 
! 
! <target name="jar_mascaret" depends="build"
  description="cree fudaa_mascaret.jar">
  <property name="fudaa.mascaret.jar.file" value="${fudaa.dist.jar.dir}/fudaa_mascaret.jar"/>
***************
*** 327,330 ****
--- 327,333 ----
    <delete file="${fudaa.mascaret.jar.file}"/>
    <genjar jarfile="${fudaa.mascaret.jar.file}">
+     <manifest>
+       <attribute name="Main-Class" value="org.fudaa.fudaa.mascaret.Mascaret"/>
+     </manifest>
      <classpath path="${fudaaDist.classpath}"/>
      <class name="org.fudaa.fudaa.mascaret.Mascaret"/>
***************
*** 337,367 ****
        <include name="org/fudaa/dodico/corba/evenement/*.class"/>
        <include name="org/fudaa/dodico/corba/objet/*.class"/>
-       <include name="org/fudaa/dodico/corba/mascaret/*.class"/>
        <include name="org/fudaa/dodico/corba/hydraulique1d/*.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/hydraulique1d/"/>
!           <include name="org/fudaa/fudaa/mascaret/"/>
!         </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."/>
--- 340,357 ----
        <include name="org/fudaa/dodico/corba/evenement/*.class"/>
        <include name="org/fudaa/dodico/corba/objet/*.class"/>
        <include name="org/fudaa/dodico/corba/hydraulique1d/*.class"/>
+       <include name="org/fudaa/dodico/corba/mascaret/*.class"/>
        <include name="org/fudaa/dodico/corba/usine/*.class"/>
      </fileset>
      </class>
!     <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."/>
***************
*** 378,392 ****
        <include name="org.fudaa.dodico.fortran."/>
        <include name="org.fudaa.dodico.commun."/>
!       
        <include name="org.fudaa.dodico.corba.hydraulique1d."/>
        <include name="org.fudaa.dodico.hydraulique1d."/>
!       
        <include name="org.fudaa.dodico.corba.mascaret."/>
        <include name="org.fudaa.dodico.mascaret."/>
      </classfilter>
    </genjar>
-   
- </target>
  
  <target name="jar_tr" depends="build"
  description="cree fudaa_tr.jar">
--- 368,397 ----
        <include name="org.fudaa.dodico.fortran."/>
        <include name="org.fudaa.dodico.commun."/>
! 
        <include name="org.fudaa.dodico.corba.hydraulique1d."/>
        <include name="org.fudaa.dodico.hydraulique1d."/>
! 
        <include name="org.fudaa.dodico.corba.mascaret."/>
        <include name="org.fudaa.dodico.mascaret."/>
      </classfilter>
+ 
+       <resource>
+         <fileset dir="${fudaa.dist.classes.dir}">
+                   <patternset refid="ressources.fic"/>
+                   <include name="org/fudaa/dodico/commun/"/>
+ 		  <include name="com/memoire/bu/"/>
+ 		  <include name="org/fudaa/dodico/hydraulique1d/"/>
+ 		  <include name="org/fudaa/dodico/mascaret/"/>
+ 		  <include name="org/fudaa/ebli/ressource/"/>
+ 		  <include name="org/fudaa/fudaa/ressource/"/>
+ 		  <include name="org/fudaa/fudaa/hydraulique1d/"/>
+ 		  <include name="org/fudaa/fudaa/mascaret/"/>
+         </fileset>
+       </resource>
+ 
+ 
    </genjar>
  
+ </target>
  <target name="jar_tr" depends="build"
  description="cree fudaa_tr.jar">
***************
*** 413,417 ****
        <exclude name="org.fudaa.dodico.usine."/>
      </classfilter>
!     
        <resource>
          <fileset dir="${fudaa.dist.classes.dir}">
--- 418,422 ----
        <exclude name="org.fudaa.dodico.usine."/>
      </classfilter>
! 
        <resource>
          <fileset dir="${fudaa.dist.classes.dir}">
***************
*** 421,433 ****
  		  <include name="org/fudaa/dodico/h2d/"/>
        <include name="org/fudaa/ebli/ressource/"/>
!       <include name="org/fudaa/fudaa/ressource/"/>          
  		  <include name="org/fudaa/fudaa/tr/"/>
  		  <include name="org/fudaa/fudaa/dico/"/>
          </fileset>
        </resource>
!       
  
    </genjar>
!   
  </target>
  
--- 426,438 ----
  		  <include name="org/fudaa/dodico/h2d/"/>
        <include name="org/fudaa/ebli/ressource/"/>
!       <include name="org/fudaa/fudaa/ressource/"/>
  		  <include name="org/fudaa/fudaa/tr/"/>
  		  <include name="org/fudaa/fudaa/dico/"/>
          </fileset>
        </resource>
! 
  
    </genjar>
! 
  </target>