comp-chem/cp2k
1
0
Fork 0
mirror of https://github.com/cp2k/cp2k.git synced 2026-07-28 22:25:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Touch up on tools/build_utils

Browse source 
svn-origin-rev: 14258
This commit is contained in:
Ole Schütt 2014-09-08 09:18:30 +00:00
parent 39e941f4f9
commit a77a5fbb50
7 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
makefiles/Makefile
View file

@ -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 "<html><body>Sorry, the Doxygen documentation is currently being updated. Please try again in a few minutes.</body></html>" > $(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"

0
tools/get_arch_code → tools/build_utils/get_arch_code
View file

0
tools/get_revision_number → tools/build_utils/get_revision_number
View file

9
tools/create_dbcsr_tarball.sh
View file

@ -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/

0
tools/build_utils/pkg_plan.txt → tools/package_planner/pkg_plan.txt
View file

0
tools/build_utils/pkg_plan_motion.txt → tools/package_planner/pkg_plan_motion.txt
View file

0
tools/build_utils/plan_packages.py → tools/package_planner/plan_packages.py
View file