Skip to content
Snippets Groups Projects
Commit 181e50b5 authored by Rene Brun's avatar Rene Brun
Browse files

From Philippe:

This patch insures to properly use the value of GetBuildDir or the build_dir parameters as a relative pathname.  Note,
that when using (the new) SetBuildDir with a relative pathname, this pathname will be relative to the current directory
at the time of calling CompileMacro and not at the time of calling SetBuildDir.
I added ACLiC.BuildDir to rootrc.in


git-svn-id: http://root.cern.ch/svn/root/trunk@6479 27541ba8-7e3a-0410-8455-c3a389f83636
parent 4931d81a
No related branches found
No related tags found
No related merge requests found
// @(#)root/base:$Name: $:$Id: TSystem.cxx,v 1.57 2003/03/11 02:27:32 rdm Exp $
// @(#)root/base:$Name: $:$Id: TSystem.cxx,v 1.58 2003/03/11 07:57:55 brun Exp $
// Author: Fons Rademakers 15/09/95
/*************************************************************************
......@@ -1441,6 +1441,9 @@ int TSystem::CompileMacro(const char *filename, Option_t * opt,
// if non-zero, build_loc indicates where to build the shared library.
TString build_loc = GetBuildDir();
if (build_dir && strlen(build_dir)) build_loc = build_dir;
if (! IsAbsoluteFileName(build_loc) ) {
build_loc = ConcatFileName( WorkingDirectory(), build_loc );
}
// ======= Get the right file names for the dictionnary and the shared library
TString library = filename;
......@@ -1944,6 +1947,10 @@ const char *TSystem::GetBuildNode() const
//______________________________________________________________________________
const char *TSystem::GetBuildDir() const
{
if (fBuildDir.Length()==0) {
if (!gEnv) return "";
const_cast<TSystem*>(this)->fBuildDir = gEnv->GetValue("ACLiC.BuildDir","");
}
return fBuildDir;
}
......
# @(#)root/config:$Name: $:$Id: rootrc.in,v 1.42 2003/03/10 14:57:11 rdm Exp $
# @(#)root/config:$Name: $:$Id: rootrc.in,v 1.43 2003/04/04 00:52:39 rdm Exp $
# Author: Fons Rademakers 22/09/95
# ROOT Environment settings are handled via the class TEnv. To see
......@@ -125,6 +125,8 @@ Rint.History: $(HOME)/.root_hist
# ACLiC.Linkdef specifies the suffix that will be added to the script name to
# try to locate a custom linkdef file when generating the dictionary.
ACLiC.Linkdef: _linkdef
# Set a top directory for storing the libraries produced by ACLiC
#ACLiC.BuildDir: /where/I/would/like/my/compiled/scripts
# Default authentication method for rootd (0=clear, 1=SRP, 2=Krb5)
Rootd.Authentication: 0
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment