diff options
| author | Andy Wingo <wingo@pobox.com> | 2006-08-13 17:00:25 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2006-08-13 17:00:25 +0200 |
| commit | e8db2bfa023f0135ff698a0a722454a7102fc1ac (patch) | |
| tree | 5d5e45f5040aae4b28ff877f4c6a3750cbc3d79e | |
| parent | b3934d6c52b73c0065d924163645745b1830f276 (diff) | |
| parent | 9a9b22990e1ed9f0e7e37efc74d0f60da0db594d (diff) | |
| download | guile-gnome-e8db2bfa023f0135ff698a0a722454a7102fc1ac.tar.gz | |
merge from wingo-bracket
| -rw-r--r-- | ChangeLog | 28 | ||||
| -rw-r--r-- | autogen-pkg.sh | 14 | ||||
| -rwxr-xr-x | scripts/add-upstream | 2 | ||||
| -rwxr-xr-x | scripts/fork-archive-pkgs | 11 | ||||
| -rwxr-xr-x | scripts/update-inventories | 8 | ||||
| -rwxr-xr-x | scripts/upstream-missing | 61 |
6 files changed, 106 insertions, 18 deletions
@@ -1,3 +1,31 @@ +2005-12-22 Andy Wingo <wingo@pobox.com> + + * scripts/update-inventories: Make tla-agnostic. + + * autogen-pkg.sh: Remove build-dep on SLIB. + +2005-11-05 Andy Wingo <wingo@pobox.com> + + * scripts/fork-archive-pkgs: Work with tla or baz. I think. + + * scripts/upstream-missing: Change to use baz missing, doh. + Renamed from patches-missing. + +2005-11-04 Andy Wingo <wingo@pobox.com> + + * scripts/patches-missing: Don't do anything about patches in + upstream but not in the local copy. Handle the no-diff case + better. Better non-full output. + + * scripts/patches-missing: Use {arch}/+upstream if available. + Don't print diffs any more, just show the patches that are + missing. Let --full do a cat-archive-log on the patch. + + * scripts/fork-archive-pkgs: Support baz. + + * scripts/patches-missing: New file, prints a list of patches + missing from this version in another archive. + 2005-04-09 Andreas Rottmann <a.rottmann@gmx.at> * dev-environ.in: Set LTDL_LIBRARY_PATH instead of diff --git a/autogen-pkg.sh b/autogen-pkg.sh index 17f5fb7..323c475 100644 --- a/autogen-pkg.sh +++ b/autogen-pkg.sh @@ -206,20 +206,6 @@ AC_SUBST(GUILE_CFLAGS) AC_SUBST(GUILE_LIBS) AC_MSG_RESULT(yes) -# The defs generator uses slib for globbing and printf -AC_MSG_CHECKING(for SLIB) -if ! guile -c '(use-modules (ice-9 slib))' >/dev/null 2>&1; then - AC_MSG_ERROR([guile-gnome needs SLIB to build. - -Most distributions ship a guile-slib package, for example guile-1.6-slib -on Debian. Otherwise, you can install it yourself by downloading it -from http://swissnet.ai.mit.edu/~jaffer/SLIB.html and install it via the -method detailed in the SLIB Installation node of the guile info manual. -Sucks for you! -]) -fi -AC_MSG_RESULT(yes) - # Check for g-wrap PKG_CHECK_MODULES(G_WRAP, g-wrap-2.0-guile >= 1.9.4) diff --git a/scripts/add-upstream b/scripts/add-upstream index f05bbb6..8c82ffc 100755 --- a/scripts/add-upstream +++ b/scripts/add-upstream @@ -16,7 +16,7 @@ for f in . *; do else pkg="$f" fi - echo guile-gnome-devel@gnu.org--2004/$pkg--dev--0 > $upstream + echo guile-gnome-devel@gnu.org--2005/$pkg--dev--0 > $upstream fi fi done diff --git a/scripts/fork-archive-pkgs b/scripts/fork-archive-pkgs index 0d2a146..7ccf573 100755 --- a/scripts/fork-archive-pkgs +++ b/scripts/fork-archive-pkgs @@ -1,7 +1,16 @@ #!/bin/sh year=`date +%Y` + +if test -n "$TLA"; + TLA=tla +fi + while [ -n "$1" ]; do - tla tag -S "guile-gnome-devel@gnu.org--$year/$1--dev--0" "guile-gnome-$1--dev--0" + if echo "$TLA" | grep -q baz; then + $TLA branch "guile-gnome-devel@gnu.org--$year/$1--dev--0" "guile-gnome-$1--dev--0" + else + $TLA tag -S "guile-gnome-devel@gnu.org--$year/$1--dev--0" "guile-gnome-$1--dev--0" + fi shift done diff --git a/scripts/update-inventories b/scripts/update-inventories index cd4fc10..331a527 100755 --- a/scripts/update-inventories +++ b/scripts/update-inventories @@ -1,9 +1,13 @@ #!/bin/bash -for i in `tla tree-lint -t`; do +if test -z "$TLA"; then + TLA=`which tla || which baz` +fi +if echo $TLA | grep -q tla; then lint=tree-lint; else lint=lint; fi +for i in `$TLA $lint -t`; do echo "Marking '$i' as precious" inv=`dirname $i`/.arch-inventory echo "precious ^$(basename $i)\$" >> $inv - if ! tla id --silent $inv; then + if ! $TLA id --silent $inv; then echo "Adding $inv as source" tla add -i `uuidgen` $inv; fi diff --git a/scripts/upstream-missing b/scripts/upstream-missing new file mode 100755 index 0000000..f0e4c9e --- /dev/null +++ b/scripts/upstream-missing @@ -0,0 +1,61 @@ +#!/bin/sh + +set -e + +if test -z "$TLA"; then + TLA=`which tla || which baz` +fi + +if ! $TLA tree-id 2>&1 >/dev/null; then + echo "Error: not in a valid arch working tree." >&2 + exit 1 +fi + +usage() { + echo "usage: $0 [--full] [FQVN]" >&2 + echo >&2 + echo "Prints the patches from the current tree missing in FQVN," >&2 + echo "defaulting to {arch}/+upstream." >&2 + exit 1 +} + +if test $# -ge 1 -a "$1" = "--full"; then + full=true + shift +else + full=false +fi + +if test $# -eq 0; then + if test -f `$TLA tree-root`/{arch}/+upstream; then + upstream=`cat $($TLA tree-root)/{arch}/+upstream` + else + echo "Error: No upstream version specified and {arch}/+upstream not found." >&2 + exit 1 + fi +else + test $# -eq 1 || usage + upstream=$1 +fi + +dir=`mktemp -d` +version=`$TLA tree-version` + +$TLA get -s $upstream $dir/working-copy +missing=`$TLA missing -d $dir/working-copy $version` + +if `$full`; then + for i in $missing; do + $TLA cat-archive-log $i + done +else + for i in $missing; do echo $i; done +fi + +rm -rf $dir + +if test -z "$missing"; then + exit 1 +else + exit 0 +fi |