OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 03-Feb-2004 21:18:20
Branch: HEAD Handle: 2004020320182000
Modified files:
openpkg-re/vcheck Makefile cron.pl report.pl
Log:
blind upgrade to new %track world order
Summary:
Revision Changes Path
1.15 +6 -36 openpkg-re/vcheck/Makefile
1.5 +0 -2 openpkg-re/vcheck/cron.pl
1.2 +9 -9 openpkg-re/vcheck/report.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/Makefile
============================================================================
$ cvs diff -u -r1.14 -r1.15 Makefile
--- openpkg-re/vcheck/Makefile 13 Jan 2004 20:17:15 -0000 1.14
+++ openpkg-re/vcheck/Makefile 3 Feb 2004 20:18:20 -0000 1.15
@@ -1,44 +1,14 @@
-VCHECK = /openpkg-dev/bin/vcheck
-HOURS = 0
-PKG = all
-SRCDIR = ../../src/
-PERL = perl
-
-run:
- [EMAIL PROTECTED] -f vc.*.lock; \
- date=`perl -e '@t = localtime(time()-(60*60*$(HOURS))-60); \
- printf("%04d-%02d-%02d %02d:%02d", \
- 1900+$$t[5], $$t[4]+1, $$t[3], $$t[2], $$t[1]);'`; \
- if [ ".$(PKG)" = .all ]; then \
- vclist=`echo vc.*`; \
- else \
- vclist="vc.$(PKG)"; \
- fi; \
- for vc in $$vclist; do \
- echo "$(VCHECK) -v --older-than=\"$$date\" -f $$vc"; \
- $(VCHECK) -v --older-than="$$date" -f $$vc; \
- done
-
-clean:
- [EMAIL PROTECTED] -f vc.*.lock; \
- if [ ".$(PKG)" = .all ]; then \
- vclist=`echo vc.*`; \
- else \
- vclist="vc.$(PKG)"; \
- fi; \
- for vc in $$vclist; do \
- echo "$$vc"; \
- egrep -v '^[ ]*(lastcheck|errors)[ ]*=' $$vc >$$vc.new; mv
$$vc.new $$vc; \
- done
-
-autogen:
- [EMAIL PROTECTED](PERL) ./autogen.pl $(SRCDIR)
+SPECDIR = /e/openpkg/wrk/openpkg-src
+RPM = /e/openpkg/sw/bin/rpm
+PERL = /e/openpkg/sw/bin/perl
+VCHECK = /e/openpkg/sw/bin/vcheck
report:
- [EMAIL PROTECTED](PERL) ./report.pl >report.vc
+ [EMAIL PROTECTED](PERL) ./report.pl $(RPM) $(SPECDIR) >report.vc
[EMAIL PROTECTED](VCHECK) --plain --no-update -f report.vc
cron:
+ [EMAIL PROTECTED](MAKE) report >report.txt 2>&1
[EMAIL PROTECTED](PERL) ./cron.pl
@@ .
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/cron.pl
============================================================================
$ cvs diff -u -r1.4 -r1.5 cron.pl
--- openpkg-re/vcheck/cron.pl 6 Apr 2002 09:57:59 -0000 1.4
+++ openpkg-re/vcheck/cron.pl 3 Feb 2004 20:18:20 -0000 1.5
@@ -1,10 +1,8 @@
-#!/usr/bin/perl
##
## cron.pl -- Daily Reporting Cronjob
##
my $ttime = time();
-system("make report >report.txt 2>&1");
$ttime = (time() - $ttime);
# statistics
@@ .
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/report.pl
============================================================================
$ cvs diff -u -r1.1 -r1.2 report.pl
--- openpkg-re/vcheck/report.pl 16 Mar 2002 08:26:03 -0000 1.1
+++ openpkg-re/vcheck/report.pl 3 Feb 2004 20:18:20 -0000 1.2
@@ -1,18 +1,18 @@
-#!/usr/bin/perl
##
## report.pl -- Generate an all-in-one report
##
+my $rpmprg = $ARGV[0];
+my $specdir = $ARGV[1];
+
my $CFG = '';
-my @VC = glob("vc.*");
-foreach $vc (@VC) {
- my $cfg = '';
- open(FP, "<$vc") || die;
- $cfg .= $_ while (<FP>);
+$CFG .= "config = {\n" .
+ "}\n";
+my @SPEC = glob("$specdir/*/*.spec");
+foreach $spec (@SPEC) {
+ open(FP, "$rpmprg --define '___track_dump yes' -bt $spec |") || die;
+ $CFG .= $_ while (<FP>);
close(FP);
- $cfg =~ s|config\s+=\s+{\s+}||s;
- $cfg =~ s|\n{2,}|\n|sg;
- $CFG .= $cfg;
}
print $CFG;
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
