fudaa-svn-commit

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

Revision: 8845
          http://sourceforge.net/p/fudaa/svn/8845
Author:   deniger
Date:     2014-09-16 23:33:49 +0000 (Tue, 16 Sep 2014)
Log Message:
-----------
upgrade de versions

Modified Paths:
--------------
    trunk/soft/fudaa-mascaret/distrib/pom.xml
    trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/izpack_fudaa_mascaret.xml

Added Paths:
-----------
    trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/customLangPack.xml
    trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/customLangPack_eng.xml

Removed Paths:
-------------
    trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/standalone-compiler.jar

Modified: trunk/soft/fudaa-mascaret/distrib/pom.xml
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/pom.xml	2014-09-16 20:27:17 UTC (rev 8844)
+++ trunk/soft/fudaa-mascaret/distrib/pom.xml	2014-09-16 23:33:49 UTC (rev 8845)
@@ -11,6 +11,8 @@
   <artifactId>mascaret-distrib</artifactId>
   <properties>
     <project.build.sourceEncoding>ISO-8859-15</project.build.sourceEncoding>
+    <info.appversion>${project.version}</info.appversion>
+    
   </properties>  
 		
   <dependencies>
@@ -45,6 +47,8 @@
           <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
             <configuration>
+              <appendAssemblyId>false</appendAssemblyId>
+              <finalName>fudaa-mascaret</finalName>
               <archive>
                 <manifest>
                   <mainClass>org.fudaa.fudaa.mascaret.Mascaret</mainClass>
@@ -58,21 +62,42 @@
             <executions>
               <!--pour etre utiliser dans le build normal-->
               <execution>
-                <id>make-assembly</id> <!-- this is used for inheritance merges -->
-                <phase>package</phase> <!-- bind to the packaging phase -->
+                <!--this is used for inheritance merges--> 
+                <id>make-assembly</id>  
+                <!--bind to the packaging phase--> 
+                <phase>package</phase>  
                 <goals>
                   <goal>single</goal>
                 </goals>
               </execution>
             </executions>
           </plugin>
+            
           <plugin>
-
+            <groupId>org.codehaus.izpack</groupId>
+            <artifactId>izpack-maven-plugin</artifactId>
+            <version>5.0.0-rc3</version>
+            <executions>
+              <execution>
+                <phase>package</phase>
+                <goals>
+                  <goal>izpack</goal>
+                </goals>
+                <configuration>
+                  <output>${project.build.directory}/Fudaa-Mascaret-${project.version}-installer.jar</output>
+                  <installFile>${basedir}/src/dist/izpack/izpack_fudaa_mascaret.xml</installFile>
+                  <baseDir>${basedir}/src/dist/</baseDir>
+                  <mkdirs>true</mkdirs>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <!--          <plugin>
             <artifactId>maven-antrun-plugin</artifactId>
             <executions>
               <execution>
-                <id>izpack</id> <!-- this is used for inheritance merges -->
-                <phase>package</phase> <!-- bind to the packaging phase -->
+                <id>izpack</id>  this is used for inheritance merges 
+                <phase>package</phase>  bind to the packaging phase 
                 <goals>
                   <goal>run</goal>
                 </goals>
@@ -86,7 +111,7 @@
                 </configuration>
               </execution>
             </executions>
-          </plugin>
+          </plugin>-->
         </plugins>
       </build>
     </profile>

Added: trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/customLangPack.xml
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/customLangPack.xml	                        (rev 0)
+++ trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/customLangPack.xml	2014-09-16 23:33:49 UTC (rev 8845)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<langpack>
+  <str id="conditionvalidator.isX64.error.message" txt="Fudaa-Mascaret ne peut être installé que sur un machine 64 bits"/>
+  <str id="data.validation.error.title" txt="Installation impossible"/>
+</langpack>
\ No newline at end of file

Added: trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/customLangPack_eng.xml
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/customLangPack_eng.xml	                        (rev 0)
+++ trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/customLangPack_eng.xml	2014-09-16 23:33:49 UTC (rev 8845)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<langpack>
+    <str id="conditionvalidator.isX64.error.message" txt="Fudaa-Mascaret requires a 64 bits OS"/>
+    <str id="data.validation.error.title" txt="Installation can't be done"/>
+</langpack>
\ No newline at end of file

Modified: trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/izpack_fudaa_mascaret.xml
===================================================================
--- trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/izpack_fudaa_mascaret.xml	2014-09-16 20:27:17 UTC (rev 8844)
+++ trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/izpack_fudaa_mascaret.xml	2014-09-16 23:33:49 UTC (rev 8845)
@@ -8,7 +8,11 @@
     - call "compile ../sample/install.xml -b ../sample"
 
   -->
-<installation version="1.0">
+<izpack:installation version="5.0"
+                     xmlns:izpack="http://izpack.org/schema/installation"
+                     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                     xsi:schemaLocation="http://izpack.org/schema/installation http://izpack.org/schema/5.0/izpack-installation-5.0.xsd">
+ 
  <!--  
         The info section.
         The meaning of the tags should be natural ...
@@ -17,9 +21,11 @@
   <info>
 		<appname>Fudaa-Mascaret</appname>
     <!--@project.version@ sera remplacé par version utilisé dans le pom-->
-		<appversion>@project.version@</appversion>
+		<!--<appversion>@project.version@</appversion>-->
+		<appversion>@{info.appversion}</appversion>
     <!--@timestamp@ sera remplacé par la date du jour-->
-		<variable name="released-on" value="@timestamp@" />
+		<!--<variable name="released-on" value="@timestamp@" />-->
+		<variable name="released-on" value="@{timestamp}" />
 		<authors>
 			<author name="EDF Recherche et Developpement" email=""/>
 			<author name="CEREMA" email="" />
@@ -27,34 +33,54 @@
 		<!-- Necessaire pour pouvoir acceder au registre et au répertoire program -->
 		<run-privileged condition="izpack.windowsinstall.vista|izpack.windowsinstall.7"/>
 		<url>http://www.openmascaret.org</url>
+    
 	</info>
+  
+  <dynamicvariables>
+  <variable name="osArch" value="${SYSTEM[os.arch]}" checkonce="true"/>
+</dynamicvariables>
 	
   <variables>
     <!-- Clé de registre pour les associations de fichiers -->
     <variable name="regkey" value="Fudaa.Mascaret" />
+    <!--<variable name="osArch" value="x64" />-->
   </variables>
+  
+  
+  
+  <conditions>
+    <condition type="contains" id="conditionvalidator.isX64">
+      <variable>osArch</variable>
+      <value>64</value>
+    </condition>
+  </conditions>
+  
 	
-  <!-- Pour les raccourcis -->
-  <native type="izpack" name="ShellLink.dll">
-    <os arch="i386" family="windows" />
-  </native>
-  <native type="izpack" name="ShellLink_x64.dll">
-    <os arch="x64" family="windows" />
-  </native>
+  <natives>
+    <!-- Pour les raccourcis -->
+    <native type="izpack" name="ShellLink.dll">
+      <os arch="i386" family="windows" />
+    </native>
+    <native type="izpack" name="ShellLink_x64.dll">
+      <os arch="x64" family="windows" />
+    </native>
+    <native type="3rdparty" name="COIOSHelper.dll" stage="both">
+      <os family="windows" />
+    </native>
+    <native type="3rdparty" name="COIOSHelper_x64.dll" stage="both">
+      <os arch="x64" family="windows" />
+    </native>
+  </natives>
     
   <!-- Enregistrement des clés de registre -->
   <listeners>
-    <listener installer="RegistryInstallerListener"
-      uninstaller="RegistryUninstallerListener" >
+    <listener classname="RegistryInstallerListener" stage="install">
       <os family="windows" />
     </listener>
+    <listener classname="RegistryUninstallerListener" stage="uninstall">
+      <os family="windows" />
+    </listener>
   </listeners>
-  <native type="3rdparty" name="COIOSHelper.dll" stage="both">
-    <os family="windows" />
-  </native>
-  <native type="3rdparty" name="COIOSHelper_x64.dll" stage="both">
-    <os arch="x64" family="windows" />
-  </native>
     
  <!--  
         The gui preferences indication.
@@ -86,6 +112,8 @@
     <res src="Readme.txt"                       id="InfoPanel.info_eng" />
     <res src="fudaamascaret.jpg"                id="Installer.image" />
     <res src="izpack/RegistrySpec.xml"          id="RegistrySpec.xml" />
+    <res src="izpack/customLangPack_eng.xml"    id="CustomLangPack.xml_eng"/>
+    <res src="izpack/customLangPack.xml"        id="CustomLangPack.xml" />
   </resources>
 
  <!--  
@@ -94,8 +122,11 @@
     
   --> 
   <panels>
-    <panel classname="CheckedHelloPanel" />
-    <panel classname="InfoPanel" />
+    <panel classname="InfoPanel">
+      <validator classname="com.izforge.izpack.installer.validator.ConditionValidator"/>
+    </panel>
+    <panel classname="CheckedHelloPanel">
+    </panel>
     <panel classname="LicencePanel" />
     <panel classname="TargetPanel" />
     <panel classname="PacksPanel" />
@@ -112,25 +143,13 @@
     <pack name="Core" required="yes">
       <description>L'application de base integrant l'interface graphique Fudaa-Mascaret et le code de calcul Mascaret</description>
       <file src="../../target/fudaa-mascaret.jar" targetdir="$INSTALL_PATH" />
-      
 
-      <!-- file src="../../aide/src/mascaret" excludes="**/.svn/**" targetdir="$INSTALL_PATH/aide/src" / -->
-      <!--aide non a jour donc enlevée-->
-      <!--<fileset dir="../../aide/src/mascaret" targetdir="$INSTALL_PATH/aide/src/mascaret">-->
-      <!--				<include name="**/*.html"/>
-    				<include name="**/*.htm"/>
-    				<include name="**/*.gif"/>
-    				<include name="**/*.jpeg"/>
-    				<include name="**/*.jpg"/>
-    				<include name="**/*.png"/>
-   			</fileset>-->
-
       <fileset os="windows" dir="icons" targetdir="$INSTALL_PATH/icons">
         <include name="*.ico"/>
       </fileset>
       <!--un dossier fudaa doit exister au meme niveau que le dossier "fudaa-mascaret"-->
       <fileset os="windows" dir="../../../../fudaa/serveurs" targetdir="$INSTALL_PATH/serveurs">
-      	<exclude name="mascaret/*/mascaret" />
+        <exclude name="mascaret/*/mascaret" />
       </fileset>
       <!-- Lancement de secours si les raccourcis ne fonctionnent pas -->
       <file os="windows" src="fudaa-mascaret.bat" targetdir="$INSTALL_PATH" />
@@ -144,7 +163,7 @@
       </fileset>
       <!--un dossier fudaa doit exister au meme niveau que le dossier "fudaa-mascaret"-->
       <fileset os="unix" dir="../../../../fudaa/serveurs" targetdir="$INSTALL_PATH/serveurs">
-      	<exclude name="mascaret/*/mascaret.exe" />
+        <exclude name="mascaret/*/mascaret.exe" />
       </fileset>
       <!-- Lancement de secours si les raccourcis ne fonctionnent pas -->
       <file os="unix" src="fudaa-mascaret.sh" targetdir="$INSTALL_PATH" />
@@ -172,21 +191,10 @@
     <pack name="Docs" required="no">
       <description>Le guide de prise en main de Fudaa-Mascaret</description>
 
-      <!-- file src="doc" excludes=".svn" targetdir="$INSTALL_PATH" / --> <!-- Reccursive adding -->
       <fileset dir="doc" targetdir="$INSTALL_PATH/doc">
         <include name="**/*.pdf"/>
       </fileset>
     </pack>
-    <!--		<pack name="Sources" required="no">
-   			<description>Le code source du projet Fudaa</description>
-   			<fileset dir="../.." targetdir="$INSTALL_PATH/src">
-    				<include name="ctulu/src/**/*.*"/>
-    				<include name="dodico/idl/**/*.*" />
-    				<include name="dodico/src/**/*.*" />
-    				<include name="ebli/src/**/*.*" />
-    				<include name="fudaa/src/**/*.*" />
-   			</fileset>
-  		</pack>-->
   </packs>
      
-</installation>
+</izpack:installation>
\ No newline at end of file

Deleted: trunk/soft/fudaa-mascaret/distrib/src/dist/izpack/standalone-compiler.jar
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.