Skip to content

Commit

Permalink
Fix macOS builds
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonKrughoff committed Jun 14, 2019
1 parent a70ca06 commit c762db5
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions auxTel/SConscript
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# -*- python -*-

import lsst.sconsUtils
from lsst.utils import getPackageDir
import os

# scons steals our environment away, so we have to reinstate it
Expand All @@ -14,9 +13,12 @@ for name in ("PYTHONPATH", "LD_LIBRARY_PATH",
# we may need an explicit library load path specified in the command
libpathstr = lsst.sconsUtils.utils.libraryLoaderEnvironment()

pipe_tasks_dir = getPackageDir('pipe_tasks')
data_dir = getPackageDir('obs_lsst_data')
command = (f"{pipe_tasks_dir}/bin/ingestDefects.py auxTel/CALIB/ {data_dir}/auxTel/defects "+
# We always run these commands with an explicit python rather than relying on the shebang
python = "{} python".format(libpathstr)

pipe_tasks_dir = lsst.sconsUtils.env.ProductDir('pipe_tasks')
data_dir = lsst.sconsUtils.env.ProductDir('obs_lsst_data')
command = (f"{python} {pipe_tasks_dir}/bin/ingestDefects.py auxTel/CALIB/ {data_dir}/auxTel/defects "+
"--calib auxTel/CALIB --config clobber=True")
commandInst = env.Command('CALIB/calibRegistry.sqlite3', [], command)
env.Depends(commandInst, lsst.sconsUtils.targets["python"])

0 comments on commit c762db5

Please sign in to comment.