From 9e55cea0116febb5c536ed18ede9a7b2c647e631 Mon Sep 17 00:00:00 2001 From: Jeroen Vermeulen Date: Sat, 9 Jan 2021 20:37:28 +0100 Subject: [PATCH] Removed some old `tools/` scripts. --- Makefile.in | 34 ++++++------- NEWS | 1 + aclocal.m4 | 50 +++++++++---------- config/Makefile.in | 4 +- config/depcomp | 2 +- config/missing | 2 +- configure | 4 +- doc/Makefile.in | 4 +- include/Makefile.in | 4 +- include/pqxx/Makefile.in | 8 +-- src/Makefile.in | 4 +- test/Makefile.in | 4 +- tools/Makefile.am | 1 - tools/Makefile.in | 5 +- tools/pre-release-check | 39 --------------- tools/release | 103 --------------------------------------- tools/sign-tarball | 26 ---------- 17 files changed, 58 insertions(+), 237 deletions(-) delete mode 100755 tools/pre-release-check delete mode 100755 tools/release delete mode 100755 tools/sign-tarball diff --git a/Makefile.in b/Makefile.in index 542c5ebbe..6e5e01bcb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -987,10 +987,6 @@ dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) -dist-zstd: distdir - tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst - $(am__post_remove_distdir) - dist-tarZ: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 @@ -1033,8 +1029,6 @@ distcheck: dist eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ - *.tar.zst*) \ - zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) @@ -1220,18 +1214,18 @@ uninstall-am: uninstall-pkgconfigDATA am--refresh check check-TESTS check-am clean clean-cscope \ clean-generic clean-libtool cscope cscopelist-am ctags \ ctags-am dist dist-all dist-bzip2 dist-gzip dist-hook \ - dist-lzip dist-shar dist-tarZ dist-xz dist-zip dist-zstd \ - distcheck distclean distclean-generic distclean-libtool \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am recheck tags tags-am uninstall uninstall-am \ + dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \ + distclean distclean-generic distclean-libtool distclean-tags \ + distcleancheck distdir distuninstallcheck dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkgconfigDATA install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags tags-am uninstall uninstall-am \ uninstall-pkgconfigDATA .PRECIOUS: Makefile diff --git a/NEWS b/NEWS index 4242920fc..1b257de33 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,7 @@ - Suppress spurious deprecation messages on Visual Studio. (#402) - Correct error when prepared/param statement clashes with tx focus. (#401) - `from_stream` with `from_query` now has a convenient factory function. + - Removed some obsolete scripts from the `tools/` directory. 7.3.0 - `stream_to` now quotes and escapes its table name. - Removed `transaction_base::classname()`. Did anyone ever use it? diff --git a/aclocal.m4 b/aclocal.m4 index d4439da60..3eded3373 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.2 -*- Autoconf -*- +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1005,7 +1005,7 @@ namespace cxx17 AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX]) AC_DEFUN([AX_CXX_COMPILE_STDCXX_17], [AX_CXX_COMPILE_STDCXX([17], [$1], [$2])]) -# Copyright (C) 2002-2020 Free Software Foundation, Inc. +# Copyright (C) 2002-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1020,7 +1020,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.2], [], +m4_if([$1], [1.16.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -1036,14 +1036,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.2])dnl +[AM_AUTOMAKE_VERSION([1.16.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1095,7 +1095,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2020 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1126,7 +1126,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1317,7 +1317,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1356,9 +1356,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], done if test $am_rc -ne 0; then AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. If GNU make was not used, consider - re-running the configure script with MAKE="gmake" (or whatever is - necessary). You can also try re-running configure with the + for automatic dependency tracking. Try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking).]) fi @@ -1385,7 +1383,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1582,7 +1580,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1603,7 +1601,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2020 Free Software Foundation, Inc. +# Copyright (C) 2003-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1625,7 +1623,7 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1660,7 +1658,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1703,7 +1701,7 @@ AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2020 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1742,7 +1740,7 @@ fi # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1771,7 +1769,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1818,7 +1816,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1837,7 +1835,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1918,7 +1916,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2020 Free Software Foundation, Inc. +# Copyright (C) 2009-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1978,7 +1976,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2006,7 +2004,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2020 Free Software Foundation, Inc. +# Copyright (C) 2006-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -2025,7 +2023,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2020 Free Software Foundation, Inc. +# Copyright (C) 2004-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/config/Makefile.in b/config/Makefile.in index 6eac80239..9fd588a86 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/config/depcomp b/config/depcomp index 6b391623c..65cbf7093 100755 --- a/config/depcomp +++ b/config/depcomp @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2020 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # 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 diff --git a/config/missing b/config/missing index 8d0eaad25..625aeb118 100755 --- a/config/missing +++ b/config/missing @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify diff --git a/configure b/configure index 6cc29482b..f7ecdfa82 100755 --- a/configure +++ b/configure @@ -20364,9 +20364,7 @@ $as_echo X/"$am_mf" | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. If GNU make was not used, consider - re-running the configure script with MAKE=\"gmake\" (or whatever is - necessary). You can also try re-running configure with the + for automatic dependency tracking. Try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking). See \`config.log' for more details" "$LINENO" 5; } diff --git a/doc/Makefile.in b/doc/Makefile.in index 17ea6b080..79af4f636 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/include/Makefile.in b/include/Makefile.in index 6b4ca4ccf..a2da8741d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/include/pqxx/Makefile.in b/include/pqxx/Makefile.in index f2a033837..a36beedb3 100644 --- a/include/pqxx/Makefile.in +++ b/include/pqxx/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -124,8 +124,8 @@ am__can_run_installinfo = \ *) (install-info --version) >/dev/null 2>&1;; \ esac HEADERS = $(nodist_noinst_HEADERS) $(noinst_HEADERS) -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ - config.h.in +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is # *not* preserved. diff --git a/src/Makefile.in b/src/Makefile.in index 9004d5c31..6c5dd925a 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/test/Makefile.in b/test/Makefile.in index c68c9b9cf..ba15f81c8 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/tools/Makefile.am b/tools/Makefile.am index f79877666..9f918cd5a 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,7 +1,6 @@ EXTRA_DIST = \ extract_version \ lint \ - release \ rmlo.cxx \ splitconfig \ template2mak.py \ diff --git a/tools/Makefile.in b/tools/Makefile.in index d551abbbe..8cb7f8a71 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.2 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2020 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -315,7 +315,6 @@ with_postgres_lib = @with_postgres_lib@ EXTRA_DIST = \ extract_version \ lint \ - release \ rmlo.cxx \ splitconfig \ template2mak.py \ diff --git a/tools/pre-release-check b/tools/pre-release-check deleted file mode 100755 index 1063d5b2d..000000000 --- a/tools/pre-release-check +++ /dev/null @@ -1,39 +0,0 @@ -#! /bin/sh -e -# -# Pre-release checks for libpqxx. Run from the subversion tag directory for the -# version that is to be released. -# -# Returns 0 if the branch appears ready for release. - -PQXXVERSION="$(./tools/extract_version)" - -# There must be no uncommitted changes. -check_uncommitted_changes() { - local UNCOMMITTED_CHANGES - UNCOMMITTED_CHANGES="$(svn st)" - if test -n "$UNCOMMITTED_CHANGES" - then - cat <&2 -Branch has uncommitted changes: -$UNCOMMITTED_CHANGES -EOF - exit 1 - fi -} - - -# We must be in the tag directory for the right release. -check_version_tag() { - if ! pwd | grep -q "/tags/$PQXXVERSION$" - then - cat <&2 -This does not appear to be the tag directory for $PQXXVERSION. -EOF - exit 1 - fi -} - - -./tools/lint -check_uncommitted_changes -check_version_tag diff --git a/tools/release b/tools/release deleted file mode 100755 index 2069e4a97..000000000 --- a/tools/release +++ /dev/null @@ -1,103 +0,0 @@ -#! /bin/bash -# Release current libpqxx trunk (or other branch). -# -# Use this after a successful full test run in the parent series. -# -# Arguments: -# [parent] -# -# The next version number is the one for a future release in the parent series, -# not the version that's being released now. So if you're releasing x.y.0, that -# would be x.y+1.0. If you're releasing some other x.y.z, it's x.y.z+1. -# -# The parent branch defaults to "trunk." For x.y.z releases (where z > 0), use -# branches/x.y. -set -e - -NEXTVERSION="$1" -if test -z "$NEXTVERSION" -then - echo "Usage: $0 [parent]" >&2 - exit 1 -fi - -PARENT="$2" -if test -z "$PARENT" -then - PARENT="trunk" -fi - -REPO="svn+ssh://pqxx.org/srv/svn/libpqxx/" -FTP="/srv/ftp/libpqxx" -SNAPSHOT="/home/jtv/public_html/tmp/pqxx/snapshot" -DOC="/srv/www/devprojects/libpqxx/doc" - -CHECKOUT="$(mktemp -p /tmp -d pqxx.XXXXXXXXXX)" -echo "** Checking out source tree to $CHECKOUT **" -cd -- "$CHECKOUT" -svn co -q "$REPO" -cd libpqxx/ - -export PATH="$PATH:$CHECKOUT/libpqxx/$PARENT/tools" - -pushd "$PARENT" >/dev/null -PQXXVERSION="$(extract_version)" -popd >/dev/null - -if test "$PQXXVERSION" = "$NEXTVERSION" -then - cat <&2 -The given "next version" is the same as the existing version in -$PARENT/PQXXVERSION. Instead, give the next version for a future -release in the same series. -EOF - exit 2 -fi - -RELEASEDATE="$(date +'%a, %d %b %y %T %z')" - - -echo "** Updating source tree **" -svn cp "$PARENT" "tags/$PQXXVERSION" - - -# Mark next version in NEWS. -cat - <"$PARENT/NEWS" -$NEXTVERSION -EOF - -echo "PQXX_VERSION $NEXTVERSION" >"$PARENT"/VERSION - -cd /tmp - -echo "** Setting up new documentation **" -TEMPDOC="$(mktemp -p /tmp -d pqxxdoc.XXXXXXXXXX)" -cd -- "$TEMPDOC" -tar xzf "$SNAPSHOT"/libpqxx-*.tar.gz -cd libpqxx-*/ - -PREVIOUS='' -for d in $(ls "$DOC" | grep '[0-9]') -do - PREVIOUS="$PREVIOUS --link-dest='$DOC/$d'" -done - -rsync -r $PREVIOUS doc/html "$DOC/$PQXXVERSION" - -cd /tmp -rm -rf "$TEMPDOC" - -if test "$PARENT" = "trunk" -then - # Move snapshot tarball to FTP directory. - mv "$SNAPSHOT"/libpqxx-*.tar.* "$FTP/" -else - echo "*** Remember: Build tarball and make available for upload ***" -fi - -cd -- "$CHECKOUT" -svn commit -m "Forking release $PQXXVERSION, moving on to $NEXTVERSION." -cd /tmp -rm -rf -- "$CHECKOUT" - -echo "** Done **" diff --git a/tools/sign-tarball b/tools/sign-tarball deleted file mode 100755 index 09e1029a7..000000000 --- a/tools/sign-tarball +++ /dev/null @@ -1,26 +0,0 @@ -#! /bin/sh -# Add GPG signature and checksums for libpqxx tarball. -# -# Usage: -# sign-tarball - -TARBALL="$1" - -if test -z "$TARBALL" -then - echo "No tarball to sign. Usage: $0 " >&2 - exit 1 -fi - -if ! test -f "$TARBALL" -then - echo "Can't find '$TARBALL'." >&2 - exit 1 -fi - -gpg --armor --sign --detach-sig "$TARBALL" - -for DIGEST in md5sum sha256sum -do - "$DIGEST" "$TARBALL" >"$TARBALL.$DIGEST" -done