Commit: 84eb939b91f3f5551d64327928df12275eb7a880 - sctk (git)

Superconducting Toolkit

Commit MetaInfo

• Revision: 84eb939b91f3f5551d64327928df12275eb7a880 (tree)
• Time: 2016-10-05 02:37:33
• Author: spigafi <spigafi@c92e...>
• Commiter: spigafi

Log Message

(semi)automated release script/procedure reflecting 6.0

git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@13088 c92efa57-630b-4861-b058-cf58834340f0

Change Summary

• modified: Makefile
• modified: dev-tools/release.sh

Incremental Difference

--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # Copyright (C) 2001-2016 Quantum ESPRESSO group
-# 
+#
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
@@ -64,7 +64,7 @@ default :
 # If "|| exit 1" is not present, the error code from make in subdirectories
 # is not returned and make goes on even if compilation has failed
 
-pw : bindir libfft libla mods liblapack libs libiotk 
+pw : bindir libfft libla mods liblapack libs libiotk
 	if test -d PW ; then \
 	( cd PW ; $(MAKE) TLDEPS= all || exit 1) ; fi
 
@@ -118,7 +118,7 @@ ld1 : bindir liblapack libfft libla mods libs
 	if test -d atomic ; then \
 	( cd atomic ; $(MAKE) TLDEPS= all || exit 1 ) ; fi
 
-upf : libfft libla mods libs liblapack 
+upf : libfft libla mods libs liblapack
 	if test -d upftools ; then \
 	( cd upftools ; $(MAKE) TLDEPS= all || exit 1 ) ; fi
 
@@ -166,7 +166,7 @@ mods : libiotk libla libfft
 libs : mods
 	( cd clib ; $(MAKE) TLDEPS= all || exit 1 )
 
-lrmods : libs libla libfft 
+lrmods : libs libla libfft
 	( cd LR_Modules ; $(MAKE) TLDEPS= all || exit 1 )
 
 bindir :
@@ -226,7 +226,7 @@ touch-dummy :
 # into system directories with no danger of name conflicts
 #########################################################
 
-inst : 
+inst :
 	( for exe in */*/*.x */bin/* ; do \
 	   file=`basename $$exe`; if test "$(INSTALLDIR)" != ""; then \
 		if test ! -L $(PWD)/$$exe; then \
@@ -265,7 +265,7 @@ install : touch-dummy
 
 #########################################################
 # Run test-suite for numerical regression testing
-# NB: it is assumed that reference outputs have been 
+# NB: it is assumed that reference outputs have been
 #     already computed once (usualy during release)
 #########################################################
 
@@ -278,7 +278,7 @@ test-suite: pw cp touch-dummy
 
 # remove object files and executables
 clean : doc_clean
-	touch make.inc 
+	touch make.inc
 	for dir in \
 		CPV LAXlib FFTXlib Modules PP PW EPW \
 		NEB ACFDT COUPLE GWW XSpectra PWCOND \
@@ -309,13 +309,13 @@ veryclean : clean
 	- rm -f espresso.tar.gz
 	- rm -rf make.inc
 
-# remove everything not in the original distribution 
+# remove everything not in the original distribution
 distclean : veryclean
 	( cd install ; $(MAKE) -f plugins_makefile $@ || exit 1 )
 
 tar :
 	@if test -f espresso.tar.gz ; then /bin/rm espresso.tar.gz ; fi
-	# do not include unneeded stuff 
+	# do not include unneeded stuff
 	find ./ -type f | grep -v -e /.svn/ -e'/\.' -e'\.o$$' -e'\.mod$$'\
 		-e /.git/ -e'\.a$$' -e'\.d$$' -e'\.i$$' -e'_tmp\.f90$$' -e'\.x$$' \
 		-e'~$$' -e'\./GUI' -e '\./tempdir' | xargs tar rvf espresso.tar
@@ -372,4 +372,3 @@ depend: libiotk version
 
 version:
 	- ( cd Modules; make version )
-

--- a/dev-tools/release.sh
+++ b/dev-tools/release.sh
@@ -6,26 +6,35 @@ version=6.0
 revision=13079
 
 # make sure there is no locale setting creating unneeded differences.
-LC_ALL=C
-export LC_ALL
-
-mkdir $tempdir
-cd $tempdir
-/bin/rm -rf espresso/ qe-$version
+#LC_ALL=C
+#export LC_ALL
 
 # get the svn copy via tag
 svn checkout http://qeforge.qe-forge.org/svn/q-e/tags/QE-$version/espresso qe-$version
 
 # -OR- get the svn copy via revision checkout
-svn checkout -r$revision svn+ssh://[e-mail]/svnroot/q-e/trunk/espresso qe-$version
+svn checkout -r$revision svn+ssh://<...>@qeforge.qe-forge.org/svnroot/q-e/trunk/espresso qe-$version
 
 cd qe-$version
 
+# *** manual edit Makefile  ***
+# - Update PWgui
+# - disable Doc distclean target
+
+# *** manual edit install/plugins_makefile  ***
+# - uncomment 'examples' target
+# - uncomment 'uncompress-examples' target
+# - uncomment 'examples_distclean' target
+
+# Manual edit "userconfig.tmp" and "ENVIRONMENT"
+# - change 'SVN' to $revision
+# - change 'REFERENCE_VERSION' to $revision
+
 # generate version.f90 (requires svn files)
+# save version.f90 (make veryclean removes it)
 touch make.inc
 cd Modules
 make version.f90
-# save version.f90 (make veryclean removes it)
 mv version.f90 ..
 cd ..
 
@@ -57,10 +66,6 @@ tar -xzvf PWgui-$version.tgz
 make tar-qe-modes VERSION=$version
 mv QE-modes-$version.tar.gz ../qe-$version-emacs_modes.tar.gz
 
-# *** manual edit Makefile  ***
-# - Update PWgui
-# - disable Doc distclean target
-
 # Updating reference outputs on test-suite
 cd test-suite
 find . -name benchmark.out* > list-SVN.txt
@@ -74,14 +79,14 @@ file_dst=`echo $x | awk '{ print $2}'`
 mv ${file_src} ${file_dst}
 done
 rm ./STUFF-TO-RENAME.txt ./list-SVN.txt ./list-$version.txt
-
-# Manual edit "userconfig.tmp"
+cp License test-suite/
 
 cd ..
 
 make distclean
 
 # packacking test-suite
+mv test-suite test-suite
 tar -czvf ../qe-$version-test-suite.tar.gz test-suite
 
 # Grouping Examples in the same directory and packacking them
@@ -105,9 +110,9 @@ mv ../PWCOND/examples/* PWCOND/
 mv ../PHonon/examples/* PHonon/
 rm -rf ../TDDFPT/Examples ../CPV/examples ../PHonon/examples ../NEB/examples ../COUPLE/examples ../PP/examples ../PP/simple_transport/examples ../PW/examples ../PWgui-6.0/examples ../XSpectra/examples ../GWW/examples ../EPW/examples ../atomic/examples ../PWCOND/examples
 cd ..
+cp License Examples/
 
-# Manual edit "Makefile"  and "install/plugins_makefile" to enable target
-
+# Grouping Examples in the same directory and packacking them
 tar -czvf ../qe-$version-examples.tar.gz Examples
 
 cd ../
@@ -168,9 +173,7 @@ cp -R ../PHonon/Doc/user_guide ./ph_user_guide
 cp -R ../NEB/Doc/user_guide ./neb_user_guide
 cp -R ../atomic/Doc/pseudo-gen ./pseudo-gen
 
-#
 # Copy "Docs" to QE website
-
 scp -R Doc <...>@<...>/wp-content/uploads/Doc-$version
 
 # Connect to the website and create/update symbolic link to "Doc-$version"