Commits

Satish Balay committed 7659ca2

exodus: cleanup build process [make.inc is unused & fix postInstall() to use the correct file]

Comments (0)

Files changed (1)

config/BuildSystem/config/packages/exodusii.py

     config.package.Package.configureLibrary(self)
 
   def Install(self):
-    self.logPrintBox('Compiling ExodusII; this may take several minutes')
     import os
     import shutil
     configOpts     = []
       configOpts.append('F77OPTIONS="'+self.setCompilers.getCompilerFlags()+'"')
       self.setCompilers.popLanguage()
 
-    mkfile = 'make.inc'
-    g = open(os.path.join(self.packageDir, mkfile), 'w')
     self.framework.log.write(repr(dir(self.setCompilers)))
 
     args = ' '.join(configOpts)
-    fd = file(os.path.join(self.packageDir,'exodusii'), 'w')
+    cfgfile = 'exodusii'
+    fd = file(os.path.join(self.packageDir,cfgfile), 'w')
     fd.write(args)
     fd.close()
 
-    if self.installNeeded('exodusii'):
+    if self.installNeeded(cfgfile):
       cincludes  = ['exodusII.h','exodusII_cfg.h','exodusII_int.h','exodusII_par.h']
       fincludes  = ['exodusII.inc','exodusII_int.inc']
       try:
         output,err,ret = config.base.Configure.executeShellCommand('cd '+builddir+' && make -f Makefile.standalone clean', timeout=250, log = self.framework.log)
       except RuntimeError, e:
         raise RuntimeError('Error running make on ExodusII: '+str(e))
-      self.postInstall(output+err, mkfile)
+      self.postInstall(output+err, cfgfile)
     return self.installDir
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.