From a9c5ef601792aba01769a5263d79fe252da58e11 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 6 Nov 2013 11:27:21 -0500 Subject: removed unused redhat specfile, export.sh --- tools/README | 3 --- tools/export.py | 17 +---------------- tools/export.sh | 50 -------------------------------------------------- 3 files changed, 1 insertion(+), 69 deletions(-) delete mode 100755 tools/export.sh (limited to 'tools') diff --git a/tools/README b/tools/README index 8fe2c1a28..5505573c8 100644 --- a/tools/README +++ b/tools/README @@ -55,9 +55,6 @@ encap-util-xml.sh export.py - Export a tagged version of the Bcfg2 source -export.sh - - Export a tagged version of the Bcfg2 source - generate-manpages.bash - Generate man pages from the Sphinx source diff --git a/tools/export.py b/tools/export.py index 7c3c56db2..0ea6df2af 100755 --- a/tools/export.py +++ b/tools/export.py @@ -177,8 +177,7 @@ E.G. 1.2.0pre1 is a valid version. # write out the new RPM changelog specs = ["misc/bcfg2.spec", - "misc/bcfg2-selinux.spec", - "redhat/bcfg2.spec.in"] + "misc/bcfg2-selinux.spec"] if options.dryrun: print("*** Add the following to the top of the %%changelog section in %s:\n%s\n" % (rpmchangelog, " and ".join(specs))) @@ -201,20 +200,6 @@ E.G. 1.2.0pre1 is a valid version. print(help_message) quit() - # Update redhat directory versions - if options.dryrun: - print("*** Replace redhat/VERSIONS content with '%s'." - % version_release) - print("*** Replace redhat/RELEASE content with '%s'." - % version_info['build']) - else: - with open('redhat/VERSION', 'w') as f: - f.write("%s\n" % version_release) - f.close() - with open('redhat/RELEASE', 'w') as f: - f.write("0.0%s\n" % version_info['build']) - f.close() - # update solaris version find_and_replace('solaris/Makefile', 'VERS=', 'VERS=%s-1\n' % version, diff --git a/tools/export.sh b/tools/export.sh deleted file mode 100755 index 632067f95..000000000 --- a/tools/export.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env sh - -pkgname="bcfg2" -repo="https://svn.mcs.anl.gov/repos/bcfg" -version="${1}" -expath="/tmp/${pkgname}-${version}/" -tarname="/tmp/${pkgname}-${version}.tar.gz" -url=`svn info | grep URL | awk '{print $2}'` - -if [ -z "${version}" ] ; then - echo "Usage: $0 " - exit 1 -fi - -# update the version -tmpbase=`basename $0` -deblogtmp=`mktemp /tmp/${tmpbase}.XXXXXX` -majorver=`/usr/bin/python -c "print '${version}'[:5]"` -minorver=`/usr/bin/python -c "print '${version}'[5:]"` -printf "name: " -read name -printf "email: " -read email -cat > deblogtmp << EOF -bcfg2 (${majorver}-0.0${minorver}) unstable; urgency=low - - * New upstream release - - -- ${name} <${email}> `/bin/date -R` - -EOF -sed -i "s/^\(Version:\) [:digits:]*.*$/\1 ${version}/" misc/bcfg2.spec -cat debian/changelog >> deblogtmp -mv deblogtmp debian/changelog -echo ${majorver} > redhat/VERSION -echo 0.0${minorver} > redhat/RELEASE -sed -i "s/\(version=\).*/\1\"${version}\",/" setup.py -sed -i "s/^\(VERS\).*/\1=${version}-1/" solaris/Makefile -svn ci -m "Version bump to ${version}" - -# tag the release -tagstr=`echo ${version} | sed -e 's/\./_/g'` -svn copy "$url" "${repo}/tags/${pkgname}_${tagstr}" -m "tagged ${version} release" -svn export . "${expath}" -svn log -v "${repo}/tags/${pkgname}_${tagstr}" > "${expath}/ChangeLog" -cd /tmp - -tar czf "${tarname}" "${pkgname}-${version}" -gpg --armor --output "${tarname}".gpg --detach-sig "${tarname}" -scp "${tarname}"* terra.mcs.anl.gov:/mcs/ftp/pub/bcfg -- cgit v1.2.3-1-g7c22