From: Uwe Köcher <koecher@hsu-hamburg.de>
Date: Mon, 22 Sep 2014 09:47:41 +0000 (+0200)
Subject: Changed local.cfg to candi.cfg.
X-Git-Tag: v0.4~61
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5dd8a339c0d4ad61bf1281eb67258d52a20d0da5;p=candi.git

Changed local.cfg to candi.cfg.
- The local.cfg should be used by the end-user only (now it is safe
  to pull the current candi updates and keep the local configuration
  files).
- Added "switch-project-to" bash script file.

Changes to be committed:
	typechange: candi.cfg
	deleted:    local.cfg
	renamed:    local-DTM++.toolbox.cfg -> project-DTM++.toolbox.cfg
	renamed:    local-FEniCS.cfg -> project-FEniCS.cfg
	renamed:    local-deal.II.cfg -> project-deal.II.cfg
	renamed:    local-gcc.cfg -> project-gcc.cfg
	renamed:    local-mpi.cfg -> project-mpi.cfg
	new file:   switch-project-to
---

diff --git a/candi.cfg b/candi.cfg
deleted file mode 100644
index 96be80e..0000000
--- a/candi.cfg
+++ /dev/null
@@ -1,75 +0,0 @@
-# Global configuration variables go here. You will want to tweak this
-# file to suit your needs. If you want to keep local changes that are
-# not overwritten by repository updates, those can be written
-# to local.cfg instead (entries there will override those in this file).
-
-# Meta-project to build
-PROJECT=deal.II
-CLEAN_BUILD=false
-
-#########################################################################
-#Choose components of deal.II
-DEAL_CONFOPTS=" \
--D CMAKE_BUILD_TYPE=DebugRelease \
--D DEAL_II_COMPONENT_DOCUMENTATION:BOOL=OFF \
--D DEAL_II_WITH_ARPACK:BOOL=OFF \
--D DEAL_II_WITH_BOOST:BOOL=ON \
--D DEAL_II_WITH_FUNCTIONPARSER:BOOL=ON \
--D DEAL_II_WITH_LAPACK:BOOL=ON \
--D DEAL_II_WITH_METIS:BOOL=OFF \
--D DEAL_II_WITH_MUMPS:BOOL=OFF \
--D DEAL_II_WITH_MPI:BOOL=ON \
--D DEAL_II_WITH_NETCDF:BOOL=OFF \
--D DEAL_II_WITH_P4EST:BOOL=ON \
--D DEAL_II_WITH_PETSC:BOOL=ON \
--D DEAL_II_WITH_SLEPC:BOOL=ON \
--D DEAL_II_WITH_THREADS:BOOL=OFF \
--D DEAL_II_WITH_TRILINOS:BOOL=ON \
--D DEAL_II_WITH_UMFPACK:BOOL=ON \
--D DEAL_II_WITH_ZLIB:BOOL=ON \
--D DEAL_II_WITH_HDF5:BOOL=ON \
-"
-
-# Please add the following path(es) to DEAL_CONFOPTS ahead,
-# if you wish to use (self-compiled) versions of them together
-# with deal.II.
-# Make sure, that the coinciding option is setted to "ON".
-# If you want to use the packages from your system, you
-# may not set the variables (usually deal.II is smart enough
-# to recognise them automatically).
-# If you want to install the packages using CANDI,
-# simply set the option to ON and do NOT specify the path,
-# this will be done automatically elsewhere.
-#
-#-D ARPACK_DIR= \
-#-D METIS_DIR= \
-#-D MUMPS_DIR= \
-#-D P4EST_DIR= \
-#-D TRILINOS_DIR= \
-#-D HDF5_DIR= \
-
-#########################################################################
-# Prefix directory
-PREFIX_PATH=${HOME}/apps/candi
-COMPILER=native-openmpi
-
-# Where do you want the downloaded source files to go?
-DOWNLOAD_PATH=${PREFIX_PATH}/src
-
-# Where do you want to unpack source files to go?
-UNPACK_PATH=${PREFIX_PATH}/unpack
-
-# Where do you want the build files to go?
-BUILD_PATH=${PREFIX_PATH}/${PROJECT}/${COMPILER}-build
-
-# Where do you want the compiled software installed?
-INSTALL_PATH=${PREFIX_PATH}/${PROJECT}/${COMPILER}
-
-# How many processes would you like to build using?
-PROCS=1
-
-# Would you like to build stable versions of projects?
-# If STABLE_BUILD=false, then the development version of deal.II will be
-# installed.
-STABLE_BUILD=true
-
diff --git a/candi.cfg b/candi.cfg
new file mode 120000
index 0000000..249457d
--- /dev/null
+++ b/candi.cfg
@@ -0,0 +1 @@
+./project-deal.II.cfg
\ No newline at end of file
diff --git a/local.cfg b/local.cfg
deleted file mode 120000
index 5677a4e..0000000
--- a/local.cfg
+++ /dev/null
@@ -1 +0,0 @@
-local-deal.II.cfg
\ No newline at end of file
diff --git a/local-DTM++.toolbox.cfg b/project-DTM++.toolbox.cfg
similarity index 100%
rename from local-DTM++.toolbox.cfg
rename to project-DTM++.toolbox.cfg
diff --git a/local-FEniCS.cfg b/project-FEniCS.cfg
similarity index 100%
rename from local-FEniCS.cfg
rename to project-FEniCS.cfg
diff --git a/local-deal.II.cfg b/project-deal.II.cfg
similarity index 100%
rename from local-deal.II.cfg
rename to project-deal.II.cfg
diff --git a/local-gcc.cfg b/project-gcc.cfg
similarity index 100%
rename from local-gcc.cfg
rename to project-gcc.cfg
diff --git a/local-mpi.cfg b/project-mpi.cfg
similarity index 100%
rename from local-mpi.cfg
rename to project-mpi.cfg
diff --git a/switch-project-to b/switch-project-to
new file mode 100755
index 0000000..ea3034a
--- /dev/null
+++ b/switch-project-to
@@ -0,0 +1,5 @@
+#!/bin/bash
+project="$1"
+rm -f ./candi.cfg
+ln -s ./project-${project}.cfg candi.cfg
+