Implementation of the "20494: EDF 1123 KERNEL/GUI : Improvment of 'About' dialog...

diff --git a/configure.ac b/configure.ac
index 9515a1f7530773a48e93a567e51677a98459d899..52e53052159d9193c607c526cec3f7c8f3b31ab3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -399,5 +399,6 @@ AC_OUTPUT([ \
        src/HOMARD_SWIG/Makefile \
        resources/Makefile \
        resources/HOMARDCatalog.xml \
+       resources/SalomeApp.xml \
        tests/Makefile \
 ])

diff --git a/resources/Makefile.am b/resources/Makefile.am
index 037d1c216a5407ebea95e1839f536fb8b097d7f5..e7ffbc99c097b268ccde815f53ec288fab0c06d0 100644 (file)
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -20,7 +20,7 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 
 dist_salomeres_DATA =   \
-       SalomeApp.xml   \
+       $(top_builddir)/resources/SalomeApp.xml \
        boxdxyz.png \
        boxdxyz_2.png \
        cas_calcule.png \

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
deleted file mode 100644 (file)
index f7564bc..0000000
--- a/resources/SalomeApp.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-  Copyright (C) 2011  CEA/DEN, EDF R&D
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-
-  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
--->
- 
-<document>
-  <section name="HOMARD">
-    <!-- Major module parameters -->
-    <parameter name="name"    value="Homard"/>
-    <parameter name="icon"    value="HOMARD.png"/>
-  </section>
-  <section name="resources">
-    <!-- Module resources -->
-    <parameter name="HOMARD" value="${HOMARD_ROOT_DIR}/share/salome/resources/homard"/>
-  </section>
-</document>

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
new file mode 100644 (file)
index 0000000..30e6d24
--- /dev/null
+++ b/resources/SalomeApp.xml.in
@@ -0,0 +1,33 @@
+<!--
+  Copyright (C) 2011  CEA/DEN, EDF R&D
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+
+  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+
+-->
+ 
+<document>
+  <section name="HOMARD">
+    <!-- Major module parameters -->
+    <parameter name="name"    value="Homard"/>
+    <parameter name="icon"    value="HOMARD.png"/>
+    <parameter name="HOMARD_VERSION"    value="@VERSION@"/>
+  </section>
+  <section name="resources">
+    <!-- Module resources -->
+    <parameter name="HOMARD" value="${HOMARD_ROOT_DIR}/share/salome/resources/homard"/>
+  </section>
+</document>