Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
#17288 make mathjax standard and a dependency of ipython
Browse files Browse the repository at this point in the history
  • Loading branch information
Thierry Monteil committed Nov 7, 2014
1 parent 8f18d36 commit 0443d99
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 1 deletion.
7 changes: 6 additions & 1 deletion build/deps
Expand Up @@ -65,6 +65,7 @@ all-sage: \
$(INST)/$(LINBOX) \
$(INST)/$(M4RI) \
$(INST)/$(M4RIE) \
$(INST)/$(MATHJAX) \
$(INST)/$(MATPLOTLIB) \
$(INST)/$(MAXIMA) \
$(INST)/$(MPC) \
Expand Down Expand Up @@ -307,7 +308,8 @@ $(INST)/$(GAP): $(INST)/$(NCURSES) $(INST)/$(READLINE) $(INST)/$(MPIR)
$(INST)/$(LIBGAP): $(INST)/$(GAP)
+$(PIPE) "$(SAGE_SPKG) $(LIBGAP) 2>&1" "tee -a $(SAGE_LOGS)/$(LIBGAP).log"

$(INST)/$(IPYTHON): $(INST)/$(PYTHON) $(INST)/$(JINJA2) $(INST)/$(TORNADO) $(INST)/$(PYZMQ)
$(INST)/$(IPYTHON): $(INST)/$(PYTHON) $(INST)/$(JINJA2) $(INST)/$(TORNADO) \
$(INST)/$(PYZMQ) $(INST)/$(MATHJAX)
+$(PIPE) "$(SAGE_SPKG) $(IPYTHON) 2>&1" "tee -a $(SAGE_LOGS)/$(IPYTHON).log"

$(INST)/$(PEXPECT): $(INST)/$(PYTHON)
Expand Down Expand Up @@ -381,6 +383,9 @@ $(INST)/$(PYZMQ): $(INST)/$(PYTHON) $(INST)/$(ZEROMQ) $(INST)/$(SETUPTOOLS)
$(INST)/$(TORNADO): $(INST)/$(PYTHON) $(INST)/$(SETUPTOOLS)
+$(PIPE) "$(SAGE_SPKG) $(TORNADO) 2>&1" "tee -a $(SAGE_LOGS)/$(TORNADO).log"

$(INST)/$(MATHJAX):
+$(PIPE) "$(SAGE_SPKG) $(MATHJAX) 2>&1" "tee -a $(SAGE_LOGS)/$(MATHJAX).log"

$(INST)/$(MATPLOTLIB): $(INST)/$(PYTHON) $(INST)/$(NUMPY) \
$(INST)/$(FREETYPE) $(INST)/$(LIBPNG) \
$(INST)/$(GDMODULE) $(INST)/$(DATEUTIL) \
Expand Down
1 change: 1 addition & 0 deletions build/install
Expand Up @@ -305,6 +305,7 @@ LIBPNG=`newest_version libpng`
LINBOX=`newest_version linbox`
M4RI=`newest_version m4ri`
M4RIE=`newest_version m4rie`
MATHJAX=`newest_version mathjax`
MATPLOTLIB=`newest_version matplotlib`
MAXIMA=`newest_version maxima`
MPC=`newest_version mpc`
Expand Down
8 changes: 8 additions & 0 deletions build/pkgs/ipython/spkg-install
Expand Up @@ -46,3 +46,11 @@ if python -c 'import sys; sys.exit(sys.version_info.major != 3)'; then
rm -f ipython
ln -s ipython3 ipython
fi

# let ipython use mathjax
cd "$SAGE_LOCAL/lib/python/site-packages/IPython/html/static"
if [ -h mathjax ] ; then
rm mathjax
fi
ln -s ../../../../../../share/mathjax/

0 comments on commit 0443d99

Please sign in to comment.