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

Commit dbf461d

Browse files
author
Matthias Koeppe
committed
Merge tag '9.1.rc2' into t/29530/make_docker_images_generated_by_github_ci_workflows_available
SageMath version 9.1.rc2, Release Date: 2020-04-25
2 parents 27c63f1 + 50c5ac8 commit dbf461d

File tree

63 files changed

+2745
-596
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+2745
-596
lines changed

‎Makefile‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,7 @@ build/make/Makefile: configure build/make/deps $(SPKG_COLLECT_FILES) $(CONFIG_FI
5050
./config.status --recheck && ./config.status; \
5151
else \
5252
./configure $$PREREQ_OPTIONS; \
53-
fi || ( \
54-
if [ "x$$SAGE_PORT" = x ]; then \
55-
echo "If you would like to try to build Sage anyway (to help porting),"; \
56-
echo "export the variable 'SAGE_PORT' to something non-empty."; \
57-
exit 1; \
58-
else \
59-
echo "Since 'SAGE_PORT' is set, we will try to build anyway."; \
60-
fi; )
53+
fi
6154

6255
# This is used to monitor progress towards Python 3 and prevent
6356
# regressions. Should be removed after the full switch to python3.

‎VERSION.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SageMath version 9.1.rc1, Release Date: 2020-04-22
1+
SageMath version 9.1.rc2, Release Date: 2020-04-25

‎build/bin/sage-print-system-package-command‎

Lines changed: 71 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,85 @@
11
#!/usr/bin/env bash
22
#
33
system=$1
4-
command=$2
5-
if [ -z "$system" -o -z "$command" ]; then
6-
echo >&2 "usage: $0 {debian|arch|conda|...} {install|remove|...} PACKAGES..."
7-
exit 1
8-
fi
9-
shift 2
10-
system_packages="$*"
11-
shopt -s extglob
12-
if [ -n "$system_packages" ]; then
13-
# No command needed to install nothing
14-
case $system:$command in
15-
debian*|ubuntu*)
16-
echo "sudo apt-get $command $system_packages"
17-
;;
18-
@(fedora*|redhat*|centos*):install)
19-
echo "sudo yum install $system_packages"
20-
;;
21-
arch*:install)
22-
echo "sudo pacman -S $system_packages"
4+
shift
5+
IF_VERBOSE=:
6+
SUDO=
7+
PROMPT=
8+
while :
9+
do
10+
case "$1" in
11+
--verbose)
12+
IF_VERBOSE=
2313
;;
24-
*conda*:install)
25-
echo "conda install $system_packages"
14+
--sudo)
15+
# Whether to print sudo for package managers that need sudo for non-root users
16+
SUDO="sudo "
2617
;;
27-
homebrew*:install)
28-
echo "brew install $system_packages"
29-
echo "# Afterwards: "
18+
--prompt)
19+
PROMPT=' $ '
3020
;;
31-
slackware*:install)
32-
echo "sudo slackpkg install $system_packages"
33-
;;
34-
cygwin*:install)
35-
echo "# first install apt-cyg from https://github.com/transcode-open/apt-cyg"
36-
echo "apt-cyg install $system_packages"
21+
-*)
22+
echo >&2 "$0: unknown option $2"
23+
exit 1
3724
;;
3825
*)
39-
echo "# $command the following packages: $system_packages"
40-
;;
26+
break
4127
esac
28+
shift
29+
done
30+
command=$1
31+
shift
32+
if [ -z "$system" -o -z "$command" ]; then
33+
echo >&2 "usage: $0 {debian|arch|conda|...} [--verbose] [--sudo] [--prompt] {update|install|setup-build-env|remove|...} PACKAGES..."
34+
exit 1
4235
fi
43-
# Messages that should go out even if not packages need to be installed
36+
system_packages="$*"
37+
shopt -s extglob
4438
case $system:$command in
45-
homebrew*:install)
46-
echo "# To automatically take care of homebrew messages regarding "
47-
echo "# keg-only packages for the current shell session:"
39+
homebrew*:setup-build-env)
40+
$IF_VERBOSE echo "# To automatically take care of homebrew messages regarding "
41+
$IF_VERBOSE echo "# keg-only packages for the current shell session:"
4842
[ -n "$SAGE_ROOT" ] || SAGE_ROOT=.
49-
echo "# $ source $SAGE_ROOT/.homebrew-build-env"
50-
echo "# Add this to your shell profile if you want it to persist between shell sessions."
43+
echo "${PROMPT}source $SAGE_ROOT/.homebrew-build-env"
44+
$IF_VERBOSE echo "# Add this to your shell profile if you want it to persist between shell sessions."
45+
;;
46+
*:setup-build-env)
47+
# Nothing needed
48+
;;
49+
#
50+
# Verbs handled above are our own inventions. Verbs handled below are apt-get verbs.
51+
#
52+
@(debian*|ubuntu*):update)
53+
echo "${PROMPT}${SUDO}apt-get $command $system_packages"
54+
;;
55+
@(debian*|ubuntu*):*)
56+
[ -n "$system_packages" ] && echo "${PROMPT}${SUDO}apt-get $command $system_packages"
57+
;;
58+
@(fedora*|redhat*|centos*):install)
59+
[ -n "$system_packages" ] && echo "${PROMPT}${SUDO}yum install $system_packages"
60+
;;
61+
arch*:install)
62+
[ -n "$system_packages" ] && echo "${PROMPT}${SUDO}pacman -S $system_packages"
63+
;;
64+
*conda*:install)
65+
[ -n "$system_packages" ] && echo "${PROMPT}conda install $system_packages"
66+
;;
67+
homebrew*:install)
68+
[ -n "$system_packages" ] && echo "${PROMPT}brew install $system_packages"
69+
;;
70+
slackware*:install)
71+
[ -n "$system_packages" ] && echo "${PROMPT}${SUDO}slackpkg install $system_packages"
72+
;;
73+
cygwin*:update)
74+
echo "# first install apt-cyg from https://github.com/transcode-open/apt-cyg"
75+
;;
76+
cygwin*:install)
77+
[ -n "$system_packages" ] && echo "${PROMPT}apt-cyg install $system_packages"
78+
;;
79+
*:update)
80+
# Nothing needed
81+
;;
82+
*)
83+
echo "# $command the following packages: $system_packages"
5184
;;
5285
esac

‎build/bin/sage-spkg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ if [ $INFO -ne 0 -a "$USE_LOCAL_SCRIPTS" = yes ]; then
390390
;;
391391
esac
392392
echo -n " "
393-
sage-print-system-package-command $system install $system_packages
393+
sage-print-system-package-command $system --prompt --sudo install $system_packages
394394
fi
395395
done
396396
if [ -z "$system" ]; then

‎build/pkgs/brial/spkg-configure.m4‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎build/pkgs/configure/checksums.ini‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=configure-VERSION.tar.gz
2-
sha1=4e229f01e58451cce917d20718584565fc37a395
3-
md5=5f227165cf7fd23ed7e0fe890a7c1b1e
4-
cksum=2087518725
2+
sha1=840e31bcaa0f8c2ff6fcd6aedade6322c9cd9847
3+
md5=e014eaafe01d115e3cbe9e6ed5db4c94
4+
cksum=2845446683

‎build/pkgs/configure/package-version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
358caa9bccf45c8142c77d0bcf38dc6e44df8dfd
1+
119bf4775960e4184b1831067df9c86ef7f14180

‎build/pkgs/giac/checksums.ini‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
tarball=giac-VERSION.tar.bz2
2-
sha1=7ea2f353b7f63f484d38fe86c5720c82d770c69c
3-
md5=652634cf95590a5601d17c90c3fc410c
4-
cksum=2772110213
2+
sha1=eadeb7194b1809298a0d94642d94c8dff80bbe3d
3+
md5=7760e342f5e5b3f5da0f1b9c15546b96
4+
cksum=1678878999
5+
upstream_url=https://trac.sagemath.org/raw-attachment/ticket/29521/giac-1.5.0.63-p0.tar.bz2

‎build/pkgs/giac/package-version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.5.0.63.p0
1+
1.5.0.63-p0

‎build/pkgs/giac/spkg-src‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,22 @@ set -e
1515

1616
VERSION="1.5.0"
1717
VERSIONREV="63"
18+
PATCHSUFFIX="-p0"
1819

1920
# The upstream tarball name is: giac"$SOURCEORIG".tar.gz
2021
SOURCEORIG=_"$VERSION"-"$VERSIONREV"
2122

2223
# The name of the output file without tar.gz or tar.bz2 extension
23-
OUTPUTFILEBASENAME="$SAGE_DISTFILES"/giac-"$VERSION"."$VERSIONREV"
24+
OUTPUTFILEBASENAME="$SAGE_DISTFILES"/giac-"$VERSION"."$VERSIONREV""$PATCHSUFFIX"
2425

2526
# Testing if the output file already exist in one of gz or bz2 format:
2627
if [ -f "$OUTPUTFILEBASENAME".tar.gz -o -f "$OUTPUTFILEBASENAME".tar.bz2 ] ; then
2728
echo >&2 "there is already a giac archive of this version"
2829
exit 1
2930
fi
3031

31-
# Build a temporary working dir. (subdir of SAGE_DISTFILES)
32-
TARGET=$(mktemp -d -p"$SAGE_DISTFILES")
32+
# Build a temporary working dir. (preferably, a subdir of SAGE_DISTFILES)
33+
TARGET=$(mktemp -d -p"$SAGE_DISTFILES" || mktemp -d)
3334
ORIGDIR=`pwd`
3435
cd "$TARGET"
3536

@@ -44,6 +45,9 @@ tar -xzf giac"$SOURCEORIG".tar.gz
4445
# rename top sourcedir
4546
mv giac-"$VERSION" src
4647

48+
# remove unnecessary files
49+
rm -rf src/doc/pari/*.html
50+
4751
# removing french html doc, but keep keywords, and working makefiles.
4852
# NB: the french html doc is huge and not GPL.
4953
# it is freely redistributable only for non commercial purposes.
@@ -66,9 +70,7 @@ touch html_vall
6670

6771
# building giac source tarball for the spkg
6872
cd ../../../
69-
tar -cj src -f "$OUTPUTFILEBASENAME".tar.bz2
70-
71-
73+
tar -cjf "$OUTPUTFILEBASENAME".tar.bz2 src
7274

7375
# cleaning extracted dir.
7476
cd ..

0 commit comments

Comments
 (0)