cplex aur repository update

From e9921639e4bb0f55f5c4b1bd0644f127d95942a8 Mon Sep 17 00:00:00 2001
From: Alberto Santini <santini.alberto@gmail.com>
Date: Fri, 10 Aug 2018 23:54:51 +0200
Subject: [PATCH] Updated pkgbuild

---
 .SRCINFO |  2 +-
 PKGBUILD | 66 +++++++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index e2dbfd9..42c1a8a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,7 +3,7 @@
 pkgbase = cplex
 	pkgdesc = A commercial solver for mathematical optimization problems.
 	pkgver = 12.8
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.ibm.com/software/products/de/ibmilogcpleoptistud
 	arch = x86_64
 	license = custom
diff --git a/PKGBUILD b/PKGBUILD
index eff0759..8f08cca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer: Maximilian Stahlberg <maximilian.stahlberg tu-berlin de>
+# Contributor: Alberto Santini <alberto.santini at upf dot edu>

 # You need to manually download the IBM ILOG CPLEX Optimization Studio installer
 # and place it into the same directory as this PKGBUILD, before you proceed.
@@ -6,11 +7,11 @@
 pkgname='cplex'
 pkgdesc="A commercial solver for mathematical optimization problems."
 pkgver=12.8
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://www.ibm.com/software/products/de/ibmilogcpleoptistud'
 license=('custom')
-makedepends=('python2-setuptools' 'python-setuptools')
+makedepends=('python2>=2.7', 'python>=3.5', 'python2-setuptools' 'python-setuptools')
 depends=('gcc-libs')
 optdepends=(
 	'python2: for Python2 bindings'
@@ -21,6 +22,7 @@ options=('!strip')
 _basename="cplex_studio${pkgver//./}.linux-${arch/_/-}"
 _installer="${_basename}.bin"
 _archdir="${arch/_/-}_linux"
+_python_min_version=$(python --version | awk '{ print $2 }' | awk -F "." '{ print $2 }')

 source=("file://${_installer}" installer.properties.template)

@@ -39,17 +41,43 @@ prepare() {
 package() {
 	cd "${srcdir}/${_basename}"

-	# Install binaries.
+	### Install binaries:
+
+	# Cplex main exe.
 	install -Dm755 "./cplex/bin/${_archdir}/cplex" "${pkgdir}/usr/bin/cplex"
+
+	# Cplex AMPL.
 	install -Dm755 "./cplex/bin/${_archdir}/cplexamp" "${pkgdir}/usr/bin/cplexamp"

-	# Install library files.
+	# Cplex Constraint Optimizer.
+	install -Dm755 "./cpoptimizer/bin/${_archdir}/cpoptimizer" "${pkgdir}/usr/bin/cpoptimizer"
+
+	### Install library files:
 	install -dm755 "${pkgdir}/usr/lib"
-	install -m755  "./cplex/bin/${_archdir}/"*.so "${pkgdir}/usr/lib/"

-	# Install C headers.
+	# Cplex libraries.
+	install -m755  "./cplex/lib/${_archdir}/static_pic/"*.a "${pkgdir}/usr/lib"
+
+	# Concert libraries.
+	install -m755 "./concert/lib/${_archdir}/static_pic/"*.a "${pkgdir}/usr/lib"
+
+	# Constraint Optimizer libraries.
+	install -m755 "./cpoptimizer/lib/${_archdir}/static_pic/"*.a "${pkgdir}/usr/lib"
+
+	### Install C/C++ headers:
 	install -dm755 "${pkgdir}/usr/include"
-	install -m755  "./cplex/include/ilcplex/"*.h "${pkgdir}/usr/include/"
+
+	# Cplex headers.
+	install -dm755 "${pkgdir}/usr/include/ilcplex"
+	install -m755  "./cplex/include/ilcplex/"*.h "${pkgdir}/usr/include/ilcplex"
+
+	# Concert headers.
+	install -dm755 "${pkgdir}/usr/include/ilconcert"
+	install -m755 "./concert/include/ilconcert/"*.h "${pkgdir}/usr/include/ilconcert"
+
+	# Constraint Optimizer headers.
+	install -dm755 "${pkgdir}/usr/include/ilcp"
+	install -m755 "./cpoptimizer/include/ilcp/"*.h "${pkgdir}/usr/include/ilcp"

 	# Install Python2 bindings.
 	cd "./cplex/python/2.7/${_archdir}/"
@@ -57,13 +85,27 @@ package() {
 	cd "../../../../"

 	# Install Python bindings.
-	cd "./cplex/python/3.6/${_archdir}/"
-	python3 setup.py install --root="${pkgdir}/" --optimize=1
-	cd "../../../../"
-
-	# Install documentation.
+	if [[ "${_python_min_version}" > 6 ]]; then
+		echo -ne "\033[0;31m\033[1mWARNING\033[0m "
+		echo "Skipping the installation of Python bindings."
+		echo "CPLEX 12.8.0 only supports Python 3.5 and 3.6; later versions of Python are not supported."
+		echo "Downgrade to Python 3.6 if you need Python bindings."
+	else
+		cd "./cplex/python/3.7/${_archdir}/"
+		python3 setup.py install --root="${pkgdir}/" --optimize=1
+		cd "../../../../"
+	fi
+
+	# Install license.
 	install -dm755 "${pkgdir}/usr/share/licenses/cplex"
 	install -m644  "./license/"*.txt "${pkgdir}/usr/share/licenses/cplex/"
+
+	# Install documentation and examples.
+	install -dm755 "${pkgdir}/usr/share/doc/cplex/"{html,examples/{cplex,cpoptimizer}}
+	cp -R ./doc/html/* "${pkgdir}/usr/share/doc/cplex/html"
+	cp -R ./cplex/examples/{src,data} "${pkgdir}/usr/share/doc/cplex/examples/cplex"
+	cp -R ./cpoptimizer/examples/{src,data,tutorial} "${pkgdir}/usr/share/doc/cplex/examples/cpoptimizer"
+	chmod -R 644 "${pkgdir}/usr/share/doc/cplex"
 }

 md5sums=('1cb4b29131433491a95efd73b145b821'
--
2.18.0