From de40a2c191eec5c4cffbb37858f90dffb731a609 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Jan 2004 15:29:15 +0000 Subject: [PATCH] * Idem. svn path=/nixpkgs/trunk/; revision=634 --- strategoxt-dist/build+upload.sh | 22 ----- strategoxt-dist/build-from-svn.sh | 85 ------------------- strategoxt-dist/do-it.nix | 26 ------ strategoxt-dist/mail-result.sh | 33 ------- strategoxt-dist/server-side/cgi-bin/md5.pl | 21 ----- strategoxt-dist/server-side/cgi-bin/upload.pl | 23 ----- strategoxt-dist/strategoxt-source-dist.nix | 22 ----- strategoxt-dist/svn-to-nix.sh | 71 ---------------- strategoxt-dist/tiger-source-dist.nix | 27 ------ strategoxt-dist/urls-to-nix.sh | 10 --- 10 files changed, 340 deletions(-) delete mode 100755 strategoxt-dist/build+upload.sh delete mode 100755 strategoxt-dist/build-from-svn.sh delete mode 100644 strategoxt-dist/do-it.nix delete mode 100755 strategoxt-dist/mail-result.sh delete mode 100755 strategoxt-dist/server-side/cgi-bin/md5.pl delete mode 100755 strategoxt-dist/server-side/cgi-bin/upload.pl delete mode 100644 strategoxt-dist/strategoxt-source-dist.nix delete mode 100755 strategoxt-dist/svn-to-nix.sh delete mode 100644 strategoxt-dist/tiger-source-dist.nix delete mode 100755 strategoxt-dist/urls-to-nix.sh diff --git a/strategoxt-dist/build+upload.sh b/strategoxt-dist/build+upload.sh deleted file mode 100755 index 8cf4d8b4127..00000000000 --- a/strategoxt-dist/build+upload.sh +++ /dev/null @@ -1,22 +0,0 @@ -#! /bin/sh -v - -# Build the distribution - -echo "building revision $rev of $url" - -if ! storeexprs=($(nix-instantiate -vvvv do-it.nix)); then exit 1; fi - -srcexpr=${storeexprs[0]} -#testexpr=${storeexprs[1]} - -if ! nix-store -vvvv -r "$srcexpr" > /dev/null; then exit 1; fi - -if ! outpath=$(nix-store -qn "$srcexpr"); then exit 1; fi - -#uploader="http://losser.st-lab.cs.uu.nl/~eelco/cgi-bin/upload.pl/" - -#curl --silent -T "$outpath/manual.html" "$uploader" || exit 1 -#curl --silent -T "$outpath/style.css" "$uploader" || exit 1 -#curl --silent -T "$outpath"/nix-*.tar.bz2 "$uploader" || exit 1 - -#if ! nix-store -vvvv -r "$testexpr" > /dev/null; then exit 1; fi diff --git a/strategoxt-dist/build-from-svn.sh b/strategoxt-dist/build-from-svn.sh deleted file mode 100755 index 8d3c0464996..00000000000 --- a/strategoxt-dist/build-from-svn.sh +++ /dev/null @@ -1,85 +0,0 @@ -#! /bin/sh -v - -buildinputs="$make $automake $autoconf $libtool $which $withsdf" -. $stdenv/setup || exit 1 - -echo "pwd = `pwd`" -echo "PATH = $PATH" - -# configuration flags - -config_flags="" - -for pack in `env | grep with | sed "s/^with\([A-Za-z]*\)=.*/\1/"` -do - config_flags="${config_flags} --with-${pack}=$(printenv with${pack})" -done - -for feat in `env | grep enable | sed "s/^enable\([A-Za-z]*\)=.*/\1/"` -do - config_flags="${config_flags} --enable-${feat}=$(printenv enable${feat})" -done - -echo "config_flags : $config_flags" - -# keep a log - -distdir=$out/www/strategoxt/$version-$rev -logdir=$distdir/log -mkdir -p $distdir || exit 1 -mkdir -p $logdir || exit 1 - -# get the source - -cp -r $src src || exit 1 -chmod -R +w src -cd src || exit 1 - -echo ${rev} > svn-revision - -# build it - -GO="true" - -./bootstrap 2>&1 | tee $logdir/bootstrap.txt -./configure --prefix=$out ${config_flags} 2>&1 | tee $logdir/configure.txt - -if ! make install 2>&1 | tee $logdir/install.txt -then - GO="false" -fi - -if test $GO = "true" -then - if ! make check 2>&1 | tee $logdir/check.txt - then - GO="false" - fi -fi - -# make a distribution - -if test $GO = "true" -then - if make dist 2>&1 | tee $logdir/dist.txt - then - if test "x${status}" = "xrelease" - then - cp ${packagename}-${version}.tar.gz $distdir || exit 1 - else - tar zxf ${packagename}-${version}.tar.gz - mv ${packagename}-${version} ${name} - tar zcf ${name}.tar.gz ${name} - cp ${name}.tar.gz $distdir || exit 1 - fi - fi -fi - -# distribute documentation data - -if test -f news/NEWS-$version -then - cp news/NEWS-$version $distdir || exit 1 -fi - -cp NEWS ChangeLog AUTHORS README COPYING $distdir || exit 1 diff --git a/strategoxt-dist/do-it.nix b/strategoxt-dist/do-it.nix deleted file mode 100644 index 5c6e6105f0b..00000000000 --- a/strategoxt-dist/do-it.nix +++ /dev/null @@ -1,26 +0,0 @@ -let { - system = "i686-linux"; - pkgs = (import ../pkgs/system/all-packages.nix) {system = system;}; - stdenv = pkgs.stdenv_; - - strategoxtdist = (import ./strategoxt-dist.nix) { - stdenv = stdenv; - fetchsvn = pkgs.fetchsvn; - autotools = pkgs.autotools; - which = pkgs.which; - aterm = pkgs.aterm; - sdf = pkgs.sdf2; - }; - - tigerdist = (import ./tiger-dist.nix) { - stdenv = stdenv; - fetchsvn = pkgs.fetchsvn; - autotools = pkgs.autotools; - which = pkgs.which; - aterm = pkgs.aterm; - sdf = pkgs.sdf2; - strategoxt = strategoxtdist; - }; - - body = [strategoxtdist tigerdist]; -} diff --git a/strategoxt-dist/mail-result.sh b/strategoxt-dist/mail-result.sh deleted file mode 100755 index f5e94d18bba..00000000000 --- a/strategoxt-dist/mail-result.sh +++ /dev/null @@ -1,33 +0,0 @@ -#! /bin/sh - -email=$1 -shift - -logfile=/tmp/logfile-$$ # !!! security -trap "rm $logfile" EXIT - -echo $logfile - -if ! "$@" > $logfile 2>&1; then - BLOCKER=/tmp/inhibit-notify - if ! test -f $BLOCKER; then - HEAD=`head $logfile` - TAIL=`tail $logfile` - bzip2 < $logfile > $logfile.bz2 - mail -s "Nix build failed" -a $logfile.bz2 $email <new->addfile(*FILE)->hexdigest; -close FILE; - -print "Content-Type: text/plain\n\n"; -print "$hash"; diff --git a/strategoxt-dist/server-side/cgi-bin/upload.pl b/strategoxt-dist/server-side/cgi-bin/upload.pl deleted file mode 100755 index 4d303c77d38..00000000000 --- a/strategoxt-dist/server-side/cgi-bin/upload.pl +++ /dev/null @@ -1,23 +0,0 @@ -#! /usr/bin/perl -w - -use strict; - -my $uploadpath = $ENV{"PATH_INFO"}; - -# Sanitise upload path. -die unless $uploadpath =~ /^(\/[A-Za-z0-9-][A-Za-z0-9-\.]+)+$/; - -my $dst = "/home/eelco/public_html/nix/$uploadpath"; -my $tmp = "${dst}_$$"; - -open OUT, ">$tmp" or die; -while () { - print OUT "$_" or die; -} -close OUT or die; - -rename $tmp, $dst or die; - -print "Content-Type: text/plain\n\n"; -print "upload succesful\n"; -print "upload path: $uploadpath\n"; diff --git a/strategoxt-dist/strategoxt-source-dist.nix b/strategoxt-dist/strategoxt-source-dist.nix deleted file mode 100644 index a274bc0d128..00000000000 --- a/strategoxt-dist/strategoxt-source-dist.nix +++ /dev/null @@ -1,22 +0,0 @@ -{name, packagename, version, rev, url} : -{stdenv, fetchsvn, autotools, which, aterm, sdf}: -derivation { - name = name; - packagename = packagename; - rev = rev; - version = version; - - system = stdenv.system; - builder = ./build-from-svn.sh; - src = fetchsvn {url = url; rev = rev;}; - stdenv = stdenv; - - make = autotools.make; - automake = autotools.automake; - autoconf = autotools.autoconf; - libtool = autotools.libtool; - which = which; - - withaterm = aterm; - withsdf = sdf; -} diff --git a/strategoxt-dist/svn-to-nix.sh b/strategoxt-dist/svn-to-nix.sh deleted file mode 100755 index 29ee6054074..00000000000 --- a/strategoxt-dist/svn-to-nix.sh +++ /dev/null @@ -1,71 +0,0 @@ -#! /bin/sh -v - -# Generate a Nix expression for the head revision of a directory in -# a subversion repository. The directory is assumed to contain -# a package with a configure.in file. -# -# Usage : -# -# svn-to-nix.sh url -# -# where url points to a subversion repository - -# Obtain version information from repository - -# Revision - -url=$1 - -rev=`svn log ${url} \ - | head -n 2 \ - | grep rev \ - | sed "s/rev \([0-9]*\):.*$/\1/"` - -# The configure.in file - -configure="/tmp/$$configure.in" -svn cat -r ${rev} ${url}/configure.in > $configure - -# Version number from AC_INIT - -version=`grep AC_INIT $configure \ - | awk -F , -- "{print \\$2}" \ - | sed "s/[[]//" \ - | sed "s/[]]//"` - -# Package name from AC_INIT - -packagename=`grep AC_INIT $configure \ - | awk -F , -- "{print \\$1}" \ - | sed "s/AC_INIT([[]//" \ - | sed "s/[]]//"` - -# Status - -status=`grep status $configure \ - | sed "s/^status=\(.*\)/\1/"` - -# The name of the distribution - -name="${packagename}-${version}-${rev}" - -rm $configure - -########################### - -# Generate Nix expressions - -cat > ${packagename}-dist.nix < ${name}.nix <