JAR: add information to the manifest 71/3871/4
Clément DAVID [Wed, 20 Apr 2011 09:26:40 +0000 (11:26 +0200)]
Description from the module build.xml
Version from Version.incl
Vendor set on scilab.properties

Change-Id: I4fa6821c875f3d1d2d853a1d1eea5cf067aac78d

25 files changed:
scilab/build.incl.xml
scilab/modules/action_binding/build.xml
scilab/modules/commons/build.xml
scilab/modules/completion/build.xml
scilab/modules/console/build.xml
scilab/modules/core/build.xml
scilab/modules/graph/build.xml
scilab/modules/graphic_export/build.xml
scilab/modules/gui/build.xml
scilab/modules/hdf5/build.xml
scilab/modules/helptools/build.xml
scilab/modules/history_browser/build.xml
scilab/modules/history_manager/build.xml
scilab/modules/javasci/build.xml
scilab/modules/jvm/build.xml
scilab/modules/localization/build.xml
scilab/modules/output_stream/build.xml
scilab/modules/renderer/build.xml
scilab/modules/scinotes/build.xml
scilab/modules/shell/build.xml
scilab/modules/types/build.xml
scilab/modules/ui_data/build.xml
scilab/modules/xcos/build.xml
scilab/scilab.properties.in
scilab/scilab.properties.vc

index fa6b615..482ec90 100644 (file)
@@ -33,6 +33,8 @@
   <property file="${base.dir}/scilab-lib-doc.properties"/>
   <!-- Configure ANT flags -->
   <property file="${base.dir}/scilab.properties"/>
+  <!-- Set ${SCIVERSION} -->
+  <property file="${base.dir}/Version.incl"/>
   <path id="checkstyle.classpath">
     <pathelement location="${checkstyle.jar}"/>
     <pathelement location="${commons-logging.jar}"/>
@@ -88,8 +90,6 @@
     <pathelement location="${jeuclid-core.jar}"/>
     <pathelement location="${jlatexmath.jar}"/>
   </path>
-
-
   <taskdef resource="checkstyletask.properties" classpathref="checkstyle.classpath"/>
   <!-- Checkstyle process -->
   <target name="checkstyle" depends="checkstyle-init" description="Generates a report of code convention violations.">
          or if there is a mistake in the build system
      -->
     <fail message="JDK 1.6 or 1.7 required">
-       <condition>
+      <condition>
         <not>
           <or>
-            <equals arg1="${ant.java.version}" arg2="1.6" />
-            <equals arg1="${ant.java.version}" arg2="1.7" />
+            <equals arg1="${ant.java.version}" arg2="1.6"/>
+            <equals arg1="${ant.java.version}" arg2="1.7"/>
           </or>
         </not>
-       </condition>
+      </condition>
     </fail>
     <mkdir dir="${classes.dir}"/>
     <mkdir dir="${classes.test.dir}"/>
   <target name="jar" description="Build the jar file" depends="compile">
     <jar destfile="${build.jar.dir}/${library.name}" basedir="${classes.dir}">
       <manifest>
+        <attribute name="Built-By" value="${user.name}"/>
+        <section name="org/scilab/modules/${ant.project.name}/">
+          <attribute name="Specification-Title" value="${library.title}"/>
+          <attribute name="Specification-Version" value="${SCIVERSION}"/>
+          <attribute name="Specification-Vendor" value="${library.vendor}"/>
+          <attribute name="Implementation-Title" value="${library.name}"/>
+          <attribute name="Implementation-Version" value="${DSTAMP} ${TSTAMP}"/>
+          <attribute name="Implementation-Vendor" value="${library.vendor}"/>
+        </section>
       </manifest>
     </jar>
   </target>
index 54e32de..2dfece8 100644 (file)
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  -->
-
 <project name="action_binding" default="jar">
   <import file="../../build.incl.xml"/>
-
-  <property name="library.name" value="${library.action_binding.name}" />
-
+  <property name="library.name" value="${library.action_binding.name}"/>
+  <property name="library.title" value="Java-Scilab communication"/>
   <description>
        Build the action_binding Scilab module
   </description>
-
 </project>
-
index 7723e45..e20ab49 100644 (file)
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  -->
-
 <project name="commons" default="jar">
-
   <import file="../../build.incl.xml"/>
-  <property name="library.name" value="${library.commons.name}" />
-
+  <property name="library.name" value="${library.commons.name}"/>
+  <property name="library.title" value="Commons for Scilab modules"/>
   <description>
                        Build the Scilab commons module
   </description>
-
 </project>
index 4e1e9df..a5395e0 100644 (file)
  -->
 <project name="completion" default="jar">
   <import file="../../build.incl.xml"/>
-
-  <property name="library.name" value="${library.completion.name}" />
-
+  <property name="library.name" value="${library.completion.name}"/>
+  <property name="library.title" value="Scilab commands completion"/>
   <description>
        Build "completion" module
   </description>
-
 </project>
index 7b1ed68..4d216fc 100644 (file)
  -->
 <project name="console" default="jar">
   <import file="../../build.incl.xml"/>
-
-  <property name="library.name" value="${library.console.name}" />
-
+  <property name="library.name" value="${library.console.name}"/>
+  <property name="library.title" value="Scilab console"/>
   <description>
        Build the console Scilab module
   </description>
-
 </project>
index f3e83f0..6cbb504 100644 (file)
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  -->
-
 <project name="core" default="jar">
   <import file="../../build.incl.xml"/>
-
-  <property name="library.name" value="${library.core.name}" />
-
+  <property name="library.name" value="${library.core.name}"/>
+  <property name="library.title" value="Scilab application"/>
   <description>
        Build the core Scilab module
   </description>
-
 </project>
index 4f747d5..993f9ac 100644 (file)
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  -->
-
 <project name="graph" default="jar">
-
   <import file="../../build.incl.xml"/>
-  <property name="library.name" value="${library.graph.name}" />
-
+  <property name="library.name" value="${library.graph.name}"/>
+  <property name="library.title" value="Graph drawing"/>
   <description>
                        Build the Scilab graph module
   </description>
-
 </project>
index c64598f..c49bc17 100644 (file)
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  -->
-
 <project name="graphic_export" default="jar">
   <import file="../../build.incl.xml"/>
-
-  <property name="library.name" value="${library.graphic_export.name}" />
-
+  <property name="library.name" value="${library.graphic_export.name}"/>
+  <property name="library.title" value="Export plot to any image format"/>
   <description>
        Build the graphic export Scilab module
   </description>
-
 </project>
index bf09d1a..e841d8f 100644 (file)
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  -->
-
 <project name="gui" default="jar">
-
   <import file="../../build.incl.xml"/>
-  <property name="library.name" value="${library.gui.name}" />
-
+  <property name="library.name" value="${library.gui.name}"/>
+  <property name="library.title" value="Graphical interface"/>
   <description>
                        Build the Scilab GUI module
   </description>
-
 </project>
index 17466b5..e869bd9 100644 (file)
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  -->
-
 <project name="hdf5" default="jar">
   <import file="../../build.incl.xml"/>
-
-  <property name="library.name" value="${library.hdf5.name}" />
-
+  <property name="library.name" value="${library.hdf5.name}"/>
+  <property name="library.title" value="HDF format support"/>
   <description>
        Build the hdf5 Scilab module
   </description>
-
 </project>
-
index cfce8f8..bd12d90 100644 (file)
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  -->
-
 <project name="helptools" default="jar">
-
   <import file="../../build.incl.xml"/>
-  <property name="library.name" value="${library.helptools.name}" />
-  <property name="isDocBuilding" value="True" />
-
+  <property name="library.name" value="${library.helptools.name}"/>
+  <property name="library.title" value="Help components"/>
+  <property name="isDocBuilding" value="True"/>
   <description>
                        Build the Scilab Help Tools module
   </description>
-
 </project>
index 7f1b1c1..75e3fd3 100644 (file)
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  -->
-
 <project name="history_browser" default="jar">
-
   <import file="../../build.incl.xml"/>
-  <property name="library.name" value="${library.history_browser.name}" />
-
+  <property name="library.name" value="${library.history_browser.name}"/>
+  <property name="library.title" value="Scilab history browser"/>
   <description>
                        Build the Scilab history_browser module
   </description>
-
 </project>
index 591c580..e9b6262 100644 (file)
@@ -12,9 +12,8 @@
  -->
 <project name="history_manager" default="jar">
   <import file="../../build.incl.xml"/>
-
-  <property name="library.name" value="${library.history_manager.name}" />
-
+  <property name="library.name" value="${library.history_manager.name}"/>
+  <property name="library.title" value="Scilab history manager"/>
   <description>
        Build "history_manager" Scilab module
   </description>
index 211bf62..287b575 100644 (file)
  -->
 <project name="javasci" default="build-examples">
   <import file="../../build.incl.xml"/>
-  <property name="library-v1.name" value="${library.javasci-v1.name}" />
-  <property name="library.name" value="${library.javasci.name}" />
-
-       
+  <property name="library-v1.name" value="${library.javasci-v1.name}"/>
+  <property name="library.name" value="${library.javasci.name}"/>
+  <property name="library.title" value="Scilab Java API"/>
   <description>
        Build the Java/Scilab connecter (javasci) module
   </description>
-
-        <!-- Compile sources -->
-        <target name="compile-v1" description="Build sources of Javasci v1" depends="init">
-        <mkdir dir="${classes.dir}/v1/"/>
-                <javac
-                        srcdir="src/java/javasci/" 
-                        destdir="${classes.dir}/v1/" 
-                        classpathref="compile.classpath" 
-                        deprecation="on"
-                        debug="off"
-                        verbose="off"
-                        listfiles="on"
-                        includeAntRuntime="no"
-                        source="5"
-                        />
-        </target>
-
-        <!-- Compile sources -->
-        <target name="compile" description="Build sources of Javasci v2" depends="init">
-        <mkdir dir="${classes.dir}/v2/"/>
-                <javac
-                        srcdir="src/java/org/" 
-                        destdir="${classes.dir}/v2/"
-                        classpathref="compile.classpath" 
-                        deprecation="on"
-                        debug="off"
-                        verbose="off"
-                        listfiles="on"
-                        includeAntRuntime="no"
-                        source="5"
-                        />
-        </target>
-
-  <property name="examples.classes.dir" location="${build.dir}/examples/" />
-
+  <!-- Compile sources -->
+  <target name="compile-v1" description="Build sources of Javasci v1" depends="init">
+    <mkdir dir="${classes.dir}/v1/"/>
+    <javac srcdir="src/java/javasci/" destdir="${classes.dir}/v1/" classpathref="compile.classpath" deprecation="on" debug="off" verbose="off" listfiles="on" includeAntRuntime="no" source="5"/>
+  </target>
+  <!-- Compile sources -->
+  <target name="compile" description="Build sources of Javasci v2" depends="init">
+    <mkdir dir="${classes.dir}/v2/"/>
+    <javac srcdir="src/java/org/" destdir="${classes.dir}/v2/" classpathref="compile.classpath" deprecation="on" debug="off" verbose="off" listfiles="on" includeAntRuntime="no" source="5"/>
+  </target>
+  <property name="examples.classes.dir" location="${build.dir}/examples/"/>
   <target name="build-examples" description="Build the examples" depends="jar, jar-v1">
-        <property name="examples.src.dir"  location="examples/others/" />
-        <mkdir dir="${examples.classes.dir}"/>
-
-                <javac
-                        srcdir="${examples.src.dir}"
-                        destdir="${examples.classes.dir}"
-                        classpath="${library.javasci.dir}/${library.javasci-v1.name}"
-                        deprecation="on"
-                        debug="off"
-                        verbose="off"
-                        listfiles="on"
-                        includeAntRuntime="no"
-                        source="5"
-                        />
-
+    <property name="examples.src.dir" location="examples/others/"/>
+    <mkdir dir="${examples.classes.dir}"/>
+    <javac srcdir="${examples.src.dir}" destdir="${examples.classes.dir}" classpath="${library.javasci.dir}/${library.javasci-v1.name}" deprecation="on" debug="off" verbose="off" listfiles="on" includeAntRuntime="no" source="5"/>
   </target>
-
   <target name="clean-examples" description="clean examples">
-         <delete dir="${examples.classes.dir}"/>
+    <delete dir="${examples.classes.dir}"/>
   </target>
-
   <target name="jar-v1" description="Build the jar file" depends="compile-v1">
-      <manifestclasspath property="manifest-v1.classpath" jarfile="${build.jar.dir}/${library-v1.name}">
-          <classpath location="${library.jvm.dir}/${library.jvm.name}" />
-      </manifestclasspath>
-
-       <jar destfile="${build.jar.dir}/${library-v1.name}" basedir="${classes.dir}/v1/">
-
-         <manifest>
-               <attribute name="SciAbstractDataType" value="javasci.SciAbstractDataType"/>
-               <attribute name="SciBooleanArray" value="javasci.SciBooleanArray"/>
-               <attribute name="SciComplexArray" value="javasci.SciComplexArray"/>
-               <attribute name="SciDoubleArray" value="javasci.SciDoubleArray"/>
-               <attribute name="SciString" value="javasci.SciString"/>
-               <attribute name="BadDataArgumentException" value="javasci.BadDataArgumentException"/>
-               <attribute name="SciAbstractArray" value="javasci.SciAbstractArray"/>
-               <attribute name="SciBoolean" value="javasci.SciBoolean"/>
-               <attribute name="SciComplex" value="javasci.SciComplex"/>
-               <attribute name="SciDouble" value="javasci.SciDouble"/>
-               <attribute name="Scilab" value="javasci.Scilab"/>
-               <attribute name="SciStringArray" value="javasci.SciStringArray"/>
-               <attribute name="ClassPath" value="javasci.ClassPath"/>
-               <attribute name="LibraryPath" value="javasci.LibraryPath"/>
+    <manifestclasspath property="manifest-v1.classpath" jarfile="${build.jar.dir}/${library-v1.name}">
+      <classpath location="${library.jvm.dir}/${library.jvm.name}"/>
+    </manifestclasspath>
+    <jar destfile="${build.jar.dir}/${library-v1.name}" basedir="${classes.dir}/v1/">
+      <manifest>
+        <attribute name="SciAbstractDataType" value="javasci.SciAbstractDataType"/>
+        <attribute name="SciBooleanArray" value="javasci.SciBooleanArray"/>
+        <attribute name="SciComplexArray" value="javasci.SciComplexArray"/>
+        <attribute name="SciDoubleArray" value="javasci.SciDoubleArray"/>
+        <attribute name="SciString" value="javasci.SciString"/>
+        <attribute name="BadDataArgumentException" value="javasci.BadDataArgumentException"/>
+        <attribute name="SciAbstractArray" value="javasci.SciAbstractArray"/>
+        <attribute name="SciBoolean" value="javasci.SciBoolean"/>
+        <attribute name="SciComplex" value="javasci.SciComplex"/>
+        <attribute name="SciDouble" value="javasci.SciDouble"/>
+        <attribute name="Scilab" value="javasci.Scilab"/>
+        <attribute name="SciStringArray" value="javasci.SciStringArray"/>
+        <attribute name="ClassPath" value="javasci.ClassPath"/>
+        <attribute name="LibraryPath" value="javasci.LibraryPath"/>
         <attribute name="Class-Path" value="${manifest-v1.classpath}"/>
-         </manifest>
-       </jar>
+      </manifest>
+    </jar>
+  </target>
+  <!-- Create the jar -->
+  <target name="jar" description="Build the jar file" depends="compile">
+    <manifestclasspath property="manifest.classpath" jarfile="${build.jar.dir}/${library.name}">
+      <classpath location="${library.jvm.dir}/${library.jvm.name}"/>
+    </manifestclasspath>
+    <jar destfile="${build.jar.dir}/${library.name}" basedir="${classes.dir}/v2/">
+      <manifest>
+        <attribute name="Class-Path" value="${manifest.classpath}"/>
+      </manifest>
+    </jar>
   </target>
-
-       <!-- Create the jar -->
-       <target name="jar" description="Build the jar file" depends="compile">
-        <manifestclasspath property="manifest.classpath" jarfile="${build.jar.dir}/${library.name}">
-             <classpath location="${library.jvm.dir}/${library.jvm.name}" />
-        </manifestclasspath>
-
-               <jar destfile="${build.jar.dir}/${library.name}" basedir="${classes.dir}/v2/">
-
-               <manifest>
-                <attribute name="Class-Path" value="${manifest.classpath}"/>
-               </manifest>
-               </jar>
-
-
-       </target>
-
 </project>
index 946756e..6a13688 100644 (file)
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) INRIA - Allan CORNET , Sylvestre LEDRU
  -->
 <project name="jvm" default="jar">
   <import file="../../build.incl.xml"/>
-
-  <property name="library.name" value="${library.jvm.name}" />
-
+  <property name="library.name" value="${library.jvm.name}"/>
+  <property name="library.title" value="JVM helpers"/>
   <description>
        Build the JVM Scilab module
   </description>
-
 </project>
index fd36391..c253774 100644 (file)
  *
  -->
 <project name="localization" default="jar">
-
   <import file="../../build.incl.xml"/>
-  <property name="library.name" value="${library.localization.name}" />
-
+  <property name="library.name" value="${library.localization.name}"/>
+  <property name="library.title" value="Localization support"/>
   <description>
                        Build the Scilab Localization module
   </description>
-
 </project>
index eb9c271..07a9f25 100644 (file)
@@ -12,9 +12,8 @@
  -->
 <project name="output_stream" default="jar">
   <import file="../../build.incl.xml"/>
-
-  <property name="library.name" value="${library.output_stream.name}" />
-
+  <property name="library.name" value="${library.output_stream.name}"/>
+  <property name="library.title" value="Scilab I/O"/>
   <description>
        Build "output_stream" Scilab module
   </description>
index ea93cf1..2f6dfeb 100644 (file)
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  -->
 <project name="renderer" default="jar">
   <import file="../../build.incl.xml"/>
-
-  <property name="library.name" value="${library.renderer.name}" />
-
+  <property name="library.name" value="${library.renderer.name}"/>
+  <property name="library.title" value="Plot management"/>
   <description>
        Build the renderer Scilab module
   </description>
-
 </project>
index 14f9912..9730dbf 100644 (file)
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  -->
-
 <project name="scinotes" default="jar">
-
   <import file="../../build.incl.xml"/>
-  <property name="library.name" value="${library.scinotes.name}" />
-
+  <property name="library.name" value="${library.scinotes.name}"/>
+  <property name="library.title" value="Text editor for Scilab"/>
   <description>
     Build the Scilab scinotes module
   </description>
-
 </project>
index fd734c9..651510e 100644 (file)
     *
  -->
 <project name="shell" default="jar">
-
   <import file="../../build.incl.xml"/>
-  <property name="library.name" value="${library.shell.name}" />
-
+  <property name="library.name" value="${library.shell.name}"/>
+  <property name="library.title" value="Java read/write command access"/>
   <description>
                        Build the Scilab Shell module
   </description>
-
 </project>
index aae4807..bd2de9a 100644 (file)
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  -->
-
 <project name="types" default="jar">
-
   <import file="../../build.incl.xml"/>
-  <property name="library.name" value="${library.types.name}" />
-
+  <property name="library.name" value="${library.types.name}"/>
+  <property name="library.title" value="Java compatible types"/>
   <description>
                        Build the Scilab types module
   </description>
-
 </project>
index 0d01abb..8cdae80 100644 (file)
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  -->
-
 <project name="ui_data" default="jar">
-
   <import file="../../build.incl.xml"/>
-  <property name="library.name" value="${library.ui_data.name}" />
-
+  <property name="library.name" value="${library.ui_data.name}"/>
+  <property name="library.title" value="User interface graphical components"/>
   <description>
                        Build the Scilab ui_data module
   </description>
-
 </project>
index 2eb76fa..c5ca4fd 100644 (file)
@@ -14,6 +14,7 @@
 <project name="xcos" default="jar">
   <import file="../../build.incl.xml"/>
   <property name="library.name" value="${library.xcos.name}"/>
+  <property name="library.title" value="Modeler and simulator for hybrid systems"/>
   <description>
       Build the Scilab xcos module
   </description>
index 8cae230..0ccb3ca 100644 (file)
@@ -1,3 +1,5 @@
 ; Definition ANT flags for Scilab
 
 build.debug=@JAVAC_DEBUG@
+library.vendor="The Scilab Consortium - DIGITEO"
+
index 1691c15..2e919d3 100644 (file)
@@ -1,3 +1,6 @@
 ; Definition ANT flags for Scilab
 
 build.debug=off
+library.vendor="The Scilab Consortium - DIGITEO"
+
+