10
0
mirror of https://github.com/LCPQ/quantum_package synced 2024-12-23 04:43:50 +01:00

Improved setup_environment.sh

This commit is contained in:
Anthony Scemama 2014-10-29 22:25:30 +01:00
parent c65f93c67c
commit 4bae97159b
2 changed files with 6 additions and 1 deletions

View File

@ -54,7 +54,7 @@ bin/m4:
ocaml: curl m4 ocaml: curl m4
rm ocaml/Qptypes.ml - rm -f -- ocaml/Qptypes.ml
$(MAKE) ocaml/Qptypes.ml $(MAKE) ocaml/Qptypes.ml
ocaml/Qptypes.ml: ocaml/Qptypes.ml:

View File

@ -6,10 +6,15 @@
QPACKAGE_ROOT=${PWD} QPACKAGE_ROOT=${PWD}
PACKAGES="core cryptokit" PACKAGES="core cryptokit"
if [[ -f quantum_package.rc ]]
then
source quantum_package.rc
fi
make -C ocaml Qptypes.ml &> /dev/null make -C ocaml Qptypes.ml &> /dev/null
if [[ $? -ne 0 ]] if [[ $? -ne 0 ]]
then then
rm -rf -- ${HOME}/ocamlbrew
scripts/fetch_from_web.py "https://raw.github.com/hcarty/ocamlbrew/master/ocamlbrew-install" ocamlbrew-install.sh scripts/fetch_from_web.py "https://raw.github.com/hcarty/ocamlbrew/master/ocamlbrew-install" ocamlbrew-install.sh
cat < ocamlbrew-install.sh | env OCAMLBREW_FLAGS="-r" bash | tee ocamlbrew_install.log cat < ocamlbrew-install.sh | env OCAMLBREW_FLAGS="-r" bash | tee ocamlbrew_install.log
grep "source " ocamlbrew_install.log | grep "etc/ocamlbrew.bashrc" >> quantum_package.rc grep "source " ocamlbrew_install.log | grep "etc/ocamlbrew.bashrc" >> quantum_package.rc