Merge remote branch 'origin/HEAD'

Compiler/openmpi/1.10/variants

-:Linux:Darwin:	unstable	gcc/4.8.5
-:Linux:Darwin:	unstable	gcc/4.9.3
-:Linux:Darwin:	unstable	gcc/5.2.0
-:Linux:		unstable	intel/15.3
+# comment
+1.10.0	Linux,Darwin	deprecated	gcc/4.8.4
+1.10.0	Linux,Darwin	deprecated	gcc/4.9.2
+1.10.0	Linux,Darwin	deprecated	gcc/4.9.3
+1.10.2	Linux,Darwin	unstable	gcc/4.8.5
+1.10.2	Linux,Darwin	unstable	gcc/4.9.3
+1.10.2	Linux,Darwin	unstable	gcc/5.2.0
+1.10.2	Linux,Darwin	unstable	gcc/5.3.0
+1.10.2	Linux		unstable	intel/15.3

Compiler/openmpi/1.8/variants

-1.8.2,1.8.4,1.8.8	stable	    Linux,Darwin	gcc/4.7.4
-1.8.2,1.8.4,1.8.8	stable	    Linux,Darwin	gcc/4.8.3
-1.8.2,1.8.4,1.8.8	stable	    Linux,Darwin	gcc/4.8.4
-1.8.2,1.8.4,1.8.8	unstable    Linux,Darwin	gcc/4.8.5
-1.8.2,1.8.4,1.8.8	stable	    Linux,Darwin 	gcc/4.9.2
-1.8.2,1.8.4,1.8.8	unstable    Linux,Darwin	gcc/4.9.3
-
-
+# comment
+1.8.2	Linux,Darwin	stable		gcc/4.7.4
+1.8.2	Linux,Darwin	stable		gcc/4.8.3
+1.8.2	Linux,Darwin	stable		gcc/4.8.4
+1.8.2	Linux,Darwin	stable		gcc/4.9.2
+1.8.4	Linux,Darwin	stable		gcc/4.7.4
+1.8.4	Linux,Darwin	stable		gcc/4.8.3
+1.8.4	Linux,Darwin	stable		gcc/4.8.4
+1.8.4	Linux,Darwin	stable		gcc/4.9.2
+1.8.8	Linux,Darwin	deprecated	gcc/4.8.4
+1.8.8	Linux,Darwin	unstable	gcc/4.8.5
+1.8.8	Linux,Darwin	unstable	gcc/4.9.3
+1.8.8	Linux,Darwin	deprecated	gcc/5.2.0
+1.8.8	Linux,Darwin	unstable	gcc/5.3.0

Compiler/openmpi/build

@@ -7,8 +7,11 @@ pbuild::configure() {
 		--enable-mpi-cxx-seek \
 		--enable-mpi-f90 \
 		--enable-mpi-profile \
+		--enable-orterun-prefix-by-default \
 		--enable-shared \
 		--enable-smp-locks \
+		--with-sge=yes \
+		--with-slurm=yes \
 		|| exit 1
 }
 

HDF5/build_all_variants

-#!/bin/bash
-
-declare -r basedir=$(dirname $0)
-source '../../config/Pmodules.conf'
-
-declare -r recipe="${basedir}/$1/build"
-shift
-
-if [[ ! -x "${recipe}" ]]; then
-	echo "Error: no recipe to build '$1'!"
-	exit 1
-fi
-
-for cc in "${COMPILER_VERSIONS[@]}"; do
-	for mpi in "${MPI_VERSIONS[@]}"; do
-		for hdf5 in "${HDF5_VERSIONS[@]}"; do
-			"${recipe}" "$@" --with=$cc --with=$mpi --with=$hdf5 || {
-				echo "Oops: build failed for:"
-				echo "        compile: $cc"
-				echo "        mpi:     $mpi"
-				echo "        hdf5:    $hdf5"
-				exit 1
-			}
-		done
-	done
-done

Libraries/gmp/5/variants

+5.1.1	Linux,Darwin	stable	

Libraries/gmp/6/variants

+6.0.0	Linux,Darwin	stable	
+6.1.0	Linux,Darwin	unstable	

Libraries/mpc/1/variants

+1.0.2	Linux,Darwin	stable		gmp/5.1.1 mpfr/3.1.2
+1.0.3	Linux,Darwin	stable		gmp/6.1.0 mpfr/3.1.4

Libraries/mpc/build

@@ -14,6 +14,5 @@ declare -rx CC=gcc
 
 module use 'Libraries'
 pbuild::add_to_group 'Libraries'
-pbuild::set_build_dependencies 'gmp' 'mpfr'
 pbuild::make_all
 

Libraries/mpc/with_modules-1.0.2

-gmp/5.1.1
-mpfr/3.1.2

Libraries/mpc/with_modules-1.0.3

-gmp/6.0.0
-mpfr/3.1.3

Libraries/mpfr/3/variants

+3.1.2	Linux,Darwin	stable		gmp/5.1.1
+3.1.3	Linux,Darwin	stable		gmp/6.0.0
+3.1.4	Linux,Darwin	stable		gmp/6.1.0

Libraries/mpfr/with_modules-3.1.2

-gmp/5.1.1

Libraries/mpfr/with_modules-3.1.3

-gmp/6.0.0

Libraries/tiff/build

@@ -3,6 +3,9 @@
 pbuild::configure() {
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
+		--with-pic=yes \
+		--disable-shared \
+		--disable-jpeg \
 		|| exit 1
 }
 

Libraries/tiff/modulefile

 #%Module1.0
 
-set whatis	"set of C functions that support the manipulation of TIFF image files."
-set url		"http://www.libtiff.org/"
-set license	"BSD-like, see: http://libtiff.org/misc.html"
-set maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+module-whatis		"set of C functions that support the manipulation of TIFF image files."
+module-url		"http://www.remotesensing.org/libtiff/"
+module-license		"BSD-like, see: http://libtiff.org/misc.html"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
 
-set help	"
+module-help	"
 This software provides support for the Tag Image File Format (TIFF), a
 widely used format for storing image data. The latest version of the TIFF
 specification is available on-line in several different formats, as are a
 number of Technical Notes (TTN's).
 "
- 
-source		$env(PSI_LIBMODULES)

MPI/hdf5/1.10/variants

+1.10.0	Linux,Darwin	unstable	gcc/4.8.5 openmpi/1.10.2
+1.10.0	Linux,Darwin	unstable	gcc/4.9.3 openmpi/1.10.2
+1.10.0	Linux,Darwin	unstable	gcc/5.3.0 openmpi/1.10.2
+

MPI/hdf5/1.8/variants

+hdf5/1.8.12	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.6.5
+hdf5/1.8.12	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.8.2
+hdf5/1.8.12	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.8.4
+hdf5/1.8.12	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.6.5
+hdf5/1.8.12	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.8.2
+hdf5/1.8.12	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.8.4
+hdf5/1.8.12	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.6.5
+hdf5/1.8.12	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.8.2
+hdf5/1.8.12	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.8.4
+hdf5/1.8.12	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.6.5
+hdf5/1.8.12	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.8.2
+hdf5/1.8.12	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.8.4
+hdf5/1.8.14	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.6.5
+hdf5/1.8.14	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.8.2
+hdf5/1.8.14	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.8.4
+hdf5/1.8.14	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.6.5
+hdf5/1.8.14	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.8.2
+hdf5/1.8.14	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.8.4
+hdf5/1.8.14	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.6.5
+hdf5/1.8.14	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.8.2
+hdf5/1.8.14	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.8.4
+hdf5/1.8.14	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.8.8
+hdf5/1.8.14	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.6.5
+hdf5/1.8.14	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.8.2
+hdf5/1.8.14	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.8.4
+hdf5/1.8.15.1	Linux,Darwin	stable		gcc/5.2.0 openmpi/1.8.8
+hdf5/1.8.16	Linux,Darwin	unstable	gcc/4.8.5 openmpi/1.8.2
+hdf5/1.8.16	Linux,Darwin	unstable	gcc/4.8.5 openmpi/1.8.4
+hdf5/1.8.16	Linux,Darwin	unstable	gcc/4.8.5 openmpi/1.8.8
+hdf5/1.8.16	Linux,Darwin	unstable	gcc/4.9.3 openmpi/1.8.2
+hdf5/1.8.16	Linux,Darwin	unstable	gcc/4.9.3 openmpi/1.8.4
+hdf5/1.8.16	Linux,Darwin	unstable	gcc/4.9.3 openmpi/1.8.8
+hdf5/1.8.16	Linux,Darwin	unstable	gcc/5.3.0 openmpi/1.8.2
+hdf5/1.8.16	Linux,Darwin	unstable	gcc/5.3.0 openmpi/1.8.4
+hdf5/1.8.16	Linux,Darwin	unstable	gcc/5.3.0 openmpi/1.8.8

MPI/hdf5/build

@@ -15,6 +15,7 @@ pbuild::configure() {
 		--enable-cxx \
 		--enable-fortran \
 		--enable-unsupported \
+		--enable-threadsafe \
 		--with-pic \
 		|| exit 1
 }

MPI/hdf5/compiler

-gcc/4.7.4
-gcc/4.8.4
-gcc/4.9.2
-gcc/5.2.0
-intel/15.3

MPI/hdf5/mpi

-openmpi/1.6.5
-openmpi/1.8.4
-mpich/3.1.4

MPI/hdf5/versions

-1.8.12
-1.8.14
-1.8.15.1

Programming/gcc/4/variants

+4.7.4	Linux,Darwin	stable		gmp/5.1.1 mpfr/3.1.2 mpc/1.0.2
+4.8.3	Linux,Darwin	stable		gmp/5.1.1 mpfr/3.1.2 mpc/1.0.2
+4.8.4	Linux,Darwin	stable		gmp/5.1.1 mpfr/3.1.2 mpc/1.0.2
+4.8.5	Linux,Darwin	stable		gmp/6.0.0 mpfr/3.1.3 mpc/1.0.3
+4.9.0	Linux,Darwin	deprecated	gmp/5.1.1 mpfr/3.1.2 mpc/1.0.2
+4.9.2	Linux,Darwin	stable		gmp/5.1.1 mpfr/3.1.2 mpc/1.0.2
+4.9.3	Linux,Darwin	stable		gmp/6.0.0 mpfr/3.1.3 mpc/1.0.3

Programming/gcc/5/variants

+5.1.0	Linux,Darwin	stable		gmp/5.1.1 mpfr/3.1.2 mpc/1.0.2
+5.2.0	Linux,Darwin	stable		gmp/6.0.0 mpfr/3.1.3 mpc/1.0.3
+5.3.0	Linux,Darwin	stable		gmp/6.0.0 mpfr/3.1.3 mpc/1.0.3
+

Programming/gcc/with_modules-4.9.3

-gmp/6.0.0
-mpfr/3.1.3
-mpc/1.0.3

Programming/gcc/with_modules-5.2.0

-gmp/6.0.0
-mpfr/3.1.3
-mpc/1.0.3

Tools/emacs/build

@@ -2,12 +2,11 @@
 
 module use 'Libraries'
 
-build_dependencies="${COMPILER} libungif tiff"
+build_dependencies="libungif tiff"
 
 case ${OS} in
 Darwin )
-	configure_args='--with-ns'
-	build_dependencies="libungif tiff"
+	configure_args='--with-ns --with-jpeg=no'
 	CC=''
 	CXX=''
 	COMPILER=''

Tools/emacs/with_modules

+libungif/4.1.4
+tiff/4.0.6

Tools/git/2/variants

+2.3.3	Linux,Darwin	stable		Tcl/8.6.4 Tk/8.6.4
+2.5.2	Linux,Darwin	stable		Tcl/8.6.4 Tk/8.6.4
+2.8.1	Linux,Darwin	unstable	Tcl/8.6.4 Tk/8.6.4
+

Tools/git/build

@@ -33,7 +33,7 @@ pbuild::install() {
 
 pbuild::add_to_group 'Tools'
 pbuild::set_runtime_dependencies 'Tcl' 'Tk'
-pbuild::set_docfiles 'COPYING' 'README'
+pbuild::set_docfiles 'COPYING' 'README.md'
 pbuild::make_all
 
 # Local Variables:

Tools/git/with_modules

-Tcl/8.6.4
-Tk/8.6.4

bin/manage_variants

@@ -6,11 +6,23 @@ declare variants=$2
 
 declare -r OS=$(uname -s)
 
-while read versions release oss dependencies; do
-      	 [[ "${oss}" =~ "${OS}" ]] || continue
-	 versions_a=( ${versions//,/ } )
-	 dependencies_a=( ${dependencies//,/ } )
-	 for version in "${versions_a[@]}"; do
-	         "${buildblock}"  "${version}" --release=${release} "${dependencies_a[@]/#/--with=}"
-	 done
-done < "${variants}"
\ No newline at end of file
+# File format example
+# 1.10.2	Linux,Darwin	unstable	gcc/4.8.5
+declare -a toks=()
+declare version=''
+declare oss=''
+declare release=''
+declare -a dependencies=()
+
+while read -a toks; do
+	# skip comment and empty line
+	(( ${#toks[@]} == 0 )) && continue
+	[[ "${toks[0]:0:1}" == "#" ]] && continue
+	version=${toks[0]}
+	oss=${toks[1]}
+	release=${toks[2]}
+	dependencies=( ${toks[@]:3} )
+
+	[[ "${oss}" =~ "${OS}" ]] || continue
+	"${buildblock}"  "${version}" --release=${release} "${dependencies[@]/#/--with=}"
+done < "${variants}"