fix hdf5 jar filename (org.scilab.modules.hdf5.jar)
Allan CORNET [Mon, 27 Jul 2009 08:26:10 +0000 (10:26 +0200)]
scilab/etc/classpath.xml.in
scilab/etc/classpath.xml.vc
scilab/modules/hdf5/build.xml
scilab/modules/hdf5/src/java/hdf5-JAVA.vcproj
scilab/scilab-lib.properties.in
scilab/scilab-lib.properties.vc

index d488177..4a58d56 100644 (file)
@@ -50,6 +50,9 @@ The option is "disableUnderMode" and can be:
         <load on="hdf5BasedFeature"/>
 </path>
 
+<!-- Temp. loaded at startup -->
+<path value="$SCILAB/modules/hdf5/jar/org.scilab.modules.hdf5.jar" load="startup"/>
+
 <!-- Documentation (not mandatory) -->
 <path value="@JEUCLID_CORE@" load="onUse">
        <load on="documentationGeneration"/>
index bbc21e7..098ca24 100644 (file)
@@ -50,6 +50,9 @@ The option is "disableUnderMode" and can be:
         <load on="hdf5BasedFeature"/>
 </path>
 
+<!-- Temp. loaded at startup -->
+<path value="$SCILAB/modules/hdf5/jar/org.scilab.modules.hdf5.jar" load="startup"/>
+
 <!-- Documentation (not mandatory) -->
 <path value="$SCILAB/thirdparty/jeuclid-core.jar" load="onUse">
        <load on="documentationGeneration"/>
index 946a3c8..17466b5 100644 (file)
@@ -14,7 +14,7 @@
 <project name="hdf5" default="jar">
   <import file="../../build.incl.xml"/>
 
-  <property name="library.name" value="${library.action_hdf5.name}" />
+  <property name="library.name" value="${library.hdf5.name}" />
 
   <description>
        Build the hdf5 Scilab module
index 0c4ead3..3c9ab03 100644 (file)
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
                </Filter>
+               <File
+                       RelativePath="..\..\build.xml"
+                       >
+               </File>
        </Files>
        <Globals>
        </Globals>
index 6c64a52..f53c9ea 100644 (file)
@@ -52,3 +52,5 @@ library.graphic_export.name=org.scilab.modules.graphic_export.jar
 library.javasci.dir=${modules.dir}/javasci/${build.jar.dir}/
 library.javasci.name=javasci.jar
 
+library.hdf5.dir=${modules.dir}/hdf5/${build.jar.dir}/
+library.hdf5.name=org.scilab.modules.hdf5.jar
index 302f753..4df7ecb 100644 (file)
@@ -53,3 +53,6 @@ library.javasci.name=javasci.jar
 
 library.graphic_export.dir=${modules.dir}/graphic_export/${build.jar.dir}/
 library.graphic_export.name=org.scilab.modules.graphic_export.jar
+
+library.hdf5.dir=${modules.dir}/hdf5/${build.jar.dir}/
+library.hdf5.name=org.scilab.modules.hdf5.jar