reference to savanna removed

LutzGross · Sep 19, 2024 · a8fd21c · a8fd21c
1 parent 374dde9
commit a8fd21c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 153 deletions.
diff --git a/SConstruct b/SConstruct
@@ -44,10 +44,8 @@ options_file=ARGUMENTS.get('options_file', None)
 if not options_file:
     ext_dir = os.path.join(os.getcwd(), 'scons')
     hostname = platform.node().split('.')[0]
-    for name in hostname, effectiveName(hostname):
-        mangledhostname = re.sub('[^0-9a-zA-Z]', '_', hostname)
-        options_file = os.path.join(ext_dir, mangledhostname+'_options.py')
-        if os.path.isfile(options_file): break
+    mangledhostname = re.sub('[^0-9a-zA-Z]', '_', hostname)
+    options_file = os.path.join(ext_dir, mangledhostname+'_options.py')
 
 if not os.path.isfile(options_file):
     print("\nWARNING:\nOptions file %s" % options_file)

diff --git a/scons/savanna_options.py b/scons/savanna_options.py
diff --git a/scons/savanna_trilinosmake.sh b/scons/savanna_trilinosmake.sh
diff --git a/site_scons/site_init.py b/site_scons/site_init.py
@@ -280,12 +280,6 @@ def eps2pdf(target, source, env):
        return 1
    return None
 
-def effectiveName(inname):
-    m=re.compile("^r1i[0-9]{1,2}n[0-9]{1,2}$")  # savanna names take the form r1i?n?
-    if m.match(inname):
-        return "savanna"
-    return inname
-
 def osxlib_dep_rewrite(libname, targetdir, env):
     if env.Execute("tools/libmover.sh %s %s"%(libname, targetdir)):
        return 1