-
-
Notifications
You must be signed in to change notification settings - Fork 481
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Trac #29850: Install sage-env-config as part of sage_conf
As a follow-up to #21559 and #30128, we reassign `sage-env-config` from the package `sagelib` to the package `sage_conf`. (After #22731, `sage-env-config` is no longer required by the `sage` script.) (This is preparation for allowing installation of sagelib for example in a conda environment without having to run ./configure first - see #28745, #30845.) ------ Part of Meta-ticket #21707: Split sage-env into 5 to clean up sage configuration URL: https://trac.sagemath.org/29850 Reported by: mkoeppe Ticket author(s): Matthias Koeppe Reviewer(s): Dima Pasechnik
- Loading branch information
Showing
8 changed files
with
35 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
$(PYTHON) ../pkgs/sage_conf/src/sage_conf.py ../pkgs/sage_conf/src/setup.cfg | $(PYTHON_TOOLCHAIN) | ||
$(PYTHON) ../pkgs/sage_conf/src/sage_conf.py ../pkgs/sage_conf/src/setup.cfg ../pkgs/sage_conf/src/bin/sage-env-config | $(PYTHON_TOOLCHAIN) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
#!/usr/bin/env bash | ||
# | ||
# Script to prepare an sdist tarball for sage_conf | ||
# This script is not used during build. | ||
# | ||
# HOW TO MAKE THE TARBALL: | ||
# ./sage --sh build/pkgs/sage_conf/spkg-src | ||
|
||
if [ -z "$SAGE_ROOT" ] ; then | ||
echo >&2 "Error - SAGE_ROOT undefined ... exiting" | ||
echo >&2 "Maybe run 'sage -sh'?" | ||
exit 1 | ||
fi | ||
|
||
# Exit on failure | ||
set -e | ||
|
||
cd build/pkgs/sage_conf | ||
|
||
cd src | ||
sage-python23 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
include bin/sage-env-config |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../../../../../src/bin/sage-env-config |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters