From a77a5fbb50770a2abd661f44aa3ab8e576dbc6b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20Sch=C3=BCtt?= Date: Mon, 8 Sep 2014 09:18:30 +0000 Subject: [PATCH] Touch up on tools/build_utils svn-origin-rev: 14258 --- makefiles/Makefile | 6 +++--- tools/{ => build_utils}/get_arch_code | 0 tools/{ => build_utils}/get_revision_number | 0 tools/create_dbcsr_tarball.sh | 9 +++------ tools/{build_utils => package_planner}/pkg_plan.txt | 0 .../{build_utils => package_planner}/pkg_plan_motion.txt | 0 tools/{build_utils => package_planner}/plan_packages.py | 0 7 files changed, 6 insertions(+), 9 deletions(-) rename tools/{ => build_utils}/get_arch_code (100%) rename tools/{ => build_utils}/get_revision_number (100%) rename tools/{build_utils => package_planner}/pkg_plan.txt (100%) rename tools/{build_utils => package_planner}/pkg_plan_motion.txt (100%) rename tools/{build_utils => package_planner}/plan_packages.py (100%) diff --git a/makefiles/Makefile b/makefiles/Makefile index 42ddfab3fb..d0015c7451 100644 --- a/makefiles/Makefile +++ b/makefiles/Makefile @@ -12,7 +12,7 @@ SHELL = /bin/sh # also works fine # CP2KHOME := $(abspath $(PWD)/..) -ARCH := $(shell $(CP2KHOME)/tools/get_arch_code) +ARCH := $(shell $(CP2KHOME)/tools/build_utils/get_arch_code) export VERSION=sopt MAKEFILE := $(CP2KHOME)/makefiles/Makefile @@ -26,7 +26,7 @@ INSTANTIATEDDIR := $(CP2KHOME)/obj/instantiated TOOLSRC := $(CP2KHOME)/tools SRCDIR := $(CP2KHOME)/src EXEDIR := $(MAINEXEDIR)/$(ARCH) -REVISION := $(shell $(CP2KHOME)/tools/get_revision_number $(SRCDIR)) +REVISION := $(shell $(CP2KHOME)/tools/build_utils/get_revision_number $(SRCDIR)) # Discover programs ========================================================= @@ -260,7 +260,7 @@ doxygen: doxygen/clean @echo "Sorry, the Doxygen documentation is currently being updated. Please try again in a few minutes." > $(DOXYGENDIR)/html/index.html cp $(ALL_SRC_FILES) $(DOXYGENDIR) @for i in $(DOXYGENDIR)/*.F ; do mv $${i} $${i%%.*}.f90; done ; - @cat $(CP2KHOME)/doc/Doxyfile.template | sed "s/#revision#/`$(TOOLSRC)/get_revision_number $(CP2KHOME)`/" >$(DOXYGENDIR)/Doxyfile + @cat $(CP2KHOME)/doc/Doxyfile.template | sed "s/#revision#/`$(TOOLSRC)/build_utils/get_revision_number $(CP2KHOME)`/" >$(DOXYGENDIR)/Doxyfile cd $(DOXYGENDIR); doxygen ./Doxyfile TOOL_HELP += "doxygen : Generate the doxygen documentation" diff --git a/tools/get_arch_code b/tools/build_utils/get_arch_code similarity index 100% rename from tools/get_arch_code rename to tools/build_utils/get_arch_code diff --git a/tools/get_revision_number b/tools/build_utils/get_revision_number similarity index 100% rename from tools/get_revision_number rename to tools/build_utils/get_revision_number diff --git a/tools/create_dbcsr_tarball.sh b/tools/create_dbcsr_tarball.sh index 2627f23460..4de486dbdb 100755 --- a/tools/create_dbcsr_tarball.sh +++ b/tools/create_dbcsr_tarball.sh @@ -3,7 +3,7 @@ #set -x TMPDIR=`mktemp -d` -REV=`./get_revision_number ../ | sed -e "s/://"` +REV=`./build_utils/get_revision_number ../ | sed -e "s/://"` OUTNAME=libdbcsr_$REV OUTDIR=$TMPDIR/$OUTNAME @@ -49,11 +49,8 @@ rsync -axq \ ../src/mpiwrap/ $OUTDIR/src/mpiwrap -mkdir $OUTDIR/tools -cp -a ../tools/makedep.py $OUTDIR/tools/ -cp -a ../tools/discover_programs.py $OUTDIR/tools/ -cp -a ../tools/get_arch_code $OUTDIR/tools/ -cp -a ../tools/get_revision_number $OUTDIR/tools/ +mkdir -p $OUTDIR/tools/build_utils +rsync -axq --exclude=".*" ../tools/build_utils/ $OUTDIR/tools/build_utils/ mkdir $OUTDIR/tools/dbcsr_test/ rsync -axq --exclude=".*" ../tools/dbcsr_test/ $OUTDIR/tools/dbcsr_test/ diff --git a/tools/build_utils/pkg_plan.txt b/tools/package_planner/pkg_plan.txt similarity index 100% rename from tools/build_utils/pkg_plan.txt rename to tools/package_planner/pkg_plan.txt diff --git a/tools/build_utils/pkg_plan_motion.txt b/tools/package_planner/pkg_plan_motion.txt similarity index 100% rename from tools/build_utils/pkg_plan_motion.txt rename to tools/package_planner/pkg_plan_motion.txt diff --git a/tools/build_utils/plan_packages.py b/tools/package_planner/plan_packages.py similarity index 100% rename from tools/build_utils/plan_packages.py rename to tools/package_planner/plan_packages.py