10
0
mirror of https://github.com/LCPQ/quantum_package synced 2024-12-22 20:35:19 +01:00

Improved setup scripts

This commit is contained in:
Anthony Scemama 2014-10-23 23:29:17 +02:00
parent 9b83d42ba7
commit 11663c96da
4 changed files with 14 additions and 7 deletions

View File

@ -7,21 +7,23 @@ BLUE=
BLACK=(B BLACK=(B
.PHONY: doc src curl m4 ocaml irpf90 .PHONY: doc src curl m4 ocaml irpf90
default: default:
./setup_environment.sh exec ./setup_environment.sh
curl: bin/curl curl: bin/curl
m4: bin/m4 m4: bin/m4
irpf90: bin/irpf90 irpf90: bin/irpf90
EZFIO: irpf90 EZFIO: bin/irpf90
$(info $(BLUE)===== Fetching EZFIO from the web ===== $(BLACK)) $(info $(BLUE)===== Fetching EZFIO from the web ===== $(BLACK))
@sleep 1 @sleep 1
@$(FETCH_FROM_WEB) "$(WWW_SERVER)/$(EZFIO_TGZ)" $(EZFIO_TGZ) || \ @$(FETCH_FROM_WEB) "$(WWW_SERVER)/$(EZFIO_TGZ)" $(EZFIO_TGZ) || \
(echo Unable to download EZFIO : $(WWW_SERVER)/$(EZFIO_TGZ) ; exit 1) (echo Unable to download EZFIO : $(WWW_SERVER)/$(EZFIO_TGZ) ; exit 1)
tar -zxf $(EZFIO_TGZ) && rm $(EZFIO_TGZ) tar -zxf $(EZFIO_TGZ) && rm $(EZFIO_TGZ)
$(MAKE) -C src $$PWD/EZFIO
touch EZFIO
bin/irpf90: bin/irpf90:
$(info $(BLUE)===== Fetching IRPF90 from the web ===== $(BLACK)) $(info $(BLUE)===== Fetching IRPF90 from the web ===== $(BLACK))

View File

@ -6,4 +6,5 @@ inputs:
cd inputs ; $(MAKE) all_ezfio cd inputs ; $(MAKE) all_ezfio
executables: executables:
$(MAKE) -C $(QPACKAGE_ROOT)/src executables && mv $(QPACKAGE_ROOT)/src/executables . cd $(QPACKAGE_ROOT)/src ; $(MAKE) executables
mv $(QPACKAGE_ROOT)/src/executables .

View File

@ -9,9 +9,9 @@ make -C ocaml Qptypes.ml &> /dev/null
if [[ $? -ne 0 ]] if [[ $? -ne 0 ]]
then then
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 cat < ocamlbrew-install.sh | env OCAMLBREW_FLAGS="-r" bash | tee ocamlbrew_install.log
grep "source " ocaml_install.log | grep "etc/ocamlbrew.bashrc" >> quantum_package.rc grep "source " ocamlbrew_install.log | grep "etc/ocamlbrew.bashrc" >> quantum_package.rc
source quantum_package.rc source quantum_package.rc
echo Y | opam install core echo Y | opam install core
fi fi

View File

@ -28,6 +28,7 @@ export QPACKAGE_ROOT=${QPACKAGE_ROOT}
export PYTHONPATH=\${PYTHONPATH}:\${QPACKAGE_ROOT}/scripts export PYTHONPATH=\${PYTHONPATH}:\${QPACKAGE_ROOT}/scripts
export PATH=\${PATH}:\${QPACKAGE_ROOT}/scripts export PATH=\${PATH}:\${QPACKAGE_ROOT}/scripts
export PATH=\${PATH}:\${QPACKAGE_ROOT}/bin export PATH=\${PATH}:\${QPACKAGE_ROOT}/bin
export PATH=\${PATH}:\${QPACKAGE_ROOT}/ocaml
export QPACKAGE_CACHE_URL="http://qmcchem.ups-tlse.fr/files/scemama/quantum_package/cache" export QPACKAGE_CACHE_URL="http://qmcchem.ups-tlse.fr/files/scemama/quantum_package/cache"
source \${QPACKAGE_ROOT}/bin/irpman > /dev/null source \${QPACKAGE_ROOT}/bin/irpman > /dev/null
EOF EOF
@ -57,3 +58,6 @@ source quantum_package.rc
======================================================= =======================================================
" $BLACK " $BLACK
source quantum_package.rc
exec bash