From e8653342d8b2aad5e3deb387074a967b0ff2eebd Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Wed, 11 May 2016 17:19:53 -0400 Subject: [PATCH] update scripts for precompiled packages for new doc structure --- tools/mingw-cross/build-mingw-cross.sh | 5 +--- tools/mingw-cross/lammps.nsis | 2 +- tools/rpm/build-rpm-from-git.sh | 2 +- tools/rpm/lammps.spec | 40 +++++++++++++++----------- 4 files changed, 26 insertions(+), 23 deletions(-) diff --git a/tools/mingw-cross/build-mingw-cross.sh b/tools/mingw-cross/build-mingw-cross.sh index 0a03b8b8c8..4859093845 100755 --- a/tools/mingw-cross/build-mingw-cross.sh +++ b/tools/mingw-cross/build-mingw-cross.sh @@ -145,10 +145,7 @@ do mv -v $f $f.txt; done # create up-to-date version of the manual pushd lammps-current -make -C txt2html -./txt2html/txt2html -b doc/*.txt -htmldoc --batch lammps.book -mv lammps.pdf doc/Manual.pdf || exit 5 +make -C src pdf popd # build installers diff --git a/tools/mingw-cross/lammps.nsis b/tools/mingw-cross/lammps.nsis index 17febfd72b..25a8652a55 100644 --- a/tools/mingw-cross/lammps.nsis +++ b/tools/mingw-cross/lammps.nsis @@ -99,7 +99,7 @@ Section "${LAMMPS}" SetOutPath "$INSTDIR\Doc" File /oname=LAMMPS-Manual.pdf lammps-current/doc/Manual.pdf - File /oname=Colvars-Manual.pdf lammps-current/doc/PDF/colvars-refman-lammps.pdf + File /oname=Colvars-Manual.pdf lammps-current/doc/src/PDF/colvars-refman-lammps.pdf File /oname=CreateAtoms-Manual.pdf lammps-current/tools/createatoms/Manual.pdf SetOutPath "$INSTDIR\Potentials" diff --git a/tools/rpm/build-rpm-from-git.sh b/tools/rpm/build-rpm-from-git.sh index 0cfec3ff88..0cff5acd8b 100755 --- a/tools/rpm/build-rpm-from-git.sh +++ b/tools/rpm/build-rpm-from-git.sh @@ -43,7 +43,7 @@ cp -pv tools/rpm/lammps.sh ${MYRPM_BUILD_DIR}/SOURCES/ cp -pv tools/rpm/lammps.csh ${MYRPM_BUILD_DIR}/SOURCES/ git archive -v --format=tar --prefix=lammps-current/ HEAD \ - README LICENSE doc/Manual.pdf doc/PDF src lib python \ + README LICENSE doc/Manual.pdf doc/src/PDF src lib python \ examples/{README,ASPHERE,KAPPA,MC,VISCOSITY,dipole,peri,hugoniostat,colloid,crack,friction,msst,obstacle,body,sputter,pour,ELASTIC,neb,ellipse,flow,meam,min,indent,deposit,micelle,shear,srd,dreiding,eim,prd,rigid,COUPLE,peptide,melt,comb,tad,reax,balance,snap,USER/{awpmd,misc,phonon,cg-cmm,fep}} \ bench potentials tools/*.cpp tools/*.f tools/msi2lmp tools/xmgrace tools/createatoms tools/colvars \ | gzip -9c - > "${MYRPM_BUILD_DIR}/SOURCES/lammps-current.tar.gz" diff --git a/tools/rpm/lammps.spec b/tools/rpm/lammps.spec index ddcb41efd1..3e1aa826eb 100644 --- a/tools/rpm/lammps.spec +++ b/tools/rpm/lammps.spec @@ -1,17 +1,20 @@ -# verified on Fedora 19 / x86_64 / 2015-10-16 -# verified on Fedora 19 / i386 / 2015-10-16 -# verified on Fedora 20 / x86_64 / 2015-10-16 -# verified on Fedora 20 / i386 / 2015-10-16 -# verified on Fedora 21 / x86_64 / 2015-10-16 -# verified on Fedora 22 / x86_64 / 2015-10-16 -# verified on Fedora 23 / x86_64 / 2015-10-16 -# verified on CentOS 6.6 / x86_64 / 2015-10-16 -# verified on CentOS 6.6 / i386 / 2015-10-16 -# verified on CentOS 7.0 / x86_64 / 2015-10-16 -# verified on OpenSuSE 12.3 / x86_64 / 2015-10-16 -# verified on OpenSuSE 12.3 / i586 / 2015-10-16 -# verified on OpenSuSE 13.1 / x86_64 / 2015-10-16 -# verified on OpenSuSE 13.1 / i586 / 2015-10-16 +# verified on Fedora 19 / x86_64 / 2016-05-11 +# verified on Fedora 19 / i386 / 2016-05-11 +# verified on Fedora 20 / x86_64 / 2016-05-11 +# verified on Fedora 20 / i386 / 2016-05-11 +# verified on Fedora 21 / x86_64 / 2016-05-11 +# verified on Fedora 22 / x86_64 / 2016-05-11 +# verified on Fedora 23 / x86_64 / 2016-05-11 +# verified on Fedora 24 / x86_64 / 2016-05-11 +# verified on CentOS 6.6 / x86_64 / 2016-05-11 +# verified on CentOS 6.6 / i386 / 2016-05-11 +# verified on CentOS 7.0 / x86_64 / 2016-05-11 +# verified on OpenSuSE 12.3 / x86_64 / 2016-05-11 +# verified on OpenSuSE 12.3 / i586 / 2016-05-11 +# verified on OpenSuSE 13.1 / x86_64 / 2016-05-11 +# verified on OpenSuSE 13.1 / i586 / 2016-05-11 +# verified on OpenSuSE 13.2 / x86_64 / 2016-05-11 +# verified on OpenSuSE 42.1 / x86_64 / 2016-05-11 %ifnarch s390 s390x %global with_openmpi 1 @@ -43,8 +46,8 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Name: lammps -Version: 20151016 -Release: 12%{?dist} +Version: 20160511 +Release: 14%{?dist} Summary: LAMMPS Molecular Dynamics Simulator Group: Applications/Engineering @@ -368,7 +371,7 @@ rm -rf %{buildroot} %{_datadir}/lammps/bench %{_datadir}/lammps/examples %doc doc/Manual.pdf -%doc doc/PDF/*.pdf +%doc doc/src/PDF/*.pdf %if %{with_openmpi} %files openmpi @@ -402,6 +405,9 @@ rm -rf %{buildroot} %changelog +* Wed May 11 2016 Axel Kohlmeyer - 20160511-14 +- Update for new documentation tree. addition of Fedora 24 + * Fri Oct 16 2015 Axel Kohlmeyer - 20151016-12 - Update for removal of Fedora 17/18 and addition of Fedora 23