[23057] in Source-Commits
/svn/athena r22720 - trunk/debathena/scripts
daemon@ATHENA.MIT.EDU (ghudson@MIT.EDU)
Wed Jan 30 14:17:36 2008
Date: Wed, 30 Jan 2008 14:17:05 -0500 (EST)
From: ghudson@MIT.EDU
Message-Id: <200801301917.OAA10163@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: ghudson
Date: 2008-01-30 14:17:05 -0500 (Wed, 30 Jan 2008)
New Revision: 22720
Added:
trunk/debathena/scripts/aclocal.m4
trunk/debathena/scripts/daconfiscate
trunk/debathena/scripts/install-sh
trunk/debathena/scripts/mkinstalldirs
Modified:
trunk/debathena/scripts/dasource
Log:
Create an autoconfiscation transform step for Athena source trees
before the orig archive is created.
* debathena/scripts/mkinstalldirs,
debathena/scripts/install-sh: Copies from automake 1.10 so that we
aren't dependent on a specific version of automake.
* debathena/scripts/aclocal.m4: The Athena aclocal.m4, resurrected
from the attic.
* debathena/scripts/daconfiscate: New script to copy in boilerplate
and generate configure for Athena source directories.
* debathena/scripts/dasource: Invoke daconfiscate for athena packages.
Also, avoid creating conflicting orig archives by (1) leaving alone
an existing orig archive and (2) searching the apt repositories for
an orig archive before generating one.
Copied: trunk/debathena/scripts/aclocal.m4 (from rev 22719, attic/packs/build/aclocal.m4)
Added: trunk/debathena/scripts/daconfiscate
Property changes on: trunk/debathena/scripts/daconfiscate
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/debathena/scripts/dasource
===================================================================
--- trunk/debathena/scripts/dasource 2008-01-30 03:45:12 UTC (rev 22719)
+++ trunk/debathena/scripts/dasource 2008-01-30 19:17:05 UTC (rev 22720)
@@ -15,7 +15,9 @@
set -e
-pkgfile=$(dirname "$0")/packages
+: ${DEBATHENA_APT=/mit/debathena/apt}
+basedir=$(dirname "$0")
+pkgfile=$basedir/packages
repo=svn+ssh://svn.mit.edu/athena/trunk
while getopts r: opt; do
@@ -70,11 +72,24 @@
dir=$correctdir
fi
- # Create an orig tarfile if the version has a Debian component.
- if [ $sver != $upver ]; then
- echo "Creating original source archive"
- (cd $pkgname && tar --exclude=.svn --exclude=debian $correctname -czf \
- ${pkgname}_$upver.orig.tar.gz ${pkgname}-$upver)
+ # Add autoconf goo if it's an Athena source directory.
+ case $pkgpath in
+ athena/*)
+ (cd $dir && $basedir/daconfiscate)
+ ;;
+ esac
+
+ tarfile=${pkgname}_$upver.orig.tar.gz
+ if [ ! -e $pkgname/$tarfile ]; then
+ aptorig=$(find ${DEBATHENA_APT}*/pool -name $tarfile | head -1)
+ if [ -n "$aptorig" ]; then
+ echo "Copying existing $aptorig to original source"
+ cp $aptorig $pkgname/$tarfile
+ else
+ echo "Creating original source archive"
+ (cd $pkgname && tar --exclude=.svn --exclude=debian $correctname -czf \
+ $tarfile ${pkgname}-$upver)
+ fi
fi
# Build an unsigned package, ignoring version control subdirs in the source.
Added: trunk/debathena/scripts/install-sh
Property changes on: trunk/debathena/scripts/install-sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/debathena/scripts/mkinstalldirs
Property changes on: trunk/debathena/scripts/mkinstalldirs
___________________________________________________________________
Name: svn:executable
+ *
