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

Commit 1383a59

Browse files
author
Matthias Koeppe
committed
Merge branch 'u/jhpalmieri/remove-boilerplate' of git://trac.sagemath.org/sage into t/29510/spkg_check_in__remove_messages_that_duplicate_sage_spkg_s_messages
2 parents 10ed24e + 251ab47 commit 1383a59

File tree

90 files changed

+11
-715
lines changed

Some content is hidden

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

90 files changed

+11
-715
lines changed

build/pkgs/4ti2/spkg-check.in

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
if [ -z "$SAGE_LOCAL" ]; then
2-
echo >&2 "Error: SAGE_LOCAL undefined - exiting..."
3-
echo >&2 "Maybe run 'sage -sh'?"
4-
exit 1
5-
fi
6-
71
cd src
82

93
# We don't have to set up any environment variables here since the

build/pkgs/atlas/configuration.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,6 @@
4040
# linker_GNU?, linker_Solaris?, linker_Darwin? # ld
4141

4242

43-
######################################################################
44-
### Sanity check
45-
######################################################################
46-
47-
if 'SAGE_LOCAL' not in os.environ:
48-
print("SAGE_LOCAL undefined ... exiting")
49-
print("Maybe run 'sage -sh'?")
50-
sys.exit(1)
51-
52-
5343
######################################################################
5444
### Functions
5545
######################################################################

build/pkgs/atlas/spkg-check.in

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
######################################################################
2-
### Sanity check
3-
######################################################################
4-
5-
if [ -z "$SAGE_LOCAL" ]; then
6-
echo >&2 "Error: SAGE_LOCAL undefined - exiting..."
7-
echo >&2 "Maybe run 'sage -sh'?"
8-
exit 1
9-
fi
10-
111
######################################################################
122
### Skip building ATLAS on specific systems
133
######################################################################

build/pkgs/boost/spkg-install.in

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
if [ "$SAGE_LOCAL" = "" ]; then
2-
echo "SAGE_LOCAL undefined ... exiting";
3-
echo "Maybe run 'sage -sh'?"
4-
exit 1
5-
fi
6-
71
cd src
82

93
echo "Running boost bootstrap"

build/pkgs/cliquer/spkg-check.in

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
if [ -z "$SAGE_LOCAL" ]; then
2-
echo >&2 "Error: SAGE_LOCAL undefined - exiting..."
3-
echo >&2 "Maybe run 'sage -sh'?"
4-
exit 1
5-
fi
6-
71
cd src
82

93
echo "Now building and running cliquer's test suite..."

build/pkgs/compilerwrapper/spkg-install.in

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
if [ -z "$SAGE_LOCAL" ]; then
2-
echo >&2 "SAGE_LOCAL undefined ... exiting"
3-
echo >&2 "Maybe run 'sage -sh'?"
4-
exit 1
5-
fi
6-
71
# remove wrapper if it is already installed
82
rm -f $SAGE_LOCAL/bin/gcc
93
rm -f $SAGE_LOCAL/bin/cc

build/pkgs/coxeter3/spkg-check.in

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
if [ "$SAGE_LOCAL" = "" ]; then
2-
echo >&2 "SAGE_LOCAL undefined ... exiting";
3-
echo >&2 "Maybe run 'sage -sh'?"
4-
exit 1
5-
fi
6-
71
cd src
82

93
$MAKE check

build/pkgs/cycler/spkg-install.in

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
if [ "$SAGE_LOCAL" = "" ]; then
2-
echo "SAGE_LOCAL undefined ... exiting";
3-
echo "Maybe run 'sage -sh'?"
4-
exit 1
5-
fi
6-
71
cd src
82

93
sdh_pip_install .
10-
if [ $? -ne 0 ]; then
11-
echo "Error installing cycler ... exiting"
12-
exit 1
13-
fi
14-

build/pkgs/d3js/spkg-install.in

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
if [ -z "$SAGE_SHARE" ]; then
2-
echo >&2 "SAGE_SHARE undefined ... exiting"
3-
echo >&2 "Maybe run 'sage --sh'?"
4-
exit 1
5-
fi
6-
71
TARGET="${SAGE_SHARE}/d3js"
82
if [ ! -d "${TARGET}" ]; then
93
mkdir "${TARGET}"

build/pkgs/database_kohel/spkg-install.in

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
if [ -z "$SAGE_LOCAL" ]; then
2-
echo "SAGE_LOCAL undefined ... exiting";
3-
echo "Maybe run 'sage -sh'?"
4-
exit 1
5-
fi
6-
71
cd src
82

93
TARGET="${SAGE_SHARE}/kohel/"

0 commit comments

Comments
 (0)