Commit 711cedeb authored by Sébastien Villemot's avatar Sébastien Villemot

New upstream version 1.12.0

parent d35e78a0
Version 1.12.0, 2018-02-16
Adjusted makefiles for GLPK 4.65
Version 1.11.0, 2017-12-02
Adjusted makefiles for GLPK 4.64
Version 1.10.0, 2017-07-25
......
Version 1.12.0, 2018-02-16
Adjusted makefiles for GLPK 4.65
Version 1.11.0, 2017-12-02
Adjusted makefiles for GLPK 4.64
Version 1.10.0, 2017-07-25
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for GLPK for Java 1.11.0.
# Generated by GNU Autoconf 2.69 for GLPK for Java 1.12.0.
#
# Report bugs to <xypron.glpk@gmx.de>.
#
......@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='GLPK for Java'
PACKAGE_TARNAME='libglpk-java'
PACKAGE_VERSION='1.11.0'
PACKAGE_STRING='GLPK for Java 1.11.0'
PACKAGE_VERSION='1.12.0'
PACKAGE_STRING='GLPK for Java 1.12.0'
PACKAGE_BUGREPORT='xypron.glpk@gmx.de'
PACKAGE_URL='http://glpk-java.sourceforge.net'
......@@ -1336,7 +1336,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures GLPK for Java 1.11.0 to adapt to many kinds of systems.
\`configure' configures GLPK for Java 1.12.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1407,7 +1407,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of GLPK for Java 1.11.0:";;
short | recursive ) echo "Configuration of GLPK for Java 1.12.0:";;
esac
cat <<\_ACEOF
......@@ -1522,7 +1522,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
GLPK for Java configure 1.11.0
GLPK for Java configure 1.12.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -1891,7 +1891,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by GLPK for Java $as_me 1.11.0, which was
It was created by GLPK for Java $as_me 1.12.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -2758,7 +2758,7 @@ fi
# Define the identity of the package.
PACKAGE='libglpk-java'
VERSION='1.11.0'
VERSION='1.12.0'
cat >>confdefs.h <<_ACEOF
......@@ -13629,7 +13629,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by GLPK for Java $as_me 1.11.0, which was
This file was extended by GLPK for Java $as_me 1.12.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -13696,7 +13696,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
GLPK for Java config.status 1.11.0
GLPK for Java config.status 1.12.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
dnl GLPK for Java
dnl Initialization
AC_INIT([GLPK for Java], [1.11.0], [xypron.glpk@gmx.de],
AC_INIT([GLPK for Java], [1.12.0], [xypron.glpk@gmx.de],
[libglpk-java], [http://glpk-java.sourceforge.net])
AC_CONFIG_SRCDIR([swig/glpk.i])
AC_CONFIG_HEADERS([config.h])
......
No preview for this file type
......@@ -3,7 +3,7 @@
%***********************************************************************
% This code is part of GLPK for Java.
%
% Copyright (C) 2009-2017 Heinrich Schuchardt,
% Copyright (C) 2009-2018 Heinrich Schuchardt,
% <xypron.glpk@gmx.de>
%
% GLPK for Java is free software: you can redistribute it and/or
......@@ -34,9 +34,9 @@
%%generate index
\makeindex
\newcommand{\glpkJavaVersion}{1.11.0}
\newcommand{\glpkJavaVersion}{1.12.0}
\newcommand{\glpkVersionMajor}{4}
\newcommand{\glpkVersionMinor}{64}
\newcommand{\glpkVersionMinor}{65}
\newcommand{\code}{\texttt}
......@@ -289,8 +289,9 @@ If configure is called with \code{--enable-libpath},
class GLPKJNI will try to load the GLPK library from the path specified by
java.library.path (see section \ref{sec:JNI-library}).
OS X has jni.h in a special path. You may want to specify this path in the
parameters CPPFLAGS and SWIGFLAGS for the configure script
Some POSIX systems like OS X have jni.h in a special path. You may want to
specify this path in the parameters CPPFLAGS and SWIGFLAGS for the configure
script, e.g.
\begin{lstlisting}
./configure \
......@@ -359,6 +360,89 @@ $JAVA_HOME/bin/java \
GmplSwing marbles.mod
\end{lstlisting}
\subsection{OS X}
\subsubsection{Installation from source}
For building GLPK for Java the package manager Homebrew is needed. The
installation and usage is described at \url{https://brew.sh}.
Install GLPK
\begin{lstlisting}
brew install glpk
\end{lstlisting}
For the next steps you will need a Java Development Kit (JDK) to be installed.
You can check the correct installation with the following commands:
\begin{lstlisting}
$JAVA_HOME/bin/javac -version
java -version
\end{lstlisting}
If the JDK is missing it can be installed with
\begin{lstlisting}
brew cask install java
\end{lstlisting}
To build GLPK for Java you will need package SWIG (Simplified Wrapper and
Interface Generator, \href{http://www.swig.org/}{http://www.swig.org/}). You
can check the installation with the following command:
\begin{lstlisting}
swig -version
\end{lstlisting}
SWIG can be installed with
\begin{lstlisting}
brew install swig
\end{lstlisting}
Download GLPK for Java from \url{https://sourceforge.net/projects/glpk-java/files/}.
Unzip the archive with:
\begin{lstlisting}
tar -xzf glpk-java-#\glpkJavaVersion..tar.gz
cd glpk-java-#\glpkJavaVersion.
\end{lstlisting}
Configure with:
\begin{lstlisting}
./configure
\end{lstlisting}
If configure is called with \code{--enable-libpath},
class GLPKJNI will try to load the GLPK library from the path specified by
java.library.path (see section \ref{sec:JNI-library}).
OS X has jni.h in a special path. You will have to specify this path by setting
parameters CPPFLAGS and SWIGFLAGS for the configure script.
\begin{lstlisting}
./configure \
CPPFLAGS=-I/System/Library/Frameworks/JavaVM.framework/Headers \
SWIGFLAGS=-I/System/Library/Frameworks/JavaVM.framework/Headers
\end{lstlisting}
If libglpk.so is in a special path you may specify this path using parameter
LDFLAGS, e.g.
\begin{lstlisting}
./configure LDFLAGS=-L/opt/lib
\end{lstlisting}
Make and install with:
\begin{lstlisting}
make
make check
sudo make install
\end{lstlisting}
\section{Trivial example}
In the example we will create a Java class which will write the GLPK version to the console.
......
.TH libglpk-java 3 "December 2nd, 2017" "version 1.11.0" "libglpk-java overview"
.TH libglpk-java 3 "February 16th, 2018" "version 1.12.0" "libglpk-java overview"
.SH NAME
libglpk-java \- GNU Linear Programming Kit Java Binding
.SH DESCRIPTION
......
EXTRA_DIST = *.i *.h *.java pom.xml src/site
# copy version-info from glpk package: src/Makefile.am
VERSION_INFO = 42:3:2
VERSION_INFO = 43:0:3
all:
mkdir -p target/classes
......
......@@ -248,7 +248,7 @@ top_srcdir = @top_srcdir@
EXTRA_DIST = *.i *.h *.java pom.xml src/site
# copy version-info from glpk package: src/Makefile.am
VERSION_INFO = 42:3:2
VERSION_INFO = 43:0:3
all: all-am
.SUFFIXES:
......
......@@ -16,14 +16,14 @@
#ifdef GLPKPRELOAD
%pragma(java) jniclasscode=%{
try {
System.loadLibrary("glpk_4_64");
System.loadLibrary("glpk_4_65");
} catch (UnsatisfiedLinkError en) {
// The dependent library might be in the OS library search path.
}
%}
#endif
%pragma(java) jniclasscode=%{
System.loadLibrary("glpk_4_64_java");
System.loadLibrary("glpk_4_65_java");
} else {
// try to load Linux library
%}
......
......@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.gnu.glpk</groupId>
<artifactId>glpk-java</artifactId>
<version>1.11.0</version>
<version>1.12.0</version>
<prerequisites>
<maven>3.0</maven>
</prerequisites>
......@@ -29,7 +29,7 @@
<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
<netbeans.hint.license>gpl30</netbeans.hint.license>
<glpkVersionMajor>4</glpkVersionMajor>
<glpkVersionMinor>64</glpkVersionMinor>
<glpkVersionMinor>65</glpkVersionMinor>
</properties>
<licenses>
<license>
......
......@@ -292,6 +292,99 @@ $JAVA_HOME/bin/java \
GmplSwing marbles.mod
----
** OS X
*** Installation from source
**** Prerequisites
For building GLPK for Java the package manager Homebrew is needed. The
installation and usage is described at https://brew.sh.
Install GLPK with
----
brew install glpk
---
Check the installation with
----
glpsol --version
----
For the next steps you will need a Java Development Kit (JDK) to be installed.
You can check the correct installation with the following commands:
----
$JAVA_HOME/bin/javac -version
java -version
----
If the JDK is missing it can be installed with
----
brew cask install java
----
To build GLPK for Java you will need package SWIG (Simplified Wrapper and
Interface Generator). You can check the installation with the following
command:
----
swig -version
----
SWIG can be installed with
----
brew install swig
----
**** GLPK for Java
Download GLPK for Java from
{{{https://sourceforge.net/projects/glpk-java/files/}https://sourceforge.net/projects/glpk-java/files/}}.
Unzip the archive with:
----
tar -xzf glpk-java-${project.version}.tar.gz
cd glpk-java-${project.version}
----
Configure with:
----
./configure
----
OS X has jni.h in a special path. You may want to specify this path in the
parameters CPPFLAGS and SWIGFLAGS for the configure script, e.g.
----
./configure \
CPPFLAGS=-I/System/Library/Frameworks/JavaVM.framework/Headers \
SWIGFLAGS=-I/System/Library/Frameworks/JavaVM.framework/Headers
----
If libglpk.so is in a special path you may specify this path using parameter
LDFLAGS, e.g.
----
./configure LDFLAGS=-L/opt/lib
----
Make and install with:
----
make
make check
sudo make install
sudo ldconfig
----
* Trivial example
In the example we will create a Java class which will write the GLPK version
......
# Build GLPK JNI DLL with Microsoft Visual Studio Express 2010
GLPKVERS=4_64
GLPKVERS=4_65
CFLAGS = /I. /I../swig /I$(GLPK_HOME)\src /nologo /W3 /O2 /Zi
OBJSET = \
......
#include "VerRsrc.h"
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,11,0,0
PRODUCTVERSION 1,11,0,0
FILEVERSION 1,12,0,0
PRODUCTVERSION 1,12,0,0
FILEFLAGSMASK 0
FILEFLAGS 0
FILEOS VOS__WINDOWS32
......@@ -14,12 +14,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Xypron\0"
VALUE "FileDescription", "JNI wrapper for GLPK 32bit\0"
VALUE "FileVersion", "1.11.0.0\0"
VALUE "InternalName", "glpk_4_64_java.dll\0"
VALUE "FileVersion", "1.12.0.0\0"
VALUE "InternalName", "glpk_4_65_java.dll\0"
VALUE "LegalCopyright", "Heinrich Schuchardt, GPL v3"
VALUE "OriginalFilename", "glpk_4_64_java.dll\0"
VALUE "OriginalFilename", "glpk_4_65_java.dll\0"
VALUE "ProductName", "GLPK for Java - http://glpk-java.sourceforge.net\0"
VALUE "ProductVersion", "1.11.0.0\0"
VALUE "ProductVersion", "1.12.0.0\0"
END
END
BLOCK "VarFileInfo"
......
......@@ -30,7 +30,7 @@ cd ..\..\..
cd "%~dp0"
set INCLUDE=
set LIB=
call %HOME%\vcvarsall.bat x64
call %HOME%\vcvarsall.bat x86_amd64
call %SDK%\bin\x86\rc.exe glpk_java_dll.rc
set INCLUDE=%INCLUDE%;%JAVA_HOME%\include;%JAVA_HOME%\include\win32
%HOME%\bin\nmake.exe /f Makefile_JNI_VC_DLL
......
# Build GLPK JNI DLL with Microsoft Visual Studio Express 2010
GLPKVERS=4_64
GLPKVERS=4_65
CFLAGS = /I. /I../swig /I$(GLPK_HOME)\src /nologo /W3 /O2 /Zi
OBJSET = \
......
#include "VerRsrc.h"
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,11,0,0
PRODUCTVERSION 1,11,0,0
FILEVERSION 1,12,0,0
PRODUCTVERSION 1,12,0,0
FILEFLAGSMASK 0
FILEFLAGS 0
FILEOS VOS_UNKNOWN
......@@ -14,12 +14,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Xypron\0"
VALUE "FileDescription", "JNI wrapper for GLPK 64bit\0"
VALUE "FileVersion", "1.11.0.0\0"
VALUE "InternalName", "glpk_4_64_java.dll\0"
VALUE "FileVersion", "1.12.0.0\0"
VALUE "InternalName", "glpk_4_65_java.dll\0"
VALUE "LegalCopyright", "Heinrich Schuchardt, GPL v3"
VALUE "OriginalFilename", "glpk_4_64_java.dll\0"
VALUE "OriginalFilename", "glpk_4_65_java.dll\0"
VALUE "ProductName", "GLPK for Java - http://glpk-java.sourceforge.net\0"
VALUE "ProductVersion", "1.11.0.0\0"
VALUE "ProductVersion", "1.12.0.0\0"
END
END
BLOCK "VarFileInfo"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment