Merge branch 'master' of github.com:LCPQ/quantum_package

Makefile

@@ -27,3 +27,5 @@ doc:
 src: irpf90 EZFIO
 	export QPACKAGE_ROOT=$$PWD ; \
 	$(MAKE) -C src
+
+

ocaml/Makefile

@@ -30,10 +30,14 @@ executables: $(ALL_EXE)
 	mv _build/$*.inferred.mli .
 
 %.byte: $(MLFILES) $(MLIFILES)
+	rm -f -- $*
 	$(OCAMLBUILD) $*.byte  -use-ocamlfind  $(PKGS)
+	ln -s $*.native $*
 
 %.native: $(MLFILES) $(MLIFILES)
+	rm -f -- $*
 	$(OCAMLBUILD) $*.native -use-ocamlfind $(PKGS)
+	ln -s $*.native $*
 
 ezfio.ml: ${QPACKAGE_ROOT}/EZFIO/Ocaml/ezfio.ml
 	cp ${QPACKAGE_ROOT}/EZFIO/Ocaml/ezfio.ml .

ocaml/_tags

@@ -1,3 +1,3 @@
-true: package(core)
+true: package(core,async)
 true: thread
 

setup_environment.sh

@@ -39,3 +39,16 @@ then
   echo "Error in IRPF90 installation"
   exit 1
 fi
+
+# Ocaml installation
+make -C ocaml qp_create_ezfio_from_xyz.native
+if [[ $? -ne 0 ]]
+then
+  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 > ocaml_install.log
+  grep "source " install.log | grep "etc/ocamlbrew.bashrc"  >> quantum_package.rc
+  source quantum_package.rc
+  echo Y | opam install core async
+fi
+
+