Fix ocaml #5

.travis.yml

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

install/scripts/install_ocaml.sh

@@ -34,7 +34,7 @@ export LD_LIBRARY_PATH=${QP_ROOT}/lib:${LD_LIBRARY_PATH}
 export LIBRARY_PATH=${QP_ROOT}/lib:${LIBRARY_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
 rm -f ../_build/ocaml.log
 exit 0

setup_environment.py

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