adopted use of general damask package ("import damask" instead of "damask_tools")

This commit is contained in:
Philip Eisenlohr 2011-12-15 08:52:41 +00:00
parent 2fcbc1ff13
commit a8dece8694
1 changed files with 7 additions and 7 deletions

View File

@ -1,7 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
# $Id$ # $Id$
# Writes version specific files for different MARC releases # Writes version specific files for different MARC releases
import os,sys,string,damask_tools import os,sys,string,damask
architectures = { architectures = {
'marc': { 'marc': {
@ -16,8 +16,8 @@ bin_link = { \
], ],
} }
damask_variables = damask_tools.DAMASK_TOOLS() damaskEnv = damask.Environment('../../') # script location relative to root
baseDir = damask_variables.relPath('code/') baseDir = damaskEnv.relPath('code/')
for arch in architectures: for arch in architectures:
me = architectures[arch] me = architectures[arch]
@ -44,10 +44,10 @@ makefile.close()
makefile = open(os.path.join(baseDir,'makefile'),'w') makefile = open(os.path.join(baseDir,'makefile'),'w')
for line in content: for line in content:
if line.startswith('FFTWPATH'): if line.startswith('FFTWPATH'):
line='FFTWPATH =%s\n'%(damask_variables.pathInfo['fftw']) line='FFTWPATH =%s\n'%(damaskEnv.pathInfo['fftw'])
print line print line
if line.startswith('ACMLROOT'): if line.startswith('ACMLROOT'):
line='ACMLROOT =%s\n'%(damask_variables.pathInfo['acml']) line='ACMLROOT =%s\n'%(damaskEnv.pathInfo['acml'])
print line print line
makefile.writelines(line) makefile.writelines(line)
makefile.close() makefile.close()
@ -67,9 +67,9 @@ for dir in bin_link:
for file in bin_link[dir]: for file in bin_link[dir]:
src = os.path.abspath(os.path.join(baseDir,dir,file)) src = os.path.abspath(os.path.join(baseDir,dir,file))
if (file == ''): if (file == ''):
sym_link = os.path.abspath(os.path.join(damask_variables.binDir(),dir)) sym_link = os.path.abspath(os.path.join(damaskEnv.binDir(),dir))
else: else:
sym_link = os.path.abspath(os.path.join(damask_variables.binDir(),os.path.splitext(file)[0])) sym_link = os.path.abspath(os.path.join(damaskEnv.binDir(),os.path.splitext(file)[0]))
print sym_link,'-->',src print sym_link,'-->',src
if os.path.lexists(sym_link): if os.path.lexists(sym_link):
os.remove(sym_link) os.remove(sym_link)