From e3299e6923c8c998317ed9db1dbf86bf45a052f6 Mon Sep 17 00:00:00 2001
From: Tamara Dahlgren <35777542+tldahlgren@users.noreply.github.com>
Date: Thu, 11 Jul 2019 13:32:06 -0700
Subject: Rename build logs and make names consistent (#11806)

Fixes #11781

* Rename build log to spack-build-log.txt
* Rename environment variables file to spack-build-env.txt
* The name of the log and env files is now the same during the build
  and after the build completes
* Update packages which referred to the build log/env files
* For packages installed before this commit using older names for the
  build and env files, search for the older names
---
 var/spack/repos/builtin/packages/foam-extend/package.py  | 2 +-
 var/spack/repos/builtin/packages/mathematica/package.py  | 8 --------
 var/spack/repos/builtin/packages/openfoam-org/package.py | 2 +-
 var/spack/repos/builtin/packages/openfoam/package.py     | 2 +-
 var/spack/repos/builtin/packages/picard/package.py       | 2 +-
 5 files changed, 4 insertions(+), 12 deletions(-)

(limited to 'var')

diff --git a/var/spack/repos/builtin/packages/foam-extend/package.py b/var/spack/repos/builtin/packages/foam-extend/package.py
index 0d29dc13ee..8932c4cc07 100644
--- a/var/spack/repos/builtin/packages/foam-extend/package.py
+++ b/var/spack/repos/builtin/packages/foam-extend/package.py
@@ -425,7 +425,7 @@ class FoamExtend(Package):
         # Make build log visible - it contains OpenFOAM-specific information
         with working_dir(self.projectdir):
             os.symlink(
-                join_path('.spack', 'build.out'),
+                join_path(os.path.relpath(self.install_log_path)),
                 join_path('log.' + str(self.foam_arch)))
 
 # -----------------------------------------------------------------------------
diff --git a/var/spack/repos/builtin/packages/mathematica/package.py b/var/spack/repos/builtin/packages/mathematica/package.py
index 9386e06f6d..c86d98fa75 100644
--- a/var/spack/repos/builtin/packages/mathematica/package.py
+++ b/var/spack/repos/builtin/packages/mathematica/package.py
@@ -29,11 +29,3 @@ class Mathematica(Package):
            '-targetdir={0}'.format(prefix),
            '-execdir={0}'.format(prefix.bin),
            '-selinux=y')
-
-        # after the install phase completes, spack tries to install build.out
-        # into <prefix>/.spack, but the .spack dir will not exist, causing the
-        # build to fail. package.py:1690 seems to show that the dir is created
-        # right before writing build.out -- possible bug?
-
-        # creating the .spack dir right after installing prevents explosions
-        mkdirp(join_path(prefix, '.spack'))
diff --git a/var/spack/repos/builtin/packages/openfoam-org/package.py b/var/spack/repos/builtin/packages/openfoam-org/package.py
index 7f26bd87d9..1bdec40181 100644
--- a/var/spack/repos/builtin/packages/openfoam-org/package.py
+++ b/var/spack/repos/builtin/packages/openfoam-org/package.py
@@ -344,7 +344,7 @@ class OpenfoamOrg(Package):
         # Make build log visible - it contains OpenFOAM-specific information
         with working_dir(self.projectdir):
             os.symlink(
-                join_path('.spack', 'build.out'),
+                join_path(os.path.relpath(self.install_log_path)),
                 join_path('log.' + str(self.foam_arch)))
 
         if not self.config['link']:
diff --git a/var/spack/repos/builtin/packages/openfoam/package.py b/var/spack/repos/builtin/packages/openfoam/package.py
index 4cf12a19b1..5f2ca0386a 100644
--- a/var/spack/repos/builtin/packages/openfoam/package.py
+++ b/var/spack/repos/builtin/packages/openfoam/package.py
@@ -724,7 +724,7 @@ class Openfoam(Package):
         # Make build log visible - it contains OpenFOAM-specific information
         with working_dir(self.projectdir):
             os.symlink(
-                join_path('.spack', 'build.out'),
+                join_path(os.path.relpath(self.install_log_path)),
                 join_path('log.' + str(self.foam_arch)))
 
         if not self.config['link']:
diff --git a/var/spack/repos/builtin/packages/picard/package.py b/var/spack/repos/builtin/packages/picard/package.py
index 82f34344e0..d42f80a3f0 100644
--- a/var/spack/repos/builtin/packages/picard/package.py
+++ b/var/spack/repos/builtin/packages/picard/package.py
@@ -42,7 +42,7 @@ class Picard(Package):
     def install(self, spec, prefix):
         mkdirp(prefix.bin)
         # The list of files to install varies with release...
-        # ... but skip the spack-{build.env}.out files.
+        # ... but skip the spack-build-{env}out.txt files.
         files = [x for x in glob.glob("*") if not re.match("^spack-", x)]
         for f in files:
             install(f, prefix.bin)
-- 
cgit v1.2.3-60-g2f50