-
Notifications
You must be signed in to change notification settings - Fork 7
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Tickets/dm 2961 - psfex port #1
Changes from 11 commits
0ebadc7
bc20bb8
039fe8b
aa9ff0d
b2eac69
f74a977
3adea1e
725772a
45837ce
f271090
cc52389
15f55ec
1ac6006
4586f37
252ca17
618727c
aecb8d6
64aca56
ea300d1
d229054
9b6219b
89ba518
d8ec3d2
2ffdbe2
6ff9fc8
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
build(){ | ||
scons opt=3 prefix=$PREFIX version=$VERSION | ||
} | ||
install(){ | ||
scons opt=3 install prefix=$PREFIX version=$VERSION | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These shouldn't be necessary -- you should be able to completely remove the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Removed. I figured out it would not be necessary after the fact of creating it, but just had not gone back and removed it. I was playing around with different opt levels and debug for a while. |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,8 +4,8 @@ import lsst.sconsUtils | |
|
||
dependencies = { | ||
"required": [], | ||
"buildRequired": ["afw", "boost_test", "daf_base", "meas_algorithms", | ||
"swig", "utils", "psfex"], | ||
"buildRequired": ["afw", "boost_test", "daf_base", "fftw_float", | ||
"meas_base","meas_algorithms","swig", "utils", "psfex"], | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why did the indent disappear? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added back, I had my editor width set too small and when I made the change it pushed it back and I didn't catch it. |
||
} | ||
|
||
config = lsst.sconsUtils.Configuration( | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
setupRequired(meas_base) | ||
setupRequired(meas_algorithms) | ||
setupRequired(psfex) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Either delete it or uncomment it please. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Strange, I don't have that on my local copy. I wonder If I forgot to push that change |
||
#setupRequired(pyfits) | ||
|
||
envPrepend(PATH, ${PRODUCT_DIR}/bin) | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Two comments:
if
always all on one line; use a regularif
if it can't fit.if False
will always eval to False, of course)?