summaryrefslogtreecommitdiffstats
path: root/scilab/modules/javasci
AgeCommit message (Collapse)AuthorFilesLines
2010-04-14Merge commit 'origin/5.2'Pierre MARECHAL1-0/+1
Conflicts: scilab/modules/functions/tests/unit_tests/getf.tst Change-Id: Ic209624ec52e0615fce1f02c08a387aea90b8ded
2010-04-14includeAntRuntime added to the javac target. Removes some warnings on more ↵Sylvestre Ledru1-0/+1
recent version of ant: warning: 'includeantruntime' was not set, defaulting to build.sysclasspath=last; set to false for repeatable builds Change-Id: Idc71ee7059a1c90600a1cf1d989ea986a7578fbd
2010-04-09Merge commit 'origin/5.2'Pierre MARECHAL1-0/+1
2010-04-08Some macros were duplicated during the installation process.Sylvestre Ledru1-0/+1
Change-Id: I513fb3ac83f002982b90db22d863c99b979801d1
2010-03-08MSDOS replaced by getos() == 'Windows'Allan CORNET2-4/+4
2010-02-26compatibility dll versioning and VS expressAllan CORNET2-15/+1
2010-02-26dll versioningAllan CORNET3-1/+119
2010-02-18force UTF-8 encoding for vcprojAllan CORNET2-2/+2
2010-02-12merge with masterAllan CORNET1-0/+1
2010-02-12remove not used file in .issAllan CORNET1-2/+0
2010-02-12Merge remote branch 'origin/master' into textrenderingSylvestre Ledru1-0/+1
Conflicts: scilab/CHANGES_5.3.X scilab/configure scilab/configure.ac
2010-02-12regeneration of Makefile.inSylvestre Ledru1-1/+1
2010-02-12%helps_module defined only when we needAllan CORNET2-10/+0
2010-02-04Merge branch '5.2'Clément DAVID1-0/+1
Conflicts: scilab/configure scilab/modules/xcos/src/java/org/scilab/modules/graph/ScilabGraph.java scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/actions/RegionToSuperblockAction.java scilab/modules/xcos/src/java/org/scilab/modules/xcos/palette/actions/ViewPaletteBrowserAction.java
2010-02-04regenerated of autotools due to previous commitSylvestre Ledru1-0/+1
2010-02-03Merge branch '5.2'Clément DAVID1-1/+2
Conflicts: scilab/configure scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/FitDiagramToViewAction.java
2010-02-03* When two versions of the same jar libraries, in some cases, the systemSylvestre Ledru1-1/+2
could not detect any of them
2010-02-02Merge commit 'origin/5.2'Pierre MARECHAL1-1/+0
Conflicts: scilab/configure
2010-02-02autoreconfPierre MARECHAL1-1/+0
2010-02-02Merge remote branch 'origin/master' into textrenderingSylvestre Ledru2-2/+6
Conflicts: scilab/configure
2010-01-31regeneration of Makefile.inSylvestre Ledru1-0/+4
2010-01-26regenerated autotools files regarding jlatexmath-fop stuffSylvestre Ledru1-0/+1
2010-01-26remove /ARCH:IA32 limitationAllan CORNET1-2/+2
2010-01-12Merge remote branch 'refs/remotes/origin/5.2'Allan CORNET1-7/+8
2010-01-12checkstyleAllan CORNET1-7/+8
2010-01-11Merge branch '5.2'Clément DAVID1-1/+2
2010-01-11* Under GNU/Linux, Mac OS X & Unix, a m4 macro calledSylvestre Ledru1-1/+2
AC_JAVA_CHECK_VERSION_PACKAGE has been added to check the version of Java packages used The first use of this feature is too check the version jgraphx which should be 1.2.0.X Note that this commit will make the compilation fails under Clement pushes his changes.
2010-01-07Merge commit 'refs/remotes/origin/5.2'Allan CORNET4-4/+67
2010-01-07bug 6388Allan CORNET4-4/+67
2009-11-04MODULES : version.xml, Scilab 5.3Pierre MARECHAL1-1/+1
2009-11-04MODULES : homogenize version.xml files5.2.0-beta-1Pierre MARECHAL1-15/+3
2009-11-03bug 5155 - scilab windows with old CPUsAllan CORNET1-0/+2
2009-10-30Also rename strErr => sciErr as a matter of consistencySylvestre Ledru8-145/+145
2009-10-27Rename of the structure StrErr => SciErr for something more explicitSylvestre Ledru8-27/+27
2009-10-12Merge commit 'origin/master' into XcosVincent COUVERT1-0/+1
Conflicts: scilab/configure
2009-10-12Merge of the textrendering branch into the masterSylvestre Ledru1-0/+1
2009-10-09Merge commit 'refs/remotes/origin/master' into XcosAllan CORNET1-4/+4
2009-10-08update rebuild antAllan CORNET1-4/+4
2009-10-08Merge commit 'origin/master' into XcosPierre MARECHAL9-151/+213
Conflicts: scilab/Version.incl scilab/configure scilab/modules/Makefile.in scilab/modules/core/includes/version.h
2009-10-07AutoreconfPierre MARECHAL1-3/+2
2009-10-07Regenrate Makefile.inSylvestre Ledru1-5/+11
2009-10-06Merge branch 'master' of git@git.scilab.org:scilabantoine ELIAS1-2/+1
2009-10-06add Scilab context parameter in API functionsantoine ELIAS8-42/+42
2009-10-06Because mac os x is happier with mkinstalldirs, we are using itSylvestre Ledru1-105/+162
and therefor all makefiles need to be regenerated
2009-10-06Merge commit 'origin/master' into XcosVincent COUVERT1-164/+106
Conflicts: scilab/Version.incl scilab/configure scilab/modules/core/includes/version.h
2009-10-05Merged (regeneration of Makefile.in)Sylvestre Ledru1-163/+106
2009-10-02Merge commit 'origin/master' into scilab-macosxPierre MARECHAL8-62/+169
2009-10-02Merge commit 'origin/master' into xcosVincent COUVERT11-130/+175
Conflicts: scilab/configure scilab/modules/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp scilab/modules/hdf5/src/c/h5_readDataFromFile.c scilab/modules/hdf5/src/c/h5_writeDataToFile.c
2009-10-02master with masterantoine ELIAS2-67/+5
2009-10-02add error handling in api_scilab, add uint management in import/export HDF5antoine ELIAS8-62/+169