Move some file to be logic

scripts/ezfio_interface/ei_handler.py

@@ -63,7 +63,7 @@ from collections import defaultdict
 from collections import namedtuple
 
 
-from qp_utils import cache
+from cache import cache
 
 Type = namedtuple('Type', 'fancy ocaml fortran')
 

scripts/install/install_curl.sh

@@ -22,7 +22,7 @@ then
 fi
 
 rm -f -- ${QPACKAGE_ROOT}/bin/curl
-${QPACKAGE_ROOT}/scripts/fetch_from_web.py ${CURL_URL} CURL.tar.bz2
+${QPACKAGE_ROOT}/scripts/install/fetch_from_web.py ${CURL_URL} CURL.tar.bz2
 tar -jxf CURL.tar.bz2 && rm CURL.tar.bz2 ||exit 1
 cd ${CURL} || exit 1 
 mv curl.ermine ${QPACKAGE_ROOT}/bin/curl

scripts/install/install_docopt.sh

@@ -16,6 +16,6 @@ fi
 cd ${QPACKAGE_ROOT}
 
 rm -f -- scripts/${DOCOPT}{,c}
-${QPACKAGE_ROOT}/scripts/fetch_from_web.py ${DOCOPT_URL} ${DOCOPT}
+${QPACKAGE_ROOT}/scripts/install/fetch_from_web.py ${DOCOPT_URL} ${DOCOPT}
 
-mv ${DOCOPT} scripts/${DOCOPT}
+mv ${DOCOPT} scripts/utility/${DOCOPT}

scripts/install/install_emsl.sh

@@ -15,7 +15,7 @@ fi
 
 cd ${QPACKAGE_ROOT}
 
-${QPACKAGE_ROOT}/scripts/fetch_from_web.py ${URL} ${QPACKAGE_ROOT}/${BASE}.tar.gz
+${QPACKAGE_ROOT}/scripts/install/fetch_from_web.py ${URL} ${QPACKAGE_ROOT}/${BASE}.tar.gz
 tar -zxf ${BASE}.tar.gz && rm ${BASE}.tar.gz ||exit 1
 rm -rf EMSL_Basis
 mv ${BASE}-master EMSL_Basis

scripts/install/install_ezfio.sh

@@ -16,7 +16,7 @@ fi
 cd ${QPACKAGE_ROOT}
 
 rm -rf -- EZFIO
-${QPACKAGE_ROOT}/scripts/fetch_from_web.py ${URL} ${QPACKAGE_ROOT}/${BASE}.tar.gz
+${QPACKAGE_ROOT}/scripts/install/fetch_from_web.py ${URL} ${QPACKAGE_ROOT}/${BASE}.tar.gz
 tar -zxf ${BASE}.tar.gz && rm ${BASE}.tar.gz ||exit 1
 mv EZFIO-master EZFIO
 

scripts/install/install_irpf90.sh

@@ -17,7 +17,7 @@ fi
 cd ${QPACKAGE_ROOT}
 
 
-${QPACKAGE_ROOT}/scripts/fetch_from_web.py ${URL} ${QPACKAGE_ROOT}/${BASE}.tar.gz
+${QPACKAGE_ROOT}/scripts/install/fetch_from_web.py ${URL} ${QPACKAGE_ROOT}/${BASE}.tar.gz
 tar -zxf ${BASE}.tar.gz && rm ${BASE}.tar.gz ||exit 1
 mv ${BASE}-master irpf90
 make -C irpf90 | tee install_irpf90.log

scripts/install/install_m4.sh

@@ -19,7 +19,7 @@ cd ${QPACKAGE_ROOT}
 if [[ -z ${M4} ]] 
 then 
     rm -f -- bin/m4
-    ${QPACKAGE_ROOT}/scripts/fetch_from_web.py ${M4_URL} M4.tar.gz 
+    ${QPACKAGE_ROOT}/scripts/install/fetch_from_web.py ${M4_URL} M4.tar.gz 
     tar -zxf M4.tar.gz && rm M4.tar.gz ||exit 1
     cd m4* || exit 1 
     ./configure && make || exit 1 

scripts/install/install_ocaml.sh

@@ -45,7 +45,7 @@ then
     done
   fi
 fi
-${QPACKAGE_ROOT}/scripts/fetch_from_web.py \
+${QPACKAGE_ROOT}/scripts/install/fetch_from_web.py \
    "https://raw.github.com/ocaml/opam/master/shell/opam_installer.sh" opam_installer.sh
 chmod +x opam_installer.sh
 echo N | ./opam_installer.sh ${QPACKAGE_ROOT}/bin 

scripts/install/install_resultsFile.sh

@@ -17,7 +17,7 @@ cd ${QPACKAGE_ROOT}
 
 
 rm -rf resultsFile-master
-${QPACKAGE_ROOT}/scripts/fetch_from_web.py ${URL} ${QPACKAGE_ROOT}/resultsFile.tar.gz
+${QPACKAGE_ROOT}/scripts/install/fetch_from_web.py ${URL} ${QPACKAGE_ROOT}/resultsFile.tar.gz
 tar -zxf resultsFile.tar.gz && rm resultsFile.tar.gz ||exit 1
 mv resultsFile-master resultsFile
 

scripts/install/install_zlib.sh

@@ -28,7 +28,7 @@ then
 fi
 rm /tmp/main.c
 
-${QPACKAGE_ROOT}/scripts/fetch_from_web.py ${ZLIB_URL} ZLIB.tar.gz
+${QPACKAGE_ROOT}/scripts/install/fetch_from_web.py ${ZLIB_URL} ZLIB.tar.gz
 tar -zxf ZLIB.tar.gz && rm ZLIB.tar.gz ||exit 1
 cd ${ZLIB} || exit 1 
 ./configure && make

scripts/module/build_modules.sh

@@ -3,7 +3,7 @@
 # This script should run from the directory $QPACKAGE_ROOT/src
 
 # Check is we are in `QPROOT_SRC` and all the dependancy are corect
-${QPACKAGE_ROOT}/scripts/check_src.sh
+${QPACKAGE_ROOT}/scripts/module/check_src.sh
 
 NPROC=$(cat /proc/cpuinfo | grep MHz | wc -l)
 
@@ -19,14 +19,11 @@ do
   echo ${MODULE}  
 
   # Update Makefile.depend
-  ${QPACKAGE_ROOT}/scripts/check_module.sh
+  ${QPACKAGE_ROOT}/scripts/module/check_module.sh
 
   # Update Makefile.depend
-  ${QPACKAGE_ROOT}/scripts/module/create_Makefile_depend.sh 
   ${QPACKAGE_ROOT}/scripts/module/module_handler.py save_makefile_depend
 
-#   save_makefile_depend
-  
   # Update EZFIO interface (create the irp.f90 and the ocaml)
   ${QPACKAGE_ROOT}/scripts/ezfio_interface/ei_handler.py --irpf90 --ocaml
 
@@ -52,6 +49,9 @@ Build failed for module $MODULE
   # Create png
   ${QPACKAGE_ROOT}/scripts/module/module_handler.py create_png
 
+  # Create png
+  ${QPACKAGE_ROOT}/scripts/module/update_README.py
+
   cd ${OLDPWD}
 done
 ${QPACKAGE_ROOT}/scripts/module/create_executables_list.sh

scripts/module/module_handler.py

@@ -25,7 +25,7 @@ from docopt import docopt
 import os
 import sys
 import os.path
-from qp_utils import cache
+from cache import cache
 
 
 @cache