From 281dd89c25c76fd0408da6542b9d15d00150ebcb Mon Sep 17 00:00:00 2001 From: Thomas Applencourt Date: Thu, 30 Apr 2015 14:10:41 +0200 Subject: [PATCH] Move create script into create folder --- ocaml/Makefile | 2 +- scripts/build_modules.sh | 4 ++-- scripts/{ => create}/create_Makefile.sh | 0 scripts/{ => create}/create_Makefile_depend.sh | 0 scripts/{ => create}/create_Needed_modules.sh | 0 scripts/{ => create}/create_executables_list.sh | 0 scripts/{ => create}/create_gitignore.sh | 0 scripts/{ => create}/create_module.sh | 6 +++--- scripts/{ => create}/create_rst_templates.sh | 0 scripts/run_Makefile_common.sh | 4 ++-- src/Makefile.common | 2 +- 11 files changed, 9 insertions(+), 9 deletions(-) rename scripts/{ => create}/create_Makefile.sh (100%) rename scripts/{ => create}/create_Makefile_depend.sh (100%) rename scripts/{ => create}/create_Needed_modules.sh (100%) rename scripts/{ => create}/create_executables_list.sh (100%) rename scripts/{ => create}/create_gitignore.sh (100%) rename scripts/{ => create}/create_module.sh (88%) rename scripts/{ => create}/create_rst_templates.sh (100%) diff --git a/ocaml/Makefile b/ocaml/Makefile index eaa8e382..ce932bfc 100644 --- a/ocaml/Makefile +++ b/ocaml/Makefile @@ -35,7 +35,7 @@ default: $(ALL_TESTS) $(ALL_EXE) .gitignore executables: $(QPACKAGE_ROOT)/data/executables $(QPACKAGE_ROOT)/data/executables: - $(QPACKAGE_ROOT)/scripts/create_executables_list.sh + $(QPACKAGE_ROOT)/scripts/create/create_executables_list.sh external_libs: opam install cryptokit core diff --git a/scripts/build_modules.sh b/scripts/build_modules.sh index c3e0cda5..44c8183a 100755 --- a/scripts/build_modules.sh +++ b/scripts/build_modules.sh @@ -30,7 +30,7 @@ Build failed for module $MODULE " fi fi - ${QPACKAGE_ROOT}/scripts/create_gitignore.sh + ${QPACKAGE_ROOT}/scripts/create/create_gitignore.sh cd ${OLDPWD} done -${QPACKAGE_ROOT}/scripts/create_executables_list.sh +${QPACKAGE_ROOT}/scripts/create/create_executables_list.sh diff --git a/scripts/create_Makefile.sh b/scripts/create/create_Makefile.sh similarity index 100% rename from scripts/create_Makefile.sh rename to scripts/create/create_Makefile.sh diff --git a/scripts/create_Makefile_depend.sh b/scripts/create/create_Makefile_depend.sh similarity index 100% rename from scripts/create_Makefile_depend.sh rename to scripts/create/create_Makefile_depend.sh diff --git a/scripts/create_Needed_modules.sh b/scripts/create/create_Needed_modules.sh similarity index 100% rename from scripts/create_Needed_modules.sh rename to scripts/create/create_Needed_modules.sh diff --git a/scripts/create_executables_list.sh b/scripts/create/create_executables_list.sh similarity index 100% rename from scripts/create_executables_list.sh rename to scripts/create/create_executables_list.sh diff --git a/scripts/create_gitignore.sh b/scripts/create/create_gitignore.sh similarity index 100% rename from scripts/create_gitignore.sh rename to scripts/create/create_gitignore.sh diff --git a/scripts/create_module.sh b/scripts/create/create_module.sh similarity index 88% rename from scripts/create_module.sh rename to scripts/create/create_module.sh index dbddc3d3..90c6586b 100755 --- a/scripts/create_module.sh +++ b/scripts/create/create_module.sh @@ -117,7 +117,7 @@ debug "Module directory is created." # Create the Makefile -"${QPACKAGE_ROOT}/scripts/create_Makefile.sh" || fail "Unable to create Makefile" +"${QPACKAGE_ROOT}/scripts/create/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_Needed_modules.sh" ${NEEDED_MODULES} || fail "Unable to create the NEEDED_MODULES file" +"${QPACKAGE_ROOT}/scripts/create/create_Needed_modules.sh" ${NEEDED_MODULES} || fail "Unable to create the NEEDED_MODULES file" if [[ ! -f NEEDED_MODULES ]] then fail "NEEDED_MODULES was not created" @@ -135,7 +135,7 @@ debug "NEEDED_MODULES created" # Create rst templates -"${QPACKAGE_ROOT}/scripts/create_rst_templates.sh" || fail "Unable to create rst templates" +"${QPACKAGE_ROOT}/scripts/create/create_rst_templates.sh" || fail "Unable to create rst templates" # Update module list in main NEEDED_MODULES diff --git a/scripts/create_rst_templates.sh b/scripts/create/create_rst_templates.sh similarity index 100% rename from scripts/create_rst_templates.sh rename to scripts/create/create_rst_templates.sh diff --git a/scripts/run_Makefile_common.sh b/scripts/run_Makefile_common.sh index 82e898ac..153fa948 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_rst_templates.sh + ${QPACKAGE_ROOT}/scripts/create/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_Makefile_depend.sh +${QPACKAGE_ROOT}/scripts/create/create_Makefile_depend.sh # Update EZFIO interface ${QPACKAGE_ROOT}/scripts/ezfio_interface/ei_handler.py diff --git a/src/Makefile.common b/src/Makefile.common index eddaa481..4df805ce 100644 --- a/src/Makefile.common +++ b/src/Makefile.common @@ -45,7 +45,7 @@ include irpf90.make endif .gitignore: - $(QPACKAGE_ROOT)/scripts/create_gitignore.sh + $(QPACKAGE_ROOT)/scripts/create/create_gitignore.sh # Frequent typos clena: clean