Build in the mean time javasci v1 and v2. Keep the same filenames for the v1. Update... 67/1767/5
Sylvestre Ledru [Wed, 1 Sep 2010 09:54:21 +0000 (11:54 +0200)]
+ missing swig file

Change-Id: I0cbe7a368c93f9973a1aacbd0657655818f0eb6a

scilab/modules/javasci/Makefile.am
scilab/modules/javasci/Makefile.in
scilab/modules/javasci/build.xml
scilab/modules/javasci/src/java/org/scilab/modules/javasci/Call_ScilabJNI.java
scilab/scilab-lib.properties.in
scilab/scilab-lib.properties.vc

index 11d271c..798608f 100644 (file)
@@ -27,7 +27,7 @@ if JAVASCI
 
 
 #### Javasci : sources ####
-JAVASCI_C_SOURCES = src/c/javasci_Scilab2.c \
+JAVASCI_V1_C_SOURCES = src/c/javasci_Scilab2.c \
 src/c/javasci_globals.c \
 src/c/javasci_SciAbstractArray.c \
 src/c/javasci_SciStringArray.c \
@@ -36,15 +36,21 @@ src/c/fix.c \
 src/c/javasci_SciDoubleArray.c \
 src/c/javasci_Scilab.c \
 src/c/javasci_SciBooleanArray.c \
-src/c/javasci_SciIntegerArray.c \
+src/c/javasci_SciIntegerArray.c
+
+JAVASCI_V2_C_SOURCES = \
 src/jni/call_scilab_wrap.c \
 src/c/javasci2_helper.c
 
-pkglib_LTLIBRARIES = libjavasci.la
+pkglib_LTLIBRARIES = libjavasci.la libjavasci2.la
 
 libjavasci_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
 
-libjavasci_la_SOURCES = $(JAVASCI_C_SOURCES)
+libjavasci_la_SOURCES = $(JAVASCI_V1_C_SOURCES)
+
+libjavasci2_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
+
+libjavasci2_la_SOURCES = $(JAVASCI_V2_C_SOURCES)
 
 # For the code check (splint)
 CHECK_SRC= $(JAVASCI_C_SOURCES)
@@ -66,6 +72,22 @@ libjavasci_la_LIBADD = \
        $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
        $(top_builddir)/modules/libscilab.la
 
+libjavasci2_la_CFLAGS = -I$(srcdir)/includes/ \
+                       $(JAVA_JNI_INCLUDE) \
+                       $(TCL_INC_PATH) \
+                       $(TK_INC_PATH) \
+                       -I$(top_srcdir)/libs/doublylinkedlist/includes \
+                       -I$(top_srcdir)/modules/tclsci/includes \
+                       -I$(top_srcdir)/modules/call_scilab/includes \
+                       -I$(top_srcdir)/modules/api_scilab/includes \
+                       -I$(top_srcdir)/modules/fileio/includes \
+                       -I$(top_srcdir)/modules/output_stream/includes
+
+libjavasci2_la_LIBADD = \
+       $(top_builddir)/libs/MALLOC/libscimalloc.la \
+       $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
+       $(top_builddir)/modules/libscilab.la
+
 ### javasci :  images ###
 libsciscipad_la_imagesdir = $(mydatadir)/help/images/
 libsciscipad_la_images_DATA = help/images/ScilabClass.gif \
index 508cb97..e4a3bd6 100644 (file)
@@ -128,8 +128,7 @@ am__libjavasci_la_SOURCES_DIST = src/c/javasci_Scilab2.c \
        src/c/javasci_SciStringArray.c src/c/javasci_SciComplexArray.c \
        src/c/fix.c src/c/javasci_SciDoubleArray.c \
        src/c/javasci_Scilab.c src/c/javasci_SciBooleanArray.c \
-       src/c/javasci_SciIntegerArray.c src/jni/call_scilab_wrap.c \
-       src/c/javasci2_helper.c
+       src/c/javasci_SciIntegerArray.c
 @JAVASCI_TRUE@am__objects_1 = libjavasci_la-javasci_Scilab2.lo \
 @JAVASCI_TRUE@ libjavasci_la-javasci_globals.lo \
 @JAVASCI_TRUE@ libjavasci_la-javasci_SciAbstractArray.lo \
@@ -139,15 +138,27 @@ am__libjavasci_la_SOURCES_DIST = src/c/javasci_Scilab2.c \
 @JAVASCI_TRUE@ libjavasci_la-javasci_SciDoubleArray.lo \
 @JAVASCI_TRUE@ libjavasci_la-javasci_Scilab.lo \
 @JAVASCI_TRUE@ libjavasci_la-javasci_SciBooleanArray.lo \
-@JAVASCI_TRUE@ libjavasci_la-javasci_SciIntegerArray.lo \
-@JAVASCI_TRUE@ libjavasci_la-call_scilab_wrap.lo \
-@JAVASCI_TRUE@ libjavasci_la-javasci2_helper.lo
+@JAVASCI_TRUE@ libjavasci_la-javasci_SciIntegerArray.lo
 @JAVASCI_TRUE@am_libjavasci_la_OBJECTS = $(am__objects_1)
 libjavasci_la_OBJECTS = $(am_libjavasci_la_OBJECTS)
 libjavasci_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libjavasci_la_CFLAGS) \
        $(CFLAGS) $(libjavasci_la_LDFLAGS) $(LDFLAGS) -o $@
 @JAVASCI_TRUE@am_libjavasci_la_rpath = -rpath $(pkglibdir)
+@JAVASCI_TRUE@libjavasci2_la_DEPENDENCIES =  \
+@JAVASCI_TRUE@ $(top_builddir)/libs/MALLOC/libscimalloc.la \
+@JAVASCI_TRUE@ $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
+@JAVASCI_TRUE@ $(top_builddir)/modules/libscilab.la
+am__libjavasci2_la_SOURCES_DIST = src/jni/call_scilab_wrap.c \
+       src/c/javasci2_helper.c
+@JAVASCI_TRUE@am__objects_2 = libjavasci2_la-call_scilab_wrap.lo \
+@JAVASCI_TRUE@ libjavasci2_la-javasci2_helper.lo
+@JAVASCI_TRUE@am_libjavasci2_la_OBJECTS = $(am__objects_2)
+libjavasci2_la_OBJECTS = $(am_libjavasci2_la_OBJECTS)
+libjavasci2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libjavasci2_la_CFLAGS) \
+       $(CFLAGS) $(libjavasci2_la_LDFLAGS) $(LDFLAGS) -o $@
+@JAVASCI_TRUE@am_libjavasci2_la_rpath = -rpath $(pkglibdir)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -161,8 +172,9 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
-SOURCES = $(libjavasci_la_SOURCES)
-DIST_SOURCES = $(am__libjavasci_la_SOURCES_DIST)
+SOURCES = $(libjavasci_la_SOURCES) $(libjavasci2_la_SOURCES)
+DIST_SOURCES = $(am__libjavasci_la_SOURCES_DIST) \
+       $(am__libjavasci2_la_SOURCES_DIST)
 DATA = $(libjavasci_la_etc_DATA) $(libjavasci_la_root_DATA) \
        $(libsciscipad_la_images_DATA) \
        $(libsciscipad_la_specialtest_DATA)
@@ -428,7 +440,7 @@ libjavasci_la_etc_DATA = etc/javasci.quit etc/javasci.start
 ### All the compilation process of java is deleguated to ant
 
 #### Javasci : sources ####
-@JAVASCI_TRUE@JAVASCI_C_SOURCES = src/c/javasci_Scilab2.c \
+@JAVASCI_TRUE@JAVASCI_V1_C_SOURCES = src/c/javasci_Scilab2.c \
 @JAVASCI_TRUE@src/c/javasci_globals.c \
 @JAVASCI_TRUE@src/c/javasci_SciAbstractArray.c \
 @JAVASCI_TRUE@src/c/javasci_SciStringArray.c \
@@ -437,13 +449,17 @@ libjavasci_la_etc_DATA = etc/javasci.quit etc/javasci.start
 @JAVASCI_TRUE@src/c/javasci_SciDoubleArray.c \
 @JAVASCI_TRUE@src/c/javasci_Scilab.c \
 @JAVASCI_TRUE@src/c/javasci_SciBooleanArray.c \
-@JAVASCI_TRUE@src/c/javasci_SciIntegerArray.c \
+@JAVASCI_TRUE@src/c/javasci_SciIntegerArray.c
+
+@JAVASCI_TRUE@JAVASCI_V2_C_SOURCES = \
 @JAVASCI_TRUE@src/jni/call_scilab_wrap.c \
 @JAVASCI_TRUE@src/c/javasci2_helper.c
 
-@JAVASCI_TRUE@pkglib_LTLIBRARIES = libjavasci.la
+@JAVASCI_TRUE@pkglib_LTLIBRARIES = libjavasci.la libjavasci2.la
 @JAVASCI_TRUE@libjavasci_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
-@JAVASCI_TRUE@libjavasci_la_SOURCES = $(JAVASCI_C_SOURCES)
+@JAVASCI_TRUE@libjavasci_la_SOURCES = $(JAVASCI_V1_C_SOURCES)
+@JAVASCI_TRUE@libjavasci2_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
+@JAVASCI_TRUE@libjavasci2_la_SOURCES = $(JAVASCI_V2_C_SOURCES)
 
 # For the code check (splint)
 @JAVASCI_TRUE@CHECK_SRC = $(JAVASCI_C_SOURCES)
@@ -464,6 +480,22 @@ libjavasci_la_etc_DATA = etc/javasci.quit etc/javasci.start
 @JAVASCI_TRUE@ $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
 @JAVASCI_TRUE@ $(top_builddir)/modules/libscilab.la
 
+@JAVASCI_TRUE@libjavasci2_la_CFLAGS = -I$(srcdir)/includes/ \
+@JAVASCI_TRUE@                 $(JAVA_JNI_INCLUDE) \
+@JAVASCI_TRUE@                 $(TCL_INC_PATH) \
+@JAVASCI_TRUE@                 $(TK_INC_PATH) \
+@JAVASCI_TRUE@                 -I$(top_srcdir)/libs/doublylinkedlist/includes \
+@JAVASCI_TRUE@                 -I$(top_srcdir)/modules/tclsci/includes \
+@JAVASCI_TRUE@                 -I$(top_srcdir)/modules/call_scilab/includes \
+@JAVASCI_TRUE@                 -I$(top_srcdir)/modules/api_scilab/includes \
+@JAVASCI_TRUE@                 -I$(top_srcdir)/modules/fileio/includes \
+@JAVASCI_TRUE@                 -I$(top_srcdir)/modules/output_stream/includes
+
+@JAVASCI_TRUE@libjavasci2_la_LIBADD = \
+@JAVASCI_TRUE@ $(top_builddir)/libs/MALLOC/libscimalloc.la \
+@JAVASCI_TRUE@ $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
+@JAVASCI_TRUE@ $(top_builddir)/modules/libscilab.la
+
 
 ### javasci :  images ###
 @JAVASCI_TRUE@libsciscipad_la_imagesdir = $(mydatadir)/help/images/
@@ -641,6 +673,8 @@ clean-pkglibLTLIBRARIES:
        done
 libjavasci.la: $(libjavasci_la_OBJECTS) $(libjavasci_la_DEPENDENCIES) 
        $(libjavasci_la_LINK) $(am_libjavasci_la_rpath) $(libjavasci_la_OBJECTS) $(libjavasci_la_LIBADD) $(LIBS)
+libjavasci2.la: $(libjavasci2_la_OBJECTS) $(libjavasci2_la_DEPENDENCIES) 
+       $(libjavasci2_la_LINK) $(am_libjavasci2_la_rpath) $(libjavasci2_la_OBJECTS) $(libjavasci2_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
@@ -648,9 +682,9 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjavasci_la-call_scilab_wrap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjavasci2_la-call_scilab_wrap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjavasci2_la-javasci2_helper.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjavasci_la-fix.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjavasci_la-javasci2_helper.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjavasci_la-javasci_SciAbstractArray.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjavasci_la-javasci_SciBooleanArray.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjavasci_la-javasci_SciComplexArray.Plo@am__quote@
@@ -752,19 +786,19 @@ libjavasci_la-javasci_SciIntegerArray.lo: src/c/javasci_SciIntegerArray.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjavasci_la_CFLAGS) $(CFLAGS) -c -o libjavasci_la-javasci_SciIntegerArray.lo `test -f 'src/c/javasci_SciIntegerArray.c' || echo '$(srcdir)/'`src/c/javasci_SciIntegerArray.c
 
-libjavasci_la-call_scilab_wrap.lo: src/jni/call_scilab_wrap.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjavasci_la_CFLAGS) $(CFLAGS) -MT libjavasci_la-call_scilab_wrap.lo -MD -MP -MF $(DEPDIR)/libjavasci_la-call_scilab_wrap.Tpo -c -o libjavasci_la-call_scilab_wrap.lo `test -f 'src/jni/call_scilab_wrap.c' || echo '$(srcdir)/'`src/jni/call_scilab_wrap.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libjavasci_la-call_scilab_wrap.Tpo $(DEPDIR)/libjavasci_la-call_scilab_wrap.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/jni/call_scilab_wrap.c' object='libjavasci_la-call_scilab_wrap.lo' libtool=yes @AMDEPBACKSLASH@
+libjavasci2_la-call_scilab_wrap.lo: src/jni/call_scilab_wrap.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjavasci2_la_CFLAGS) $(CFLAGS) -MT libjavasci2_la-call_scilab_wrap.lo -MD -MP -MF $(DEPDIR)/libjavasci2_la-call_scilab_wrap.Tpo -c -o libjavasci2_la-call_scilab_wrap.lo `test -f 'src/jni/call_scilab_wrap.c' || echo '$(srcdir)/'`src/jni/call_scilab_wrap.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libjavasci2_la-call_scilab_wrap.Tpo $(DEPDIR)/libjavasci2_la-call_scilab_wrap.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/jni/call_scilab_wrap.c' object='libjavasci2_la-call_scilab_wrap.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjavasci_la_CFLAGS) $(CFLAGS) -c -o libjavasci_la-call_scilab_wrap.lo `test -f 'src/jni/call_scilab_wrap.c' || echo '$(srcdir)/'`src/jni/call_scilab_wrap.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjavasci2_la_CFLAGS) $(CFLAGS) -c -o libjavasci2_la-call_scilab_wrap.lo `test -f 'src/jni/call_scilab_wrap.c' || echo '$(srcdir)/'`src/jni/call_scilab_wrap.c
 
-libjavasci_la-javasci2_helper.lo: src/c/javasci2_helper.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjavasci_la_CFLAGS) $(CFLAGS) -MT libjavasci_la-javasci2_helper.lo -MD -MP -MF $(DEPDIR)/libjavasci_la-javasci2_helper.Tpo -c -o libjavasci_la-javasci2_helper.lo `test -f 'src/c/javasci2_helper.c' || echo '$(srcdir)/'`src/c/javasci2_helper.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libjavasci_la-javasci2_helper.Tpo $(DEPDIR)/libjavasci_la-javasci2_helper.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/javasci2_helper.c' object='libjavasci_la-javasci2_helper.lo' libtool=yes @AMDEPBACKSLASH@
+libjavasci2_la-javasci2_helper.lo: src/c/javasci2_helper.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjavasci2_la_CFLAGS) $(CFLAGS) -MT libjavasci2_la-javasci2_helper.lo -MD -MP -MF $(DEPDIR)/libjavasci2_la-javasci2_helper.Tpo -c -o libjavasci2_la-javasci2_helper.lo `test -f 'src/c/javasci2_helper.c' || echo '$(srcdir)/'`src/c/javasci2_helper.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libjavasci2_la-javasci2_helper.Tpo $(DEPDIR)/libjavasci2_la-javasci2_helper.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/javasci2_helper.c' object='libjavasci2_la-javasci2_helper.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjavasci_la_CFLAGS) $(CFLAGS) -c -o libjavasci_la-javasci2_helper.lo `test -f 'src/c/javasci2_helper.c' || echo '$(srcdir)/'`src/c/javasci2_helper.c
+@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjavasci2_la_CFLAGS) $(CFLAGS) -c -o libjavasci2_la-javasci2_helper.lo `test -f 'src/c/javasci2_helper.c' || echo '$(srcdir)/'`src/c/javasci2_helper.c
 
 mostlyclean-libtool:
        -rm -f *.lo
index 0ae79a0..969ff23 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}" />
 
   <description>
        Build the Java/Scilab connecter (javasci) module
   </description>
 
-  <target name="jar" description="Build the jar file" depends="compile">
-       <jar destfile="${build.jar.dir}/${library.name}" basedir="${classes.dir}">
+  <target name="jar-v1" description="Build the jar file" depends="compile">
+       <jar destfile="${build.jar.dir}/${library-v1.name}" basedir="${classes.dir}">
          <manifest>
                <attribute name="SciAbstractDataType" value="javasci.SciAbstractDataType"/>
                <attribute name="SciBooleanArray" value="javasci.SciBooleanArray"/>
 
   <property name="examples.classes.dir" location="${build.dir}/examples/" />
 
-  <target name="build-examples" description="Build the examples" depends="jar">
+  <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.name}"
+                        classpath="${library.javasci.dir}/${library.javasci-v1.name}"
                         deprecation="on"
                         debug="off"
                         verbose="off"
index b38fdcc..a651571 100644 (file)
@@ -28,7 +28,7 @@ class Call_ScilabJNI {
   static {
     try {
         System.loadLibrary("scilab");
-        System.loadLibrary("javasci");
+        System.loadLibrary("javasci2");
     } catch (SecurityException e) {
                System.err.println("A security manager exists and does not allow the loading of the specified dynamic library :");
                e.printStackTrace(System.err);
index 102b118..528e6bd 100644 (file)
@@ -76,7 +76,8 @@ library.core.dir=${modules.dir}/core/${build.jar.dir}/
 library.core.name=org.scilab.modules.core.jar
 
 library.javasci.dir=${modules.dir}/javasci/${build.jar.dir}/
-library.javasci.name=javasci.jar
+library.javasci-v1.name=javasci.jar
+library.javasci.name=org.scilab.modules.javasci.jar
 
 library.types.dir=${modules.dir}/types/${build.jar.dir}/
 library.types.name=org.scilab.modules.types.jar
index 34e5649..881087e 100644 (file)
@@ -72,7 +72,8 @@ library.core.dir=${modules.dir}/core/${build.jar.dir}/
 library.core.name=org.scilab.modules.core.jar
 
 library.javasci.dir=${modules.dir}/javasci/${build.jar.dir}/
-library.javasci.name=javasci.jar
+library.javasci-v1.name=javasci.jar
+library.javasci.name=org.scilab.modules.javasci.jar
 
 library.graphic_export.dir=${modules.dir}/graphic_export/${build.jar.dir}/
 library.graphic_export.name=org.scilab.modules.graphic_export.jar