Move src/ext to src/sage/ext_data and install it as 'package_data'

sagemath · Feb 1, 2020 · 95c8316 · 95c8316
1 parent 2cbd93e
commit 95c8316
Show file tree

Hide file tree

Showing 80 changed files with 4 additions and 25 deletions.
diff --git a/build/make/Makefile.in b/build/make/Makefile.in
@@ -76,8 +76,6 @@ SDIST_PACKAGES = @SAGE_SDIST_PACKAGES@
 
 SCRIPTS = @SAGE_SCRIPTS@
 
-EXTCODE = @SAGE_EXTCODE@
-
 # Packages that use the 'normal' build rules
 NORMAL_PACKAGES = @SAGE_NORMAL_PACKAGES@
 

diff --git a/build/make/deps b/build/make/deps
@@ -53,7 +53,6 @@ all-sage: \
 		sagelib \
 		$(STANDARD_PACKAGE_INSTS) \
 		$(OPTIONAL_INSTALLED_PACKAGE_INSTS) \
-		$(EXTCODE) \
 		$(SCRIPTS)
 
 # Download all packages which should be inside an sdist tarball (the -B
@@ -123,6 +122,7 @@ base: $(inst_patch) $(inst_pkgconf)
 # Sage library (e.g. CYTHON, JINJA2), and on the other hand all
 # dependencies for Cython files (e.g. PARI, NTL, MP_LIBRARY).
 sagelib: \
+		$(SCRIPTS) \
 		$(inst_arb) \
 		$(inst_boost_cropped) \
 		$(inst_$(BLAS)) \
@@ -175,7 +175,6 @@ sagelib: \
 		$(inst_six) \
 		$(inst_symmetrica) \
 		$(inst_zn_poly) \
-		$(EXTCODE) \
 		$(PCFILES)
 	$(AM_V_at)if [ -z "$$SAGE_INSTALL_FETCH_ONLY" ]; then \
 		cd $(SAGE_SRC) && source bin/sage-env && \
@@ -184,27 +183,18 @@ sagelib: \
 
 
 ###############################################################################
-# Building scripts and extcode
+# Building scripts
 ###############################################################################
 
 # Don't just use "install" since we don't want to change permissions
 $(SAGE_LOCAL)/bin/%: $(SAGE_SRC)/bin/%
 	$(AM_V_at)cp $< $@
 
-# Don't just use "install -D" since we don't want to change permissions.
-# cp won't correctly setup the SAGE_EXTCODE directory structure
-# (unlike install), so we need a mkdir here such that cp can copy into
-# an existing folder.
-$(SAGE_EXTCODE)/%: $(SAGE_SRC)/ext/%
-	@mkdir -p "$(@D)"
-	$(AM_V_at)cp $< $@
-
 # Install sage-specific generated .pc files
 $(SAGE_PKGCONFIG)/%.pc: $(SAGE_SRC)/lib/pkgconfig/%.pc
 	@mkdir -p "$(@D)"
 	$(AM_V_at)cp -P $< $@
 
-
 ###############################################################################
 # Building the documentation
 ###############################################################################

diff --git a/build/make/install b/build/make/install
@@ -16,7 +16,6 @@ if [ $? -ne 0 ]; then
 fi
 
 export SAGE_SHARE="$SAGE_LOCAL/share"
-export SAGE_EXTCODE="$SAGE_SHARE/sage/ext"
 export SAGE_PKGCONFIG="$SAGE_LOCAL/lib/pkgconfig"
 export SAGE_LOGS="$SAGE_ROOT/logs/pkgs"
 export SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed"

diff --git a/configure.ac b/configure.ac
@@ -433,14 +433,6 @@ done
 
 AC_SUBST([SAGE_SCRIPTS])
 
-SAGE_EXTCODE='\
-'
-for file in `find "$SAGE_SRC"/ext -type f`; do
-    SAGE_EXTCODE+="    \$(SAGE_EXTCODE)${file#$SAGE_SRC/ext} \\"$'\n'
-done
-
-AC_SUBST([SAGE_EXTCODE])
-
 SAGE_MAKE_DEPS="$SAGE_ROOT/build/make/deps"
 AC_SUBST_FILE([SAGE_MAKE_DEPS])
 

diff --git a/src/bin/sage-env b/src/bin/sage-env
@@ -283,7 +283,6 @@ fi
 # depending on SAGE_ROOT and SAGE_LOCAL which are already defined.
 export SAGE_ETC="$SAGE_LOCAL/etc"
 export SAGE_SHARE="$SAGE_LOCAL/share"
-export SAGE_EXTCODE="$SAGE_SHARE/sage/ext"
 export SAGE_PKGCONFIG="$SAGE_LOCAL/lib/pkgconfig"
 export SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed"
 export SAGE_SPKG_SCRIPTS="$SAGE_LOCAL/var/lib/sage/scripts"

diff --git a/src/sage/env.py b/src/sage/env.py
@@ -164,6 +164,7 @@ def var(key, *fallbacks, **kwds):
 var('SAGE_DOC',            join(SAGE_SHARE, 'doc', 'sage'))
 var('SAGE_SPKG_INST',      join(SAGE_LOCAL, 'var', 'lib', 'sage', 'installed'))
 var('SAGE_LIB',            os.path.dirname(os.path.dirname(sage.__file__)))
+var('SAGE_EXTCODE',        join(SAGE_LIB, 'sage', 'ext_data'))
 
 var('SAGE_ROOT')           # no fallback for SAGE_ROOT
 var('SAGE_SRC',            join(SAGE_ROOT, 'src'), SAGE_LIB)
@@ -175,7 +176,6 @@ def var(key, *fallbacks, **kwds):
 var('SAGE_STARTUP_FILE',   join(DOT_SAGE, 'init.sage'))
 
 # installation directories for various packages
-var('SAGE_EXTCODE',                  join(SAGE_SHARE, 'sage', 'ext'))
 var('CONWAY_POLYNOMIALS_DATA_DIR',   join(SAGE_SHARE, 'conway_polynomials'))
 var('GRAPHS_DATA_DIR',               join(SAGE_SHARE, 'graphs'))
 var('ELLCURVE_DATA_DIR',             join(SAGE_SHARE, 'ellcurves'))

diff --git a/src/ext/doctest/invalid/syntax_error.tachyon → ...data/doctest/invalid/syntax_error.tachyon b/src/ext/doctest/invalid/syntax_error.tachyon → ...data/doctest/invalid/syntax_error.tachyon
diff --git a/src/ext/doctest/rich_output/example.avi → .../ext_data/doctest/rich_output/example.avi b/src/ext/doctest/rich_output/example.avi → .../ext_data/doctest/rich_output/example.avi
diff --git a/src/ext/doctest/rich_output/example.canvas3d → ...data/doctest/rich_output/example.canvas3d b/src/ext/doctest/rich_output/example.canvas3d → ...data/doctest/rich_output/example.canvas3d
diff --git a/src/ext/doctest/rich_output/example.dvi → .../ext_data/doctest/rich_output/example.dvi b/src/ext/doctest/rich_output/example.dvi → .../ext_data/doctest/rich_output/example.dvi
diff --git a/src/ext/doctest/rich_output/example.flv → .../ext_data/doctest/rich_output/example.flv b/src/ext/doctest/rich_output/example.flv → .../ext_data/doctest/rich_output/example.flv
diff --git a/src/ext/doctest/rich_output/example.gif → .../ext_data/doctest/rich_output/example.gif b/src/ext/doctest/rich_output/example.gif → .../ext_data/doctest/rich_output/example.gif
diff --git a/src/ext/doctest/rich_output/example.jpg → .../ext_data/doctest/rich_output/example.jpg b/src/ext/doctest/rich_output/example.jpg → .../ext_data/doctest/rich_output/example.jpg
diff --git a/src/ext/doctest/rich_output/example.mkv → .../ext_data/doctest/rich_output/example.mkv b/src/ext/doctest/rich_output/example.mkv → .../ext_data/doctest/rich_output/example.mkv
diff --git a/src/ext/doctest/rich_output/example.mov → .../ext_data/doctest/rich_output/example.mov b/src/ext/doctest/rich_output/example.mov → .../ext_data/doctest/rich_output/example.mov
diff --git a/src/ext/doctest/rich_output/example.mp4 → .../ext_data/doctest/rich_output/example.mp4 b/src/ext/doctest/rich_output/example.mp4 → .../ext_data/doctest/rich_output/example.mp4
diff --git a/src/ext/doctest/rich_output/example.ogv → .../ext_data/doctest/rich_output/example.ogv b/src/ext/doctest/rich_output/example.ogv → .../ext_data/doctest/rich_output/example.ogv
diff --git a/src/ext/doctest/rich_output/example.pdf → .../ext_data/doctest/rich_output/example.pdf b/src/ext/doctest/rich_output/example.pdf → .../ext_data/doctest/rich_output/example.pdf
diff --git a/src/ext/doctest/rich_output/example.png → .../ext_data/doctest/rich_output/example.png b/src/ext/doctest/rich_output/example.png → .../ext_data/doctest/rich_output/example.png
diff --git a/src/ext/doctest/rich_output/example.svg → .../ext_data/doctest/rich_output/example.svg b/src/ext/doctest/rich_output/example.svg → .../ext_data/doctest/rich_output/example.svg
diff --git a/src/ext/doctest/rich_output/example.webm → ...ext_data/doctest/rich_output/example.webm b/src/ext/doctest/rich_output/example.webm → ...ext_data/doctest/rich_output/example.webm
diff --git a/src/ext/doctest/rich_output/example.wmv → .../ext_data/doctest/rich_output/example.wmv b/src/ext/doctest/rich_output/example.wmv → .../ext_data/doctest/rich_output/example.wmv
diff --git a/.../doctest/rich_output/example_jmol.spt.zip → .../doctest/rich_output/example_jmol.spt.zip b/.../doctest/rich_output/example_jmol.spt.zip → .../doctest/rich_output/example_jmol.spt.zip
diff --git a/...t/rich_output/example_wavefront/scene.mtl → ...t/rich_output/example_wavefront/scene.mtl b/...t/rich_output/example_wavefront/scene.mtl → ...t/rich_output/example_wavefront/scene.mtl
diff --git a/...t/rich_output/example_wavefront/scene.obj → ...t/rich_output/example_wavefront/scene.obj b/...t/rich_output/example_wavefront/scene.obj → ...t/rich_output/example_wavefront/scene.obj
diff --git a/src/ext/gap/console.g → src/sage/ext_data/gap/console.g b/src/ext/gap/console.g → src/sage/ext_data/gap/console.g
diff --git a/src/ext/gap/joyner/hurwitz_crv_rr_sp.gap → ...ext_data/gap/joyner/hurwitz_crv_rr_sp.gap b/src/ext/gap/joyner/hurwitz_crv_rr_sp.gap → ...ext_data/gap/joyner/hurwitz_crv_rr_sp.gap
diff --git a/src/ext/gap/joyner/modular_crv_rr_sp.gap → ...ext_data/gap/joyner/modular_crv_rr_sp.gap b/src/ext/gap/joyner/modular_crv_rr_sp.gap → ...ext_data/gap/joyner/modular_crv_rr_sp.gap
diff --git a/src/ext/gap/sage.g → src/sage/ext_data/gap/sage.g b/src/ext/gap/sage.g → src/sage/ext_data/gap/sage.g
diff --git a/src/ext/graphs/graph_plot_js.html → src/sage/ext_data/graphs/graph_plot_js.html b/src/ext/graphs/graph_plot_js.html → src/sage/ext_data/graphs/graph_plot_js.html
diff --git a/src/ext/images/corner.png → src/sage/ext_data/images/corner.png b/src/ext/images/corner.png → src/sage/ext_data/images/corner.png
diff --git a/src/ext/images/evaluate.png → src/sage/ext_data/images/evaluate.png b/src/ext/images/evaluate.png → src/sage/ext_data/images/evaluate.png
diff --git a/src/ext/images/evaluate_over.png → src/sage/ext_data/images/evaluate_over.png b/src/ext/images/evaluate_over.png → src/sage/ext_data/images/evaluate_over.png
diff --git a/src/ext/images/favicon.ico → src/sage/ext_data/images/favicon.ico b/src/ext/images/favicon.ico → src/sage/ext_data/images/favicon.ico
diff --git a/src/ext/images/sagelogo.png → src/sage/ext_data/images/sagelogo.png b/src/ext/images/sagelogo.png → src/sage/ext_data/images/sagelogo.png
diff --git a/src/ext/kenzo/CP2.txt → src/sage/ext_data/kenzo/CP2.txt b/src/ext/kenzo/CP2.txt → src/sage/ext_data/kenzo/CP2.txt
diff --git a/src/ext/kenzo/CP3.txt → src/sage/ext_data/kenzo/CP3.txt b/src/ext/kenzo/CP3.txt → src/sage/ext_data/kenzo/CP3.txt
diff --git a/src/ext/kenzo/CP4.txt → src/sage/ext_data/kenzo/CP4.txt b/src/ext/kenzo/CP4.txt → src/sage/ext_data/kenzo/CP4.txt
diff --git a/src/ext/kenzo/README.txt → src/sage/ext_data/kenzo/README.txt b/src/ext/kenzo/README.txt → src/sage/ext_data/kenzo/README.txt
diff --git a/src/ext/kenzo/S4.txt → src/sage/ext_data/kenzo/S4.txt b/src/ext/kenzo/S4.txt → src/sage/ext_data/kenzo/S4.txt
diff --git a/src/ext/magma/latex/latex.m → src/sage/ext_data/magma/latex/latex.m b/src/ext/magma/latex/latex.m → src/sage/ext_data/magma/latex/latex.m
diff --git a/src/ext/magma/latex/latex.spec → src/sage/ext_data/magma/latex/latex.spec b/src/ext/magma/latex/latex.spec → src/sage/ext_data/magma/latex/latex.spec
diff --git a/src/ext/magma/sage/basic.m → src/sage/ext_data/magma/sage/basic.m b/src/ext/magma/sage/basic.m → src/sage/ext_data/magma/sage/basic.m
diff --git a/src/ext/magma/sage/sage.spec → src/sage/ext_data/magma/sage/sage.spec b/src/ext/magma/sage/sage.spec → src/sage/ext_data/magma/sage/sage.spec
diff --git a/src/ext/magma/spec → src/sage/ext_data/magma/spec b/src/ext/magma/spec → src/sage/ext_data/magma/spec
diff --git a/src/ext/mwrank/PRIMES → src/sage/ext_data/mwrank/PRIMES b/src/ext/mwrank/PRIMES → src/sage/ext_data/mwrank/PRIMES
diff --git a/src/ext/nbconvert/postprocess.py → src/sage/ext_data/nbconvert/postprocess.py b/src/ext/nbconvert/postprocess.py → src/sage/ext_data/nbconvert/postprocess.py
diff --git a/src/ext/nbconvert/rst_sage.tpl → src/sage/ext_data/nbconvert/rst_sage.tpl b/src/ext/nbconvert/rst_sage.tpl → src/sage/ext_data/nbconvert/rst_sage.tpl
diff --git a/src/ext/notebook-ipython/logo-64x64.png → .../ext_data/notebook-ipython/logo-64x64.png b/src/ext/notebook-ipython/logo-64x64.png → .../ext_data/notebook-ipython/logo-64x64.png
diff --git a/src/ext/notebook-ipython/logo.svg → src/sage/ext_data/notebook-ipython/logo.svg b/src/ext/notebook-ipython/logo.svg → src/sage/ext_data/notebook-ipython/logo.svg
diff --git a/src/ext/pari/buzzard/DimensionSk.g → src/sage/ext_data/pari/buzzard/DimensionSk.g b/src/ext/pari/buzzard/DimensionSk.g → src/sage/ext_data/pari/buzzard/DimensionSk.g
diff --git a/src/ext/pari/buzzard/Tpprog.g → src/sage/ext_data/pari/buzzard/Tpprog.g b/src/ext/pari/buzzard/Tpprog.g → src/sage/ext_data/pari/buzzard/Tpprog.g
diff --git a/src/ext/pari/buzzard/genusn.g → src/sage/ext_data/pari/buzzard/genusn.g b/src/ext/pari/buzzard/genusn.g → src/sage/ext_data/pari/buzzard/genusn.g
diff --git a/src/ext/pari/dokchitser/computel.gp → ...sage/ext_data/pari/dokchitser/computel.gp b/src/ext/pari/dokchitser/computel.gp → ...sage/ext_data/pari/dokchitser/computel.gp
diff --git a/src/ext/pari/dokchitser/computel.gp.template → ...data/pari/dokchitser/computel.gp.template b/src/ext/pari/dokchitser/computel.gp.template → ...data/pari/dokchitser/computel.gp.template
diff --git a/src/ext/pari/dokchitser/ex-bsw → src/sage/ext_data/pari/dokchitser/ex-bsw b/src/ext/pari/dokchitser/ex-bsw → src/sage/ext_data/pari/dokchitser/ex-bsw
diff --git a/src/ext/pari/dokchitser/ex-chgen → src/sage/ext_data/pari/dokchitser/ex-chgen b/src/ext/pari/dokchitser/ex-chgen → src/sage/ext_data/pari/dokchitser/ex-chgen
diff --git a/src/ext/pari/dokchitser/ex-chqua → src/sage/ext_data/pari/dokchitser/ex-chqua b/src/ext/pari/dokchitser/ex-chqua → src/sage/ext_data/pari/dokchitser/ex-chqua
diff --git a/src/ext/pari/dokchitser/ex-delta → src/sage/ext_data/pari/dokchitser/ex-delta b/src/ext/pari/dokchitser/ex-delta → src/sage/ext_data/pari/dokchitser/ex-delta
diff --git a/src/ext/pari/dokchitser/ex-eisen → src/sage/ext_data/pari/dokchitser/ex-eisen b/src/ext/pari/dokchitser/ex-eisen → src/sage/ext_data/pari/dokchitser/ex-eisen
diff --git a/src/ext/pari/dokchitser/ex-gen2 → src/sage/ext_data/pari/dokchitser/ex-gen2 b/src/ext/pari/dokchitser/ex-gen2 → src/sage/ext_data/pari/dokchitser/ex-gen2
diff --git a/src/ext/pari/dokchitser/ex-gen3 → src/sage/ext_data/pari/dokchitser/ex-gen3 b/src/ext/pari/dokchitser/ex-gen3 → src/sage/ext_data/pari/dokchitser/ex-gen3
diff --git a/src/ext/pari/dokchitser/ex-gen4 → src/sage/ext_data/pari/dokchitser/ex-gen4 b/src/ext/pari/dokchitser/ex-gen4 → src/sage/ext_data/pari/dokchitser/ex-gen4
diff --git a/src/ext/pari/dokchitser/ex-nf → src/sage/ext_data/pari/dokchitser/ex-nf b/src/ext/pari/dokchitser/ex-nf → src/sage/ext_data/pari/dokchitser/ex-nf
diff --git a/src/ext/pari/dokchitser/ex-shin → src/sage/ext_data/pari/dokchitser/ex-shin b/src/ext/pari/dokchitser/ex-shin → src/sage/ext_data/pari/dokchitser/ex-shin
diff --git a/src/ext/pari/dokchitser/ex-tau2 → src/sage/ext_data/pari/dokchitser/ex-tau2 b/src/ext/pari/dokchitser/ex-tau2 → src/sage/ext_data/pari/dokchitser/ex-tau2
diff --git a/src/ext/pari/dokchitser/ex-zeta → src/sage/ext_data/pari/dokchitser/ex-zeta b/src/ext/pari/dokchitser/ex-zeta → src/sage/ext_data/pari/dokchitser/ex-zeta
diff --git a/src/ext/pari/dokchitser/ex-zeta2 → src/sage/ext_data/pari/dokchitser/ex-zeta2 b/src/ext/pari/dokchitser/ex-zeta2 → src/sage/ext_data/pari/dokchitser/ex-zeta2
diff --git a/src/ext/pari/dokchitser/testall → src/sage/ext_data/pari/dokchitser/testall b/src/ext/pari/dokchitser/testall → src/sage/ext_data/pari/dokchitser/testall
diff --git a/src/ext/pari/simon/ell.gp → src/sage/ext_data/pari/simon/ell.gp b/src/ext/pari/simon/ell.gp → src/sage/ext_data/pari/simon/ell.gp
diff --git a/src/ext/pari/simon/ellQ.gp → src/sage/ext_data/pari/simon/ellQ.gp b/src/ext/pari/simon/ellQ.gp → src/sage/ext_data/pari/simon/ellQ.gp
diff --git a/src/ext/pari/simon/ellcommon.gp → src/sage/ext_data/pari/simon/ellcommon.gp b/src/ext/pari/simon/ellcommon.gp → src/sage/ext_data/pari/simon/ellcommon.gp
diff --git a/src/ext/pari/simon/qfsolve.gp → src/sage/ext_data/pari/simon/qfsolve.gp b/src/ext/pari/simon/qfsolve.gp → src/sage/ext_data/pari/simon/qfsolve.gp
diff --git a/src/ext/pari/simon/resultant3.gp → src/sage/ext_data/pari/simon/resultant3.gp b/src/ext/pari/simon/resultant3.gp → src/sage/ext_data/pari/simon/resultant3.gp
diff --git a/src/ext/singular/function_field/core.lib → ...ext_data/singular/function_field/core.lib b/src/ext/singular/function_field/core.lib → ...ext_data/singular/function_field/core.lib
diff --git a/src/ext/threejs/threejs_template.html → ...ge/ext_data/threejs/threejs_template.html b/src/ext/threejs/threejs_template.html → ...ge/ext_data/threejs/threejs_template.html
diff --git a/src/ext/valgrind/pyalloc.supp → src/sage/ext_data/valgrind/pyalloc.supp b/src/ext/valgrind/pyalloc.supp → src/sage/ext_data/valgrind/pyalloc.supp
diff --git a/src/ext/valgrind/sage-additional.supp → ...ge/ext_data/valgrind/sage-additional.supp b/src/ext/valgrind/sage-additional.supp → ...ge/ext_data/valgrind/sage-additional.supp
diff --git a/src/ext/valgrind/sage.supp → src/sage/ext_data/valgrind/sage.supp b/src/ext/valgrind/sage.supp → src/sage/ext_data/valgrind/sage.supp
diff --git a/src/setup.py b/src/setup.py
@@ -863,6 +863,7 @@ def clean_stale_files(self):
       packages    = python_packages,
       package_data = {
           'sage.libs.gap': ['sage.gaprc'],
+          'sage': ['ext_data/*']
       },
       cmdclass = dict(build=sage_build,
                       build_cython=sage_build_cython,