Changeset 14255

Timestamp:

01/15/13 15:18:51 (12 years ago)

Author:

jschierm

Message:

CHG: get DAKOTA_VERSION from config.h, rather than from externalpackage/dakota.

Location:

issm/trunk-jpl/src/m/os

Files:

• dakotaversion.m (modified) (2 diffs)
• dakotaversion.py (modified) (2 diffs)

issm/trunk-jpl/src/m/os/dakotaversion.m

@@ -6 +6 @@
 
 %default
-DAKOTA_VERSION=0;
+DAKOTA_VERSION='';
 
-configfile=[issmdir() '/externalpackages/dakota/install/include/dakota_config.h'];
+configfile=[issmdir() '/config.h'];
 if ~exist(configfile,'file'),
         error(['File ' configfile ' not found. Dakota has not been configured yet!']);
@@ -20 +20 @@
         tline=fgets(fid);
         if ~ischar(tline), break, end
-        if  strncmp(tline,'#define PACKAGE_VERSION',23),
-                DAKOTA_VERSION=strtrim(strrep(tline(25:end),'"',''));
+        if  strncmp(tline,'#define DAKOTA_VERSION',22),
+                DAKOTA_VERSION=strtrim(strrep(tline(24:end),'"',''));
         end
 end

issm/trunk-jpl/src/m/os/dakotaversion.py

@@ -12 +12 @@
 
         #default
-        DAKOTA_VERSION=0
+        DAKOTA_VERSION=''
 
-        configfile=os.path.join(issmdir(),'externalpackages','dakota','install','include','dakota_config.h')
+        configfile=os.path.join(issmdir(),'config.h')
         if not os.path.exists(configfile):
                 raise RuntimeError("File '%s' not found. Dakota has not been configured yet!" % configfile)
@@ -25 +25 @@
 
         for tline in fid:
-                if strncmp(tline,'#define PACKAGE_VERSION',23):
-                        DAKOTA_VERSION=tline[24:].replace('"','').strip()
+                if strncmp(tline,'#define DAKOTA_VERSION',22):
+                        DAKOTA_VERSION=tline[23:].replace('"','').strip()
                         break