Additional modifications for the "20494: EDF 1123 KERNEL/GUI : Improvment of 'About...

diff --git a/configure.ac b/configure.ac
index dda193f3cc800c6f0d8b4542b3419bdab7fb6870..8d84682c5979c9803b50a61348c3508baa105672 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -137,6 +137,7 @@ AC_OUTPUT([ \
   src/standalone/start_jobmanager.sh \
   src/salomegui/Makefile \
   src/salomegui/JOBMANAGER_version.h \
+  src/salomegui/resources/SalomeApp.xml \
   doc/Makefile \
   doc/conf.py \
 ])

diff --git a/src/salomegui/Makefile.am b/src/salomegui/Makefile.am
index af7f056bd2bd0012d173241970f19abe613e66c1..3c9e4313584473c030864dc8fe529d396f8bb962 100644 (file)
--- a/src/salomegui/Makefile.am
+++ b/src/salomegui/Makefile.am
@@ -55,9 +55,11 @@ salomeinclude_HEADERS = BL_SalomeGui.hxx \
                        JOBMANAGER_version.h
 
 # resources files
-LIBICONS = SalomeApp.xml jobmanager.png
+LIBICONS = jobmanager.png
+LIBRES = $(top_builddir)/src/salomegui/resources/SalomeApp.xml
+
 dist_salomeres_DATA = ${ICONS}
-ICONS = $(LIBICONS:%=resources/%)
+ICONS = $(LIBICONS:%=resources/%) $(LIBRES)
 
 # --------------------------------------------
 # *.h --> *_moc.cxx

diff --git a/src/salomegui/resources/SalomeApp.xml b/src/salomegui/resources/SalomeApp.xml
deleted file mode 100644 (file)
index a964d89..0000000
--- a/src/salomegui/resources/SalomeApp.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  Copyright (C) 2009-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="JOBMANAGER">
-    <!-- Major module parameters -->
-    <parameter name="name" value="JobManager"/>
-    <parameter name="icon" value="jobmanager.png"/>
-    <parameter name="documentation" value="jobmanager_help"/>
-  </section>
-  <section name="resources">
-    <!-- Module resources -->
-    <parameter name="JOBMANAGER" value="${JOBMANAGER_ROOT_DIR}/share/salome/resources/jobmanager"/>
-  </section>
-  <section name="jobmanager_help">
-    <parameter name="sub_menu"     value="%1 module"/>
-    <parameter name="User's Guide" value="${JOBMANAGER_ROOT_DIR}/share/doc/salome/gui/JOBMANAGER/index.html"/>
-  </section>
-</document>

diff --git a/src/salomegui/resources/SalomeApp.xml.in b/src/salomegui/resources/SalomeApp.xml.in
new file mode 100644 (file)
index 0000000..26ab6ee
--- /dev/null
+++ b/src/salomegui/resources/SalomeApp.xml.in
@@ -0,0 +1,37 @@
+<!--
+  Copyright (C) 2009-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="JOBMANAGER">
+    <!-- Major module parameters -->
+    <parameter name="name" value="JobManager"/>
+    <parameter name="icon" value="jobmanager.png"/>
+    <parameter name="documentation" value="jobmanager_help"/>
+    <parameter name="version" value="@VERSION@"/>
+  </section>
+  <section name="resources">
+    <!-- Module resources -->
+    <parameter name="JOBMANAGER" value="%JOBMANAGER_ROOT_DIR%/share/salome/resources/jobmanager"/>
+  </section>
+  <section name="jobmanager_help">
+    <parameter name="sub_menu"     value="%1 module"/>
+    <parameter name="User's Guide" value="%JOBMANAGER_ROOT_DIR%/share/doc/salome/gui/JOBMANAGER/index.html"/>
+  </section>
+</document>