LCPQ/quantum_package
10
0
Fork 0
mirror of https://github.com/LCPQ/quantum_package synced 2024-12-23 04:43:50 +01:00
Code Issues Releases Wiki Activity

Fix ocaml #5

Browse Source
This commit is contained in:
Thomas Applencourt 2015-06-08 16:24:42 +02:00
parent 41098f94b2
commit d2c110c472
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -10,7 +10,7 @@ before_script:
- sudo apt-get install graphviz - sudo apt-get install graphviz
script: script:
- ./setup_environment.py - travis_wait ./setup_environment.py
- source ./quantum_package.rc - source ./quantum_package.rc
- qp_create_ninja.py --production ./config/gfortran_example.cfg - qp_create_ninja.py --production ./config/gfortran_example.cfg
- ninja - ninja

2
install/scripts/install_ocaml.sh
View File

@ -34,7 +34,7 @@ export LD_LIBRARY_PATH=${QP_ROOT}/lib:${LD_LIBRARY_PATH}
export LIBRARY_PATH=${QP_ROOT}/lib:${LIBRARY_PATH} export LIBRARY_PATH=${QP_ROOT}/lib:${LIBRARY_PATH}
export C_INCLUDE_PATH=${QP_ROOT}/lib:${C_INCLUDE_PATH} export C_INCLUDE_PATH=${QP_ROOT}/lib:${C_INCLUDE_PATH}
source ${QPACKAGE_ROOT}/quantum_package.rc source ${QP_ROOT}/quantum_package.rc
echo Y | ${QP_ROOT}/bin/opam install ${PACKAGES} || exit 1 echo Y | ${QP_ROOT}/bin/opam install ${PACKAGES} || exit 1
rm -f ../_build/ocaml.log rm -f ../_build/ocaml.log
exit 0 exit 0

15
setup_environment.py
View File

@ -259,9 +259,6 @@ def create_rule():
" description = Downloading ${descr}", "", "rule install", " description = Downloading ${descr}", "", "rule install",
" command = ./scripts/install_${target}.sh > _build/${target}.log 2>&1", " command = ./scripts/install_${target}.sh > _build/${target}.log 2>&1",
" description = Installing ${descr}", "" " description = Installing ${descr}", ""
"rule install_verbose",
" command = ./scripts/install_${target}.sh | tee _build/${target}.log 2>&1",
" description = Installing ${descr}", ""
] ]
return l_rules return l_rules
@ -287,15 +284,9 @@ for need in l_need_genealogy:
# Build to install # Build to install
l_dependancy = [d_info[i].default_path for i in d_dependancy[need] if i in l_need_genealogy] l_dependancy = [d_info[i].default_path for i in d_dependancy[need] if i in l_need_genealogy]
if need == "ocaml": l_build += ["build {0}: install {1} {2}".format(d_info[need].default_path,
install ="install_verbose" archive_path,
else: " ".join(l_dependancy)),
install ="install"
l_build += ["build {0}: {1} {2} {3}".format(d_info[need].default_path,
install,
archive_path,
" ".join(l_dependancy)),
" target = {0}".format(need), " target = {0}".format(need),
" descr = {0}".format(descr), ""] " descr = {0}".format(descr), ""]