Add a target to generate the correct scirenderer.jar when called from the module 37/11437/2
Sylvestre Ledru [Thu, 2 May 2013 12:27:48 +0000 (14:27 +0200)]
Change-Id: I40fa553d89505bc70246d7247e8bbf65b70e25c2

scilab/modules/prebuildjava/build.xml
scilab/modules/scirenderer/build.xml

index e9a2a7f..5d58cc3 100644 (file)
@@ -31,7 +31,7 @@ The main idea is to build at once all the var files
         <condition property="thirdparty.dir" value="../../thirdparty">
             <os family="windows"/>
         </condition>
-        <ant antfile="../scirenderer/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false">
+        <ant antfile="../scirenderer/build.xml" target="noversion" inheritRefs="false" inheritAll="false">
             <property name="thirdparty.dir" value="${thirdparty.dir}"/>
             <property name="fromScilab" value="yes"/>
         </ant>
index 18b6e2a..c771366 100644 (file)
@@ -19,9 +19,7 @@
     <property file="${dependencies.prop}"/>
     
     <!-- Scirenderer is built from Scilab itself -->
-    <condition property="library.name" value="scirenderer.jar">
-        <isset property="fromScilab" />
-    </condition>
+    <property name="library.noversion.name" value="scirenderer.jar" />
     
     <!-- Scirenderer is built as a thirdparty application -->
     <condition property="library.name" value="scirenderer-${version}.jar">
@@ -44,7 +42,7 @@
     <property name="build.jar.dir"  value="jar/" />
     
     <property name="library.jar" value="${build.jar.dir}/${library.name}" />
-    <property name="library.no-version.jar" value="${build.jar.dir}/${library.no-version.name}" />
+    <property name="library.noversion.jar" value="${build.jar.dir}/${library.noversion.name}" />
     
     <!-- The building directory -->
     <property name="build.dir" location="build/"/>
         </jar>
     </target>
     
+    <!-- Create the jar without the extension -->
+    <target name="noversion" description="Build the jar file without version" depends="compile">
+        
+        <antcall target="jar">
+            <param name="library.jar" value="${library.noversion.jar}"/>
+        </antcall>
+    </target>
+    
     <target name="doc">
         <javadoc
            destdir="${doc.dir}"