summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément DAVID <clement.david@scilab.org>2011-04-20 11:26:40 +0200
committerVincent COUVERT <vincent.couvert@scilab.org>2011-04-29 14:50:50 +0200
commit54eda2e81eabe7af3c686cc8081c6ec8dac7f44e (patch)
treea77414777617d6d03140d086d03d3ee0c36c5b50
parent784228d4d9a2799966314994e71ef121cc1fcd21 (diff)
downloadscilab-54eda2e81eabe7af3c686cc8081c6ec8dac7f44e.zip
scilab-54eda2e81eabe7af3c686cc8081c6ec8dac7f44e.tar.gz
JAR: add information to the manifest
Description from the module build.xml Version from Version.incl Vendor set on scilab.properties Change-Id: I4fa6821c875f3d1d2d853a1d1eea5cf067aac78d
-rw-r--r--scilab/build.incl.xml21
-rw-r--r--scilab/modules/action_binding/build.xml8
-rw-r--r--scilab/modules/commons/build.xml7
-rw-r--r--scilab/modules/completion/build.xml6
-rw-r--r--scilab/modules/console/build.xml6
-rw-r--r--scilab/modules/core/build.xml7
-rw-r--r--scilab/modules/graph/build.xml7
-rw-r--r--scilab/modules/graphic_export/build.xml7
-rw-r--r--scilab/modules/gui/build.xml7
-rw-r--r--scilab/modules/hdf5/build.xml8
-rw-r--r--scilab/modules/helptools/build.xml9
-rw-r--r--scilab/modules/history_browser/build.xml7
-rw-r--r--scilab/modules/history_manager/build.xml5
-rw-r--r--scilab/modules/javasci/build.xml147
-rw-r--r--scilab/modules/jvm/build.xml8
-rw-r--r--scilab/modules/localization/build.xml6
-rw-r--r--scilab/modules/output_stream/build.xml5
-rw-r--r--scilab/modules/renderer/build.xml7
-rw-r--r--scilab/modules/scinotes/build.xml7
-rw-r--r--scilab/modules/shell/build.xml6
-rw-r--r--scilab/modules/types/build.xml7
-rw-r--r--scilab/modules/ui_data/build.xml7
-rw-r--r--scilab/modules/xcos/build.xml1
-rw-r--r--scilab/scilab.properties.in2
-rw-r--r--scilab/scilab.properties.vc3
25 files changed, 112 insertions, 199 deletions
diff --git a/scilab/build.incl.xml b/scilab/build.incl.xml
index fa6b615..482ec90 100644
--- a/scilab/build.incl.xml
+++ b/scilab/build.incl.xml
@@ -33,6 +33,8 @@
33 <property file="${base.dir}/scilab-lib-doc.properties"/> 33 <property file="${base.dir}/scilab-lib-doc.properties"/>
34 <!-- Configure ANT flags --> 34 <!-- Configure ANT flags -->
35 <property file="${base.dir}/scilab.properties"/> 35 <property file="${base.dir}/scilab.properties"/>
36 <!-- Set ${SCIVERSION} -->
37 <property file="${base.dir}/Version.incl"/>
36 <path id="checkstyle.classpath"> 38 <path id="checkstyle.classpath">
37 <pathelement location="${checkstyle.jar}"/> 39 <pathelement location="${checkstyle.jar}"/>
38 <pathelement location="${commons-logging.jar}"/> 40 <pathelement location="${commons-logging.jar}"/>
@@ -88,8 +90,6 @@
88 <pathelement location="${jeuclid-core.jar}"/> 90 <pathelement location="${jeuclid-core.jar}"/>
89 <pathelement location="${jlatexmath.jar}"/> 91 <pathelement location="${jlatexmath.jar}"/>
90 </path> 92 </path>
91
92
93 <taskdef resource="checkstyletask.properties" classpathref="checkstyle.classpath"/> 93 <taskdef resource="checkstyletask.properties" classpathref="checkstyle.classpath"/>
94 <!-- Checkstyle process --> 94 <!-- Checkstyle process -->
95 <target name="checkstyle" depends="checkstyle-init" description="Generates a report of code convention violations."> 95 <target name="checkstyle" depends="checkstyle-init" description="Generates a report of code convention violations.">
@@ -133,14 +133,14 @@
133 or if there is a mistake in the build system 133 or if there is a mistake in the build system
134 --> 134 -->
135 <fail message="JDK 1.6 or 1.7 required"> 135 <fail message="JDK 1.6 or 1.7 required">
136 <condition> 136 <condition>
137 <not> 137 <not>
138 <or> 138 <or>
139 <equals arg1="${ant.java.version}" arg2="1.6" /> 139 <equals arg1="${ant.java.version}" arg2="1.6"/>
140 <equals arg1="${ant.java.version}" arg2="1.7" /> 140 <equals arg1="${ant.java.version}" arg2="1.7"/>
141 </or> 141 </or>
142 </not> 142 </not>
143 </condition> 143 </condition>
144 </fail> 144 </fail>
145 <mkdir dir="${classes.dir}"/> 145 <mkdir dir="${classes.dir}"/>
146 <mkdir dir="${classes.test.dir}"/> 146 <mkdir dir="${classes.test.dir}"/>
@@ -179,6 +179,15 @@
179 <target name="jar" description="Build the jar file" depends="compile"> 179 <target name="jar" description="Build the jar file" depends="compile">
180 <jar destfile="${build.jar.dir}/${library.name}" basedir="${classes.dir}"> 180 <jar destfile="${build.jar.dir}/${library.name}" basedir="${classes.dir}">
181 <manifest> 181 <manifest>
182 <attribute name="Built-By" value="${user.name}"/>
183 <section name="org/scilab/modules/${ant.project.name}/">
184 <attribute name="Specification-Title" value="${library.title}"/>
185 <attribute name="Specification-Version" value="${SCIVERSION}"/>
186 <attribute name="Specification-Vendor" value="${library.vendor}"/>
187 <attribute name="Implementation-Title" value="${library.name}"/>
188 <attribute name="Implementation-Version" value="${DSTAMP} ${TSTAMP}"/>
189 <attribute name="Implementation-Vendor" value="${library.vendor}"/>
190 </section>
182 </manifest> 191 </manifest>
183 </jar> 192 </jar>
184 </target> 193 </target>
diff --git a/scilab/modules/action_binding/build.xml b/scilab/modules/action_binding/build.xml
index 54e32de..2dfece8 100644
--- a/scilab/modules/action_binding/build.xml
+++ b/scilab/modules/action_binding/build.xml
@@ -12,15 +12,11 @@
12 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 12 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
13 * 13 *
14 --> 14 -->
15
16<project name="action_binding" default="jar"> 15<project name="action_binding" default="jar">
17 <import file="../../build.incl.xml"/> 16 <import file="../../build.incl.xml"/>
18 17 <property name="library.name" value="${library.action_binding.name}"/>
19 <property name="library.name" value="${library.action_binding.name}" /> 18 <property name="library.title" value="Java-Scilab communication"/>
20
21 <description> 19 <description>
22 Build the action_binding Scilab module 20 Build the action_binding Scilab module
23 </description> 21 </description>
24
25</project> 22</project>
26
diff --git a/scilab/modules/commons/build.xml b/scilab/modules/commons/build.xml
index 7723e45..e20ab49 100644
--- a/scilab/modules/commons/build.xml
+++ b/scilab/modules/commons/build.xml
@@ -10,14 +10,11 @@
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 * 11 *
12 --> 12 -->
13
14<project name="commons" default="jar"> 13<project name="commons" default="jar">
15
16 <import file="../../build.incl.xml"/> 14 <import file="../../build.incl.xml"/>
17 <property name="library.name" value="${library.commons.name}" /> 15 <property name="library.name" value="${library.commons.name}"/>
18 16 <property name="library.title" value="Commons for Scilab modules"/>
19 <description> 17 <description>
20 Build the Scilab commons module 18 Build the Scilab commons module
21 </description> 19 </description>
22
23</project> 20</project>
diff --git a/scilab/modules/completion/build.xml b/scilab/modules/completion/build.xml
index 4e1e9df..a5395e0 100644
--- a/scilab/modules/completion/build.xml
+++ b/scilab/modules/completion/build.xml
@@ -12,11 +12,9 @@
12 --> 12 -->
13<project name="completion" default="jar"> 13<project name="completion" default="jar">
14 <import file="../../build.incl.xml"/> 14 <import file="../../build.incl.xml"/>
15 15 <property name="library.name" value="${library.completion.name}"/>
16 <property name="library.name" value="${library.completion.name}" /> 16 <property name="library.title" value="Scilab commands completion"/>
17
18 <description> 17 <description>
19 Build "completion" module 18 Build "completion" module
20 </description> 19 </description>
21
22</project> 20</project>
diff --git a/scilab/modules/console/build.xml b/scilab/modules/console/build.xml
index 7b1ed68..4d216fc 100644
--- a/scilab/modules/console/build.xml
+++ b/scilab/modules/console/build.xml
@@ -14,11 +14,9 @@
14 --> 14 -->
15<project name="console" default="jar"> 15<project name="console" default="jar">
16 <import file="../../build.incl.xml"/> 16 <import file="../../build.incl.xml"/>
17 17 <property name="library.name" value="${library.console.name}"/>
18 <property name="library.name" value="${library.console.name}" /> 18 <property name="library.title" value="Scilab console"/>
19
20 <description> 19 <description>
21 Build the console Scilab module 20 Build the console Scilab module
22 </description> 21 </description>
23
24</project> 22</project>
diff --git a/scilab/modules/core/build.xml b/scilab/modules/core/build.xml
index f3e83f0..6cbb504 100644
--- a/scilab/modules/core/build.xml
+++ b/scilab/modules/core/build.xml
@@ -10,14 +10,11 @@
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 * 11 *
12 --> 12 -->
13
14<project name="core" default="jar"> 13<project name="core" default="jar">
15 <import file="../../build.incl.xml"/> 14 <import file="../../build.incl.xml"/>
16 15 <property name="library.name" value="${library.core.name}"/>
17 <property name="library.name" value="${library.core.name}" /> 16 <property name="library.title" value="Scilab application"/>
18
19 <description> 17 <description>
20 Build the core Scilab module 18 Build the core Scilab module
21 </description> 19 </description>
22
23</project> 20</project>
diff --git a/scilab/modules/graph/build.xml b/scilab/modules/graph/build.xml
index 4f747d5..993f9ac 100644
--- a/scilab/modules/graph/build.xml
+++ b/scilab/modules/graph/build.xml
@@ -10,14 +10,11 @@
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 * 11 *
12 --> 12 -->
13
14<project name="graph" default="jar"> 13<project name="graph" default="jar">
15
16 <import file="../../build.incl.xml"/> 14 <import file="../../build.incl.xml"/>
17 <property name="library.name" value="${library.graph.name}" /> 15 <property name="library.name" value="${library.graph.name}"/>
18 16 <property name="library.title" value="Graph drawing"/>
19 <description> 17 <description>
20 Build the Scilab graph module 18 Build the Scilab graph module
21 </description> 19 </description>
22
23</project> 20</project>
diff --git a/scilab/modules/graphic_export/build.xml b/scilab/modules/graphic_export/build.xml
index c64598f..c49bc17 100644
--- a/scilab/modules/graphic_export/build.xml
+++ b/scilab/modules/graphic_export/build.xml
@@ -11,14 +11,11 @@
11 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 11 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
12 * 12 *
13 --> 13 -->
14
15<project name="graphic_export" default="jar"> 14<project name="graphic_export" default="jar">
16 <import file="../../build.incl.xml"/> 15 <import file="../../build.incl.xml"/>
17 16 <property name="library.name" value="${library.graphic_export.name}"/>
18 <property name="library.name" value="${library.graphic_export.name}" /> 17 <property name="library.title" value="Export plot to any image format"/>
19
20 <description> 18 <description>
21 Build the graphic export Scilab module 19 Build the graphic export Scilab module
22 </description> 20 </description>
23
24</project> 21</project>
diff --git a/scilab/modules/gui/build.xml b/scilab/modules/gui/build.xml
index bf09d1a..e841d8f 100644
--- a/scilab/modules/gui/build.xml
+++ b/scilab/modules/gui/build.xml
@@ -11,14 +11,11 @@
11 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 11 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
12 * 12 *
13 --> 13 -->
14
15<project name="gui" default="jar"> 14<project name="gui" default="jar">
16
17 <import file="../../build.incl.xml"/> 15 <import file="../../build.incl.xml"/>
18 <property name="library.name" value="${library.gui.name}" /> 16 <property name="library.name" value="${library.gui.name}"/>
19 17 <property name="library.title" value="Graphical interface"/>
20 <description> 18 <description>
21 Build the Scilab GUI module 19 Build the Scilab GUI module
22 </description> 20 </description>
23
24</project> 21</project>
diff --git a/scilab/modules/hdf5/build.xml b/scilab/modules/hdf5/build.xml
index 17466b5..e869bd9 100644
--- a/scilab/modules/hdf5/build.xml
+++ b/scilab/modules/hdf5/build.xml
@@ -10,15 +10,11 @@
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 * 11 *
12 --> 12 -->
13
14<project name="hdf5" default="jar"> 13<project name="hdf5" default="jar">
15 <import file="../../build.incl.xml"/> 14 <import file="../../build.incl.xml"/>
16 15 <property name="library.name" value="${library.hdf5.name}"/>
17 <property name="library.name" value="${library.hdf5.name}" /> 16 <property name="library.title" value="HDF format support"/>
18
19 <description> 17 <description>
20 Build the hdf5 Scilab module 18 Build the hdf5 Scilab module
21 </description> 19 </description>
22
23</project> 20</project>
24
diff --git a/scilab/modules/helptools/build.xml b/scilab/modules/helptools/build.xml
index cfce8f8..bd12d90 100644
--- a/scilab/modules/helptools/build.xml
+++ b/scilab/modules/helptools/build.xml
@@ -10,15 +10,12 @@
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 * 11 *
12 --> 12 -->
13
14<project name="helptools" default="jar"> 13<project name="helptools" default="jar">
15
16 <import file="../../build.incl.xml"/> 14 <import file="../../build.incl.xml"/>
17 <property name="library.name" value="${library.helptools.name}" /> 15 <property name="library.name" value="${library.helptools.name}"/>
18 <property name="isDocBuilding" value="True" /> 16 <property name="library.title" value="Help components"/>
19 17 <property name="isDocBuilding" value="True"/>
20 <description> 18 <description>
21 Build the Scilab Help Tools module 19 Build the Scilab Help Tools module
22 </description> 20 </description>
23
24</project> 21</project>
diff --git a/scilab/modules/history_browser/build.xml b/scilab/modules/history_browser/build.xml
index 7f1b1c1..75e3fd3 100644
--- a/scilab/modules/history_browser/build.xml
+++ b/scilab/modules/history_browser/build.xml
@@ -10,14 +10,11 @@
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 * 11 *
12 --> 12 -->
13
14<project name="history_browser" default="jar"> 13<project name="history_browser" default="jar">
15
16 <import file="../../build.incl.xml"/> 14 <import file="../../build.incl.xml"/>
17 <property name="library.name" value="${library.history_browser.name}" /> 15 <property name="library.name" value="${library.history_browser.name}"/>
18 16 <property name="library.title" value="Scilab history browser"/>
19 <description> 17 <description>
20 Build the Scilab history_browser module 18 Build the Scilab history_browser module
21 </description> 19 </description>
22
23</project> 20</project>
diff --git a/scilab/modules/history_manager/build.xml b/scilab/modules/history_manager/build.xml
index 591c580..e9b6262 100644
--- a/scilab/modules/history_manager/build.xml
+++ b/scilab/modules/history_manager/build.xml
@@ -12,9 +12,8 @@
12 --> 12 -->
13<project name="history_manager" default="jar"> 13<project name="history_manager" default="jar">
14 <import file="../../build.incl.xml"/> 14 <import file="../../build.incl.xml"/>
15 15 <property name="library.name" value="${library.history_manager.name}"/>
16 <property name="library.name" value="${library.history_manager.name}" /> 16 <property name="library.title" value="Scilab history manager"/>
17
18 <description> 17 <description>
19 Build "history_manager" Scilab module 18 Build "history_manager" Scilab module
20 </description> 19 </description>
diff --git a/scilab/modules/javasci/build.xml b/scilab/modules/javasci/build.xml
index 211bf62..287b575 100644
--- a/scilab/modules/javasci/build.xml
+++ b/scilab/modules/javasci/build.xml
@@ -13,111 +13,64 @@
13 --> 13 -->
14<project name="javasci" default="build-examples"> 14<project name="javasci" default="build-examples">
15 <import file="../../build.incl.xml"/> 15 <import file="../../build.incl.xml"/>
16 <property name="library-v1.name" value="${library.javasci-v1.name}" /> 16 <property name="library-v1.name" value="${library.javasci-v1.name}"/>
17 <property name="library.name" value="${library.javasci.name}" /> 17 <property name="library.name" value="${library.javasci.name}"/>
18 18 <property name="library.title" value="Scilab Java API"/>
19
20 <description> 19 <description>
21 Build the Java/Scilab connecter (javasci) module 20 Build the Java/Scilab connecter (javasci) module
22 </description> 21 </description>
23 22 <!-- Compile sources -->
24 <!-- Compile sources --> 23 <target name="compile-v1" description="Build sources of Javasci v1" depends="init">
25 <target name="compile-v1" description="Build sources of Javasci v1" depends="init"> 24 <mkdir dir="${classes.dir}/v1/"/>
26 <mkdir dir="${classes.dir}/v1/"/> 25 <javac srcdir="src/java/javasci/" destdir="${classes.dir}/v1/" classpathref="compile.classpath" deprecation="on" debug="off" verbose="off" listfiles="on" includeAntRuntime="no" source="5"/>
27 <javac 26 </target>
28 srcdir="src/java/javasci/" 27 <!-- Compile sources -->
29 destdir="${classes.dir}/v1/" 28 <target name="compile" description="Build sources of Javasci v2" depends="init">
30 classpathref="compile.classpath" 29 <mkdir dir="${classes.dir}/v2/"/>
31 deprecation="on" 30 <javac srcdir="src/java/org/" destdir="${classes.dir}/v2/" classpathref="compile.classpath" deprecation="on" debug="off" verbose="off" listfiles="on" includeAntRuntime="no" source="5"/>
32 debug="off" 31 </target>
33 verbose="off" 32 <property name="examples.classes.dir" location="${build.dir}/examples/"/>
34 listfiles="on"
35 includeAntRuntime="no"
36 source="5"
37 />
38 </target>
39
40 <!-- Compile sources -->
41 <target name="compile" description="Build sources of Javasci v2" depends="init">
42 <mkdir dir="${classes.dir}/v2/"/>
43 <javac
44 srcdir="src/java/org/"
45 destdir="${classes.dir}/v2/"
46 classpathref="compile.classpath"
47 deprecation="on"
48 debug="off"
49 verbose="off"
50 listfiles="on"
51 includeAntRuntime="no"
52 source="5"
53 />
54 </target>
55
56 <property name="examples.classes.dir" location="${build.dir}/examples/" />
57
58 <target name="build-examples" description="Build the examples" depends="jar, jar-v1"> 33 <target name="build-examples" description="Build the examples" depends="jar, jar-v1">
59 <property name="examples.src.dir" location="examples/others/" /> 34 <property name="examples.src.dir" location="examples/others/"/>
60 <mkdir dir="${examples.classes.dir}"/> 35 <mkdir dir="${examples.classes.dir}"/>
61 36 <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"/>
62 <javac
63 srcdir="${examples.src.dir}"
64 destdir="${examples.classes.dir}"
65 classpath="${library.javasci.dir}/${library.javasci-v1.name}"
66 deprecation="on"
67 debug="off"
68 verbose="off"
69 listfiles="on"
70 includeAntRuntime="no"
71 source="5"
72 />
73
74 </target> 37 </target>
75
76 <target name="clean-examples" description="clean examples"> 38 <target name="clean-examples" description="clean examples">
77 <delete dir="${examples.classes.dir}"/> 39 <delete dir="${examples.classes.dir}"/>
78 </target> 40 </target>
79
80 <target name="jar-v1" description="Build the jar file" depends="compile-v1"> 41 <target name="jar-v1" description="Build the jar file" depends="compile-v1">
81 <manifestclasspath property="manifest-v1.classpath" jarfile="${build.jar.dir}/${library-v1.name}"> 42 <manifestclasspath property="manifest-v1.classpath" jarfile="${build.jar.dir}/${library-v1.name}">
82 <classpath location="${library.jvm.dir}/${library.jvm.name}" /> 43 <classpath location="${library.jvm.dir}/${library.jvm.name}"/>
83 </manifestclasspath> 44 </manifestclasspath>
84 45 <jar destfile="${build.jar.dir}/${library-v1.name}" basedir="${classes.dir}/v1/">
85 <jar destfile="${build.jar.dir}/${library-v1.name}" basedir="${classes.dir}/v1/"> 46 <manifest>
86 47 <attribute name="SciAbstractDataType" value="javasci.SciAbstractDataType"/>
87 <manifest> 48 <attribute name="SciBooleanArray" value="javasci.SciBooleanArray"/>
88 <attribute name="SciAbstractDataType" value="javasci.SciAbstractDataType"/> 49 <attribute name="SciComplexArray" value="javasci.SciComplexArray"/>
89 <attribute name="SciBooleanArray" value="javasci.SciBooleanArray"/> 50 <attribute name="SciDoubleArray" value="javasci.SciDoubleArray"/>
90 <attribute name="SciComplexArray" value="javasci.SciComplexArray"/> 51 <attribute name="SciString" value="javasci.SciString"/>
91 <attribute name="SciDoubleArray" value="javasci.SciDoubleArray"/> 52 <attribute name="BadDataArgumentException" value="javasci.BadDataArgumentException"/>
92 <attribute name="SciString" value="javasci.SciString"/> 53 <attribute name="SciAbstractArray" value="javasci.SciAbstractArray"/>
93 <attribute name="BadDataArgumentException" value="javasci.BadDataArgumentException"/> 54 <attribute name="SciBoolean" value="javasci.SciBoolean"/>
94 <attribute name="SciAbstractArray" value="javasci.SciAbstractArray"/> 55 <attribute name="SciComplex" value="javasci.SciComplex"/>
95 <attribute name="SciBoolean" value="javasci.SciBoolean"/> 56 <attribute name="SciDouble" value="javasci.SciDouble"/>
96 <attribute name="SciComplex" value="javasci.SciComplex"/> 57 <attribute name="Scilab" value="javasci.Scilab"/>
97 <attribute name="SciDouble" value="javasci.SciDouble"/> 58 <attribute name="SciStringArray" value="javasci.SciStringArray"/>
98 <attribute name="Scilab" value="javasci.Scilab"/> 59 <attribute name="ClassPath" value="javasci.ClassPath"/>
99 <attribute name="SciStringArray" value="javasci.SciStringArray"/> 60 <attribute name="LibraryPath" value="javasci.LibraryPath"/>
100 <attribute name="ClassPath" value="javasci.ClassPath"/>
101 <attribute name="LibraryPath" value="javasci.LibraryPath"/>
102 <attribute name="Class-Path" value="${manifest-v1.classpath}"/> 61 <attribute name="Class-Path" value="${manifest-v1.classpath}"/>
103 </manifest> 62 </manifest>
104 </jar> 63 </jar>
64 </target>
65 <!-- Create the jar -->
66 <target name="jar" description="Build the jar file" depends="compile">
67 <manifestclasspath property="manifest.classpath" jarfile="${build.jar.dir}/${library.name}">
68 <classpath location="${library.jvm.dir}/${library.jvm.name}"/>
69 </manifestclasspath>
70 <jar destfile="${build.jar.dir}/${library.name}" basedir="${classes.dir}/v2/">
71 <manifest>
72 <attribute name="Class-Path" value="${manifest.classpath}"/>
73 </manifest>
74 </jar>
105 </target> 75 </target>
106
107 <!-- Create the jar -->
108 <target name="jar" description="Build the jar file" depends="compile">
109 <manifestclasspath property="manifest.classpath" jarfile="${build.jar.dir}/${library.name}">
110 <classpath location="${library.jvm.dir}/${library.jvm.name}" />
111 </manifestclasspath>
112
113 <jar destfile="${build.jar.dir}/${library.name}" basedir="${classes.dir}/v2/">
114
115 <manifest>
116 <attribute name="Class-Path" value="${manifest.classpath}"/>
117 </manifest>
118 </jar>
119
120
121 </target>
122
123</project> 76</project>
diff --git a/scilab/modules/jvm/build.xml b/scilab/modules/jvm/build.xml
index 946756e..6a13688 100644
--- a/scilab/modules/jvm/build.xml
+++ b/scilab/modules/jvm/build.xml
@@ -1,6 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2
3
4<!-- 2<!--
5 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab 3 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
6 * Copyright (C) INRIA - Allan CORNET , Sylvestre LEDRU 4 * Copyright (C) INRIA - Allan CORNET , Sylvestre LEDRU
@@ -14,11 +12,9 @@
14 --> 12 -->
15<project name="jvm" default="jar"> 13<project name="jvm" default="jar">
16 <import file="../../build.incl.xml"/> 14 <import file="../../build.incl.xml"/>
17 15 <property name="library.name" value="${library.jvm.name}"/>
18 <property name="library.name" value="${library.jvm.name}" /> 16 <property name="library.title" value="JVM helpers"/>
19
20 <description> 17 <description>
21 Build the JVM Scilab module 18 Build the JVM Scilab module
22 </description> 19 </description>
23
24</project> 20</project>
diff --git a/scilab/modules/localization/build.xml b/scilab/modules/localization/build.xml
index fd36391..c253774 100644
--- a/scilab/modules/localization/build.xml
+++ b/scilab/modules/localization/build.xml
@@ -11,12 +11,10 @@
11 * 11 *
12 --> 12 -->
13<project name="localization" default="jar"> 13<project name="localization" default="jar">
14
15 <import file="../../build.incl.xml"/> 14 <import file="../../build.incl.xml"/>
16 <property name="library.name" value="${library.localization.name}" /> 15 <property name="library.name" value="${library.localization.name}"/>
17 16 <property name="library.title" value="Localization support"/>
18 <description> 17 <description>
19 Build the Scilab Localization module 18 Build the Scilab Localization module
20 </description> 19 </description>
21
22</project> 20</project>
diff --git a/scilab/modules/output_stream/build.xml b/scilab/modules/output_stream/build.xml
index eb9c271..07a9f25 100644
--- a/scilab/modules/output_stream/build.xml
+++ b/scilab/modules/output_stream/build.xml
@@ -12,9 +12,8 @@
12 --> 12 -->
13<project name="output_stream" default="jar"> 13<project name="output_stream" default="jar">
14 <import file="../../build.incl.xml"/> 14 <import file="../../build.incl.xml"/>
15 15 <property name="library.name" value="${library.output_stream.name}"/>
16 <property name="library.name" value="${library.output_stream.name}" /> 16 <property name="library.title" value="Scilab I/O"/>
17
18 <description> 17 <description>
19 Build "output_stream" Scilab module 18 Build "output_stream" Scilab module
20 </description> 19 </description>
diff --git a/scilab/modules/renderer/build.xml b/scilab/modules/renderer/build.xml
index ea93cf1..2f6dfeb 100644
--- a/scilab/modules/renderer/build.xml
+++ b/scilab/modules/renderer/build.xml
@@ -11,14 +11,11 @@
11 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 11 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
12 * 12 *
13 --> 13 -->
14
15<project name="renderer" default="jar"> 14<project name="renderer" default="jar">
16 <import file="../../build.incl.xml"/> 15 <import file="../../build.incl.xml"/>
17 16 <property name="library.name" value="${library.renderer.name}"/>
18 <property name="library.name" value="${library.renderer.name}" /> 17 <property name="library.title" value="Plot management"/>
19
20 <description> 18 <description>
21 Build the renderer Scilab module 19 Build the renderer Scilab module
22 </description> 20 </description>
23
24</project> 21</project>
diff --git a/scilab/modules/scinotes/build.xml b/scilab/modules/scinotes/build.xml
index 14f9912..9730dbf 100644
--- a/scilab/modules/scinotes/build.xml
+++ b/scilab/modules/scinotes/build.xml
@@ -10,14 +10,11 @@
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 * 11 *
12 --> 12 -->
13
14<project name="scinotes" default="jar"> 13<project name="scinotes" default="jar">
15
16 <import file="../../build.incl.xml"/> 14 <import file="../../build.incl.xml"/>
17 <property name="library.name" value="${library.scinotes.name}" /> 15 <property name="library.name" value="${library.scinotes.name}"/>
18 16 <property name="library.title" value="Text editor for Scilab"/>
19 <description> 17 <description>
20 Build the Scilab scinotes module 18 Build the Scilab scinotes module
21 </description> 19 </description>
22
23</project> 20</project>
diff --git a/scilab/modules/shell/build.xml b/scilab/modules/shell/build.xml
index fd734c9..651510e 100644
--- a/scilab/modules/shell/build.xml
+++ b/scilab/modules/shell/build.xml
@@ -12,12 +12,10 @@
12 * 12 *
13 --> 13 -->
14<project name="shell" default="jar"> 14<project name="shell" default="jar">
15
16 <import file="../../build.incl.xml"/> 15 <import file="../../build.incl.xml"/>
17 <property name="library.name" value="${library.shell.name}" /> 16 <property name="library.name" value="${library.shell.name}"/>
18 17 <property name="library.title" value="Java read/write command access"/>
19 <description> 18 <description>
20 Build the Scilab Shell module 19 Build the Scilab Shell module
21 </description> 20 </description>
22
23</project> 21</project>
diff --git a/scilab/modules/types/build.xml b/scilab/modules/types/build.xml
index aae4807..bd2de9a 100644
--- a/scilab/modules/types/build.xml
+++ b/scilab/modules/types/build.xml
@@ -10,14 +10,11 @@
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 * 11 *
12 --> 12 -->
13
14<project name="types" default="jar"> 13<project name="types" default="jar">
15
16 <import file="../../build.incl.xml"/> 14 <import file="../../build.incl.xml"/>
17 <property name="library.name" value="${library.types.name}" /> 15 <property name="library.name" value="${library.types.name}"/>
18 16 <property name="library.title" value="Java compatible types"/>
19 <description> 17 <description>
20 Build the Scilab types module 18 Build the Scilab types module
21 </description> 19 </description>
22
23</project> 20</project>
diff --git a/scilab/modules/ui_data/build.xml b/scilab/modules/ui_data/build.xml
index 0d01abb..8cdae80 100644
--- a/scilab/modules/ui_data/build.xml
+++ b/scilab/modules/ui_data/build.xml
@@ -10,14 +10,11 @@
10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 10 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 * 11 *
12 --> 12 -->
13
14<project name="ui_data" default="jar"> 13<project name="ui_data" default="jar">
15
16 <import file="../../build.incl.xml"/> 14 <import file="../../build.incl.xml"/>
17 <property name="library.name" value="${library.ui_data.name}" /> 15 <property name="library.name" value="${library.ui_data.name}"/>
18 16 <property name="library.title" value="User interface graphical components"/>
19 <description> 17 <description>
20 Build the Scilab ui_data module 18 Build the Scilab ui_data module
21 </description> 19 </description>
22
23</project> 20</project>
diff --git a/scilab/modules/xcos/build.xml b/scilab/modules/xcos/build.xml
index 2eb76fa..c5ca4fd 100644
--- a/scilab/modules/xcos/build.xml
+++ b/scilab/modules/xcos/build.xml
@@ -14,6 +14,7 @@
14<project name="xcos" default="jar"> 14<project name="xcos" default="jar">
15 <import file="../../build.incl.xml"/> 15 <import file="../../build.incl.xml"/>
16 <property name="library.name" value="${library.xcos.name}"/> 16 <property name="library.name" value="${library.xcos.name}"/>
17 <property name="library.title" value="Modeler and simulator for hybrid systems"/>
17 <description> 18 <description>
18 Build the Scilab xcos module 19 Build the Scilab xcos module
19 </description> 20 </description>
diff --git a/scilab/scilab.properties.in b/scilab/scilab.properties.in
index 8cae230..0ccb3ca 100644
--- a/scilab/scilab.properties.in
+++ b/scilab/scilab.properties.in
@@ -1,3 +1,5 @@
1; Definition ANT flags for Scilab 1; Definition ANT flags for Scilab
2 2
3build.debug=@JAVAC_DEBUG@ 3build.debug=@JAVAC_DEBUG@
4library.vendor="The Scilab Consortium - DIGITEO"
5
diff --git a/scilab/scilab.properties.vc b/scilab/scilab.properties.vc
index 1691c15..2e919d3 100644
--- a/scilab/scilab.properties.vc
+++ b/scilab/scilab.properties.vc
@@ -1,3 +1,6 @@
1; Definition ANT flags for Scilab 1; Definition ANT flags for Scilab
2 2
3build.debug=off 3build.debug=off
4library.vendor="The Scilab Consortium - DIGITEO"
5
6