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

Commit 05f3a91

Browse files
author
Matthias Koeppe
committed
Rename SAGE_SRC_ROOT -> SAGE_VPATH
1 parent 06f7d1d commit 05f3a91

File tree

14 files changed

+53
-53
lines changed

14 files changed

+53
-53
lines changed

‎build/bin/sage-spkg‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ elif [ -z "$PKG_HAS_PATH" ]; then
286286
# we try to find a package in upstream
287287
PKG_VER="${PKG_NAME#${PKG_BASE}}"
288288
PKG_VER="${PKG_VER#-}"
289-
PKG_SCRIPTS="$SAGE_SRC_ROOT/build/pkgs/$PKG_BASE"
289+
PKG_SCRIPTS="$SAGE_VPATH/build/pkgs/$PKG_BASE"
290290
LOCAL_PKG_VER=`cat $PKG_SCRIPTS/package-version.txt 2>/dev/null`
291291
if [ -n "$LOCAL_PKG_VER" ] && [ -z "$PKG_VER" -o "$PKG_VER" = "$LOCAL_PKG_VER" ]; then
292292
PKG_VER="$LOCAL_PKG_VER"
@@ -674,7 +674,7 @@ write_script_wrapper() {
674674
#!/usr/bin/env bash
675675
676676
export SAGE_ROOT="$SAGE_ROOT"
677-
export SAGE_SRC_ROOT="$SAGE_SRC_ROOT"
677+
export SAGE_VPATH="$SAGE_VPATH"
678678
export SAGE_SRC="$SAGE_SRC"
679679
export SAGE_PKG_DIR="$pkgdir"
680680
@@ -684,7 +684,7 @@ export PKG_VER="$PKG_VER"
684684
685685
for lib in env dist-helpers; do
686686
lib="sage-\$lib"
687-
source "\$SAGE_SRC_ROOT/src/bin/\$lib"
687+
source "\$SAGE_VPATH/src/bin/\$lib"
688688
if [ \$? -ne 0 ]; then
689689
echo >&2 "Error: failed to source \$lib"
690690
echo >&2 "Is \$SAGE_ROOT the correct SAGE_ROOT?"
@@ -867,7 +867,7 @@ cat > "$PKG_NAME_INSTALLED" << __EOF__
867867
"package_version": "$PKG_VER",
868868
"install_date": "$(date)",
869869
"system_uname": "$(uname -a)",
870-
"sage_version": "$(cat "${SAGE_SRC_ROOT}/VERSION.txt")",
870+
"sage_version": "$(cat "${SAGE_VPATH}/VERSION.txt")",
871871
"test_result": "$TEST_SUITE_RESULT"
872872
}
873873
__EOF__

‎build/make/deps‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ sagelib: \
172172
###############################################################################
173173

174174
# Don't just use "install" since we don't want to change permissions
175-
$(SAGE_LOCAL)/bin/%: $(SAGE_SRC_ROOT)/src/bin/%
175+
$(SAGE_LOCAL)/bin/%: $(SAGE_SRC)/bin/%
176176
$(AM_V_at)cp $< $@
177177

178178
SCRIPTS += $(SAGE_LOCAL)/bin/sage-env-config
@@ -237,7 +237,7 @@ doc-pdf: $(DOC_DEPENDENCIES)
237237
doc-clean: doc-src-clean doc-output-clean
238238

239239
doc-src-clean:
240-
cd "$(SAGE_SRC_ROOT)/src/doc" && $(MAKE) -f $(SAGE_SRC)/doc/Makefile clean
240+
cd "$(SAGE_VPATH)/src/doc" && $(MAKE) -f $(SAGE_SRC)/doc/Makefile clean
241241

242242
doc-output-clean:
243243
rm -rf "$(SAGE_SHARE)/doc/sage"

‎build/make/install‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@
77
# Assume current directory is SAGE_ROOT/build/make
88
export SAGE_ROOT=`cd ../.. && pwd -P`
99

10-
# Determine SAGE_LOCAL and SAGE_SRC_ROOT
10+
# Determine SAGE_LOCAL and SAGE_VPATH
1111
. "$SAGE_ROOT"/src/bin/sage-env-config
1212
if [ $? -ne 0 ]; then
1313
echo "Error: Failed to read sage-env-config. Did you run configure?"
1414
exit 1
1515
fi
1616

17-
export SAGE_SRC="$SAGE_SRC_ROOT/src"
17+
export SAGE_SRC="$SAGE_VPATH/src"
1818
export SAGE_SHARE="$SAGE_LOCAL/share"
1919
export SAGE_EXTCODE="$SAGE_SHARE/sage/ext"
2020
export SAGE_LOGS="$SAGE_ROOT/logs/pkgs"
2121
export SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed"
22-
export SAGE_VERSION=`cat $SAGE_SRC_ROOT/VERSION.txt | sed 's+.*\ \(.*\),.*+\1+'`
22+
export SAGE_VERSION=`cat $SAGE_VPATH/VERSION.txt | sed 's+.*\ \(.*\),.*+\1+'`
2323

2424
if [ -z "${SAGE_ORIG_PATH_SET}" ]; then
2525
SAGE_ORIG_PATH=$PATH && export SAGE_ORIG_PATH
2626
SAGE_ORIG_PATH_SET=True && export SAGE_ORIG_PATH_SET
2727
fi
28-
export PATH="$SAGE_SRC_ROOT/build/bin:$SAGE_SRC/bin:$SAGE_ROOT/src/bin:$SAGE_LOCAL/bin:$PATH"
28+
export PATH="$SAGE_VPATH/build/bin:$SAGE_SRC/bin:$SAGE_ROOT/src/bin:$SAGE_LOCAL/bin:$PATH"
2929

3030
export PYTHONPATH="$SAGE_LOCAL"
3131

‎build/sage_bootstrap/creator.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
import logging
1919
log = logging.getLogger()
2020

21-
from sage_bootstrap.env import SAGE_SRC_ROOT
21+
from sage_bootstrap.env import SAGE_VPATH
2222

2323

2424

2525
class PackageCreator(object):
2626

2727
def __init__(self, package_name):
2828
self.package_name = package_name
29-
self.path = os.path.join(SAGE_SRC_ROOT, 'build', 'pkgs', package_name)
29+
self.path = os.path.join(SAGE_VPATH, 'build', 'pkgs', package_name)
3030
try:
3131
os.mkdir(self.path)
3232
except OSError:

‎build/sage_bootstrap/env.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
variables:
77
88
* ``SAGE_ROOT``
9-
* ``SAGE_SRC_ROOT``
9+
* ``SAGE_VPATH``
1010
* ``SAGE_SRC``
1111
* ``SAGE_DISTFILES``
1212
"""
@@ -32,16 +32,16 @@
3232
os.path.abspath(__file__))))
3333

3434
try:
35-
SAGE_SRC_ROOT = os.environ['SAGE_SRC_ROOT']
35+
SAGE_VPATH = os.environ['SAGE_VPATH']
3636
except KeyError:
37-
SAGE_SRC_ROOT = SAGE_ROOT
37+
SAGE_VPATH = SAGE_ROOT
3838

3939
SAGE_SRC = os.environ.get('SAGE_SRC',
40-
os.path.join(SAGE_SRC_ROOT, 'src'))
40+
os.path.join(SAGE_VPATH, 'src'))
4141
SAGE_DISTFILES = os.environ.get('SAGE_DISTFILES',
4242
os.path.join(SAGE_ROOT, 'upstream'))
4343

44-
assert os.path.isfile(os.path.join(SAGE_SRC_ROOT, 'configure.ac')), SAGE_SRC_ROOT
44+
assert os.path.isfile(os.path.join(SAGE_VPATH, 'configure.ac')), SAGE_VPATH
4545
# Check that SAGE_ROOT is the root of either a configured build directory
4646
# or the root of an unconfigured non-VPATH source directory.
4747
assert (os.path.isfile(os.path.join(SAGE_ROOT, 'config.status'))

‎build/sage_bootstrap/package.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import logging
2020
log = logging.getLogger()
2121

22-
from sage_bootstrap.env import SAGE_SRC_ROOT, SAGE_DISTFILES
22+
from sage_bootstrap.env import SAGE_VPATH, SAGE_DISTFILES
2323

2424

2525

@@ -30,7 +30,7 @@ def __init__(self, package_name):
3030
Sage Package
3131
3232
A package is defined by a subdirectory of
33-
``SAGE_SRC_ROOT/build/pkgs/``. The name of the package is the name
33+
``SAGE_VPATH/build/pkgs/``. The name of the package is the name
3434
of the subdirectory; The metadata of the package is contained
3535
in various files in the package directory. This class provides
3636
an abstraction to the metadata, you should never need to
@@ -55,7 +55,7 @@ def name(self):
5555
Return the package name
5656
5757
A package is defined by a subdirectory of
58-
``SAGE_SRC_ROOT/build/pkgs/``. The name of the package is the name
58+
``SAGE_VPATH/build/pkgs/``. The name of the package is the name
5959
of the subdirectory.
6060
6161
OUTPUT:
@@ -179,7 +179,7 @@ def all(cls):
179179
"""
180180
Return all packages
181181
"""
182-
base = os.path.join(SAGE_SRC_ROOT, 'build', 'pkgs')
182+
base = os.path.join(SAGE_VPATH, 'build', 'pkgs')
183183
for subdir in os.listdir(base):
184184
path = os.path.join(base, subdir)
185185
if not os.path.isfile(os.path.join(path, "checksums.ini")):
@@ -191,7 +191,7 @@ def path(self):
191191
"""
192192
Return the package directory
193193
"""
194-
return os.path.join(SAGE_SRC_ROOT, 'build', 'pkgs', self.name)
194+
return os.path.join(SAGE_VPATH, 'build', 'pkgs', self.name)
195195

196196
def _init_checksum(self):
197197
"""

‎configure.ac‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ SAGE_LOCAL="$prefix"
9393
if test "$SAGE_LOCAL" = NONE; then
9494
SAGE_LOCAL=local
9595
fi
96-
SAGE_SRC_ROOT=`cd $srcdir && pwd -P`
97-
SAGE_SRC="$SAGE_SRC_ROOT/src"
96+
SAGE_VPATH=`cd $srcdir && pwd -P`
97+
SAGE_SRC="$SAGE_VPATH/src"
9898
SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed"
9999

100100
#---------------------------------------------------------
@@ -653,7 +653,7 @@ exec 7>build/make/Makefile
653653
cat >&7 <<EOF
654654
#==============================================================================
655655
# This file has been automatically generated by
656-
# $SAGE_SRC_ROOT/configure
656+
# $SAGE_VPATH/configure
657657
# You should not edit it by hand
658658
#==============================================================================
659659

@@ -736,9 +736,9 @@ AC_MSG_RESULT([])
736736
# Print version number of latest package $pkg
737737
newest_version() {
738738
PKG=$1
739-
if test -f "$SAGE_SRC_ROOT/build/pkgs/$PKG/package-version.txt" ; then
739+
if test -f "$SAGE_VPATH/build/pkgs/$PKG/package-version.txt" ; then
740740
AS_ECHO_N(["$PKG-"])
741-
cat "$SAGE_SRC_ROOT/build/pkgs/$PKG/package-version.txt"
741+
cat "$SAGE_VPATH/build/pkgs/$PKG/package-version.txt"
742742
else
743743
echo "$PKG"
744744
fi
@@ -766,7 +766,7 @@ newest_version() {
766766
changequote(<,>)
767767
filtered_packages_list() {
768768
# for each package in pkgs/
769-
for DIR in $SAGE_SRC_ROOT/build/pkgs/*; do
769+
for DIR in $SAGE_VPATH/build/pkgs/*; do
770770
test -d "$DIR" || continue
771771

772772
PKG_TYPE_FILE="$DIR/type"
@@ -914,7 +914,7 @@ cat >&7 <<EOF
914914
915915
EOF
916916
917-
cat "$SAGE_SRC_ROOT/build/make/deps" >&7
917+
cat "$SAGE_VPATH/build/make/deps" >&7
918918
# Copy build/make/deps
919919
920920
cat >&7 <<EOF
@@ -932,8 +932,8 @@ while read PKG_NAME PKG_VERSION PKG_VAR; do
932932
# filtered_packages_list signals an error (already reported there)
933933
exit 1 # this doesn't leave 'configure' (yet)
934934
fi
935-
DEP_FILE="$SAGE_SRC_ROOT/build/pkgs/$PKG_NAME/dependencies"
936-
TYPE=`cat "$SAGE_SRC_ROOT/build/pkgs/$PKG_NAME/type"`
935+
DEP_FILE="$SAGE_VPATH/build/pkgs/$PKG_NAME/dependencies"
936+
TYPE=`cat "$SAGE_VPATH/build/pkgs/$PKG_NAME/type"`
937937
if [ -f "$DEP_FILE" ]; then
938938
# DEPS is first line of $DEP_FILE with some modifications:
939939
# - start with a single space
@@ -967,14 +967,14 @@ while read PKG_NAME PKG_VERSION PKG_VAR; do
967967
echo >&7 "$PKG_NAME:$DEPS"
968968
echo >&7 " \$(A""M_V_at)cd '$SAGE_ROOT' && \\"
969969
echo >&7 " source '$SAGE_ROOT/src/bin/sage-env' && \\"
970-
echo >&7 " sage-logger -p '$SAGE_SRC_ROOT/build/pkgs/$PKG_NAME/spkg-install' \$(SAGE_LOGS)/$PKG_NAME.log"
970+
echo >&7 " sage-logger -p '$SAGE_VPATH/build/pkgs/$PKG_NAME/spkg-install' \$(SAGE_LOGS)/$PKG_NAME.log"
971971
echo >&7
972972
973973
# Just run the spkg-uninstall script if it exists
974974
echo >&7 "$PKG_NAME-clean:"
975975
echo >&7 " -\$(A""M_V_at)cd '$SAGE_ROOT' && \\"
976976
echo >&7 " source '$SAGE_ROOT/src/bin/sage-env' && \\"
977-
echo >&7 " '$SAGE_SRC_ROOT/build/pkgs/$PKG_NAME/spkg-uninstall'"
977+
echo >&7 " '$SAGE_VPATH/build/pkgs/$PKG_NAME/spkg-uninstall'"
978978
echo >&7
979979
else
980980
# Normal Sage packages
@@ -1041,11 +1041,11 @@ AS_IF([test x$srcdir != x.],
10411041
[AC_CONFIG_COMMANDS([vpath],
10421042
[
10431043
SAGE_ROOT=${ac_abs_top_builddir}
1044-
SAGE_SRC_ROOT=${ac_abs_top_srcdir}
1044+
SAGE_VPATH=${ac_abs_top_srcdir}
10451045
# Assume that $srcdir is readonly, so symlink existing upstream files into build directory upstream
10461046
# If new packages are downloaded, they end up in the build directory upstream.
10471047
mkdir -p upstream
1048-
for a in $SAGE_SRC_ROOT/upstream/* ; do
1048+
for a in $SAGE_VPATH/upstream/* ; do
10491049
if test -f "$a" -a ! -f "upstream/`basename $a`" ; then
10501050
ln -s "$a" upstream/
10511051
fi
@@ -1054,10 +1054,10 @@ AS_IF([test x$srcdir != x.],
10541054
#!/usr/bin/env bash
10551055
SAGE_ROOT="$SAGE_ROOT"
10561056
export SAGE_ROOT
1057-
exec "$SAGE_SRC_ROOT/src/bin/sage" "\@S|@@"
1057+
exec "$SAGE_VPATH/src/bin/sage" "\@S|@@"
10581058
EOF
10591059
chmod +x sage
1060-
sed "s|^top_srcdir =.*|top_srcdir = $SAGE_SRC_ROOT|" $srcdir/Makefile > Makefile
1060+
sed "s|^top_srcdir =.*|top_srcdir = $SAGE_VPATH|" $srcdir/Makefile > Makefile
10611061
])
10621062
])
10631063

‎src/Makefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ sage:
3434
cd $(srcdir) && export \
3535
SAGE_ROOT=/doesnotexist \
3636
SAGE_SRC=/doesnotexist \
37-
SAGE_SRC_ROOT=/doesnotexist \
37+
SAGE_VPATH=/doesnotexist \
3838
SAGE_DOC_SRC=/doesnotexist \
3939
SAGE_BUILD_DIR=/doesnotexist \
4040
SAGE_PKGS=$(abs_top_srcdir)/build/pkgs \

‎src/bin/sage-env‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ export SAGE_ENV_SOURCED=$SAGE_ENV_VERSION
186186

187187
export SAGE_ROOT="$NEW_SAGE_ROOT"
188188

189-
if [ -z "$SAGE_SRC_ROOT" ]; then
190-
export SAGE_SRC_ROOT="$SAGE_ROOT"
189+
if [ -z "$SAGE_VPATH" ]; then
190+
export SAGE_VPATH="$SAGE_ROOT"
191191
fi
192192

193193
# sage-env must know where the Sage's script files are.
@@ -199,7 +199,7 @@ if [ -z "$SAGE_SCRIPTS_DIR" ]; then
199199
SAGE_SRC_SCRIPTS_DIR="$SAGE_LOCAL/bin"
200200
elif [ -f "$SAGE_ROOT/src/bin/sage-env-config" ]; then
201201
SAGE_SCRIPTS_DIR="$SAGE_ROOT/src/bin"
202-
SAGE_SRC_SCRIPTS_DIR="$SAGE_SRC_ROOT/src/bin"
202+
SAGE_SRC_SCRIPTS_DIR="$SAGE_VPATH/src/bin"
203203
else
204204
echo >&2 "Error: You must set either the SAGE_LOCAL or SAGE_SCRIPTS_DIR environment variable to run this"
205205
return 1
@@ -274,7 +274,7 @@ export SAGE_SHARE="$SAGE_LOCAL/share"
274274
export SAGE_EXTCODE="$SAGE_SHARE/sage/ext"
275275
export SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed"
276276
export SAGE_LOGS="$SAGE_ROOT/logs/pkgs"
277-
export SAGE_SRC="$SAGE_SRC_ROOT/src"
277+
export SAGE_SRC="$SAGE_VPATH/src"
278278
export SAGE_DOC_SRC="$SAGE_SRC/doc"
279279
export SAGE_DOC="$SAGE_SHARE/doc/sage"
280280

‎src/bin/sage-env-config.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
#
1616
##########################################################################
1717

18-
# SAGE_SRC_ROOT is the root of the Sage distribution source tree.
18+
# SAGE_VPATH is the root of the Sage distribution source tree.
1919
# For non-VPATH builds, it is the same as SAGE_ROOT.
20-
export SAGE_SRC_ROOT="@abs_top_srcdir@"
20+
export SAGE_VPATH="@abs_top_srcdir@"
2121

2222
# SAGE_LOCAL is the installation prefix and can be customized by using
2323
# ./configure --prefix

0 commit comments

Comments
 (0)