From ecd99dc7ad2f508306f0f1cf71ca8acb7d16e7dd Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Wed, 14 Dec 2011 03:54:04 +0000 Subject: [PATCH] Removed some deprecated configuration options --- SConstruct | 18 +-- config.h.in.scons | 5 - config/install-sh | 274 ---------------------------------------------- 3 files changed, 1 insertion(+), 296 deletions(-) delete mode 100755 config/install-sh diff --git a/SConstruct b/SConstruct index f57dc7c1a..19d0abe11 100644 --- a/SConstruct +++ b/SConstruct @@ -39,13 +39,11 @@ opts.AddVariables( EnumVariable('f90_interface', 'Build Fortran90 interface?', 'default', ('y', 'n', 'default')), PathVariable('F90', 'Fortran compiler', '', PathVariable.PathAccept), - ('purify', '', ''), - ('user_src_dir', '', 'Cantera/user'), BoolVariable('debug', '', False), # ok BoolVariable('with_lattice_solid', '', True), # ok BoolVariable('with_metal', '', True), # ok BoolVariable('with_stoich_substance', '', True), # ok - BoolVariable('with_semiconductor', '', True), # ?? + BoolVariable('with_semiconductor', '', True), # ok BoolVariable('with_adsorbate', '', True), BoolVariable('with_spectra', '', True), BoolVariable('with_pure_fluids', '', True), @@ -75,7 +73,6 @@ opts.AddVariables( EnumVariable('lapack_names', '', 'lower', ('lower','upper')), BoolVariable('lapack_ftn_trailing_underscore', '', True), BoolVariable('lapack_ftn_string_len_at_end', '', True), - ('bitcompile', '', ''), # '32' or '64' ('CXX', '', env['CXX']), ('CC', '', env['CC']), ('CXXFLAGS', '', '-O3 -Wall'), @@ -87,20 +84,10 @@ opts.AddVariables( ('F77', '', env['F77']), ('F77FLAGS', '', '-O3'), ('F90FLAGS', '', '-O3'), - ('install_bin', '', 'config/install-sh'), ('graphvisdir', '' ,''), ('ct_shared_lib', '', 'clib'), ('rpfont', '', 'Helvetica'), ('cantera_version', '', '1.8.x') -# These variables shouldn't be necessary any more... -# ('exe_ext', '', ''), -# ('lcxx_end_libs', '-lm'), -# ('pic', '', '-fPIC'), -# ('shared', '', '-dynamic'), -# ('lfort_flags', '', '-L/usr/local/lib'), -# ('AR', '', env['AR']), -# ('ARFLAGS', '', env['ARFLAGS']), # ('archive', '', 'ar ruv'), -# ('ranlib', '', 'ranlib'), ) opts.Update(env) @@ -203,7 +190,6 @@ def cdefine(definevar, configvar, comp=True, value=1): configh[definevar] = None cdefine('DEBUG_MODE', 'debug') -cdefine('PURIFY_MODE', 'purify') # Need to test all of these to see what platform.system() returns configh['SOLARIS'] = 1 if env['OS'] == 'Solaris' else None @@ -273,8 +259,6 @@ env['ct_datadir'] = pjoin(env['prefix'], 'data') env['ct_demodir'] = pjoin(env['prefix'], 'demos') env['ct_templdir'] = pjoin(env['prefix'], 'templates') env['ct_tutdir'] = pjoin(env['prefix'], 'tutorials') -env['ct_docdir'] = pjoin(env['prefix'], 'doc') -env['ct_dir'] = env['prefix'] env['ct_mandir'] = pjoin(env['prefix'], 'man1') env['ct_matlab_dir'] = pjoin(env['prefix'], 'matlab', 'toolbox') diff --git a/config.h.in.scons b/config.h.in.scons index 641c956d3..f2d0e3b92 100755 --- a/config.h.in.scons +++ b/config.h.in.scons @@ -23,12 +23,8 @@ // This just compiles in the code. %(DEBUG_MODE)s -// Compiling with PURIFY instrumentation -%(PURIFY_MODE)s - //------------------------ Fortran settings -------------------// - // define types doublereal, integer, and ftnlen to match the // corresponding Fortran data types on your system. The defaults // are OK for most systems @@ -38,7 +34,6 @@ typedef int integer; // Fortran integer typedef int ftnlen; // Fortran hidden string length type - // Fortran compilers pass character strings in argument lists by // adding a hidden argement with the length of the string. Some // compilers add the hidden length argument immediately after the diff --git a/config/install-sh b/config/install-sh deleted file mode 100755 index 1f287e210..000000000 --- a/config/install-sh +++ /dev/null @@ -1,274 +0,0 @@ -#!/bin/sh -# -# install - install a program, script, or datafile -# This comes from X11R5 (mit/util/scripts/install.sh). -# -# Copyright 1991 by the Massachusetts Institute of Technology -# -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of M.I.T. not be used in advertising or -# publicity pertaining to distribution of the software without specific, -# written prior permission. M.I.T. makes no representations about the -# suitability of this software for any purpose. It is provided "as is" -# without express or implied warranty. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. - - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -verbose="" -transformbasename="" -transform_arg="" -instcmd="$cpprog" -chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src="" -dst="" -dir_arg="" - -while [ x"$1" != x ]; do - case $1 in - -c) shift - continue;; - - -move) instcmd="$mvprog" - shift - continue;; - - -move) instcmd="$mvprog" - shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd="$stripprog" - shift - continue;; - - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; - - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - -v) verbose="y" - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac -done - -if [ x"$src" = x ] -then - echo "install: no input file specified" - exit 1 -else - true -fi - - -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d $dst ]; then - instcmd=: - chmodcmd="" - else - instcmd=mkdir - fi - -else - -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f $src -o -d $src ] - then - true - else - echo "install: WARNING $src does not exist" - exit 0 - fi - - if [ x"$dst" = x ] - then - echo " install: no destination specified" - exit 1 - else - true - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d $dst ] - then - dst="$dst"/`basename $src` - else - true - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script - -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' -' -IFS="${IFS-${defaultIFS}}" - -oIFS="${IFS}" -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS="${oIFS}" - -pathcomp='' - -while [ $# -ne 0 ] ; do - pathcomp="${pathcomp}${1}" - shift - - if [ ! -d "${pathcomp}" ] ; - then - $mkdirprog "${pathcomp}" - else - true - fi - - pathcomp="${pathcomp}/" -done -fi - -if [ x"$dir_arg" != x ] -then - $doit $instcmd $dst && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi - - if [ x"$verbose" = xy ] - then - echo "$doit $instcmd $dst" - fi -else - -# If we're going to rename the final executable, determine the name now. - - if [ x"$transformarg" = x ] - then - dstfile=`basename $dst` - else - dstfile=`basename $dst $transformbasename | - sed $transformarg`$transformbasename - fi - -# don't allow the sed command to completely eliminate the filename - - if [ x"$dstfile" = x ] - then - dstfile=`basename $dst` - else - true - fi - -# Make a temp file name in the proper directory. - - dsttmp=$dstdir/#inst.$$# - -# Move or copy the file name to the temp name - - $doit $instcmd $src $dsttmp && - - trap "rm -f ${dsttmp}" 0 && - -# and set any options; do chmod last to preserve setuid bits - -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && - -# Now rename the file to the real destination. - - $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile - - if [ x"$verbose" = xy ] - then - echo "$src" ' -> ' "$dstdir/$dstfile" - fi -fi && - - -exit 0