pb mise-à-jour du jar

ant/build.xml

@@ -13,6 +13,7 @@
     Logiciel de plan de feu
   </description>
 
+  <property name="webRef"         location="/home/DMZ/adecwattWeb/data/adecwatt/v3"/>
   <property name="work"           location="ws"/>
   <property name="data"           location="data"/>
   <property name="config"         location="data/config"/>
@@ -39,6 +40,7 @@
     <mkdir dir="${work}"/>
     <mkdir dir="${data}"/>
     <mkdir dir="${build}"/>
+    <mkdir dir="${build.distrib}"/>
     <mkdir dir="${config}"/>
     <mkdir dir="${src}"/>
     <mkdir dir="${java.src}"/>
@@ -253,6 +255,14 @@
 	<!-- <include name="data/texts/help-fr/**/*.html"/> -->
       </fileset>
     </jar>
+    <copy todir="${webRef}/soft" preservelastmodified="true">
+      <fileset dir="${build.jar}">
+	<include name="AdecWatt.jar"/>
+	<include name="Misc.jar"/>
+	<include name="JMapViewer.jar"/>
+	<include name="pdfbox.jar"/>
+      </fileset>
+    </copy>
   </target>
 
   <!-- ======================================== -->
@@ -280,6 +290,16 @@
     </jar>
   </target>
 
+  <!-- ======================================== -->
+  <target name="runUpdatedAdecWattJar" depends="updatedAdecWattJar" description="execute jar" >
+    <java classname="adecWatt.control.LaunchUpdatedAdecWatt" fork="true" dir="${work}">
+      <classpath>
+	<pathelement location="${build.jar}/UpdatedAdecWatt.jar"/>
+	<pathelement path="${java.class.path}:${misc.class}:${osm.class}:${pdf.class}"/>
+      </classpath>
+    </java>
+  </target>
+
   <!-- ======================================== -->
   <target name="srcZip" depends="cleanConfig,updatedAdecWattJar,adecWattJar" description="create distribution" >
     <zip destfile="${build.distrib}/${TODAY_FR}-SCR-AdecWatt.zip">
@@ -314,18 +334,16 @@
       <zipfileset dir="." prefix="adecWatt/">
 	<include name="data/config/AdecWatt.xml"/>
       </zipfileset>
-      <zipfileset dir="${webRef}/soft" prefix="adecWatt/soft">
+      <zipfileset dir="soft" prefix="adecWatt/soft">
 	<include name="UpdatedAdecWatt.jar"/>
 	<include name="AdecWatt.jar"/>
 	<include name="Misc.jar"/>
 	<include name="JMapViewer.jar"/>
-	<include name="pdfbox.jar"/>
-	<include name="timestamp"/>
       </zipfileset>
       <zipfileset dir="${work}" prefix="adecWatt/" filemode="755">
 	<include name="launch-adecWatt.sh"/>
       </zipfileset>
-      <zipfileset dir="${webRef}/data" prefix="adecWatt/data/server" filemode="755">
+      <zipfileset dir="data" prefix="adecWatt/data/server" filemode="755">
 	<include name="furniture/000-0052.lpt"/>
       </zipfileset>
     </zip>