[interchange-cvs] interchange - jon modified 13 files
interchange-core@interchange.redhat.com
interchange-core@interchange.redhat.com
Thu Jun 27 14:56:01 2002
User: jon
Date: 2002-06-27 18:55:51 GMT
Modified: scripts compile_link.PL configdump.PL config_prog.PL
Modified: dump.PL expireall.PL expire.PL interchange.PL
Modified: localize.PL makecat.PL newcat.PL offline.PL
Modified: restart.PL update.PL
Log:
Remove install wrapper code -- will be offloaded to a single script
called relocate.pl. Should make doing diffs against these files easier,
and simplify things a bit.
Revision Changes Path
2.3 +1 -56 interchange/scripts/compile_link.PL
rev 2.3, prev_rev 2.2
Index: compile_link.PL
===================================================================
RCS file: /var/cvs/interchange/scripts/compile_link.PL,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -u -r2.2 -r2.3
--- compile_link.PL 17 Jun 2002 22:24:12 -0000 2.2
+++ compile_link.PL 27 Jun 2002 18:55:50 -0000 2.3
@@ -1,56 +1,9 @@
-my $base = $ARGV[0] || '/work/interchange';
-$self = {
- INSTALLARCHLIB => $base,
- INSTALLBIN => "$base/bin",
- INSTALLDIRS => 'perl',
- INSTALLMAN1DIR => "$base/doc",
- INSTALLMAN3DIR => "$base/doc",
- INSTALLPRIVLIB => "$base/lib",
- INSTALLSCRIPT => "$base/bin",
-};
-
-my %Special;
-
-use Config;
-
-eval {
- require 'scripts/initp.pl';
-};
-
-if(! $MV::Self ) {
- $MV::Self = $self;
- $Special{perlpath} = $Config{perlpath};
- $Special{perlpath} .= <<EOF;
-
-
-eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
- if 0; # not running under some shell
-EOF
- $Special{perlpath} =~ s/\s+$//;
-}
-
-
-sub doit {
- my ($key) = @_;
- my $val;
- if ($MV::Self->{RPMBUILDDIR} and $val = $MV::Self->{$key}) {
- $val =~ s!^$MV::Self->{RPMBUILDDIR}/!/!;
- return $val;
- }
- return $MV::Self->{$key} unless $key =~ /[a-z]/;
- return $Special{$key} if defined $Special{$key};
- $Config{$key};
-}
-
-DOIT: {
- local ($/);
- local($_) = <<'_EoP_';
#!/usr/bin/perl
##!~_~perlpath~_~
#
# Interchange link program configurator
#
-# $Id: compile_link.PL,v 2.2 2002/06/17 22:24:12 jon Exp $
+# $Id: compile_link.PL,v 2.3 2002/06/27 18:55:50 jon Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -419,11 +372,3 @@
Mike Heins, <mheins@redhat.com>
-_EoP_
- s{.*\n(#(.*)~_~(\w+)~_~(.*))}{$2 . doit($3) . "$4\n$1"}eg;
- my $file = $0;
- $file =~ s/\.PL$//;
- open(OUT, ">$file")
- or die "Create $file: $!\n";
- print OUT $_;
-}
2.2 +1 -56 interchange/scripts/configdump.PL
rev 2.2, prev_rev 2.1
Index: configdump.PL
===================================================================
RCS file: /var/cvs/interchange/scripts/configdump.PL,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -u -r2.1 -r2.2
--- configdump.PL 17 Jun 2002 22:24:12 -0000 2.1
+++ configdump.PL 27 Jun 2002 18:55:50 -0000 2.2
@@ -1,56 +1,9 @@
-my $base = $ARGV[0] || '/work/interchange';
-$self = {
- INSTALLARCHLIB => $base,
- INSTALLBIN => "$base/bin",
- INSTALLDIRS => 'perl',
- INSTALLMAN1DIR => "$base/doc",
- INSTALLMAN3DIR => "$base/doc",
- INSTALLPRIVLIB => "$base/lib",
- INSTALLSCRIPT => "$base/bin",
-};
-
-my %Special;
-
-use Config;
-
-eval {
- require 'scripts/initp.pl';
-};
-
-if(! $MV::Self ) {
- $MV::Self = $self;
- $Special{perlpath} = $Config{perlpath};
- $Special{perlpath} .= <<EOF;
-
-
-eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
- if 0; # not running under some shell
-EOF
- $Special{perlpath} =~ s/\s+$//;
-}
-
-
-sub doit {
- my ($key) = @_;
- my $val;
- if ($MV::Self->{RPMBUILDDIR} and $val = $MV::Self->{$key}) {
- $val =~ s!^$MV::Self->{RPMBUILDDIR}/!/!;
- return $val;
- }
- return $MV::Self->{$key} unless $key =~ /[a-z]/;
- return $Special{$key} if defined $Special{$key};
- $Config{$key};
-}
-
-DOIT: {
- local ($/);
- local($_) = <<'_EoP_';
#!/usr/bin/perl
##!~_~perlpath~_~
#
# Interchange configuration dumper
#
-# $Id: configdump.PL,v 2.1 2002/06/17 22:24:12 jon Exp $
+# $Id: configdump.PL,v 2.2 2002/06/27 18:55:50 jon Exp $
#
# Copyright 1999-2002 by Stefan Hornburg <racke@linuxia.de>
#
@@ -225,11 +178,3 @@
=cut
-_EoP_
- s{.*\n(#(.*)~_~(\w+)~_~(.*))}{$2 . doit($3) . "$4\n$1"}eg;
- my $file = $0;
- $file =~ s/\.PL$//;
- open(OUT, ">$file")
- or die "Create $file: $!\n";
- print OUT $_;
-}
2.2 +2 -57 interchange/scripts/config_prog.PL
rev 2.2, prev_rev 2.1
Index: config_prog.PL
===================================================================
RCS file: /var/cvs/interchange/scripts/config_prog.PL,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -u -r2.1 -r2.2
--- config_prog.PL 17 Jun 2002 22:24:12 -0000 2.1
+++ config_prog.PL 27 Jun 2002 18:55:50 -0000 2.2
@@ -1,56 +1,9 @@
-my $base = $ARGV[0] || '/work/interchange';
-$self = {
- INSTALLARCHLIB => $base,
- INSTALLBIN => "$base/bin",
- INSTALLDIRS => 'perl',
- INSTALLMAN1DIR => "$base/doc",
- INSTALLMAN3DIR => "$base/doc",
- INSTALLPRIVLIB => "$base/lib",
- INSTALLSCRIPT => "$base/bin",
-};
-
-my %Special;
-
-use Config;
-
-eval {
- require 'scripts/initp.pl';
-};
-
-if(! $MV::Self ) {
- $MV::Self = $self;
- $Special{perlpath} = $Config{perlpath};
- $Special{perlpath} .= <<EOF;
-
-
-eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
- if 0; # not running under some shell
-EOF
- $Special{perlpath} =~ s/\s+$//;
-}
-
-
-sub doit {
- my ($key) = @_;
- my $val;
- if ($MV::Self->{RPMBUILDDIR} and $val = $MV::Self->{$key}) {
- $val =~ s!^$MV::Self->{RPMBUILDDIR}/!/!;
- return $val;
- }
- return $MV::Self->{$key} unless $key =~ /[a-z]/;
- return $Special{$key} if defined $Special{$key};
- $Config{$key};
-}
-
-DOIT: {
- local ($/);
- local($_) = <<'_EoP_';
#!/usr/bin/perl
##!~_~perlpath~_~
#
# Interchange program configurator
#
-# $Id: config_prog.PL,v 2.1 2002/06/17 22:24:12 jon Exp $
+# $Id: config_prog.PL,v 2.2 2002/06/27 18:55:50 jon Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -180,7 +133,7 @@
=head1 VERSION
-# $Id: config_prog.PL,v 2.1 2002/06/17 22:24:12 jon Exp $
+# $Id: config_prog.PL,v 2.2 2002/06/27 18:55:50 jon Exp $
=head1 DESCRIPTION
@@ -193,11 +146,3 @@
restart(1), update(1)
=cut
-_EoP_
- s{.*\n(#(.*)~_~(\w+)~_~(.*))}{$2 . doit($3) . "$4\n$1"}eg;
- my $file = $0;
- $file =~ s/\.PL$//;
- open(OUT, ">$file")
- or die "Create $file: $!\n";
- print OUT $_;
-}
2.2 +2 -57 interchange/scripts/dump.PL
rev 2.2, prev_rev 2.1
Index: dump.PL
===================================================================
RCS file: /var/cvs/interchange/scripts/dump.PL,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -u -r2.1 -r2.2
--- dump.PL 17 Jun 2002 22:24:12 -0000 2.1
+++ dump.PL 27 Jun 2002 18:55:50 -0000 2.2
@@ -1,56 +1,9 @@
-my $base = $ARGV[0] || '/work/interchange';
-$self = {
- INSTALLARCHLIB => $base,
- INSTALLBIN => "$base/bin",
- INSTALLDIRS => 'perl',
- INSTALLMAN1DIR => "$base/doc",
- INSTALLMAN3DIR => "$base/doc",
- INSTALLPRIVLIB => "$base/lib",
- INSTALLSCRIPT => "$base/bin",
-};
-
-my %Special;
-
-use Config;
-
-eval {
- require 'scripts/initp.pl';
-};
-
-if(! $MV::Self ) {
- $MV::Self = $self;
- $Special{perlpath} = $Config{perlpath};
- $Special{perlpath} .= <<EOF;
-
-
-eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
- if 0; # not running under some shell
-EOF
- $Special{perlpath} =~ s/\s+$//;
-}
-
-
-sub doit {
- my ($key) = @_;
- my $val;
- if ($MV::Self->{RPMBUILDDIR} and $val = $MV::Self->{$key}) {
- $val =~ s!^$MV::Self->{RPMBUILDDIR}/!/!;
- return $val;
- }
- return $MV::Self->{$key} unless $key =~ /[a-z]/;
- return $Special{$key} if defined $Special{$key};
- $Config{$key};
-}
-
-DOIT: {
- local ($/);
- local($_) = <<'_EoP_';
#!/usr/bin/perl
##!~_~perlpath~_~
#
# Interchange session dumper
#
-# $Id: dump.PL,v 2.1 2002/06/17 22:24:12 jon Exp $
+# $Id: dump.PL,v 2.2 2002/06/27 18:55:50 jon Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -268,7 +221,7 @@
=head1 VERSION
-# $Id: dump.PL,v 2.1 2002/06/17 22:24:12 jon Exp $
+# $Id: dump.PL,v 2.2 2002/06/27 18:55:50 jon Exp $
=head1 SEE ALSO
@@ -279,11 +232,3 @@
Skeleton POD to avoid make errors.
=cut
-_EoP_
- s{.*\n(#(.*)~_~(\w+)~_~(.*))}{$2 . doit($3) . "$4\n$1"}eg;
- my $file = $0;
- $file =~ s/\.PL$//;
- open(OUT, ">$file")
- or die "Create $file: $!\n";
- print OUT $_;
-}
2.4 +2 -57 interchange/scripts/expireall.PL
rev 2.4, prev_rev 2.3
Index: expireall.PL
===================================================================
RCS file: /var/cvs/interchange/scripts/expireall.PL,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -u -r2.3 -r2.4
--- expireall.PL 17 Jun 2002 22:24:12 -0000 2.3
+++ expireall.PL 27 Jun 2002 18:55:50 -0000 2.4
@@ -1,56 +1,9 @@
-my $base = $ARGV[0] || '/work/interchange';
-$self = {
- INSTALLARCHLIB => $base,
- INSTALLBIN => "$base/bin",
- INSTALLDIRS => 'perl',
- INSTALLMAN1DIR => "$base/doc",
- INSTALLMAN3DIR => "$base/doc",
- INSTALLPRIVLIB => "$base/lib",
- INSTALLSCRIPT => "$base/bin",
-};
-
-my %Special;
-
-use Config;
-
-eval {
- require 'scripts/initp.pl';
-};
-
-if(! $MV::Self ) {
- $MV::Self = $self;
- $Special{perlpath} = $Config{perlpath};
- $Special{perlpath} .= <<EOF;
-
-
-eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
- if 0; # not running under some shell
-EOF
- $Special{perlpath} =~ s/\s+$//;
-}
-
-
-sub doit {
- my ($key) = @_;
- my $val;
- if ($MV::Self->{RPMBUILDDIR} and $val = $MV::Self->{$key}) {
- $val =~ s!^$MV::Self->{RPMBUILDDIR}/!/!;
- return $val;
- }
- return $MV::Self->{$key} unless $key =~ /[a-z]/;
- return $Special{$key} if defined $Special{$key};
- $Config{$key};
-}
-
-DOIT: {
- local ($/);
- local($_) = <<'_EoP_';
#!/usr/bin/perl
##!~_~perlpath~_~
#
# Interchange session expiration for all catalogs
#
-# $Id: expireall.PL,v 2.3 2002/06/17 22:24:12 jon Exp $
+# $Id: expireall.PL,v 2.4 2002/06/27 18:55:50 jon Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -175,7 +128,7 @@
=head1 VERSION
-# $Id: expireall.PL,v 2.3 2002/06/17 22:24:12 jon Exp $
+# $Id: expireall.PL,v 2.4 2002/06/27 18:55:50 jon Exp $
=head1 DESCRIPTION
@@ -187,11 +140,3 @@
=cut
-_EoP_
- s{.*\n(#(.*)~_~(\w+)~_~(.*))}{$2 . doit($3) . "$4\n$1"}eg;
- my $file = $0;
- $file =~ s/\.PL$//;
- open(OUT, ">$file")
- or die "Create $file: $!\n";
- print OUT $_;
-}
2.5 +1 -56 interchange/scripts/expire.PL
rev 2.5, prev_rev 2.4
Index: expire.PL
===================================================================
RCS file: /var/cvs/interchange/scripts/expire.PL,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -u -r2.4 -r2.5
--- expire.PL 27 May 2002 08:51:09 -0000 2.4
+++ expire.PL 27 Jun 2002 18:55:50 -0000 2.5
@@ -1,56 +1,9 @@
-my $base = $ARGV[0] || '/work/interchange';
-$self = {
- INSTALLARCHLIB => $base,
- INSTALLBIN => "$base/bin",
- INSTALLDIRS => 'perl',
- INSTALLMAN1DIR => "$base/doc",
- INSTALLMAN3DIR => "$base/doc",
- INSTALLPRIVLIB => "$base/lib",
- INSTALLSCRIPT => "$base/bin",
-};
-
-my %Special;
-
-use Config;
-
-eval {
- require 'scripts/initp.pl';
-};
-
-if(! $MV::Self ) {
- $MV::Self = $self;
- $Special{perlpath} = $Config{perlpath};
- $Special{perlpath} .= <<EOF;
-
-
-eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
- if 0; # not running under some shell
-EOF
- $Special{perlpath} =~ s/\s+$//;
-}
-
-
-sub doit {
- my ($key) = @_;
- my $val;
- if ($MV::Self->{RPMBUILDDIR} and $val = $MV::Self->{$key}) {
- $val =~ s!^$MV::Self->{RPMBUILDDIR}/!/!;
- return $val;
- }
- return $MV::Self->{$key} unless $key =~ /[a-z]/;
- return $Special{$key} if defined $Special{$key};
- $Config{$key};
-}
-
-DOIT: {
- local ($/);
- local($_) = <<'_EoP_';
#!/usr/bin/perl
##!~_~perlpath~_~
#
# Interchange session expiration
#
-# $Id: expire.PL,v 2.4 2002/05/27 08:51:09 racke Exp $
+# $Id: expire.PL,v 2.5 2002/06/27 18:55:50 jon Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -396,11 +349,3 @@
Mike Heins, <mheins@redhat.com>
-_EoP_
- s{.*\n(#(.*)~_~(\w+)~_~(.*))}{$2 . doit($3) . "$4\n$1"}eg;
- my $file = $0;
- $file =~ s/\.PL$//;
- open(OUT, ">$file")
- or die "Create $file: $!\n";
- print OUT $_;
-}
2.37 +3 -56 interchange/scripts/interchange.PL
rev 2.37, prev_rev 2.36
Index: interchange.PL
===================================================================
RCS file: /var/cvs/interchange/scripts/interchange.PL,v
retrieving revision 2.36
retrieving revision 2.37
diff -u -u -r2.36 -r2.37
--- interchange.PL 26 Jun 2002 21:45:20 -0000 2.36
+++ interchange.PL 27 Jun 2002 18:55:50 -0000 2.37
@@ -1,56 +1,9 @@
-my $base = $ARGV[0] || '/work/interchange';
-$self = {
- INSTALLARCHLIB => $base,
- INSTALLBIN => "$base/bin",
- INSTALLDIRS => 'perl',
- INSTALLMAN1DIR => "$base/doc",
- INSTALLMAN3DIR => "$base/doc",
- INSTALLPRIVLIB => "$base/lib",
- INSTALLSCRIPT => "$base/bin",
-};
-
-my %Special;
-
-use Config;
-
-eval {
- require 'scripts/initp.pl';
-};
-
-if(! $MV::Self ) {
- $MV::Self = $self;
- $Special{perlpath} = $Config{perlpath};
- $Special{perlpath} .= <<EOF;
-
-
-eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
- if 0; # not running under some shell
-EOF
- $Special{perlpath} =~ s/\s+$//;
-}
-
-
-sub doit {
- my ($key) = @_;
- my $val;
- if ($MV::Self->{RPMBUILDDIR} and $val = $MV::Self->{$key}) {
- $val =~ s!^$MV::Self->{RPMBUILDDIR}/!/!;
- return $val;
- }
- return $MV::Self->{$key} unless $key =~ /[a-z]/;
- return $Special{$key} if defined $Special{$key};
- $Config{$key};
-}
-
-DOIT: {
- local ($/);
- local($_) = <<'_EoP_';
#!/usr/bin/perl
##!~_~perlpath~_~
#
# Interchange version 4.9.1
#
-# $Id: interchange.PL,v 2.36 2002/06/26 21:45:20 jon Exp $
+# $Id: interchange.PL,v 2.37 2002/06/27 18:55:50 jon Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -3100,12 +3053,6 @@
=cut
+$Global::mod_perl ? 1 : 0;
+
__END__
-_EoP_
- s{.*\n(#(.*)~_~(\w+)~_~(.*))}{$2 . doit($3) . "$4\n$1"}eg;
- my $file = $0;
- $file =~ s/\.PL$//;
- open(OUT, ">$file")
- or die "Create $file: $!\n";
- print OUT $_;
-}
2.3 +2 -57 interchange/scripts/localize.PL
rev 2.3, prev_rev 2.2
Index: localize.PL
===================================================================
RCS file: /var/cvs/interchange/scripts/localize.PL,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -u -r2.2 -r2.3
--- localize.PL 17 Jun 2002 22:24:12 -0000 2.2
+++ localize.PL 27 Jun 2002 18:55:50 -0000 2.3
@@ -1,56 +1,9 @@
-my $base = $ARGV[0] || '/work/interchange';
-$self = {
- INSTALLARCHLIB => $base,
- INSTALLBIN => "$base/bin",
- INSTALLDIRS => 'perl',
- INSTALLMAN1DIR => "$base/doc",
- INSTALLMAN3DIR => "$base/doc",
- INSTALLPRIVLIB => "$base/lib",
- INSTALLSCRIPT => "$base/bin",
-};
-
-my %Special;
-
-use Config;
-
-eval {
- require 'scripts/initp.pl';
-};
-
-if(! $MV::Self ) {
- $MV::Self = $self;
- $Special{perlpath} = $Config{perlpath};
- $Special{perlpath} .= <<EOF;
-
-
-eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
- if 0; # not running under some shell
-EOF
- $Special{perlpath} =~ s/\s+$//;
-}
-
-
-sub doit {
- my ($key) = @_;
- my $val;
- if ($MV::Self->{RPMBUILDDIR} and $val = $MV::Self->{$key}) {
- $val =~ s!^$MV::Self->{RPMBUILDDIR}/!/!;
- return $val;
- }
- return $MV::Self->{$key} unless $key =~ /[a-z]/;
- return $Special{$key} if defined $Special{$key};
- $Config{$key};
-}
-
-DOIT: {
- local ($/);
- local($_) = <<'_EoP_';
#!/usr/bin/perl
##!~_~perlpath~_~
#
# Interchange localizer
#
-# $Id: localize.PL,v 2.2 2002/06/17 22:24:12 jon Exp $
+# $Id: localize.PL,v 2.3 2002/06/27 18:55:50 jon Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -402,7 +355,7 @@
=head1 VERSION
-# $Id: localize.PL,v 2.2 2002/06/17 22:24:12 jon Exp $
+# $Id: localize.PL,v 2.3 2002/06/27 18:55:50 jon Exp $
=head1 SYNOPSIS
@@ -486,11 +439,3 @@
=cut
-_EoP_
- s{.*\n(#(.*)~_~(\w+)~_~(.*))}{$2 . doit($3) . "$4\n$1"}eg;
- my $file = $0;
- $file =~ s/\.PL$//;
- open(OUT, ">$file")
- or die "Create $file: $!\n";
- print OUT $_;
-}
2.15 +2 -57 interchange/scripts/makecat.PL
rev 2.15, prev_rev 2.14
Index: makecat.PL
===================================================================
RCS file: /var/cvs/interchange/scripts/makecat.PL,v
retrieving revision 2.14
retrieving revision 2.15
diff -u -u -r2.14 -r2.15
--- makecat.PL 17 Jun 2002 22:42:06 -0000 2.14
+++ makecat.PL 27 Jun 2002 18:55:50 -0000 2.15
@@ -1,56 +1,9 @@
-my $base = $ARGV[0] || '/work/interchange';
-$self = {
- INSTALLARCHLIB => $base,
- INSTALLBIN => "$base/bin",
- INSTALLDIRS => 'perl',
- INSTALLMAN1DIR => "$base/doc",
- INSTALLMAN3DIR => "$base/doc",
- INSTALLPRIVLIB => "$base/lib",
- INSTALLSCRIPT => "$base/bin",
-};
-
-my %Special;
-
-use Config;
-
-eval {
- require 'scripts/initp.pl';
-};
-
-if(! $MV::Self ) {
- $MV::Self = $self;
- $Special{perlpath} = $Config{perlpath};
- $Special{perlpath} .= <<EOF;
-
-
-eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
- if 0; # not running under some shell
-EOF
- $Special{perlpath} =~ s/\s+$//;
-}
-
-
-sub doit {
- my ($key) = @_;
- my $val;
- if ($MV::Self->{RPMBUILDDIR} and $val = $MV::Self->{$key}) {
- $val =~ s!^$MV::Self->{RPMBUILDDIR}/!/!;
- return $val;
- }
- return $MV::Self->{$key} unless $key =~ /[a-z]/;
- return $Special{$key} if defined $Special{$key};
- $Config{$key};
-}
-
-DOIT: {
- local ($/);
- local($_) = <<'_EoP_';
#!/usr/bin/perl
##!~_~perlpath~_~
#
# Interchange catalog configurator
#
-# $Id: makecat.PL,v 2.14 2002/06/17 22:42:06 jon Exp $
+# $Id: makecat.PL,v 2.15 2002/06/27 18:55:50 jon Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -2304,7 +2257,7 @@
=head1 VERSION
-# $Id: makecat.PL,v 2.14 2002/06/17 22:42:06 jon Exp $
+# $Id: makecat.PL,v 2.15 2002/06/27 18:55:50 jon Exp $
=head1 INTRODUCTION
@@ -2871,11 +2824,3 @@
shareurl=1
vendroot=1
linkmode=1
-_EoP_
- s{.*\n(#(.*)~_~(\w+)~_~(.*))}{$2 . doit($3) . "$4\n$1"}eg;
- my $file = $0;
- $file =~ s/\.PL$//;
- open(OUT, ">$file")
- or die "Create $file: $!\n";
- print OUT $_;
-}
2.6 +1 -56 interchange/scripts/newcat.PL
rev 2.6, prev_rev 2.5
Index: newcat.PL
===================================================================
RCS file: /var/cvs/interchange/scripts/newcat.PL,v
retrieving revision 2.5
retrieving revision 2.6
diff -u -u -r2.5 -r2.6
--- newcat.PL 26 Jun 2002 22:12:26 -0000 2.5
+++ newcat.PL 27 Jun 2002 18:55:50 -0000 2.6
@@ -1,56 +1,9 @@
-my $base = $ARGV[0] || '/work/interchange';
-$self = {
- INSTALLARCHLIB => $base,
- INSTALLBIN => "$base/bin",
- INSTALLDIRS => 'perl',
- INSTALLMAN1DIR => "$base/doc",
- INSTALLMAN3DIR => "$base/doc",
- INSTALLPRIVLIB => "$base/lib",
- INSTALLSCRIPT => "$base/bin",
-};
-
-my %Special;
-
-use Config;
-
-eval {
- require 'scripts/initp.pl';
-};
-
-if(! $MV::Self ) {
- $MV::Self = $self;
- $Special{perlpath} = $Config{perlpath};
- $Special{perlpath} .= <<EOF;
-
-
-eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
- if 0; # not running under some shell
-EOF
- $Special{perlpath} =~ s/\s+$//;
-}
-
-
-sub doit {
- my ($key) = @_;
- my $val;
- if ($MV::Self->{RPMBUILDDIR} and $val = $MV::Self->{$key}) {
- $val =~ s!^$MV::Self->{RPMBUILDDIR}/!/!;
- return $val;
- }
- return $MV::Self->{$key} unless $key =~ /[a-z]/;
- return $Special{$key} if defined $Special{$key};
- $Config{$key};
-}
-
-DOIT: {
- local ($/);
- local($_) = <<'_EoP_';
#!/usr/bin/perl
##!~_~perlpath~_~
#
# Interchange catalog configurator with curses
#
-# $Id: newcat.PL,v 2.5 2002/06/26 22:12:26 jon Exp $
+# $Id: newcat.PL,v 2.6 2002/06/27 18:55:50 jon Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -3183,11 +3136,3 @@
}
close_display();
-_EoP_
- s{.*\n(#(.*)~_~(\w+)~_~(.*))}{$2 . doit($3) . "$4\n$1"}eg;
- my $file = $0;
- $file =~ s/\.PL$//;
- open(OUT, ">$file")
- or die "Create $file: $!\n";
- print OUT $_;
-}
2.2 +2 -57 interchange/scripts/offline.PL
rev 2.2, prev_rev 2.1
Index: offline.PL
===================================================================
RCS file: /var/cvs/interchange/scripts/offline.PL,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -u -r2.1 -r2.2
--- offline.PL 17 Jun 2002 22:24:12 -0000 2.1
+++ offline.PL 27 Jun 2002 18:55:50 -0000 2.2
@@ -1,56 +1,9 @@
-my $base = $ARGV[0] || '/work/interchange';
-$self = {
- INSTALLARCHLIB => $base,
- INSTALLBIN => "$base/bin",
- INSTALLDIRS => 'perl',
- INSTALLMAN1DIR => "$base/doc",
- INSTALLMAN3DIR => "$base/doc",
- INSTALLPRIVLIB => "$base/lib",
- INSTALLSCRIPT => "$base/bin",
-};
-
-my %Special;
-
-use Config;
-
-eval {
- require 'scripts/initp.pl';
-};
-
-if(! $MV::Self ) {
- $MV::Self = $self;
- $Special{perlpath} = $Config{perlpath};
- $Special{perlpath} .= <<EOF;
-
-
-eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
- if 0; # not running under some shell
-EOF
- $Special{perlpath} =~ s/\s+$//;
-}
-
-
-sub doit {
- my ($key) = @_;
- my $val;
- if ($MV::Self->{RPMBUILDDIR} and $val = $MV::Self->{$key}) {
- $val =~ s!^$MV::Self->{RPMBUILDDIR}/!/!;
- return $val;
- }
- return $MV::Self->{$key} unless $key =~ /[a-z]/;
- return $Special{$key} if defined $Special{$key};
- $Config{$key};
-}
-
-DOIT: {
- local ($/);
- local($_) = <<'_EoP_';
#!/usr/bin/perl
##!~_~perlpath~_~
#
# Interchange database builder and indexer
#
-# $Id: offline.PL,v 2.1 2002/06/17 22:24:12 jon Exp $
+# $Id: offline.PL,v 2.2 2002/06/27 18:55:50 jon Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -294,7 +247,7 @@
=head1 VERSION
-# $Id: offline.PL,v 2.1 2002/06/17 22:24:12 jon Exp $
+# $Id: offline.PL,v 2.2 2002/06/27 18:55:50 jon Exp $
=head1 DESCRIPTION
@@ -305,11 +258,3 @@
interchange(1), http://interchange.redhat.com/
=cut
-_EoP_
- s{.*\n(#(.*)~_~(\w+)~_~(.*))}{$2 . doit($3) . "$4\n$1"}eg;
- my $file = $0;
- $file =~ s/\.PL$//;
- open(OUT, ">$file")
- or die "Create $file: $!\n";
- print OUT $_;
-}
2.2 +1 -56 interchange/scripts/restart.PL
rev 2.2, prev_rev 2.1
Index: restart.PL
===================================================================
RCS file: /var/cvs/interchange/scripts/restart.PL,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -u -r2.1 -r2.2
--- restart.PL 17 Jun 2002 22:24:12 -0000 2.1
+++ restart.PL 27 Jun 2002 18:55:50 -0000 2.2
@@ -1,56 +1,9 @@
-my $base = $ARGV[0] || '/work/interchange';
-$self = {
- INSTALLARCHLIB => $base,
- INSTALLBIN => "$base/bin",
- INSTALLDIRS => 'perl',
- INSTALLMAN1DIR => "$base/doc",
- INSTALLMAN3DIR => "$base/doc",
- INSTALLPRIVLIB => "$base/lib",
- INSTALLSCRIPT => "$base/bin",
-};
-
-my %Special;
-
-use Config;
-
-eval {
- require 'scripts/initp.pl';
-};
-
-if(! $MV::Self ) {
- $MV::Self = $self;
- $Special{perlpath} = $Config{perlpath};
- $Special{perlpath} .= <<EOF;
-
-
-eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
- if 0; # not running under some shell
-EOF
- $Special{perlpath} =~ s/\s+$//;
-}
-
-
-sub doit {
- my ($key) = @_;
- my $val;
- if ($MV::Self->{RPMBUILDDIR} and $val = $MV::Self->{$key}) {
- $val =~ s!^$MV::Self->{RPMBUILDDIR}/!/!;
- return $val;
- }
- return $MV::Self->{$key} unless $key =~ /[a-z]/;
- return $Special{$key} if defined $Special{$key};
- $Config{$key};
-}
-
-DOIT: {
- local ($/);
- local($_) = <<'_EoP_';
#!/usr/bin/perl
##!~_~perlpath~_~
#
# Interchange restarter
#
-# $Id: restart.PL,v 2.1 2002/06/17 22:24:12 jon Exp $
+# $Id: restart.PL,v 2.2 2002/06/27 18:55:50 jon Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -205,11 +158,3 @@
Mike Heins, <mheins@redhat.com>
-_EoP_
- s{.*\n(#(.*)~_~(\w+)~_~(.*))}{$2 . doit($3) . "$4\n$1"}eg;
- my $file = $0;
- $file =~ s/\.PL$//;
- open(OUT, ">$file")
- or die "Create $file: $!\n";
- print OUT $_;
-}
2.2 +1 -56 interchange/scripts/update.PL
rev 2.2, prev_rev 2.1
Index: update.PL
===================================================================
RCS file: /var/cvs/interchange/scripts/update.PL,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -u -r2.1 -r2.2
--- update.PL 17 Jun 2002 22:24:12 -0000 2.1
+++ update.PL 27 Jun 2002 18:55:50 -0000 2.2
@@ -1,56 +1,9 @@
-my $base = $ARGV[0] || '/work/interchange';
-$self = {
- INSTALLARCHLIB => $base,
- INSTALLBIN => "$base/bin",
- INSTALLDIRS => 'perl',
- INSTALLMAN1DIR => "$base/doc",
- INSTALLMAN3DIR => "$base/doc",
- INSTALLPRIVLIB => "$base/lib",
- INSTALLSCRIPT => "$base/bin",
-};
-
-my %Special;
-
-use Config;
-
-eval {
- require 'scripts/initp.pl';
-};
-
-if(! $MV::Self ) {
- $MV::Self = $self;
- $Special{perlpath} = $Config{perlpath};
- $Special{perlpath} .= <<EOF;
-
-
-eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
- if 0; # not running under some shell
-EOF
- $Special{perlpath} =~ s/\s+$//;
-}
-
-
-sub doit {
- my ($key) = @_;
- my $val;
- if ($MV::Self->{RPMBUILDDIR} and $val = $MV::Self->{$key}) {
- $val =~ s!^$MV::Self->{RPMBUILDDIR}/!/!;
- return $val;
- }
- return $MV::Self->{$key} unless $key =~ /[a-z]/;
- return $Special{$key} if defined $Special{$key};
- $Config{$key};
-}
-
-DOIT: {
- local ($/);
- local($_) = <<'_EoP_';
#!/usr/bin/perl
##!~_~perlpath~_~
#
# Interchange database updater
#
-# $Id: update.PL,v 2.1 2002/06/17 22:24:12 jon Exp $
+# $Id: update.PL,v 2.2 2002/06/27 18:55:50 jon Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -362,11 +315,3 @@
Mike Heins, <mheins@redhat.com>
-_EoP_
- s{.*\n(#(.*)~_~(\w+)~_~(.*))}{$2 . doit($3) . "$4\n$1"}eg;
- my $file = $0;
- $file =~ s/\.PL$//;
- open(OUT, ">$file")
- or die "Create $file: $!\n";
- print OUT $_;
-}