From c283e6b6888a5415719eb0e6970b9b8303c2d357 Mon Sep 17 00:00:00 2001 From: Thomas Applencourt Date: Mon, 4 May 2015 15:54:51 +0200 Subject: [PATCH] Change create_module.sh into qp_create_module.sh and so on --- scripts/{ => module}/build_modules.sh | 4 ++-- scripts/{ => module}/clean_modules.sh | 0 scripts/{create => module}/create_Makefile.sh | 0 scripts/{create => module}/create_Makefile_depend.sh | 0 scripts/{create => module}/create_Needed_modules.sh | 0 scripts/{create => module}/create_executables_list.sh | 0 scripts/{create => module}/create_gitignore.sh | 0 scripts/{create => module}/create_rst_templates.sh | 0 .../create_module.sh => module/qp_create_module.sh} | 6 +++--- scripts/run_Makefile_common.sh | 4 ++-- src/Makefile | 8 ++++---- 11 files changed, 11 insertions(+), 11 deletions(-) rename scripts/{ => module}/build_modules.sh (84%) rename scripts/{ => module}/clean_modules.sh (100%) rename scripts/{create => module}/create_Makefile.sh (100%) rename scripts/{create => module}/create_Makefile_depend.sh (100%) rename scripts/{create => module}/create_Needed_modules.sh (100%) rename scripts/{create => module}/create_executables_list.sh (100%) rename scripts/{create => module}/create_gitignore.sh (100%) rename scripts/{create => module}/create_rst_templates.sh (100%) rename scripts/{create/create_module.sh => module/qp_create_module.sh} (93%) diff --git a/scripts/build_modules.sh b/scripts/module/build_modules.sh similarity index 84% rename from scripts/build_modules.sh rename to scripts/module/build_modules.sh index 44c8183a..1b69a920 100755 --- a/scripts/build_modules.sh +++ b/scripts/module/build_modules.sh @@ -30,7 +30,7 @@ Build failed for module $MODULE " fi fi - ${QPACKAGE_ROOT}/scripts/create/create_gitignore.sh + ${QPACKAGE_ROOT}/scripts/module/create_gitignore.sh cd ${OLDPWD} done -${QPACKAGE_ROOT}/scripts/create/create_executables_list.sh +${QPACKAGE_ROOT}/scripts/module/create_executables_list.sh diff --git a/scripts/clean_modules.sh b/scripts/module/clean_modules.sh similarity index 100% rename from scripts/clean_modules.sh rename to scripts/module/clean_modules.sh diff --git a/scripts/create/create_Makefile.sh b/scripts/module/create_Makefile.sh similarity index 100% rename from scripts/create/create_Makefile.sh rename to scripts/module/create_Makefile.sh diff --git a/scripts/create/create_Makefile_depend.sh b/scripts/module/create_Makefile_depend.sh similarity index 100% rename from scripts/create/create_Makefile_depend.sh rename to scripts/module/create_Makefile_depend.sh diff --git a/scripts/create/create_Needed_modules.sh b/scripts/module/create_Needed_modules.sh similarity index 100% rename from scripts/create/create_Needed_modules.sh rename to scripts/module/create_Needed_modules.sh diff --git a/scripts/create/create_executables_list.sh b/scripts/module/create_executables_list.sh similarity index 100% rename from scripts/create/create_executables_list.sh rename to scripts/module/create_executables_list.sh diff --git a/scripts/create/create_gitignore.sh b/scripts/module/create_gitignore.sh similarity index 100% rename from scripts/create/create_gitignore.sh rename to scripts/module/create_gitignore.sh diff --git a/scripts/create/create_rst_templates.sh b/scripts/module/create_rst_templates.sh similarity index 100% rename from scripts/create/create_rst_templates.sh rename to scripts/module/create_rst_templates.sh diff --git a/scripts/create/create_module.sh b/scripts/module/qp_create_module.sh similarity index 93% rename from scripts/create/create_module.sh rename to scripts/module/qp_create_module.sh index a30c1484..0e7e8013 100755 --- a/scripts/create/create_module.sh +++ b/scripts/module/qp_create_module.sh @@ -117,7 +117,7 @@ debug "Module directory is created." # Create the Makefile -"${QPACKAGE_ROOT}/scripts/create/create_Makefile.sh" || fail "Unable to create Makefile" +"${QPACKAGE_ROOT}/scripts/module/create_Makefile.sh" || fail "Unable to create Makefile" if [[ ! -f Makefile ]] then fail "Makefile was not created" @@ -125,7 +125,7 @@ fi debug "Makefile created" # Create the NEEDED_MODULES file -"${QPACKAGE_ROOT}/scripts/create/create_Needed_modules.sh" ${NEEDED_MODULES} || fail "Unable to create the NEEDED_MODULES file" +"${QPACKAGE_ROOT}/scripts/module/create_Needed_modules.sh" ${NEEDED_MODULES} || fail "Unable to create the NEEDED_MODULES file" if [[ ! -f NEEDED_CHILDREN_MODULES ]] then fail "NEEDED_MODULES was not created" @@ -135,7 +135,7 @@ debug "NEEDED_MODULES created" # Create rst templates -"${QPACKAGE_ROOT}/scripts/create/create_rst_templates.sh" || fail "Unable to create rst templates" +"${QPACKAGE_ROOT}/scripts/module/create_rst_templates.sh" || fail "Unable to create rst templates" # Update module list in main NEEDED_MODULES diff --git a/scripts/run_Makefile_common.sh b/scripts/run_Makefile_common.sh index a92507e2..859cc8d0 100755 --- a/scripts/run_Makefile_common.sh +++ b/scripts/run_Makefile_common.sh @@ -28,7 +28,7 @@ fi # Check if README.rst exists if [[ ! -f README.rst ]] then - ${QPACKAGE_ROOT}/scripts/create/create_rst_templates.sh + ${QPACKAGE_ROOT}/scripts/module/create_rst_templates.sh error " README.rst was not present, so I created a default one for you. @@ -62,7 +62,7 @@ then fi # Update Makefile.depend -${QPACKAGE_ROOT}/scripts/create/create_Makefile_depend.sh +${QPACKAGE_ROOT}/scripts/module/create_Makefile_depend.sh # Update EZFIO interface ${QPACKAGE_ROOT}/scripts/ezfio_interface/ei_handler.py diff --git a/src/Makefile b/src/Makefile index 0757825b..93b5234f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -12,17 +12,17 @@ EZFIO=$(EZFIO_DIR)/lib/libezfio_irp.a default: ezfio - $(QPACKAGE_ROOT)/scripts/build_modules.sh $(ALL_MODULES) + $(QPACKAGE_ROOT)/scripts/module/build_modules.sh $(ALL_MODULES) veryclean: - $(QPACKAGE_ROOT)/scripts/clean_modules.sh $(ALL_MODULES) + $(QPACKAGE_ROOT)/scripts/module/clean_modules.sh $(ALL_MODULES) # Define the dict [type in EZFIO.cfg] = ocaml type , f90 type # If you change the qptypes_generator.ml, you need to rm this # For simplicity add this to the veryclean rule - rm $(QPACKAGE_ROOT)/scripts/ezfio_interface/fancy_type.p + rm -f $(QPACKAGE_ROOT)/scripts/ezfio_interface/fancy_type.p $(ALL_MODULES): ezfio - $(QPACKAGE_ROOT)/scripts/build_modules.sh $@ + $(QPACKAGE_ROOT)/scripts/module/build_modules.sh $@ # Define the EZFIO rules $(EZFIO): $(wildcard $(QPACKAGE_ROOT)/src/*/*.ezfio_config) $(wildcard $(QPACKAGE_ROOT)/src/*/EZFIO.cfg)