From 8ae3a6224ce6971badc30396ff7ff60cb706ccb9 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 19 Aug 2016 16:58:55 +0200 Subject: [PATCH 1/6] add easyconfig X11-20160819-intel-2016b.eb --- .../x/X11/X11-20160819-intel-2016b.eb | 144 ++++++++++++++++++ 1 file changed, 144 insertions(+) create mode 100644 easybuild/easyconfigs/x/X11/X11-20160819-intel-2016b.eb diff --git a/easybuild/easyconfigs/x/X11/X11-20160819-intel-2016b.eb b/easybuild/easyconfigs/x/X11/X11-20160819-intel-2016b.eb new file mode 100644 index 00000000000..9e88299a843 --- /dev/null +++ b/easybuild/easyconfigs/x/X11/X11-20160819-intel-2016b.eb @@ -0,0 +1,144 @@ +easyblock = 'Bundle' + +name = 'X11' +version = '20160819' + +homepage = 'https://www.x.org' +description = "The X Window System (X11) is a windowing system for bitmap displays" + +toolchain = {'name': 'intel', 'version': '2016b'} + +builddependencies = [ + ('Autotools', '20150215'), + ('pkg-config', '0.29.1'), +] + +# Python is required for xcb-proto +allow_system_deps = [('Python', SYS_PYTHON_VERSION)] +pyshortver = '.'.join(SYS_PYTHON_VERSION.split('.')[0:2]) + +# all extensions can be installed with configure/make/make install +exts_defaultclass = 'ConfigureMake' + +preconfigopts = "if [ -f autogen.sh ]; then ./autogen.sh; fi && " +#preconfigopts += "CPATH=%(installdir)s/include LIBRARY_PATH=%(installdir)s/lib " +#preconfigopts += "PKG_CONFIG_PATH=%(installdir)s/lib/pkgconfig" + +exts_list = [ + ('xorg-macros', '1.19.0', { + 'source_urls': ['http://cgit.freedesktop.org/xorg/util/macros/snapshot'], + 'source_tmpl': 'util-macros-%(version)s.tar.gz', + }), + ('fixesproto', '5.0', { + 'source_urls': [XORG_PROTO_SOURCE], + }), + ('glproto', '1.4.17', { + 'source_urls': [XORG_PROTO_SOURCE], + }), + ('xextproto', '7.3.0', { + 'source_urls': [XORG_PROTO_SOURCE], + }), + ('xcb-proto', '1.11', { + 'source_urls': ['http://xcb.freedesktop.org/dist/'], + }), + ('inputproto', '2.3.1', { + 'source_urls': [XORG_PROTO_SOURCE], + }), + ('xproto', '7.0.28', { + 'source_urls': [XORG_PROTO_SOURCE], + }), + ('libpthread-stubs', '0.3', { + 'source_urls': ['http://xcb.freedesktop.org/dist/'], + }), + ('kbproto', '1.0.7', { + 'source_urls': [XORG_PROTO_SOURCE], + }), + ('xtrans', '1.3.5', { + 'source_urls': [XORG_LIB_SOURCE], + }), + ('xineramaproto', '1.2.1', { + 'source_urls': [XORG_PROTO_SOURCE], + }), + ('randrproto', '1.5.0', { + 'source_urls': [XORG_PROTO_SOURCE], + }), + ('renderproto', '0.11', { + 'source_urls': [XORG_PROTO_SOURCE], + }), + ('libXau', '1.0.8', { + 'source_urls': [XORG_LIB_SOURCE], + }), + ('libxcb', '1.11.1', { + 'source_urls': ['http://xcb.freedesktop.org/dist/'], + }), + ('xcb-util', '0.4.0', { + 'source_urls': ['http://xcb.freedesktop.org/dist/'], + }), + ('xcb-util-image', '0.4.0', { + 'source_urls': ['http://xcb.freedesktop.org/dist/'], + }), + ('xcb-util-keysyms', '0.4.0', { + 'source_urls': ['http://xcb.freedesktop.org/dist/'], + }), + ('xcb-util-renderutil', '0.3.9', { + 'source_urls': ['http://xcb.freedesktop.org/dist/'], + }), + ('xcb-util-wm', '0.4.1', { + 'source_urls': ['http://xcb.freedesktop.org/dist/'], + }), + ('libxkbcommon', '0.6.1', { + 'source_urls': ['http://xkbcommon.org/download/'], + 'source_tmpl': 'libxkbcommon-%(version)s.tar.xz', + }), + ('libX11', '1.6.3', { + 'source_urls': [XORG_LIB_SOURCE], + }), + ('libXrender', '0.9.9', { + 'source_urls': [XORG_LIB_SOURCE], + }), + ('libICE', '1.0.9', { + 'source_urls': [XORG_LIB_SOURCE], + }), + ('libSM', '1.2.2', { + 'source_urls': [XORG_LIB_SOURCE], + }), + ('libXt', '1.1.5', { + 'source_urls': [XORG_LIB_SOURCE], + }), + ('libXext', '1.3.3', { + 'source_urls': [XORG_LIB_SOURCE], + }), + ('libXfixes', '5.0.2', { + 'source_urls': [XORG_LIB_SOURCE], + }), + ('libXi', '1.7.6', { + 'source_urls': [XORG_LIB_SOURCE], + }), + ('libXcursor', '1.1.14', { + 'source_urls': [XORG_LIB_SOURCE], + }), + ('libXinerama', '1.1.3', { + 'source_urls': [XORG_LIB_SOURCE], + }), + ('libXrandr', '1.5.0', { + 'source_urls': [XORG_LIB_SOURCE], + }), +] + +modextrapaths = { + 'ACLOCAL_PATH': ['share/aclocal'], + 'CPATH': ['include'], + 'LIBRARY_PATH': ['lib'], + 'PKG_CONFIG_PATH': ['lib/pkgconfig', 'share/pkgconfig'], +} + +# specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module +full_sanity_check = True + +sanity_check_paths = { + 'files': ['include/X11/Xlib.h', 'include/X11/Xutil.h'], + 'dirs': ['include/GL', 'include/X11', 'include/X11/extensions', 'lib', + 'lib/python%s/site-packages/xcbgen' % pyshortver, 'lib/pkgconfig', 'share/pkgconfig'], +} + +moduleclass = 'vis' From c7e8ea90e9eddf010973a7bd8b35f362a94bf253 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 22 Aug 2016 19:21:32 +0200 Subject: [PATCH 2/6] change X11 easyconfig according to updated Bundle easyblock --- .../x/X11/X11-20160819-intel-2016b.eb | 171 +++++++----------- 1 file changed, 61 insertions(+), 110 deletions(-) diff --git a/easybuild/easyconfigs/x/X11/X11-20160819-intel-2016b.eb b/easybuild/easyconfigs/x/X11/X11-20160819-intel-2016b.eb index 9e88299a843..e4450735c26 100644 --- a/easybuild/easyconfigs/x/X11/X11-20160819-intel-2016b.eb +++ b/easybuild/easyconfigs/x/X11/X11-20160819-intel-2016b.eb @@ -8,129 +8,80 @@ description = "The X Window System (X11) is a windowing system for bitmap displa toolchain = {'name': 'intel', 'version': '2016b'} +source_urls = [ + XORG_LIB_SOURCE, + XORG_PROTO_SOURCE, + 'http://xcb.freedesktop.org/dist/', + 'http://xkbcommon.org/download/', + 'http://cgit.freedesktop.org/xorg/util/macros/snapshot', +] + builddependencies = [ ('Autotools', '20150215'), ('pkg-config', '0.29.1'), ] +default_easyblock = 'ConfigureMake' + +common_specs = { + 'sources': [SOURCE_TAR_GZ], + 'start_dir': '%(name)s-%(version)s', +} +components = [ + ('xorg-macros', '1.19.0', { + 'sources': ['util-macros-%(version)s.tar.gz'], + 'start_dir': 'util-macros-%(version)s', + }), + ('fixesproto', '5.0', common_specs), + ('glproto', '1.4.17', common_specs), + ('xextproto', '7.3.0', common_specs), + ('xcb-proto', '1.11', common_specs), + ('inputproto', '2.3.1', common_specs), + ('xproto', '7.0.28', common_specs), + ('libpthread-stubs', '0.3', common_specs), + ('kbproto', '1.0.7', common_specs), + ('xtrans', '1.3.5', common_specs), + ('xineramaproto', '1.2.1', common_specs), + ('randrproto', '1.5.0', common_specs), + ('renderproto', '0.11', common_specs), + ('libXau', '1.0.8', common_specs), + ('libxcb', '1.11.1', common_specs), + ('xcb-util', '0.4.0', common_specs), + ('xcb-util-image', '0.4.0', common_specs), + ('xcb-util-keysyms', '0.4.0', common_specs), + ('xcb-util-renderutil', '0.3.9', common_specs), + ('xcb-util-wm', '0.4.1', common_specs), + ('libxkbcommon', '0.6.1', { + 'sources': ['libxkbcommon-%(version)s.tar.xz'], + 'start_dir': 'libxkbcommon-%(version)s', + }), + ('libX11', '1.6.3', common_specs), + ('libXrender', '0.9.9', common_specs), + ('libICE', '1.0.9', common_specs), + ('libSM', '1.2.2', common_specs), + ('libXt', '1.1.5', common_specs), + ('libXext', '1.3.3', common_specs), + ('libXfixes', '5.0.2', common_specs), + ('libXi', '1.7.6', common_specs), + ('libXcursor', '1.1.14', common_specs), + ('libXinerama', '1.1.3', common_specs), + ('libXrandr', '1.5.0', common_specs), +] + # Python is required for xcb-proto allow_system_deps = [('Python', SYS_PYTHON_VERSION)] pyshortver = '.'.join(SYS_PYTHON_VERSION.split('.')[0:2]) -# all extensions can be installed with configure/make/make install -exts_defaultclass = 'ConfigureMake' - preconfigopts = "if [ -f autogen.sh ]; then ./autogen.sh; fi && " #preconfigopts += "CPATH=%(installdir)s/include LIBRARY_PATH=%(installdir)s/lib " #preconfigopts += "PKG_CONFIG_PATH=%(installdir)s/lib/pkgconfig" -exts_list = [ - ('xorg-macros', '1.19.0', { - 'source_urls': ['http://cgit.freedesktop.org/xorg/util/macros/snapshot'], - 'source_tmpl': 'util-macros-%(version)s.tar.gz', - }), - ('fixesproto', '5.0', { - 'source_urls': [XORG_PROTO_SOURCE], - }), - ('glproto', '1.4.17', { - 'source_urls': [XORG_PROTO_SOURCE], - }), - ('xextproto', '7.3.0', { - 'source_urls': [XORG_PROTO_SOURCE], - }), - ('xcb-proto', '1.11', { - 'source_urls': ['http://xcb.freedesktop.org/dist/'], - }), - ('inputproto', '2.3.1', { - 'source_urls': [XORG_PROTO_SOURCE], - }), - ('xproto', '7.0.28', { - 'source_urls': [XORG_PROTO_SOURCE], - }), - ('libpthread-stubs', '0.3', { - 'source_urls': ['http://xcb.freedesktop.org/dist/'], - }), - ('kbproto', '1.0.7', { - 'source_urls': [XORG_PROTO_SOURCE], - }), - ('xtrans', '1.3.5', { - 'source_urls': [XORG_LIB_SOURCE], - }), - ('xineramaproto', '1.2.1', { - 'source_urls': [XORG_PROTO_SOURCE], - }), - ('randrproto', '1.5.0', { - 'source_urls': [XORG_PROTO_SOURCE], - }), - ('renderproto', '0.11', { - 'source_urls': [XORG_PROTO_SOURCE], - }), - ('libXau', '1.0.8', { - 'source_urls': [XORG_LIB_SOURCE], - }), - ('libxcb', '1.11.1', { - 'source_urls': ['http://xcb.freedesktop.org/dist/'], - }), - ('xcb-util', '0.4.0', { - 'source_urls': ['http://xcb.freedesktop.org/dist/'], - }), - ('xcb-util-image', '0.4.0', { - 'source_urls': ['http://xcb.freedesktop.org/dist/'], - }), - ('xcb-util-keysyms', '0.4.0', { - 'source_urls': ['http://xcb.freedesktop.org/dist/'], - }), - ('xcb-util-renderutil', '0.3.9', { - 'source_urls': ['http://xcb.freedesktop.org/dist/'], - }), - ('xcb-util-wm', '0.4.1', { - 'source_urls': ['http://xcb.freedesktop.org/dist/'], - }), - ('libxkbcommon', '0.6.1', { - 'source_urls': ['http://xkbcommon.org/download/'], - 'source_tmpl': 'libxkbcommon-%(version)s.tar.xz', - }), - ('libX11', '1.6.3', { - 'source_urls': [XORG_LIB_SOURCE], - }), - ('libXrender', '0.9.9', { - 'source_urls': [XORG_LIB_SOURCE], - }), - ('libICE', '1.0.9', { - 'source_urls': [XORG_LIB_SOURCE], - }), - ('libSM', '1.2.2', { - 'source_urls': [XORG_LIB_SOURCE], - }), - ('libXt', '1.1.5', { - 'source_urls': [XORG_LIB_SOURCE], - }), - ('libXext', '1.3.3', { - 'source_urls': [XORG_LIB_SOURCE], - }), - ('libXfixes', '5.0.2', { - 'source_urls': [XORG_LIB_SOURCE], - }), - ('libXi', '1.7.6', { - 'source_urls': [XORG_LIB_SOURCE], - }), - ('libXcursor', '1.1.14', { - 'source_urls': [XORG_LIB_SOURCE], - }), - ('libXinerama', '1.1.3', { - 'source_urls': [XORG_LIB_SOURCE], - }), - ('libXrandr', '1.5.0', { - 'source_urls': [XORG_LIB_SOURCE], - }), -] - -modextrapaths = { - 'ACLOCAL_PATH': ['share/aclocal'], - 'CPATH': ['include'], - 'LIBRARY_PATH': ['lib'], - 'PKG_CONFIG_PATH': ['lib/pkgconfig', 'share/pkgconfig'], -} +#modextrapaths = { +# 'ACLOCAL_PATH': ['share/aclocal'], +# 'CPATH': ['include'], +# 'LIBRARY_PATH': ['lib'], +# 'PKG_CONFIG_PATH': ['lib/pkgconfig', 'share/pkgconfig'], +#} # specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module full_sanity_check = True From 14e0fb39737ef95d7c33aa13154a9883dace0f36 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 22 Aug 2016 19:23:46 +0200 Subject: [PATCH 3/6] remove commented out lines --- easybuild/easyconfigs/x/X11/X11-20160819-intel-2016b.eb | 9 --------- 1 file changed, 9 deletions(-) diff --git a/easybuild/easyconfigs/x/X11/X11-20160819-intel-2016b.eb b/easybuild/easyconfigs/x/X11/X11-20160819-intel-2016b.eb index e4450735c26..c7b4981705e 100644 --- a/easybuild/easyconfigs/x/X11/X11-20160819-intel-2016b.eb +++ b/easybuild/easyconfigs/x/X11/X11-20160819-intel-2016b.eb @@ -73,15 +73,6 @@ allow_system_deps = [('Python', SYS_PYTHON_VERSION)] pyshortver = '.'.join(SYS_PYTHON_VERSION.split('.')[0:2]) preconfigopts = "if [ -f autogen.sh ]; then ./autogen.sh; fi && " -#preconfigopts += "CPATH=%(installdir)s/include LIBRARY_PATH=%(installdir)s/lib " -#preconfigopts += "PKG_CONFIG_PATH=%(installdir)s/lib/pkgconfig" - -#modextrapaths = { -# 'ACLOCAL_PATH': ['share/aclocal'], -# 'CPATH': ['include'], -# 'LIBRARY_PATH': ['lib'], -# 'PKG_CONFIG_PATH': ['lib/pkgconfig', 'share/pkgconfig'], -#} # specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module full_sanity_check = True From 2ea8f56570cfc5dd6b564e8223a447bd3f6afbe1 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 23 Aug 2016 11:38:12 +0200 Subject: [PATCH 4/6] check for 'configure' rather than 'autogen.sh' --- easybuild/easyconfigs/x/X11/X11-20160819-intel-2016b.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/easyconfigs/x/X11/X11-20160819-intel-2016b.eb b/easybuild/easyconfigs/x/X11/X11-20160819-intel-2016b.eb index c7b4981705e..939b3393dd7 100644 --- a/easybuild/easyconfigs/x/X11/X11-20160819-intel-2016b.eb +++ b/easybuild/easyconfigs/x/X11/X11-20160819-intel-2016b.eb @@ -72,7 +72,7 @@ components = [ allow_system_deps = [('Python', SYS_PYTHON_VERSION)] pyshortver = '.'.join(SYS_PYTHON_VERSION.split('.')[0:2]) -preconfigopts = "if [ -f autogen.sh ]; then ./autogen.sh; fi && " +preconfigopts = "if [ ! -f configure ]; then ./autogen.sh; fi && " # specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module full_sanity_check = True From cd5f1ffe6077d1979e724bf7b2df79ae1ab6f3b7 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 23 Aug 2016 15:07:33 +0200 Subject: [PATCH 5/6] extend list of X11 components, add missing deps --- .../x/X11/X11-20160819-intel-2016b.eb | 71 +++++++++++++++---- 1 file changed, 57 insertions(+), 14 deletions(-) diff --git a/easybuild/easyconfigs/x/X11/X11-20160819-intel-2016b.eb b/easybuild/easyconfigs/x/X11/X11-20160819-intel-2016b.eb index 939b3393dd7..f735807177d 100644 --- a/easybuild/easyconfigs/x/X11/X11-20160819-intel-2016b.eb +++ b/easybuild/easyconfigs/x/X11/X11-20160819-intel-2016b.eb @@ -20,6 +20,10 @@ builddependencies = [ ('Autotools', '20150215'), ('pkg-config', '0.29.1'), ] +dependencies = [ + ('freetype', '2.6.5'), + ('fontconfig', '2.12.1'), +] default_easyblock = 'ConfigureMake' @@ -32,40 +36,79 @@ components = [ 'sources': ['util-macros-%(version)s.tar.gz'], 'start_dir': 'util-macros-%(version)s', }), + ('libpthread-stubs', '0.3', common_specs), + ('bigreqsproto', '1.1.2', common_specs), + ('compositeproto', '0.4.2', common_specs), + ('damageproto', '1.2.1', common_specs), + ('dmxproto', '2.3.1', common_specs), + ('dri2proto', '2.8', common_specs), + ('dri3proto', '1.0', common_specs), ('fixesproto', '5.0', common_specs), + ('fontsproto', '2.1.3', common_specs), ('glproto', '1.4.17', common_specs), - ('xextproto', '7.3.0', common_specs), - ('xcb-proto', '1.11', common_specs), ('inputproto', '2.3.1', common_specs), - ('xproto', '7.0.28', common_specs), - ('libpthread-stubs', '0.3', common_specs), ('kbproto', '1.0.7', common_specs), - ('xtrans', '1.3.5', common_specs), - ('xineramaproto', '1.2.1', common_specs), + ('presentproto', '1.0', common_specs), ('randrproto', '1.5.0', common_specs), + ('recordproto', '1.14.2', common_specs), ('renderproto', '0.11', common_specs), + ('resourceproto', '1.2.0', common_specs), + ('scrnsaverproto', '1.2.2', common_specs), + ('videoproto', '2.3.3', common_specs), + ('xcmiscproto', '1.2.2', common_specs), + ('xextproto', '7.3.0', common_specs), + ('xf86bigfontproto', '1.2.0', common_specs), + ('xf86dgaproto', '2.1', common_specs), + ('xf86driproto', '2.1.1', common_specs), + ('xf86vidmodeproto', '2.3.1', common_specs), + ('xineramaproto', '1.2.1', common_specs), + ('xproto', '7.0.28', common_specs), ('libXau', '1.0.8', common_specs), + ('libXdmcp', '1.1.2', common_specs), + ('xcb-proto', '1.11', common_specs), ('libxcb', '1.11.1', common_specs), - ('xcb-util', '0.4.0', common_specs), - ('xcb-util-image', '0.4.0', common_specs), - ('xcb-util-keysyms', '0.4.0', common_specs), - ('xcb-util-renderutil', '0.3.9', common_specs), - ('xcb-util-wm', '0.4.1', common_specs), + ('xtrans', '1.3.5', common_specs), ('libxkbcommon', '0.6.1', { 'sources': ['libxkbcommon-%(version)s.tar.xz'], 'start_dir': 'libxkbcommon-%(version)s', }), ('libX11', '1.6.3', common_specs), - ('libXrender', '0.9.9', common_specs), + ('libXext', '1.3.3', common_specs), + ('libFS', '1.0.7', common_specs), ('libICE', '1.0.9', common_specs), ('libSM', '1.2.2', common_specs), + ('libXScrnSaver', '1.2.2', common_specs), ('libXt', '1.1.5', common_specs), - ('libXext', '1.3.3', common_specs), + ('libXmu', '1.1.2', common_specs), + ('libXpm', '3.5.11', common_specs), + ('libXaw', '1.0.13', common_specs), ('libXfixes', '5.0.2', common_specs), - ('libXi', '1.7.6', common_specs), + ('libXcomposite', '0.4.4', common_specs), + ('libXrender', '0.9.9', common_specs), ('libXcursor', '1.1.14', common_specs), + ('libXdamage', '1.1.4', common_specs), + ('libfontenc', '1.1.3', common_specs), + ('libXfont', '1.5.1', common_specs), + ('libXft', '2.3.2', common_specs), + ('libXi', '1.7.6', common_specs), ('libXinerama', '1.1.3', common_specs), ('libXrandr', '1.5.0', common_specs), + ('libXres', '1.0.7', common_specs), + ('libXtst', '1.2.2', common_specs), + ('libXv', '1.0.10', common_specs), + ('libXvMC', '1.0.9', common_specs), + ('libXxf86dga', '1.1.4', common_specs), + ('libXxf86vm', '1.1.4', common_specs), + ('libdmx', '1.1.3', common_specs), + ('libpciaccess', '0.13.4', common_specs), + ('libxkbfile', '1.0.9', common_specs), + ('libxshmfence', '1.2', common_specs), + ('xcb-util', '0.4.0', common_specs), + ('xcb-util-image', '0.4.0', common_specs), + ('xcb-util-keysyms', '0.4.0', common_specs), + ('xcb-util-renderutil', '0.3.9', common_specs), + ('xcb-util-wm', '0.4.1', common_specs), + ('xcb-util-cursor', '0.1.3', common_specs), ] # Python is required for xcb-proto From 4b7a1c69ef2e444173dd51554a5f3a4be96f9b36 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 23 Aug 2016 15:32:41 +0200 Subject: [PATCH 6/6] add easyconfig fontconfig-2.12.1-intel-2016b.eb --- .../fontconfig-2.12.1-intel-2016b.eb | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 easybuild/easyconfigs/f/fontconfig/fontconfig-2.12.1-intel-2016b.eb diff --git a/easybuild/easyconfigs/f/fontconfig/fontconfig-2.12.1-intel-2016b.eb b/easybuild/easyconfigs/f/fontconfig/fontconfig-2.12.1-intel-2016b.eb new file mode 100644 index 00000000000..a2cd748981e --- /dev/null +++ b/easybuild/easyconfigs/f/fontconfig/fontconfig-2.12.1-intel-2016b.eb @@ -0,0 +1,22 @@ +easyblock = 'ConfigureMake' + +name = 'fontconfig' +version = '2.12.1' + +homepage = 'http://www.freedesktop.org/software/fontconfig' +description = """Fontconfig is a library designed to provide system-wide font configuration, customization and +application access.""" + +toolchain = {'name': 'intel', 'version': '2016b'} + +source_urls = ['http://www.freedesktop.org/software/fontconfig/release/'] +sources = [SOURCE_TAR_GZ] + +dependencies = [ + ('expat', '2.2.0'), + ('freetype', '2.6.5'), +] + +configopts = '--disable-docs ' + +moduleclass = 'vis'