build-scripts reviewed

Compiler/H5root/build

@@ -1,16 +1,11 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="http://amas.web.psi.ch/Downloads/$P/$P-$V.tar.bz2"
+pbuild::set_download_url "http://amas.web.psi.ch/Downloads/$P/$P-$V.tar.bz2"
 
 pbuild::post_prep() {
 	./autogen.sh
 }
 
-pbuild::configure() {
-	"${SRC_DIR}"/configure \
-		--prefix="${PREFIX}"
-}
-
 pbuild::post_install() {
 	# Unfortunatelly we need some fancy post-installation.
 	# Otherwise it wouldn't be possible to load the modules

Compiler/UMFPACK/build

@@ -1,7 +1,10 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="file://$PMODULES_DISTFILESDIR/$P-V.tar.bz2"
+pbuild::set_download_url "file://$PMODULES_DISTFILESDIR/$P-V.tar.bz2"
 
+pbuild::add_to_group 'Compiler'
+pbuild::compile_in_sourcetree
+	
 pbuild::configure() {
 	cat <<EOF > "${SRC_DIR}/SuiteSparse_config/SuiteSparse_config.mk"
 CF = \$(CFLAGS) \$(CPPFLAGS) \$(TARGET_ARCH) -O3 -fexceptions -fPIC -DNTIMER
@@ -38,7 +41,3 @@ pbuild::install() {
 	make PREFIX="${PREFIX}" install
 }
 
-pbuild::add_to_group 'Compiler'
-pbuild::compile_in_sourcetree
-pbuild::make_all
-pbuild::cleanup_src

Compiler/boost/build

@@ -1,6 +1,6 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="https://netcologne.dl.sourceforge.net/project/boost/boost/$V/boost_${V_MAJOR}_${V_MINOR}_${V_PATCHLVL}.tar.gz"
+pbuild::set_download_url "https://netcologne.dl.sourceforge.net/project/$P/$P/$V/$P_${V_MAJOR}_${V_MINOR}_${V_PATCHLVL}.tar.gz"
 
 BOOST_BUILD_PATH="${BUILD_DIR}"
 

Compiler/clapack/build

@@ -1,7 +1,7 @@
 #!/usr/bin/env modbuild
 #
 
-SOURCE_URL="http://www.netlib.org/$P/$P-$V-CMAKE.tgz"
+pbuild:set_download_url "http://www.netlib.org/$P/$P-$V-CMAKE.tgz"
 
 pbuild::configure() {
 	cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX \

Compiler/eigen3/build

@@ -1,12 +1,8 @@
 #!/usr/bin/env modbuild
 #
-# Notes:
-#   On Mac OS X VTK does not compile out of the box with self-compiled GCC.
-#   grep for "long-branch" and "pascal-string" in the cmake configuration
-#   and remove these strings.
-#
 
-SOURCE_URL="http://bitbucket.org/eigen/eigen/get/${V_MAJOR}.${V_MINOR}.${V_PATCHLVL}.tar.bz2"
+
+pbuild::set_download_url "http://bitbucket.org/eigen/eigen/get/${V_MAJOR}.${V_MINOR}.${V_PATCHLVL}.tar.bz2"
 
 pbuild::configure() {
 	export BOOST_ROOT="${BOOST_PREFIX}"

Compiler/gsl/build

@@ -1,12 +1,6 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="https://ftp.gnu.org/gnu/$P/$P-$V.tar.gz"
-
-pbuild::configure() {
-	"${SRC_DIR}"/configure \
-		--prefix="${PREFIX}" \
-		|| exit 1
-}
+pbuild::set_download_url "https://ftp.gnu.org/gnu/$P/$P-$V.tar.gz"
 
 pbuild::add_to_group 'Compiler'
 pbuild::install_docfiles \
@@ -20,8 +14,6 @@ pbuild::install_docfiles \
 	'THANKS' \
 	'TODO'
 
-pbuild::make_all
-
 # Local Variables:
 # mode: sh
 # sh-basic-offset: 8

Compiler/gtest/build

@@ -1,6 +1,6 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="https://github.com/google/googletest/archive/release-1.7.0.tar.gz"
+pbuild::set_download_url "https://github.com/google/googletest/archive/release-1.7.0.tar.gz"
 
 declare -a config_args=()
 

Compiler/root/build

@@ -1,6 +1,8 @@
 #!/usr/bin/env modbuild
 
-SOURCE_URL="https://root.cern.ch/download/root_v${V_MAJOR}.${V_MINOR}.${V_PATCHLVL}.source.tar.gz"
+# :FIXME: must be merged with build6!
+
+pbuild::set_download_url "https://root.cern.ch/download/root_v${V_MAJOR}.${V_MINOR}.${V_PATCHLVL}.source.tar.gz"
 
 declare -a EXTRA_LIBS=()
 config_args=''

Compiler/vtk/build

@@ -6,26 +6,19 @@
 #   and remove these strings.
 #
 
-SOURCE_URL="http://www.vtk.org/files/release/${V_MAJOR}.${V_MINOR}/VTK-$V.tar.gz"
+pbuild::set_download_url "http://www.vtk.org/files/release/${V_MAJOR}.${V_MINOR}/VTK-$V.tar.gz"
+pbuild::add_to_group 'Compiler'
 
-case ${OS} in
-Darwin )
-	pbuild::pre_configure() {
-		# for the time being: on Mac OS X we need GL/gl.h from MacPorts:
-		std::append_path C_INLCUDE_PATH '/opt/local/include'
-		std::append_path CPLUS_INCLUDE_PATH '/opt/local/include'
-	}
-	;;
-esac
-
-pbuild::configure() {
-	cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX \
-		-DVTK_INSTALL_INCLUDE_DIR:PATH=include \
-		-DVTK_INSTALL_LIB_DIR:PATH=lib \
-		-DVTK_USE_COCOA:BOOL=OFF \
-		"${SRC_DIR}"
+pbuild::pre_configure_Darwin() {
+	# for the time being: on Mac OS X we need GL/gl.h from MacPorts:
+	std::append_path C_INLCUDE_PATH '/opt/local/include'
+	std::append_path CPLUS_INCLUDE_PATH '/opt/local/include'
+}
+
+pbuild::pre_configure() {
+	pbuild::add_configure_args "-DVTK_INSTALL_INCLUDE_DIR:PATH=include"
+	pbuild::add_configure_args "-DVTK_INSTALL_LIB_DIR:PATH=lib"
+	pbuild::add_configure_args "-DVTK_USE_COCOA:BOOL=OFF"
 }
 
-pbuild::add_to_group 'Compiler'
-pbuild::make_all