added a simple HOWTO; fixed some scripts to work with spaces in the give paths; some other tweaks

Author: Max Horn

bindist/HOWTO

@@ -0,0 +1,122 @@
+This is an attempt to explain how to use the binary distro related scripts in
+this directory. I had to discover this on my own, so it might not always be
+fully correct or complete, but it should at least help to start using them.
+
+Note that these tools can and should be improved, they are not set in stone.
+They are meant to ease controlling the binary distro, and that can't be made
+simple & fail-safe enough.
+
+
+---------------------------------------------------------------------------------
+
+Environment variables:
+
+BDBASE
+  Description:
+    Set to the location where you store the bindist tree on you local HD.
+    The online bindist will be synced using rsync against this tree.
+  Example:
+    /bindist
+
+BDDATA
+  Description:
+    The location in which these scripts and some auxillary files are stored.
+    I.e. it points to your checkout of the Fink scripts module, subdir "bindist"
+  Example:
+    /Users/maxhorn/Documents/fink-cvs/scripts/bindist
+
+---------------------------------------------------------------------------------
+
+bdadd
+  Adds a list of packages to the binary distro. These files are taken from
+  your active fink installation. You invoke it with a list of package specs,
+  similiar to the "fink install" command. An invocation could look like this:
+    ./bdadd xfree86-rootless automake debianutils-1.15-4
+  It copies the .deb files into your local bindist tree, so be prepared to
+  have a lot of disk space being taken.
+  
+  TODO: right now the path "/sw" is hard coded into the script. This is not
+  that bad since the bindist is always for /sw; but if somebody wants to make
+  a bindist for say /usr/local, it's bad. Shouldn't be hard to fix.
+
+bdclean
+  ???
+
+bdindex
+  Creates index.php files in the various directories of the local bindist.
+  They will be synced to the online version by the bdsync command, and 
+  then allow there to browse the bindist in any web browser. Usually it is
+  sufficient to run it once after bdnewrel.
+
+bdlist
+  Lists all .debs currently in the local bindist tree, for the current release.
+
+bdnewrel
+  Prepares a new Fink binary release, by creating the appropriate file
+  structure. You call it with two parameters: the name of the new release,
+  and the name of the previous release (this is used to shared old .debs
+  without the need to recreate them). A typical invocation would be:
+    ./bdnewrel 0.4.0 0.3.2a
+
+  After running this command, verify that all went right and that the tree
+  it generated looks OK. You may also run the "bdindex" command just after
+  this one.
+  
+  TODO: should be extended to automatically retrieve the .info files from CVS
+  based on the release tags in CVS.
+  TODO: should be enhanced to handle "crypto" tree correctly
+
+
+bdscan
+  Scans your local bindist tree using dpk-scanpackages, creating the Packages.gz
+  files required by apt-get/dselect.
+
+
+bdsync
+  Syncs your local bindist tree at $BDBASE against the online one (you will have
+  to edit it if your SF username is not "fingolfin").
+  This will not delete files missing in your local tree from the online tree.
+  If you have to remove things again from the online tree, you have to do
+  so manually (for security reasons, so you don't wipe out by accident the whole
+  online bindist)
+
+
+---------------------------------------------------------------------------------
+
+Q: How do I make a new binary release of the Fink distribution?
+
+A: Use the bdnewrel command, as described above.
+
+---------------------------------------------------------------------------------
+
+Q: How do I add a package to the bindist?
+
+A: Assuming your local bindist tree and the environment variables are setup,
+adding a new package FOO to the bindist works like this:
+
+
+# Copy over the .deb file(s)
+./bdadd FOO
+# Ensure all .deb's etc are uploaded
+./bdsync
+# Make sure the files are referenced
+./bdscan
+# Get the Package.gz files are online
+./bdsync
+
+You could do it with the last .bdsync call only, and that would be a bit faster;
+but by using two calls, we ensure the online Package.gz files never refer to
+files that are not yet online. Not really that important, but playing it safe
+won't hurt here.
+
+---------------------------------------------------------------------------------
+
+Q: Once the new bindist is online, how can I enable it so that people can
+use it via dselect?
+
+A: In the web CVS module, modify the "LATEST-FINK" file to contain the new
+version. Then, ssh into shell.sourceforge.net and run this script:
+  /home/groups/f/fi/fink/htdocs/update.sh
+
+---------------------------------------------------------------------------------
+

bindist/bdadd

@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 $| = 1;
-use v5.6.0;  # perl 5.6.0 or newer required
+require 5.006;  # perl 5.6.0 or newer required
 use strict;
 
 my $base = $ENV{BDBASE};
@@ -77,5 +77,5 @@ foreach $pkgspec (@ARGV) {
     }
   }
 }
-
+&execute("chmod -R g+w ".$dest);
 exit 0;

bindist/bdclean

@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 $| = 1;
-use v5.6.0;  # perl 5.6.0 or newer required
+require 5.006;  # perl 5.6.0 or newer required
 use strict;
 
 use File::Find;

bindist/bdlist

@@ -5,7 +5,7 @@ if [ -z "$BDBASE" ]; then
   echo "BDBASE not set"
   exit 1
 fi
-cd $BDBASE
+cd "$BDBASE"
 
 showall=0
 if [ "x$1" = "x-a" ]; then
@@ -24,14 +24,14 @@ if [ ! -d "dists/$tree" ]; then
   exit 1
 fi
 
-basedir=dists/$tree/main/binary-darwin-powerpc
-if [ ! -d $basedir ]; then
+basedir="dists/$tree/main/binary-darwin-powerpc"
+if [ ! -d "$basedir" ]; then
   echo "ERROR: no binary directory for $tree/main"
 elif [ $showall -eq 1 ]; then
-  find $basedir -name \*.deb -print | \
+  find "$basedir" -name \*.deb -print | \
     sed -e 's,.*/,,' -e 's,_darwin-powerpc.deb,,' | sort
 else
-  find $basedir -type f -and -name \*.deb -print | \
+  find "$basedir" -type f -and -name \*.deb -print | \
     sed -e 's,.*/,,' -e 's,_darwin-powerpc.deb,,' | sort
 fi
 

bindist/bdnewrel

@@ -6,7 +6,7 @@ if [ -z "$BDBASE" ]; then
   echo "BDBASE not set"
   exit 1
 fi
-cd $BDBASE
+cd "$BDBASE"
 
 release=$1
 if [ -z "$release" ]; then
@@ -23,32 +23,35 @@ fi
 for dist in fink-$release fink-$release-updates ; do
   mkdir -p dists/$dist
   for tree in main crypto ; do
-    mkdir -p dists/$dist/$tree/finkinfo
-    mkdir -p dists/$dist/$tree/binary-darwin-powerpc
-    mkdir -p dists/$dist/$tree/source
+    mkdir -p "dists/$dist/$tree/finkinfo"
+    mkdir -p "dists/$dist/$tree/binary-darwin-powerpc"
+    mkdir -p "dists/$dist/$tree/source"
     ( echo "Archive: $dist"
       echo "Component: $tree"
       echo "Origin: Fink"
       echo "Label: Fink"
       echo "Architecture: darwin-powerpc"
-    ) | sed 's/fink-//' >dists/$dist/$tree/binary-darwin-powerpc/Release
+    ) | sed 's/fink-//' > "dists/$dist/$tree/binary-darwin-powerpc/Release"
   done
 done
 
 # symlink old packages in the main tree (not updates, not crypto)
 from="fink-$prevrel/main"
 to="fink-$release/main"
-cd $BDBASE/dists/$from/binary-darwin-powerpc
+cd "$BDBASE/dists/$from/binary-darwin-powerpc"
 
 for file in * ; do
-  if [ -d $file ]; then
-    mkdir -p $BDBASE/dists/$to/binary-darwin-powerpc/$file
+  if [ -d "$file" ]; then
+    mkdir -p "$BDBASE/dists/$to/binary-darwin-powerpc/$file"
   fi
 done
 for file in */*.deb ; do
-  ln -s ../../../../$from/binary-darwin-powerpc/$file ../../../$to/binary-darwin-powerpc/$file
+  ln -s "../../../../$from/binary-darwin-powerpc/$file" "../../../$to/binary-darwin-powerpc/$file"
 done
 
+# Update "current" with the new version
+echo "$release" > "$BDDATA/current"
+
 # TODO: copy source symlinks
 # TODO: where do we get the content for finkinfo?
 

bindist/bdscan

@@ -5,7 +5,7 @@ if [ -z "$BDBASE" ]; then
   echo "BDBASE not set"
   exit 1
 fi
-cd $BDBASE
+cd "$BDBASE"
 
 tree=$1
 if [ -z "$tree" ]; then
@@ -19,12 +19,12 @@ if [ ! -d "dists/$tree" ]; then
 fi
 
 for dir in main crypto ; do
-  basedir=dists/$tree/$dir/binary-darwin-powerpc
+  basedir="dists/$tree/$dir/binary-darwin-powerpc"
   if [ ! -d $basedir ]; then
     echo "ERROR: no binary directory for $tree/$dir"
   else
     echo "Scanning $basedir"
-    dpkg-scanpackages $basedir override | gzip >$basedir/Packages.gz
+    dpkg-scanpackages "$basedir" "$BDDATA/override" | gzip > "$basedir/Packages.gz"
   fi
 done
 

bindist/bdsync

@@ -9,22 +9,18 @@ cd $BDBASE
 
 # locations
 source=$BDBASE
-destination='shell1:/home/groups/f/fi/fink/htdocs'
-if [ "$1" = "pippin" ]; then
-  shift
-  destination='pippin:/home/chrisp/fink/web'
-fi
+destination='[email protected]:/home/groups/f/fi/fink/htdocs/bindist'
 
 # rsync options
 options="-e ssh -av --partial --progress"
-options="$options --delete"
 # NOTE: data isn't compressed on the fly as practically all data is
 #       already gzip-compressed
 
 # make sure every directory has a index.php
 $BDDATA/bdindex
 
 # upload
+echo rsync "$@" $options $source $destination
 rsync "$@" $options $source $destination
 
 exit 0

bindist/current

@@ -1 +1 @@
-0.3.1
+0.3.2a

bindist/fit

@@ -24,6 +24,7 @@ control-center
 cpio
 curl
 daemonic
+db3
 ddd
 debianutils 1.15-4
 dia
@@ -38,11 +39,15 @@ emacs-nox
 enlightenment
 esound
 eterm
+ethereal
+expat
+fileutils
 findutils
 fink
 flex 2.5.4a
 fnlib
 fortune-mod
+freeciv
 freetype 1.3.1-3
 freetype2
 frotz 2.41-3
@@ -51,36 +56,39 @@ fvwm-common
 fvwm-icons
 fvwm2
 fvwm2-no-gnome
-gal 0.11.2-1
+gal
 gawk
-gconf 1.0.1-2
+gconf
 gd 1.8.4-3
 gdbm
 gdk-pixbuf
 gettext
 ghostscript
 ghostscript-fonts 6.0-2
 ghostscript-nox
+ghostscript6
+ghostscript6-nox
 gimp 1.2.2-4
 glib
 glibwww 0.2-3
 gnome-applets
-gnome-audio 1.4.0-3
+gnome-audio
 gnome-core
-gnome-games 1.4.0.3-2
+gnome-games
 gnome-libs
-gnome-print 0.29-2
-gnome-user-docs 1.4.1-1
+gnome-print
+gnome-user-docs
 gnome-utils
-gnome-vfs 1.0.1-6
+gnome-vfs
 grep
+gnomemm
 gtk+
-gtkhtml 0.11.1-2
+gtkhtml
 gtkmm
 guile
 gzip
 icewm
-imagemagick 5.3.9-2
+imagemagick
 imlib
 indent
 ispell
@@ -105,13 +113,15 @@ libvorbis
 libwww 5.3.2-2
 libxml
 libxml2
+links
 lynx
 m4
 mc
 mesa 3.5-1
 mtr
 mutt
 mysql 3.23.42-1
+nano
 ncurses
 nedit
 netcat
@@ -123,6 +133,7 @@ oroborus 1.14.0-3
 passwd
 patch
 pcre
+pdksh
 php 4.0.6-4
 pkgconfig 0.8.0-3
 popt 1.6.2-1
@@ -133,9 +144,11 @@ python-nox
 readline
 rep-gtk
 rman
+ruby
 sawfish
-screen 3.9.9-1
-scrollkeeper 0.2-4
+screen
+scrollkeeper
+sdl
 sed
 slang
 system-libgl