# HG changeset patch
# User Leif Leonhardy
# Date 1285448826 -7200
# Node ID 30830fa63750670c67f6d02011727ab07bb22d01
# Parent 81f7b8c66cb9456958cdc1f202f17137748c5549
#10016 Call sage-spkg directly rather than via "sage -f" (and unavailable sage-sage).
=== r-2.10.1.p4 (Leif Leonhardy, September 25th 2010) ===
* #10016: Don't call "sage -f" on the included Rpy spkg, instead call
"sage-spkg -f" directly, since only this is guaranteed to be present.
This is just a temporary solution, until the Rpy spkg is removed
from this one.
diff -r 81f7b8c66cb9 -r 30830fa63750 SPKG.txt
--- a/SPKG.txt Fri Jul 09 07:33:17 2010 -0700
+++ b/SPKG.txt Sat Sep 25 23:07:06 2010 +0200
@@ -18,10 +18,19 @@
== Dependencies ==
* ATLAS
-== Build Notes ==
+== Special Update/Build Instructions ==
+ * TODO: Remove the contained Rpy spkg and ship (and maintain)
+ it separately, for many reasons. (#9906 addresses this.)
+ * TODO: Clean up spkg-install.
== Changelog ==
+=== r-2.10.1.p4 (Leif Leonhardy, September 25th 2010) ===
+ * #10016: Don't call "sage -f" on the included Rpy spkg, instead call
+ "sage-spkg -f" directly, since only this is guaranteed to be present.
+ This is just a temporary solution, until the Rpy spkg is removed
+ from this one.
+
=== r-2.10.1.p3 (Mariah Lenox, 30 Jun 2010) ===
* added "--with-ICU=no" to configure line of spkg-install (#9396)
diff -r 81f7b8c66cb9 -r 30830fa63750 spkg-install
--- a/spkg-install Fri Jul 09 07:33:17 2010 -0700
+++ b/spkg-install Sat Sep 25 23:07:06 2010 +0200
@@ -154,15 +154,46 @@
cd "$CUR"/patches
python fix_hardcode
-echo "Now install rpy"
+cd "$CUR"
-cd "$CUR"
RPY_VER=rpy2-2.0.8
-sage -f "$RPY_VER".spkg
-if [ ! -f "$SAGE_ROOT"/spkg/installed/"$RPY_VER" ]; then
- echo "Error installing rpy."
+echo "Now installing the contained Rpy ($RPY_VER) spkg..."
+
+# Do NOT call $SAGE_ROOT/sage here, since $SAGE_LOCAL/bin/sage-sage
+# might not yet exist.
+# See http://trac.sagemath.org/sage_trac/ticket/8306#comment:29
+# and http://trac.sagemath.org/sage_trac/ticket/9896#comment:95
+# Instead, as a temporary solution before Rpy gets removed from
+# R's spkg (#9906), call $SAGE_LOCAL/bin/sage-spkg directly since
+# it is present in any case (installed by spkg/base/dir-0.1-install)
+# and the environment is already set up:
+
+# sage -f "$RPY_VER".spkg # EVIL
+
+# Sanity check, should never happen:
+if [ ! -x "$SAGE_LOCAL/bin/sage-spkg" ]; then
+ echo "Error: Fatal dependency error:"
+ echo " $SAGE_LOCAL/bin/sage-spkg"
+ echp "does not (yet) exist (or isn't executable):"
+ ls -l "$SAGE_LOCAL/bin/sage-spkg"
+ echo "Please report this to one of the Google groups"
+ echo " sage-devel or sage-release."
+ echo "Error installing Rpy, which is part of the R spkg."
+ exit 1
+fi
+
+# Avoid trouble with pipestatus and spaces in the spkg's pathname:
+export RPY_PKG=$CUR/$RPY_VER.spkg
+
+# sage-spkg is in the PATH (but not pipestatus):
+"$SAGE_ROOT/spkg/pipestatus" \
+ "sage-spkg -f '$RPY_PKG' 2>&1" \
+ "tee -a '$SAGE_ROOT/spkg/logs/'$RPY_VER.log"
+
+if [ $? -ne 0 ] || [ ! -f "$SAGE_ROOT"/spkg/installed/"$RPY_VER" ]; then
+ echo "Error installing Rpy, which is part of the R spkg."
exit 1
fi