On 3/5/14, 21:24 , Mario Juric wrote:
> On 2/27/14, 9:21 , Fabrice Jammes wrote:
>> Hello Mario,
>>
>> eupspkg file contains function default_install() (see below). In this
>> function, the install procedure for a scons script doesn't run
>> *install_ups*, whereas all other install procedures launch it.
>> Do you think it could be added, or do i have to add and ups/eupspkg.sh
>> in Qserv build procedure ? Indeed Qserv relies on standard eupspkg build
>> procedure and scons, but installing it print next message :
>>
>
> Hmm, OK, good point.
>
> The reason that install_ups wasn't there was because packages that use
> sconsUtils install it automatically. I never thought (which I should, my
> mistake!) that a vanilla SCons project would need it.
>
> I'll fix it tomorrow.
>
Fabrice,
A proposed fix is now on the tip of my EUPS' eupspkg branch (commit
3fb8491). Let me know if it works (didn't test it well yet). It's a
simple change:
============
[mjuric@lsst-dev [eupspkg] /ssd/mjuric/eupspkg/sources/eups]$ git diff
HEAD^..
diff --git a/lib/eupspkg.sh b/lib/eupspkg.sh
index 39f187f..56923f8 100755
--- a/lib/eupspkg.sh
+++ b/lib/eupspkg.sh
@@ -738,22 +738,26 @@ default_install()
scons -j$NJOBS prefix="$PREFIX" version="$VERSION"
cc="$CC" install
elif [[ -f configure ]]; then
make -j$NJOBS $MAKE_INSTALL_TARGETS
- install_ups
elif [[ -f Makefile || -f makefile || -f GNUmakefile ]]; then
make -j$NJOBS prefix="$PREFIX" version="$VERSION"
$MAKE_INSTALL_TARGETS
- install_ups
elif [[ -f setup.py ]]; then
PYDEST="$PREFIX/lib/python"
mkdir -p "$PYDEST"
PYTHONPATH="$PYDEST:$PYTHONPATH" python setup.py install
$PYSETUP_INSTALL_OPTIONS
evil_setuptools_pth_fix "$PYDEST"
- install_ups
else
- # just copy everything
+ # just copy everything, except for the ups directory
mkdir -p "$PREFIX"
cp -a ./ "$PREFIX"
+ rm -rf "$PREFIX/ups"
msg "Copied the product into '$PREFIX'"
fi
+
+ # Install ups if the native build system hasn't done it already.
+ # We do this check to avoid expanding the table file twice (EUPS
has a bug there)
+ if [[ -d "ups" && ! -d "$PREFIX/ups" ]]; then
+ install_ups
+ fi
}
============
Cheers,
--
Mario Juric,
Data Mgmt. Project Scientist, Large Synoptic Survey Telescope
Web : http://research.majuric.org Phone : +1 617 744 9003
########################################################################
Use REPLY-ALL to reply to list
To unsubscribe from the QSERV-L list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=QSERV-L&A=1
