From cef28144693cd330e569b383e3b4c3ae274c8b18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Krup=C4=8D=C3=ADk?= <lukas.krupcik@vsb.cz>
Date: Fri, 4 May 2018 08:25:20 +0200
Subject: [PATCH] modified: a/ANSYS/ANSYS-18.0-intel-2017a.eb
modified: a/ANSYS/ANSYS-18.0.eb modified:
a/ANSYS/ANSYS-18.2-intel-2017a.eb modified:
a/ANSYS/ANSYS-19-intel-2017b.eb new file: l/libpng/file.err new
file: l/libpng/libpng-1.2.59.eb
---
a/ANSYS/ANSYS-18.0-intel-2017a.eb | 6 ++++++
a/ANSYS/ANSYS-18.0.eb | 8 +++++++-
a/ANSYS/ANSYS-18.2-intel-2017a.eb | 11 ++++++-----
a/ANSYS/ANSYS-19-intel-2017b.eb | 12 ++++++++++--
l/libpng/file.err | 1 +
l/libpng/libpng-1.2.59.eb | 21 +++++++++++++++++++++
6 files changed, 51 insertions(+), 8 deletions(-)
create mode 100644 l/libpng/file.err
create mode 100644 l/libpng/libpng-1.2.59.eb
diff --git a/a/ANSYS/ANSYS-18.0-intel-2017a.eb b/a/ANSYS/ANSYS-18.0-intel-2017a.eb
index 0cf11b25..004b9dc2 100644
--- a/a/ANSYS/ANSYS-18.0-intel-2017a.eb
+++ b/a/ANSYS/ANSYS-18.0-intel-2017a.eb
@@ -1,3 +1,5 @@
+# IT4Innovations 2017
+
name = 'ANSYS'
version = '18.0'
@@ -12,6 +14,10 @@ toolchain = {'name': 'intel', 'version': '2017a'}
# make sure all files of the iso's are in the same directory.
sources = ['ANSYS-18.0.zip']
+dependencies = [
+ ('libpng', '1.2.59', '', True)
+]
+
import os
license_server = os.getenv('EB_ANSYS_LICENSE_SERVER', 'license.it4i.cz')
license_server_port = os.getenv('EB_ANSYS_LICENSE_SERVER_PORT', '2325:1055')
diff --git a/a/ANSYS/ANSYS-18.0.eb b/a/ANSYS/ANSYS-18.0.eb
index 8c281023..6c022af5 100644
--- a/a/ANSYS/ANSYS-18.0.eb
+++ b/a/ANSYS/ANSYS-18.0.eb
@@ -1,3 +1,5 @@
+# IT4Innovations 2017
+
name = 'ANSYS'
version = '18.0'
@@ -6,12 +8,16 @@ description = """ANSYS simulation software enables organizations to confidently
how their products will operate in the real world. We believe that every product is
a promise of something greater. """
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = {'name': 'dummy', 'version': ''}
# create a zip file from the 3 install iso files.
# make sure all files of the iso's are in the same directory.
sources = ['ANSYS-18.0.zip']
+dependencies = [
+ ('libpng', '1.2.59', '', True)
+]
+
import os
license_server = os.getenv('EB_ANSYS_LICENSE_SERVER', 'license.it4i.cz')
license_server_port = os.getenv('EB_ANSYS_LICENSE_SERVER_PORT', '2325:1055')
diff --git a/a/ANSYS/ANSYS-18.2-intel-2017a.eb b/a/ANSYS/ANSYS-18.2-intel-2017a.eb
index aab5df22..355d30d9 100644
--- a/a/ANSYS/ANSYS-18.2-intel-2017a.eb
+++ b/a/ANSYS/ANSYS-18.2-intel-2017a.eb
@@ -1,14 +1,11 @@
+# IT4Innovations 2018
+
name = 'ANSYS'
version = '18.2'
homepage = 'http://www.ansys.com'
-<<<<<<< HEAD
-description = """ANSYS simulation software enables organizations to confidently predict
- how their products will operate in the real world. We believe that every product is
-=======
description = """ANSYS simulation software enables organizations to confidently predict
how their products will operate in the real world. We believe that every product is
->>>>>>> e33c4dbf29516f08a1821b5a17556f7d0df2e1b5
a promise of something greater. """
toolchain = {'name': 'intel', 'version': '2017a'}
@@ -17,6 +14,10 @@ toolchain = {'name': 'intel', 'version': '2017a'}
# make sure all files of the iso's are in the same directory.
sources = ['ANSYS-18.2.zip']
+dependencies = [
+ ('libpng', '1.2.59', '', True)
+]
+
import os
license_server = os.getenv('EB_ANSYS_LICENSE_SERVER', 'license.it4i.cz')
license_server_port = os.getenv('EB_ANSYS_LICENSE_SERVER_PORT', '2325:1055')
diff --git a/a/ANSYS/ANSYS-19-intel-2017b.eb b/a/ANSYS/ANSYS-19-intel-2017b.eb
index cc49c057..70b18bfb 100644
--- a/a/ANSYS/ANSYS-19-intel-2017b.eb
+++ b/a/ANSYS/ANSYS-19-intel-2017b.eb
@@ -4,8 +4,8 @@ name = 'ANSYS'
version = '19.0'
homepage = 'http://www.ansys.com'
-description = """ANSYS simulation software enables organizations to confidently predict
- how their products will operate in the real world. We believe that every product is
+description = """ANSYS simulation software enables organizations to confidently predict
+ how their products will operate in the real world. We believe that every product is
a promise of something greater. """
toolchain = {'name': 'intel', 'version': '2017b'}
@@ -14,6 +14,14 @@ toolchain = {'name': 'intel', 'version': '2017b'}
# make sure all files of the iso's are in the same directory.
sources = ['ANSYS-19.0.zip']
+dependencies = [
+ ('libpng', '1.2.59', '', True)
+]
+
+modextrapaths = {
+ 'LD_LIBRARY_PATH': ['$LD_LIBRARY_PATH:%(installdir)s/v190/Electronics/Linux64/defer:%(installdir)s/v190/Framework/bin/Linux64'],
+}
+
import os
license_server = os.getenv('EB_ANSYS_LICENSE_SERVER', 'license.it4i.cz')
license_server_port = os.getenv('EB_ANSYS_LICENSE_SERVER_PORT', '2325:1055')
diff --git a/l/libpng/file.err b/l/libpng/file.err
new file mode 100644
index 00000000..588c65e9
--- /dev/null
+++ b/l/libpng/file.err
@@ -0,0 +1 @@
+/COM,ANSYS RELEASE Release 19.0 BUILD 19.0 UP20171214 14:17:35
diff --git a/l/libpng/libpng-1.2.59.eb b/l/libpng/libpng-1.2.59.eb
new file mode 100644
index 00000000..f2bb591e
--- /dev/null
+++ b/l/libpng/libpng-1.2.59.eb
@@ -0,0 +1,21 @@
+easyblock = 'ConfigureMake'
+
+name = 'libpng'
+version = '1.2.59'
+
+homepage = 'http://www.libpng.org/pub/png/libpng.html'
+description = "libpng is the official PNG reference library"
+
+toolchain = {'name': 'dummy', 'version': ''}
+toolchainopts = {'pic': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = [SOURCELOWER_TAR_GZ]
+
+dependencies = [('zlib', '1.2.11')]
+
+preconfigopts = 'export LDFLAGS="-L/apps/all/zlib/1.2.11/lib" CPPFLAGS="-I/apps/all/zlib/1.2.11/include" &&'
+
+configopts = "--with-pic"
+
+moduleclass = 'lib'