Build: prebuildjava now handle enable_* 80/6280/5
Clément DAVID [Wed, 15 Feb 2012 10:39:53 +0000 (11:39 +0100)]
* build modules even if they are conditional on prebuildjava (does not work before)
* do not build prebuildjava module twice (reuse the included java target)

Change-Id: I2dfce1390586456f9fef75f1ad045e0b68c7a1f7

scilab/modules/prebuildjava/Makefile.am
scilab/modules/prebuildjava/Makefile.in
scilab/modules/prebuildjava/build.xml

index fb3a0f1..6e8f622 100644 (file)
@@ -12,8 +12,7 @@
 if NEED_JAVA
 USEANT=1
 
-all:
-       $(ANT) 
+all: java
 
 endif
 
index bde8fc8..0cbfb8e 100644 (file)
@@ -599,8 +599,7 @@ uninstall-am:
        mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
 
 
-@NEED_JAVA_TRUE@all:
-@NEED_JAVA_TRUE@       $(ANT) 
+@NEED_JAVA_TRUE@all: java
 
 # This target enables tests for Scilab
 check-local: $(top_builddir)/scilab-bin test
index 925d773..b508779 100644 (file)
@@ -2,6 +2,7 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2011 - Scilab Enterprises - Sylvestre LEDRU
+ * Copyright (C) 2012 - Scilab Enterprises - Clément DAVID
  * 
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
 The main idea is to build at once all the var files
 -->
   <property name="target-jar" value="jar"/>
-  <target name="all" depends="hdf5, xcos, javasci">
-    <ant antfile="../history_manager/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false"/>
-    <ant antfile="../localization/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false"/>
-    <ant antfile="../commons/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false"/>
-    <ant antfile="../jvm/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false"/>
-    <ant antfile="../action_binding/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false"/>
-    <ant antfile="../renderer/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false"/>
-    <ant antfile="../completion/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false"/>
-    <ant antfile="../console/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false"/>
-    <ant antfile="../graphic_export/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false"/>
-    <ant antfile="../gui/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false"/>
-    <ant antfile="../core/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false"/>
-    <ant antfile="../helptools/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false"/>
-    <ant antfile="../types/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false"/>
-    <ant antfile="../graph/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false"/>
-    <ant antfile="../scinotes/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false"/>
-    <ant antfile="../ui_data/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false"/>
-    <ant antfile="../history_browser/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false"/>
+  <property file="../../scilab-lib.properties"/>
+  
+  <!-- Order matter : fixed order to avoid dependency handling-->
+  <target name="all" depends="localization, history_manager, commons, jvm, action_binding, renderer, completion, console, graphic_export, gui, core, helptools, types, scinotes, ui_data, history_browser, javasci, hdf5, graph, xcos" />
+  <target name="clean">
+    <antcall target="all">
+      <param name="target-jar" value="clean"/>
+    </antcall>
   </target>
-  <target name="javasci" if="build_javasci">
-    <ant antfile="../javasci/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false"/>
+  
+  <target name="action_binding">
+    <ant antfile="../action_binding/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false" />
+  </target>
+  <target name="commons">
+    <ant antfile="../commons/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false" />
+  </target>
+  <target name="completion">
+    <ant antfile="../completion/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false" />
   </target>
-  <target name="xcos" if="build_hdf5, build_xcos">
-    <ant antfile="../xcos/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false"/>
+  <target name="console">
+    <ant antfile="../console/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false" />
+  </target>
+  <target name="core">
+    <ant antfile="../core/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false" />
+  </target>
+  <target name="graph">
+    <ant antfile="../graph/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false" />
+  </target>
+  <target name="graphic_export">
+    <ant antfile="../graphic_export/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false" />
+  </target>
+  <target name="gui">
+    <ant antfile="../gui/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false" />
   </target>
   <target name="hdf5" if="build_hdf5">
-    <ant antfile="../hdf5/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false"/>
+    <ant antfile="../hdf5/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false" />
   </target>
-  <target name="clean">
-    <antcall target="all">
-      <param name="target-jar" value="clean"/>
-    </antcall>
+  <target name="helptools">
+    <ant antfile="../helptools/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false" />
+  </target>
+  <target name="history_browser">
+    <ant antfile="../history_browser/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false" />
+  </target>
+  <target name="history_manager">
+    <ant antfile="../history_manager/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false" />
+  </target>
+  <target name="javasci" if="build_javasci">
+    <ant antfile="../javasci/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false" />
+  </target>
+  <target name="jvm">
+    <ant antfile="../jvm/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false" />
+  </target>
+  <target name="localization">
+    <ant antfile="../localization/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false" />
+  </target>
+  <target name="output_stream">
+    <ant antfile="../output_stream/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false" />
+  </target>
+  <target name="renderer">
+    <ant antfile="../renderer/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false" />
+  </target>
+  <target name="scinotes">
+    <ant antfile="../scinotes/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false" />
+  </target>
+  <target name="types">
+    <ant antfile="../types/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false" />
+  </target>
+  <target name="ui_data">
+    <ant antfile="../ui_data/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false" />
+  </target>
+  <target name="xcos" if="build_xcos" depends="hdf5, javasci">
+    <ant antfile="../xcos/build.xml" target="${target-jar}" inheritRefs="false" inheritAll="false" />
   </target>
 </project>
+