Re: GCC 4.6 warnings, and dependency on nonexisting wrapset: standard
Mark H Weaver <[email protected]> Wed, 07 Dec 2011 20:03:36 -0500
| Newsgroups | gmane.lisp.guile.gtk |
|---|---|
| Message-ID | <[email protected]> |
Hi Andy! Andy Wingo <[email protected]> writes: > I think `master' should be a bit more normal now. Looks great! I just built guile-gnome successfully, and the calc example runs perfectly :) The HACKING file still talks about setting up the subpackages for the modular build system. I guess we should strip that stuff out. For starters, how about something like this (preliminary) commit? I didn't yet touch scripts/maint/make-release-note, which still does some subpackage magic. Mark _______________________________________________ guile-gtk-general mailing list [email protected] https://lists.gnu.org/mailman/listinfo/guile-gtk-general
0001-Remove-instructions-and-scripts-for-older-modular-bu.patch
(text/x-patch, 7.2 KB)
From ec85187379bda8eaf4b9b2dfb407aed109073d3b Mon Sep 17 00:00:00 2001 From: Mark H Weaver <[email protected]> Date: Wed, 7 Dec 2011 19:49:12 -0500 Subject: [PATCH] Remove instructions and scripts for older modular build system * HACKING: Remove instructions pertaining to the older build system. * scripts/configure-packages: Deleted. * scripts/for-each-pkg: Deleted. * scripts/maint/commit-release: Deleted. * scripts/maint/prepare-release: Deleted. * scripts/pull-packages: Deleted. * scripts/push-packages: Deleted. --- HACKING | 28 +++----------------------- scripts/configure-packages | 42 ----------------------------------------- scripts/for-each-pkg | 26 ------------------------- scripts/maint/commit-release | 34 --------------------------------- scripts/maint/prepare-release | 27 -------------------------- scripts/pull-packages | 14 ------------- scripts/push-packages | 18 ----------------- 7 files changed, 4 insertions(+), 185 deletions(-) delete mode 100755 scripts/configure-packages delete mode 100755 scripts/for-each-pkg delete mode 100755 scripts/maint/commit-release delete mode 100755 scripts/maint/prepare-release delete mode 100755 scripts/pull-packages delete mode 100755 scripts/push-packages diff --git a/HACKING b/HACKING index 757b552..2a8556c 100644 --- a/HACKING +++ b/HACKING @@ -1,7 +1,7 @@ Guile-GNOME HACKING -Copyright (C) 2004,2006,2009,2010 Free Software Foundation, Inc. +Copyright (C) 2004,2006,2009,2010,2011 Free Software Foundation, Inc. See the end for copying conditions of this file. -Last updated 13 August 2006. +Last updated 7 December 2011. So, you want to hack Guile-GNOME? @@ -19,28 +19,8 @@ retrieved as: $ git clone git://git.sv.gnu.org/guile-gnome.git -Guile-GNOME is developed as a set of modular source packages; the above -command fetches all of them, and then checks out the wrapper module. The -set of packages that can be built is given in the PACKAGES file in the -toplevel source directory. To configure the directory you just fetched -as Guile-GNOME-platform, try the following script: - - $ cd guile-gnome - $ scripts/configure-packages guile-gnome-platform - -That will check out the GNOME platform modules into the guile-gnome/ -directory. At that point you can run `./autogen.sh --prefix=/usr && -make' just like any normal project. - -After hacking, you can run the `push-packages' script to publish your -code. - - $ scripts/push-packages - -Later, to update from the Guile-GNOME's canonical archive, you can do -the following: - - $ scripts/pull-packages +Note that when building from Git, you'll need to run autogen.sh to +create "configure" and the rest of the build system. We are wildebeests diff --git a/scripts/configure-packages b/scripts/configure-packages deleted file mode 100755 index 305eecc..0000000 --- a/scripts/configure-packages +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -root=`dirname $0`/.. -avail_packages="" -while read line; do - if echo $line | egrep -q '^(#.*|[[:space:]]*)$'; then - continue - elif echo $line | egrep -qv '^[[:space:]]*[[:alnum:]_-]+:.*$'; then - echo "Warning: bad PACKAGES statement: $line">&2 - continue - fi - package=`echo $line|sed -re 's/^[[:space:]]*([[:alnum:]_-]+):.*$/\\1/'` - avail_packages="$avail_packages $package" -done < $root/PACKAGES - -if test -z "$1" -o -n "$2"; then - echo "usage: $0 PACKAGE" - echo - echo "available packages:$avail_packages" - echo - exit 1 -fi - -package=$1 -echo "configuring $root as package $package" -subpackages=`grep $package: $root/PACKAGES|sed -re 's/^[^:]*:(.*)$/\\1/'` - -branch_suffix=$3 - -for package in $subpackages; do - if test -d $root/$package; then - echo "warning, directory $root/$package already exists, not checking out $package" - else - echo "checking out $package" - if git branch | grep -v -q $package; then - echo "first checking out local tracking branch for origin/$package" - git branch $package origin/$package - fi - git clone . $package - ( cd $package; git checkout -b $package origin/$package ) - fi -done diff --git a/scripts/for-each-pkg b/scripts/for-each-pkg deleted file mode 100755 index 247e608..0000000 --- a/scripts/for-each-pkg +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -command=$1 -shift - -dir=$(cd `dirname $0`/.. && pwd) -echo "* for-each-pkg in $dir" -cd $dir - -for i in *; do - if test -d $i/.git; then - packages="$packages $i"; - fi -done - -# include pkg in the list -packages="$packages ." - -for i in "$@"; do - command="$command '$i'" -done - -for i in $packages; do - echo "* $i: $command" - ( cd $i; eval $command ) -done diff --git a/scripts/maint/commit-release b/scripts/maint/commit-release deleted file mode 100755 index f783fd7..0000000 --- a/scripts/maint/commit-release +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -set -e - -package=$1 -version=$2 - -if test -z "$package" -o -z "$version"; then - echo "usage: $0 PACKAGE VERSION" >&2 - exit 1 -fi - -dir=$(cd `dirname $0`/../.. && pwd) -echo "* commit-release in $dir" -cd $dir - -for i in `find . -name VERSION`; do - echo "* setting $i to $version" - echo $version > $i - ( cd $(dirname $i); git commit -a -m "Bumped to $version." VERSION ) -done - -for i in *; do - if test -d $i/.git; then - packages="$packages $i"; - fi -done - -# include pkg in the list -packages="$packages ." - -for i in $packages; do - (cd $i && git commit -a -m "Released $package $version" && git tag $version) -done diff --git a/scripts/maint/prepare-release b/scripts/maint/prepare-release deleted file mode 100755 index 50673ba..0000000 --- a/scripts/maint/prepare-release +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -package=$1 -version=$2 -prev=$3 - -if test -z "$package" -o -z "$version" -o -z "$prev"; then - echo "usage: $0 PACKAGE VERSION PREV-VERSION" >&2 - exit 1 -fi - -dir=$(cd `dirname $0`/../.. && pwd) -echo "* prepare-release in $dir" -cd $dir - -for i in *; do - if test -d $i/.git; then - packages="$packages $i"; - fi -done - -# include pkg in the list -packages="$packages ." - -for i in $packages; do - ./scripts/maint/prepare-news-entry $i $package $version $prev -done diff --git a/scripts/pull-packages b/scripts/pull-packages deleted file mode 100755 index 141b962..0000000 --- a/scripts/pull-packages +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -root=`cd $(dirname $0)/.. && pwd` - -echo "$root: git pull $@" -( cd $root; git pull "$@" ) - -for dir in $root/*; do - if test -d $dir -a -d $dir/.git; then - package=`basename $dir` - echo "$root/$package: git pull $@" - ( cd $dir; git pull "$@" ) - fi -done diff --git a/scripts/push-packages b/scripts/push-packages deleted file mode 100755 index d3f4ebc..0000000 --- a/scripts/push-packages +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -root=`cd $(dirname $0)/.. && pwd` -if test -n "$1"; then - echo "usage: $0" - echo "pushes out all packages in $root to their origin" - exit 1 -fi - -for dir in $root/*; do - if test -d $dir -a -d $dir/.git; then - package=`basename $dir` - echo "pushing $dir to root" - ( cd $dir; git push ) - fi -done -echo "pushing $root to origin" -( cd $root; git push ) -- 1.7.5.4