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

Commit

Permalink
Update to new style of dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
jdemeyer committed Jul 14, 2016
2 parents ec50fed + db5b361 commit 6aef10c
Show file tree
Hide file tree
Showing 3,279 changed files with 281,808 additions and 112,395 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
9 changes: 7 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
/local
/logs
/upstream
/src/mac-app/build

#############################
# Autotools generated files #
Expand Down Expand Up @@ -75,4 +74,10 @@ $RECYCLE.BIN/
#################
*.sage-chat
*.sage-history
*.syncdoc*
*.syncdoc*

###########
# Jupyter #
###########
.ipynb_checkpoints
Untitled*.ipynb
2 changes: 2 additions & 0 deletions COPYING.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ the licenses of the components of Sage are included below as well.

SOFTWARE LICENSE
-----------------------------------------------------------------------
arb GPLv2+
atlas Modified BSD
boehm_gc MIT-like license (see below)
backports_ssl_match_hostname Python License
Expand Down Expand Up @@ -88,6 +89,7 @@ mpmath Modified BSD
networkx Modified BSD
ntl GPLv2+
numpy Modified BSD
openblas Modified BSD
palp GPLv3
pari GPLv2+
patch GPLv2+
Expand Down
52 changes: 24 additions & 28 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@ build: all-build

# Defer unknown targets to build/make/Makefile
%::
@if [ -x relocate-once.py ]; then ./relocate-once.py; fi
$(MAKE) build/make/Makefile
+build/bin/sage-logger \
"cd build/make && ./install '$@'" logs/install.log

# If configure was run before, rerun it with the old arguments.
# Otherwise, run configure with argument $PREREQ_OPTIONS.
build/make/Makefile: configure
build/make/Makefile: configure build/make/deps build/pkgs/*/*
rm -f config.log
mkdir -p logs/pkgs
ln -s logs/pkgs/config.log config.log
Expand All @@ -42,6 +43,9 @@ download:
export PATH=$$SAGE_ROOT/src/bin:$$PATH && \
./src/bin/sage-download-upstream

dist: build/make/Makefile
./sage --sdist

# ssl: build Sage, and also install pyOpenSSL. This is necessary for
# running the secure notebook. This make target requires internet
# access. Note that this requires that your system have OpenSSL
Expand Down Expand Up @@ -90,56 +94,48 @@ test: all
check: test

testall: all
$(TESTALL) --optional=all --logfile=logs/testall.log
$(TESTALL) --optional=sage,optional,external --logfile=logs/testall.log

testlong: all
$(TESTALL) --long --logfile=logs/testlong.log

testalllong: all
$(TESTALL) --long --optional=all --logfile=logs/testalllong.log
$(TESTALL) --long --optional=sage,optional,external --logfile=logs/testalllong.log

ptest: all
$(PTESTALL) --logfile=logs/ptest.log

ptestall: all
$(PTESTALL) --optional=all --logfile=logs/ptestall.log
$(PTESTALL) --optional=sage,optional,external --logfile=logs/ptestall.log

ptestlong: all
$(PTESTALL) --long --logfile=logs/ptestlong.log

ptestalllong: all
$(PTESTALL) --long --optional=all --logfile=logs/ptestalllong.log

$(PTESTALL) --long --optional=sage,optional,external --logfile=logs/ptestalllong.log

testoptional: testall # just an alias
testoptional: all
$(TESTALL) --optional=sage,optional --logfile=logs/testoptional.log

testoptionallong: testalllong # just an alias
testoptionallong: all
$(TESTALL) --long --optional=sage,optional --logfile=logs/testoptionallong.log

ptestoptional: ptestall # just an alias
ptestoptional: all
$(PTESTALL) --optional=sage,optional --logfile=logs/ptestoptional.log

ptestoptionallong: ptestalllong # just an alias
ptestoptionallong: all
$(PTESTALL) --long --optional=sage,optional --logfile=logs/ptestoptionallong.log

configure: configure.ac src/bin/sage-version.sh \
m4/ax_c_check_flag.m4 m4/ax_gcc_option.m4 m4/ax_gcc_version.m4 m4/ax_gxx_option.m4 m4/ax_gxx_version.m4 m4/ax_prog_perl_version.m4
configure: configure.ac src/bin/sage-version.sh m4/*.m4
./bootstrap -d

install:
echo "Experimental use only!"
if [ "$(DESTDIR)" = "" ]; then \
echo >&2 "Set the environment variable DESTDIR to the install path."; \
exit 1; \
fi
# Make sure we remove only an existing directory. If $(DESTDIR)/sage is
# a file instead of a directory then the mkdir statement later will fail
if [ -d "$(DESTDIR)"/sage ]; then \
rm -rf "$(DESTDIR)"/sage; \
fi
mkdir -p "$(DESTDIR)"/sage
mkdir -p "$(DESTDIR)"/bin
cp -Rp * "$(DESTDIR)"/sage
rm -f "$(DESTDIR)"/bin/sage
ln -s ../sage/sage "$(DESTDIR)"/bin/sage
"$(DESTDIR)"/bin/sage -c # Run sage-location
@echo "******************************************************************"
@echo "The '$@' target is no longer supported:"
@echo "either build SageMath in-place or use the binary packaging scripts"
@echo "from https://github.com/sagemath/binary-pkg"
@echo "******************************************************************"
@exit 1


.PHONY: default build install micro_release \
Expand Down
Loading

0 comments on commit 6aef10c

Please sign in to comment.