From 3a15fef000627311c09bf8be2cfeed8b013ce157 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Mon, 5 Mar 2012 20:45:03 +0000 Subject: [PATCH] legacy_headers option now installs Cantera.h --- SConstruct | 5 ++++- platform/legacy/Cantera.h | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 platform/legacy/Cantera.h diff --git a/SConstruct b/SConstruct index 72c9648bf..0ef2eddc4 100644 --- a/SConstruct +++ b/SConstruct @@ -954,10 +954,13 @@ if env['addInstallTargets']: # Make symlinks to replicate old header directory structure if env['legacy_headers']: - inst = env.Command(pjoin(instRoot, 'include', 'cantera', 'kernel'), [], + inst = env.Command(pjoin('$inst_incdir', 'kernel'), [], Mkdir("$TARGET")) installTargets.extend(inst) + inst = env.Install('$inst_incdir', 'platform/legacy/Cantera.h') + installTargets.extend(inst) + if env['OS'] == 'Windows': cmd = Copy("$TARGET", "$SOURCE") else: diff --git a/platform/legacy/Cantera.h b/platform/legacy/Cantera.h new file mode 100644 index 000000000..fd7808863 --- /dev/null +++ b/platform/legacy/Cantera.h @@ -0,0 +1,38 @@ +#ifndef CANTERA_H_INCL +#define CANTERA_H_INCL + +// Legacy 'Cantera.h' header for applications that have not +// updated to the new header files. + +#warning "Use of Cantera.h is deprecated. Please include required headers directly instead." + +// definitions +#ifndef CANTERA_APP +#define CANTERA_APP +#endif + +namespace Cantera_CXX{ } + +using namespace Cantera_CXX; + +#include "kernel/ct_defs.h" + +// some useful functions +#include "kernel/global.h" + +// the CanteraError exception class +#include "kernel/ctexceptions.h" + +// The Cantera logger class +#include "kernel/logger.h" + +// Include the timer +#include "kernel/clockWC.h" + +// Include routines for reading and writing XML files +#include "kernel/xml.h" + +// Include string utility routines +#include "kernel/stringUtils.h" + +#endif