LCPQ
/
quantum_package
mirror of https://github.com/LCPQ/quantum_package
10
0
Fork 0
Code Issues Releases Wiki Activity

Try to debug

This commit is contained in:
Thomas Applencourt 2015-06-08 15:16:28 +02:00
parent 9107350618
commit e259962e35
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ocaml/Makefile
View File

@ -1,9 +1,9 @@
.NOPARALLEL:
# Check if QPACKAGE_ROOT is defined
ifndef QPACKAGE_ROOT
# Check if QP_ROOT is defined
ifndef QP_ROOT
$(info -------------------- Error --------------------)
$(info QPACKAGE_ROOT undefined. Source the quantum_package.rc script)
$(info QP_ROOT undefined. Source the quantum_package.rc script)
$(info -----------------------------------------------)
$(error )
endif
@ -32,10 +32,10 @@ default: $(ALL_TESTS) $(ALL_EXE) .gitignore
echo $$i ; \
done > .gitignore
executables: $(QPACKAGE_ROOT)/data/executables
executables: $(QP_ROOT)/data/executables
$(QPACKAGE_ROOT)/data/executables:
$(QPACKAGE_ROOT)/scripts/module/create_executables_list.sh
$(QP_ROOT)/data/executables:
$(QP_ROOT)/scripts/module/create_executables_list.sh
external_libs:
opam install cryptokit core
@ -62,8 +62,8 @@ qp_run.native: $(MLFILES) $(MLIFILES) executables
$(OCAMLBUILD) $*.native -use-ocamlfind $(PKGS)
ln -s $*.native $*
ezfio.ml: ${QPACKAGE_ROOT}/EZFIO/Ocaml/ezfio.ml
cp ${QPACKAGE_ROOT}/EZFIO/Ocaml/ezfio.ml .
ezfio.ml: ${QP_ROOT}/EZFIO/Ocaml/ezfio.ml
cp ${QP_ROOT}/EZFIO/Ocaml/ezfio.ml .
qptypes_generator.byte: qptypes_generator.ml
$(OCAMLBUILD) qptypes_generator.byte -use-ocamlfind
@ -71,8 +71,8 @@ qptypes_generator.byte: qptypes_generator.ml
Qptypes.ml: qptypes_generator.byte
./qptypes_generator.byte > Qptypes.ml
${QPACKAGE_ROOT}/EZFIO/Ocaml/ezfio.ml:
$(MAKE) -C ${QPACKAGE_ROOT}/src ezfio
${QP_ROOT}/EZFIO/Ocaml/ezfio.ml:
$(MAKE) -C ${QP_ROOT}/src ezfio
Input_auto_generated.ml qp_edit.ml:
ei_handler.py ocaml_global

6
ocaml/Qpackage.ml
View File

@ -5,8 +5,8 @@ open Qputils;;
(** Variables related to the quantum package installation *)
let root =
match (Sys.getenv "QPACKAGE_ROOT") with
| None -> failwith "QPACKAGE_ROOT environment variable is not set.
match (Sys.getenv "QP_ROOT") with
| None -> failwith "QP_ROOT environment variable is not set.
Please source the quantum_package.rc file."
| Some x -> x
;;
@ -59,7 +59,7 @@ let executables = lazy (
|> List.filter ~f:(fun x -> x <> "")
in
match e with
| [a;b] -> (a,String.substr_replace_all ~pattern:"$QPACKAGE_ROOT" ~with_:root b)
| [a;b] -> (a,String.substr_replace_all ~pattern:"$QP_ROOT" ~with_:root b)
| _ -> ("","")
)
in

4
setup_environment.py
View File

@ -238,9 +238,11 @@ if "ninja" in l_need_genealogy:
l_cmd = ["cd install;",
"wget {0} -O {1} -o /dev/null ;".format(url, path_archive),
"./scripts/install_ninja.sh 2>/dev/null;", "cd -"]
"./scripts/install_ninja.sh", "cd -"]
check_output(" ".join(l_cmd), shell=True)
print "Done"
l_need_genealogy.remove("ninja")
print """