[cvs] dists/10.4/unstable/main/finkinfo/sound libsndfile1.info, 1.9, 1.10
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv10197 Modified Files: libsndfile1.info Log Message: Update libsndfile1 to 1.0.18pre20 Index: libsndfile1.info === RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/libsndfile1.info,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- libsndfile1.info19 Feb 2008 19:51:39 - 1.9 +++ libsndfile1.info24 Feb 2008 18:45:20 - 1.10 @@ -1,16 +1,16 @@ Package: libsndfile1 -Version: 1.0.17 -Revision: 2 -Maintainer: None [EMAIL PROTECTED] +Version: 1.0.18pre20 +Revision: 1 +Maintainer: Matthew Sachs [EMAIL PROTECTED] BuildDepends: libflac8-dev Depends: %N-shlibs (= %v-%r) -Source: http://www.mega-nerd.com/libsndfile/libsndfile-%v.tar.gz -Source-MD5: 2d126c35448503f6dbe33934d9581f6b +Source: http://www.mega-nerd.com/tmp/libsndfile-%v.tar.gz +Source-MD5: d96763f5f8161141a68d756f632fac8b Conflicts: libsndfile, libsndfile0 Replaces: libsndfile, libsndfile0 NoSetMAKEFLAGS: true SetMAKEFLAGS: -j1 -ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking --disable-sqlite +ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking --disable-sqlite --disable-asm-optimizations InstallScript: make install DESTDIR=%d - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs
[cvs] experimental/msachs libsndfile1.info, NONE, 1.1 libsndfile1.patch, NONE, 1.1
-norm_double) ;
- if (FLAC__seekable_stream_encoder_process_interleaved
(pflac-fse, buffer, writecount/psf-sf.channels))
+ if (FLAC__stream_encoder_process_interleaved (pflac-fse,
buffer, writecount/psf-sf.channels))
thiswrite = writecount ;
else
break ;
@@ -1131,8 +1134,8 @@
if (psf-mode == SFM_READ)
{ FLAC__uint64 position ;
- if (FLAC__seekable_stream_decoder_seek_absolute (pflac-fsd,
offset))
- { FLAC__seekable_stream_decoder_get_decode_position
(pflac-fsd, position) ;
+ if (FLAC__stream_decoder_seek_absolute (pflac-fsd, offset))
+ { FLAC__stream_decoder_get_decode_position (pflac-fsd,
position) ;
return offset ;
} ;
--- NEW FILE: libsndfile1.info ---
Package: libsndfile1
Version: 1.0.17
Revision: 2
Maintainer: Matthew Sachs [EMAIL PROTECTED]
BuildDepends: flac (= 1.2.1) | flac-nox (= 1.2.1)
Depends: %N-shlibs (= %v-%r)
Source: http://www.mega-nerd.com/libsndfile/libsndfile-%v.tar.gz
Source-MD5: 2d126c35448503f6dbe33934d9581f6b
PatchFile: %{Ni}.patch
PatchFile-MD5: a790d7dc8088d4ad911db13e572c92f7
Conflicts: libsndfile, libsndfile0
Replaces: libsndfile, libsndfile0
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
--disable-sqlite
InstallScript:
make install DESTDIR=%d
DocFiles: AUTHORS ChangeLog COPYING NEWS README TODO doc/*.html doc/*.jpg
doc/*.css
SplitOff:
Package: %N-shlibs
Conflicts: libsndfile-shlibs
Replaces: libsndfile-shlibs
Depends: flac-shlibs (= 1.2.1) | flac-nox-shlibs (= 1.2.1)
Files: lib/*.*.dylib
Shlibs: %p/lib/libsndfile.1.dylib 2.0.0 %n (= 1.0.11-3)
DocFiles: COPYING README
SplitOff2:
Package: %N-dev
Depends: %N-shlibs (= %v-%r)
Conflicts: libsndfile0-dev, libsndfile-dev
# 1.0.11-2 moves pkgconfig from %N to %n
Replaces: libsndfile0-dev, libsndfile-dev, %N ( 1.0.11-2)
Files: include lib
DocFiles: COPYING README
BuildDependsOnly: True
Description: Read and write files containing sampled sound
DescDetail:
Libsndfile is a C library for reading and writing files containing sampled
sound (such as MS Windows WAV and the Apple/SGI AIFF format) through one
standard library interface.
DescPackaging:
Uses pkgconfig, but there are no pkgconfig-related dependencies.
flac-shlibs does not itself depends on x11. Don't worry about diferrences
between flac and flac-nox.
Originally packaged by Matt Stephenson.
Supplies C++ interface as of 1.0.17-1 in the form of sndfile.hh, which is
just inline wrappers (no compiled C++ library implementation). Therefore,
no need for different libsndfile1 packages for different g++ ABI. The
testing of the C++ interface does not leak any compiled code into the .deb.
License: LGPL
Homepage: http://www.zip.com.au/~erikd/libsndfile
-
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
[cvs] experimental/msachs audacity.info,NONE,1.1
Update of /cvsroot/fink/experimental/msachs In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv26416 Added Files: audacity.info Log Message: Preliminary version of audacity --- NEW FILE: audacity.info --- Package: audacity Version: 1.3.4.cvs.20080102 Revision: 3 Source: http://zevils.com/files/%n-%v.tar.gz Source-MD5: f7c1c5f56212216ab42dca3922428043 SourceDirectory: audacity-src License: GPL BuildDepends: wxmac28, gettext-tools, libvorbis0, libmad, libsndfile1, libid3tag BuildConflicts: flac, flac-nox, twolame Depends: wxmac28-shlibs, libvorbis0-shlibs, libmad-shlibs, libsndfile1-shlibs, libid3tag-shlibs InstallScript: make install DESTDIR=%d mkdir -p %i/Applications ditto Audacity.app %i/Applications/Audacity.app rm -rf %i/bin PostInstScript: if ! test -e /Applications/Fink; then /usr/bin/install -d -m 755 /Applications/Fink; fi ln -nsf %p/Applications/Audacity.app /Applications/Fink/ PostRmScript: rm -f /Applications/Fink/Audacity.app Description: The Free, Cross-Platform Sound Editor DescDetail: Audacity is free, open source software for recording and editing sounds. It is available for Mac OS X, Microsoft Windows, GNU/Linux, and other operating systems. DescPackaging: The Audacity.app application bundle is installed in %p/Applications, and there is a symlink in /Applications/Fink. Maintainer: Matthew Sachs [EMAIL PROTECTED] Homepage: http://audacity.sourceforge.net/ - Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs
[cvs] experimental/msachs - New directory
Update of /cvsroot/fink/experimental/msachs In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv18492/msachs Log Message: Directory /cvsroot/fink/experimental/msachs added to the repository - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs
[cvs] experimental/msachs flac.info, NONE, 1.1 flac1.1.info, NONE, 1.1 flac1.1.patch, NONE, 1.1
Update of /cvsroot/fink/experimental/msachs
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv18891
Added Files:
flac.info flac1.1.info flac1.1.patch
Log Message:
Checkpoint work on flac
--- NEW FILE: flac1.1.info ---
Info2:
Package: flac1.1%type_pkg[-x11]
Version: 1.1.1
Revision: 1
Type: -x11 (. -nox)
Conflicts: flac ( 1.1.1-2000), flac-nox ( 1.1.1-2000)
BuildDepends:
libogg,
libiconv-dev,
(%type_raw[-x11] != -nox) xmms,
(%type_raw[-x11] != -nox) popt,
(%type_raw[-x11] != -nox) libtool14 (= 1.5-1),
(%type_raw[-x11] != -nox) readline (= 4.3-1028),
(%type_raw[-x11] != -nox) id3lib4-dev (= 3.8.3-1014),
(%type_raw[-x11] != -nox) glib,
(%type_raw[-x11] != -nox) gtk+,
(%type_raw[-x11] != -nox) libiconv-dev,
(%type_raw[-x11] != -nox) gettext-dev,
(%type_raw[-x11] != -nox) gettext-bin,
(%type_raw[-x11] != -nox) gettext-tools
Provides: flac
Depends: %n-shlibs (= %v-%r)
Source: mirror:sourceforge:flac/flac-%v.tar.gz
Source-MD5: c6ccddccf8ad344065698047c2fc7280
PatchScript:
test -r %a/%{ni}.patch
sed -e 's,@PREFIX@,%p,g' %a/%{ni}.patch | patch -p1
perl -pi.bak -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure
perl -pi.bak -e 's/hardcode_direct_CXX=yes/hardcode_direct_CXX=no/g' configure
NoSetCPPFLAGS: true
SetCPPFLAGS: -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
NoSetLDFLAGS: true
#SetLDFLAGS: -L%b/src/libOggFLAC/.libs -L%b/src/libFLAC/.libs
ConfigureParams: --mandir=%p/share/man
BuildDependsOnly: True
GCC: 4.0
CompileScript:
#!/bin/sh -ex
#mkdir -p %b/src/libOggFLAC/.libs
#mkdir -p %b/src/libFLAC/.libs
./configure %c
make OBJ_FORMAT=macho
InstallScript:
make install DESTDIR=%d
mv %i/share/doc/flac-%v %i/share/doc/%n
SplitOff:
Package: %N-shlibs
Provides: flac-shlibs
Conflicts: flac-shlibs ( 1.1.1-2000), flac-nox-shlibs ( 1.1.1-2000)
Suggests: %N-bin
Files: lib/libFLAC.*.dylib lib/libFLAC++.*.dylib lib/libOggFLAC.*.dylib
lib/libOggFLAC++.*.dylib
Shlibs:
%p/lib/libFLAC.6.dylib 7.0.0 %n (= 1.1.1-10)
%p/lib/libFLAC++.4.dylib 5.0.0 %n (= 1.1.1-10)
%p/lib/libOggFLAC.1.dylib 3.0.0 %n (= 1.1.1-10)
%p/lib/libOggFLAC++.0.dylib 2.0.0 %n (= 1.1.1-10)
DocFiles: README COPYING.LGPL
Description: Free lossless audio codec - shared libs
SplitOff2:
Package: %N-bin
Provides: flac-bin
Files: bin/flac bin/metaflac
Depends: libogg-shlibs, %N-shlibs (= %v-%r)
Conflicts: flac-bin ( 1.1.1-2000), flac-nox-bin ( 1.1.1-2000)
DocFiles: README COPYING.LGPL
Description: Free lossless audio codec - encoder/decoder
SplitOff3:
Package: %N-xmms
Depends:
(%type_raw[-x11] != -nox) xmms-bin,
%N-shlibs (= %v-%r),
(%type_raw[-x11] != -nox) id3lib4-shlibs (= 3.8.3-1014),
(%type_raw[-x11] != -nox) popt-shlibs
Suggests: %N-bin
Files: (%type_raw[-x11] != -nox) lib/xmms/Input/libxmms*
DocFiles: README COPYING.LGPL
Description: Free lossless audio codec - xmms plugin
DocFiles: README AUTHORS COPYING.FDL COPYING.GPL COPYING.LGPL
Description: Free lossless audio codec
DescDetail:
FLAC stands for Free Lossless Audio Codec. Grossly oversimplified, FLAC
is similar to MP3, but lossless. The FLAC project consists of:
* The stream format
In the flac and flac-shlibs packages:
* libFLAC, a library encoders and decoders, and a metadata interface
* libFLAC++, an object wrapper around libFLAC
In the flac-bin package:
* flac, a CLI wrapper around libFLAC to encode/decode .flac files
* metaflac, a command-line metadata editor for .flac files
DescPackaging:
Does not use pbxbuild method since we want dylibs, and
the xmms plugin. Also the make/config method puts everything in
the right place.
libtool relink and bash versioning patches applied.
patch to disable xmms plugin applied.
patch to enable dynamic_lookup (for prebinding on 10.3) applied.
Incorrect shlib major version corrected w/1.1.1. Next time, will
create flacN pkg.
License: GPL
Maintainer: Matthew Sachs [EMAIL PROTECTED]
Homepage: http://flac.sourceforge.net/
--- NEW FILE: flac1.1.patch ---
diff -ru flac-1.1.1.orig/configure flac-1.1.1/configure
--- flac-1.1.1.orig/configure 2004-09-29 00:17:41.0 -0400
+++ flac-1.1.1/configure2006-03-09 18:51:05.0 -0500
@@ -5858,13 +5858,13 @@
allow_undefined_flag='-undefined suppress'
;;
*) # Darwin 1.3 on
- allow_undefined_flag='-flat_namespace -undefined suppress'
+ allow_undefined_flag='-flat_namespace -undefined dynamic_lookup'
;;
esac
# FIXME: Relying on posixy $() will cause problems for
#cross-compilation, but unfortunately the echo tests do not
#yet detect zsh echo's removal of \ escapes.
-archive_cmds='$nonopt $(test x$module = xyes echo -bundle || echo
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags
-install_name $rpath/$soname $verstring'
+archive_cmds='$nonopt $(test x$module = xyes echo -bundle || echo
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags
$(test
[cvs] scripts/buildfink buildfink,1.62,1.63
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3182
Modified Files:
buildfink
Log Message:
Check if skipping a package before deciding to build
Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- buildfink 16 Apr 2007 12:33:03 - 1.62
+++ buildfink 18 Apr 2007 01:37:56 - 1.63
@@ -302,7 +302,7 @@
foreach (FinkLib::filterSplitoffs(@skiplist)) {
$pkglist{$_} = PKGSTATUS_SKIP;
- logPackageFail($_, Package is on the skip list.);
+ logPackageFail($_, Package is on the skip list);
}
# Don't try to install uninstalled virtual packages.
@@ -727,6 +727,8 @@
my @status_ok = (PKGSTATUS_INSTALLED);
push @status_ok, PKGSTATUS_PROCESSING if $deptype eq run;
+my @status_failed = (PKGSTATUS_FAILED, PKGSTATUS_SKIP);
+
DEP: foreach my $dep (@$deps) {
my @alts = sort {
# Prefer already-installed deps.
@@ -745,7 +747,8 @@
foreach my $alt (@alts) {
my $depstat = $pkglist-{$alt};
$depstat = PKGSTATUS_INSTALL unless defined($depstat);
- if ($depstat == PKGSTATUS_FAILED or ($deptype ne run and $depstat ==
PKGSTATUS_PROCESSING)) {
+ if (grep { $depstat == $_ } @status_failed or
+ ($deptype ne run and $depstat == PKGSTATUS_PROCESSING)) {
next;
}
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink buildfink,1.61,1.62
Update of /cvsroot/fink/scripts/buildfink In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv29231 Modified Files: buildfink Log Message: s/removeBuildLocks/FinkLib::removeBuildLocks/ Index: buildfink === RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- buildfink 15 Apr 2007 21:00:23 - 1.61 +++ buildfink 16 Apr 2007 12:33:03 - 1.62 @@ -603,7 +603,7 @@ sleep(10) if kill(0, $pid); kill(-9, $pid); FinkLib::readPackages(); - removeBuildLocks(); + FinkLib::removeBuildLocks(); last; } } @@ -616,7 +616,7 @@ sleep(10); kill(-9, $pid); FinkLib::readPackages(); -removeBuildLocks(); +FinkLib::removeBuildLocks(); } close(BUILDLOG); - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink buildfink,1.59,1.60
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv28368
Modified Files:
buildfink
Log Message:
Allow non-FDB builds to proceed
Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- buildfink 10 Apr 2007 01:47:00 - 1.59
+++ buildfink 15 Apr 2007 19:59:27 - 1.60
@@ -271,7 +271,7 @@
warn The only valid value for '--build-as-nobody' is 'try'.\n;
$opts_ok = 0;
}
-if (%fdbopts) {
+if ($fdbopts{store}) {
$FDB = FinkFDB-new(%fdbopts);
$FDB-initialize();
}
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink buildfink,1.60,1.61
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv20861
Modified Files:
buildfink
Log Message:
Pass provides = return when calling match_package
Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- buildfink 15 Apr 2007 19:59:27 - 1.60
+++ buildfink 15 Apr 2007 21:00:23 - 1.61
@@ -322,16 +322,8 @@
# Build up a map showing what each package is depended on by
my %dependents;
foreach my $pkg (FinkLib::filterSplitoffs(Fink::Package-list_packages())) {
-my $obj;
-eval {
- $obj = Fink::PkgVersion-match_package($pkg);
-};
-if ($@) {
- doLog(Couldn't get package object for $pkg: $@);
- next;
-}
-
-next if !$obj || $obj-is_type('dummy');
+my $obj = FinkLib::objForPackageNamed($pkg);
+next unless $obj and !$obj-is_type('dummy');
my @deps;
eval {
@deps = $obj-resolve_depends(1, depends);
@@ -469,19 +461,8 @@
next unless $pkgname;
next if grep { $_ eq $pkgname } @skiplist;
-my $pkg;
-eval {
- $pkg = Fink::PkgVersion-match_package($pkgname);
-};
-if ($@) {
- doLog(Couldn't get version for $pkgname: $@);
- next;
-} elsif (!$pkg) {
- doLog(Couldn't get package for $pkgname);
- next;
-}
-next if $pkg-is_type('dummy');
-
+my $pkg = FinkLib::objForPackageNamed($pkgname);
+next unless $pkg and !$pkg-is_type('dummy');
my $info = $pkg-get_info_filename();
if (!$info) {
die Couldn't get info for $pkgname: . Data::Dumper::Dumper($pkg) .
\n;
@@ -703,12 +684,9 @@
$pkglist-{$pkg} = PKGSTATUS_PROCESSING;
doLog(Trying to satisfy $pkg);
- my $obj;
- eval {
-$obj = Fink::PkgVersion-match_package($pkg);
- };
- if ($@ or !$obj) {
-setPackageFail($pkglist, $pkg, Couldn't get package object: $@);
+ my $obj = FinkLib::objForPackageNamed($pkg);
+ if (!$obj) {
+setPackageFail($pkglist, $pkg, Couldn't get package object:
$FinkLib::ERR);
return;
}
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink/lib FinkLib.pm,1.1,1.2
Update of /cvsroot/fink/scripts/buildfink/lib
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv20861/lib
Modified Files:
FinkLib.pm
Log Message:
Pass provides = return when calling match_package
Index: FinkLib.pm
===
RCS file: /cvsroot/fink/scripts/buildfink/lib/FinkLib.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FinkLib.pm 31 Mar 2007 19:35:45 - 1.1
+++ FinkLib.pm 15 Apr 2007 21:00:23 - 1.2
@@ -20,7 +20,7 @@
use strict;
use warnings;
-our($FinkDir, $FinkConfig);
+our($FinkDir, $FinkConfig, $ERR);
# Initialize the Fink API
sub initFink($) {
@@ -96,8 +96,8 @@
};
next if $@ or !$obj;
next unless $obj-is_any_installed();
-my $vo = Fink::PkgVersion-match_package($pkgname);
-next if $vo-is_type('dummy');
+my $vo = objForPackageNamed($pkgname);
+next if !$vo or $vo-is_type('dummy');
push @purgelist, $pkgname;
}
@@ -127,15 +127,7 @@
sub sortPackagesByMaintainer {
my %maints;
foreach my $pkg (@_) {
-my $obj;
-eval {
- $obj = Fink::PkgVersion-match_package($pkg);
-};
-if ($@ or !$obj) {
- warn Couldn't get object for $pkg: [EMAIL PROTECTED];
- next;
-}
-
+my $obj = objForPackageNamed($pkg) or next;
my $maint = None [EMAIL PROTECTED];
if ($obj-has_param('maintainer')) {
$maint = $obj-param('maintainer');
@@ -198,15 +190,7 @@
foreach my $pkgname (@pkglist) {
next if $got_families{$pkgname};
-my $pkgobj;
-eval {
- $pkgobj = Fink::PkgVersion-match_package($pkgname);
-};
-if ($@) {
- doLog(Couldn't get object for $pkgname: $@);
- next;
-}
-
+my $pkgobj = objForPackageNamed($pkgname) or next;
if ($pkgobj-{parent}) {
my $parent = $pkgobj-can(get_parent) ?
$pkgobj-get_parent()-get_name() : $pkgobj-{parent}-get_name();
@@ -222,4 +206,26 @@
return @ret;
}
+sub objForPackageNamed {
+ my $name = shift;
+ my $pkgobj;
+ eval {
+# Exception thrown to indicate error.
+# provides = return causes a Fink::Package object to be returned
+# instead of a Fink::PkgVersion for virtual packages; without it,
+# an interactive-only prompt asks for user input.
+$pkgobj = Fink::PkgVersion-match_package($name, provides = 'return');
+ };
+ if($@) {
+$ERR = $@;
+warn Couldn't get package for $name: [EMAIL PROTECTED];
+ } elsif($pkgobj-isa(Fink::PkgVersion)) {
+$ERR = ;
+return $pkgobj;
+ }
+
+ $ERR = Package doesn't exist.;
+ return;
+}
+
1;
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink/lib/FinkFDB DBI.pm,1.7,1.8
Update of /cvsroot/fink/scripts/buildfink/lib/FinkFDB
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv20675/lib/FinkFDB
Modified Files:
DBI.pm
Log Message:
Don't create extra level under /
Index: DBI.pm
===
RCS file: /cvsroot/fink/scripts/buildfink/lib/FinkFDB/DBI.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- DBI.pm 5 Apr 2007 02:41:21 - 1.7
+++ DBI.pm 8 Apr 2007 18:03:30 - 1.8
@@ -136,7 +136,10 @@
$self-{queries}-{get_package_id}-finish();
my $fileroot = $self-makeFileHierarchy($package, $files);
- $self-addFileTree($package_id, $fileroot, 0);
+ foreach my $subfile (keys %$fileroot) {
+next if $subfile eq . or $subfile eq .. or $subfile eq /versions/ or
$subfile eq /path/;
+$self-addFileTree($package_id, $fileroot-{$subfile}, $0);
+ }
$self-{dbh}-commit();
}
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink/lib/FinkFDB DBI.pm,1.8,1.9
Update of /cvsroot/fink/scripts/buildfink/lib/FinkFDB
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv25174/lib/FinkFDB
Modified Files:
DBI.pm
Log Message:
Tweak DB schema
Index: DBI.pm
===
RCS file: /cvsroot/fink/scripts/buildfink/lib/FinkFDB/DBI.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- DBI.pm 8 Apr 2007 18:03:30 - 1.8
+++ DBI.pm 8 Apr 2007 18:14:58 - 1.9
@@ -13,20 +13,20 @@
INSERT INTO file_versions(
package_id,
is_directory,
-fullpath,
file_id,
size,
posix_user,
posix_group,
flags)
-VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+VALUES (?, ?, ?, ?, ?, ?, ?)
EOF
get_package_id = SELECT package_id FROM packages WHERE
package_name = ?,
get_file_id = SELECT file_id FROM file_paths WHERE fullpath
= ?,
get_package_files = EOF,
SELECT fullpath AS 'path',
size, posix_user, posix_group, flags
-FROM file_versions
+FROM file_versions LEFT OUTER JOIN file_paths
+ ON file_paths.file_id = file_versions.file_id
WHERE package_id=?
ORDER BY is_directory DESC, fullpath ASC
EOF
@@ -245,7 +245,6 @@
$self-execQuery(add_file_version,
$pkgid,
$filever-{isdir},
- $filever-{fullpath},
$file_id,
$filever-{size},
$filever-{user},
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink/schemas sqlite.sql,1.1,1.2
Update of /cvsroot/fink/scripts/buildfink/schemas In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv25174/schemas Modified Files: sqlite.sql Log Message: Tweak DB schema Index: sqlite.sql === RCS file: /cvsroot/fink/scripts/buildfink/schemas/sqlite.sql,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- sqlite.sql 31 Mar 2007 20:49:14 - 1.1 +++ sqlite.sql 8 Apr 2007 18:14:58 - 1.2 @@ -1,8 +1,8 @@ CREATE TABLE file_paths ( file_id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, parent_id INTEGER NOT NULL, - file_name VARCHAR NOT NULL, - fullpath STRING NOT NULL, + file_name VARCHAR NOT NULL COLLATE NOCASE, + fullpath STRING NOT NULL UNIQUE COLLATE NOCASE, UNIQUE (parent_id, file_name) ); @@ -15,7 +15,6 @@ file_version_id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, is_directory BOOLEAN NOT NULL, package_id INTEGER NOT NULL, - fullpath STRING NOT NULL, file_id INTEGER NOT NULL, size INTEGER NOT NULL, posix_user STRING NULL, - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink/fdb disclosure-closed.png, NONE, 1.1 disclosure-open.png, NONE, 1.1 FDBWebsite.pm, 1.4, 1.5 fdb.css, 1.1, 1.2 fdb.js, 1.3, 1.4
Update of /cvsroot/fink/scripts/buildfink/fdb
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv25759/fdb
Modified Files:
FDBWebsite.pm fdb.css fdb.js
Added Files:
disclosure-closed.png disclosure-open.png
Log Message:
Pretty little triangles
--- NEW FILE: disclosure-open.png ---
(This appears to be a binary file; contents omitted.)
Index: FDBWebsite.pm
===
RCS file: /cvsroot/fink/scripts/buildfink/fdb/FDBWebsite.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- FDBWebsite.pm 7 Apr 2007 05:30:13 - 1.4
+++ FDBWebsite.pm 8 Apr 2007 19:39:56 - 1.5
@@ -62,11 +62,11 @@
body
h1Fink File Database/h1
h2Filesystem/h2
-ul id=filesystemli class=directorya href=javascript:
file_id=0/sw/a/li/ul
+ul id=filesystemli class=tree-opena href=javascript: id=root
file_id=0/sw/a/li/ul
h2Packages/h2
ul id=packages
@{[join(\n, map { sprintf(
- 'li class=packagea href=javascript: package_id=%s%s/a/li',
+ 'li class=tree-closeda href=javascript: package_id=%s%s/a/li',
$_-{package_id},
$_-{package_name})
} @packages)]}
Index: fdb.css
===
RCS file: /cvsroot/fink/scripts/buildfink/fdb/fdb.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fdb.css 31 Mar 2007 19:35:45 - 1.1
+++ fdb.css 8 Apr 2007 19:39:56 - 1.2
@@ -1,3 +1,10 @@
-li {
- font-family: monospace;
+li { font-family: monospace; }
+li.leaf { list-style-type: disc; }
+li.tree-open {
+ list-style-type: disc;
+ list-style-image: url(disclosure-open.png);
+}
+li.tree-closed {
+ list-style-type: disc;
+ list-style-image: url(disclosure-closed.png);
}
Index: fdb.js
===
RCS file: /cvsroot/fink/scripts/buildfink/fdb/fdb.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fdb.js 7 Apr 2007 05:30:13 - 1.3
+++ fdb.js 8 Apr 2007 19:39:57 - 1.4
@@ -13,31 +13,38 @@
});
}
-function do_show(node, child_name) {
+function do_show(node, child_name, show_class, hide_class) {
node.unbind(click);
-node.click(function() { do_hide(node, child_name) });
+node.click(function() { do_hide(node, child_name, show_class, hide_class)
});
+if(show_class) {
+ node.parent().removeClass();
+ node.parent().addClass(show_class);
+}
$(child_name, node.parent()).show();
}
-function do_hide(node, child_name) {
+function do_hide(node, child_name, show_class, hide_class) {
node.unbind(click);
-node.click(function() { do_show(node, child_name) });
+node.click(function() { do_show(node, child_name, show_class, hide_class)
});
+if(hide_class) {
+ node.parent().removeClass();
+ node.parent().addClass(hide_class);
+}
$(child_name, node.parent()).hide();
}
-function got_ls(node, data) {
-node.unbind(click);
-node.click(function() { do_hide(node, ul); });
+function got_ls(node, data, show_class, hide_class) {
+do_show(node, ul, tree-open, tree-closed);
var lschildren = ul;
for(var i = 0; i data.length; i++) {
var file = data[i];
if(file.is_directory) {
- lschildren += li class=\directory\ +
+ lschildren += li class=\tree-closed\ +
a href=\javascript:\ file_id=\ + file.file_id +
\ + file.file_name + (;
} else {
- lschildren += li + file.file_name + (;
+ lschildren += li class=\leaf\ style=\list-style-image:
none\ + file.file_name + (;
}
var packagestr = ;
@@ -57,12 +64,11 @@
}
lschildren += /ul;
node.parent().append(lschildren);
-$(.directory [EMAIL PROTECTED], node.parent()).click(function() {
ls($(this)) });
+$([EMAIL PROTECTED], node.parent()).click(function() { ls($(this)) });
}
function got_lspkg(node, data) {
-node.unbind(click);
-node.click(function() { do_hide(node, table) });
+do_show(node, table, tree-open, tree-closed);
var lschildren = table;
for(var i = 0; i data.length; i++) {
@@ -79,6 +85,7 @@
}
$(function() {
- $(.directory [EMAIL PROTECTED]).click(function() { ls($(this)) });
- $(.package [EMAIL PROTECTED]).click(function() { lspkg($(this)); });
+ $(#filesystem [EMAIL PROTECTED]).click(function() { ls($(this)) });
+ $(#packages [EMAIL PROTECTED]).click(function() { lspkg($(this));
});
+ $(#root).click();
});
--- NEW FILE: disclosure-closed.png ---
(This appears to be a binary file; contents omitted.)
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief
[cvs] scripts/buildfink/fdb FDBWebsite.pm,1.3,1.4 fdb.js,1.2,1.3
Update of /cvsroot/fink/scripts/buildfink/fdb
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv16945
Modified Files:
FDBWebsite.pm fdb.js
Log Message:
Don't use # as a dummy href
Index: FDBWebsite.pm
===
RCS file: /cvsroot/fink/scripts/buildfink/fdb/FDBWebsite.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- FDBWebsite.pm 2 Apr 2007 04:35:45 - 1.3
+++ FDBWebsite.pm 7 Apr 2007 05:30:13 - 1.4
@@ -62,11 +62,11 @@
body
h1Fink File Database/h1
h2Filesystem/h2
-ul id=filesystemli class=directorya href=#
file_id=0/sw/a/li/ul
+ul id=filesystemli class=directorya href=javascript:
file_id=0/sw/a/li/ul
h2Packages/h2
ul id=packages
@{[join(\n, map { sprintf(
- 'li class=packagea href=# package_id=%s%s/a/li',
+ 'li class=packagea href=javascript: package_id=%s%s/a/li',
$_-{package_id},
$_-{package_name})
} @packages)]}
Index: fdb.js
===
RCS file: /cvsroot/fink/scripts/buildfink/fdb/fdb.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fdb.js 2 Apr 2007 04:35:45 - 1.2
+++ fdb.js 7 Apr 2007 05:30:13 - 1.3
@@ -34,7 +34,7 @@
var file = data[i];
if(file.is_directory) {
lschildren += li class=\directory\ +
- a href=\#\ file_id=\ + file.file_id +
+ a href=\javascript:\ file_id=\ + file.file_id +
\ + file.file_name + (;
} else {
lschildren += li + file.file_name + (;
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink buildfink,1.57,1.58
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6786
Modified Files:
buildfink
Log Message:
Remove trailing slash from finkdir
Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- buildfink 5 Apr 2007 02:41:21 - 1.57
+++ buildfink 6 Apr 2007 03:00:36 - 1.58
@@ -239,6 +239,7 @@
$opts_ok = 0;
} else {
($FinkDir, $RunDir) = @ARGV;
+ $FinkDir =~ s!/$!!;
}
if ($checkpoint and not -f $checkpoint) {
warn The specified checkpoint file does not exist.\n;
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink/lib/FinkFDB DBI.pm,1.4,1.5
Update of /cvsroot/fink/scripts/buildfink/lib/FinkFDB
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv25320/lib/FinkFDB
Modified Files:
DBI.pm
Log Message:
Continue RR's good work on making FDB code more robust
Index: DBI.pm
===
RCS file: /cvsroot/fink/scripts/buildfink/lib/FinkFDB/DBI.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- DBI.pm 4 Apr 2007 18:41:59 - 1.4
+++ DBI.pm 5 Apr 2007 01:45:51 - 1.5
@@ -80,7 +80,7 @@
sub disconnect {
my($self) = @_;
delete $self-{queries};
- $self-{dbh}-disconnect();
+ $self-{dbh}-disconnect() if $self-{dbh};
delete $self-{dbh};
}
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink buildfink,1.55,1.56
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv25320
Modified Files:
buildfink
Log Message:
Continue RR's good work on making FDB code more robust
Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- buildfink 1 Apr 2007 04:46:30 - 1.55
+++ buildfink 5 Apr 2007 01:45:51 - 1.56
@@ -135,6 +135,8 @@
our %max_build_time_forpkg = ();
our %max_log_size_forpkg = ();
+END { $FDB-disconnect() if $FDB; }
+
sub limit_arg {
my($arg, $val) = @_;
my $pkg;
@@ -270,6 +272,7 @@
}
if (%fdbopts) {
$FDB = FinkFDB-new(%fdbopts);
+ $FDB-connect();
}
if (!$opts_ok) {
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink/lib/FinkFDB DBI.pm,1.5,1.6
Update of /cvsroot/fink/scripts/buildfink/lib/FinkFDB
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3481/lib/FinkFDB
Modified Files:
DBI.pm
Log Message:
Autopopulate database schemas
Index: DBI.pm
===
RCS file: /cvsroot/fink/scripts/buildfink/lib/FinkFDB/DBI.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- DBI.pm 5 Apr 2007 01:45:51 - 1.5
+++ DBI.pm 5 Apr 2007 02:11:16 - 1.6
@@ -3,6 +3,7 @@
use warnings;
use Carp;
use DBI;
+use FindBin qw($Bin);
our @ISA = qw(FinkFDB);
our %dbqueries = (
@@ -42,6 +43,7 @@
ORDER BY is_directory DESC, file_name ASC, package_name ASC
EOF
get_packages = SELECT package_name, package_id FROM
packages ORDER BY package_name ASC,
+ schemacheck = SELECT * FROM packages WHERE 0=1,
);
sub new {
@@ -68,6 +70,8 @@
return $self;
}
+sub DESTROY { shift-disconnect(); }
+
sub connect {
my($self) = @_;
$self-{dbh} = DBI-connect($self-{dbstr},
@@ -75,6 +79,35 @@
$self-{dbpass},
$self-{dbattrs}) or die unable to connect to
$self-{dbstr}: . DBI-errstr;
$self-{queries} = {};
+
+ eval {
+$self-{dbh}-{PrintError} = 0;
+$self-{dbh}-do($dbqueries{schemacheck});
+ };
+ $self-{dbh}-{PrintError} = 1;
+ if($@) {
+my $schemafile = $Bin/schemas/.lc($self-{dbtype})..sql;
+if(not -f $schemafile) {
+ die EOF;
+'$schemafile' doesn't exist.
+Database doesn't appear to have the correct schema, and don't know how to
+populate a $self-{dbtype} schema.
+EOF
+}
+
+open(SCHEMA, , $schemafile) or die
+ Couldn't open schema file '$schemafile': $!\n;
+local $/ = undef;
+my $schema = SCHEMA;
+close(SCHEMA);
+
+# Yeah, this is a pretty poor excuse for a .sql parser...
+my @statements = split(/;/, $schema);
+foreach my $statement(@statements) {
+ $self-{dbh}-do($statement);
+}
+$self-{dbh}-commit();
+ }
}
sub disconnect {
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink buildfink,1.56,1.57
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv15271
Modified Files:
buildfink
Log Message:
Small FDB tweaks, allow for better subclassing of FinkFDB module
Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- buildfink 5 Apr 2007 01:45:51 - 1.56
+++ buildfink 5 Apr 2007 02:41:21 - 1.57
@@ -664,8 +664,10 @@
$path =~ s/ link to.*//;
$path =~ s/ - .*//;
$path =~ s!^\.!!;
+
next if $FinkDir =~ m!^\Q$path\E!;
$path =~ s!^\Q$FinkDir\E!%p!;
+
my($user, $group) = split(m!/!, $owners);
push @files, {
flags = $flags,
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink/lib FinkFDB.pm,1.1,1.2
Update of /cvsroot/fink/scripts/buildfink/lib
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv15271/lib
Modified Files:
FinkFDB.pm
Log Message:
Small FDB tweaks, allow for better subclassing of FinkFDB module
Index: FinkFDB.pm
===
RCS file: /cvsroot/fink/scripts/buildfink/lib/FinkFDB.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FinkFDB.pm 1 Apr 2007 04:46:30 - 1.1
+++ FinkFDB.pm 5 Apr 2007 02:41:21 - 1.2
@@ -4,10 +4,16 @@
sub new {
my($self, %params) = @_;
- die FinkFDB::new requires 'store' argument!\n unless $params{store};
- eval require FinkFDB::$params{store};;
- die $@ if $@;
- FinkFDB::$params{store}-new(%params);
+
+ # Some magic to let SUPER-new work from subclasses...
+ if(!ref($self) or !$self-isa(FinkFDB)) {
+die FinkFDB::new requires 'store' argument!\n unless $params{store};
+eval require FinkFDB::$params{store};;
+die $@ if $@;
+FinkFDB::$params{store}-new(%params);
+ } else {
+# Common initialization code would go here
+ }
}
1;
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink/lib/FinkFDB DBI.pm,1.6,1.7
Update of /cvsroot/fink/scripts/buildfink/lib/FinkFDB
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv15271/lib/FinkFDB
Modified Files:
DBI.pm
Log Message:
Small FDB tweaks, allow for better subclassing of FinkFDB module
Index: DBI.pm
===
RCS file: /cvsroot/fink/scripts/buildfink/lib/FinkFDB/DBI.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- DBI.pm 5 Apr 2007 02:11:16 - 1.6
+++ DBI.pm 5 Apr 2007 02:41:21 - 1.7
@@ -52,6 +52,7 @@
my $class = ref($pkg) || $pkg || __PACKAGE__;
bless $self, $class;
+ $self-SUPER::new(%params);
$self-{dbtype} = $params{dbtype} or die Must specify dbtype for DBI
store.\n;
my $dbstr;
my %dbattrs = (RaiseError = 1, AutoCommit = 0);
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink/fdb FDBWebsite.pm, NONE, 1.1 htaccess.example, NONE, 1.1 fdb.pl, 1.2, NONE
Update of /cvsroot/fink/scripts/buildfink/fdb
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv21412/fdb
Added Files:
FDBWebsite.pm htaccess.example
Removed Files:
fdb.pl
Log Message:
Start moving web interface to new framework
--- NEW FILE: htaccess.example ---
Perl
%FDBWebsite::FDBParams = (
store = DBI,
dbtype = sqlite,
db = fdb.sqlite,
);
/Perl
PerlSwitches -I.
PerlModule FDBWebsite
SetHandler modperl
PerlResponseHandler FDBWebsite
--- NEW FILE: FDBWebsite.pm ---
package FDBWebsite;
use strict;
use warnings;
use FindBin qw($Bin);
use lib $Bin/../lib;
use FinkFDB;
use Apache2::RequestRec ();
use CGI qw(:standard param);
use JSON;
our %FDBParams;
sub handler {
my($r) = @_;
die Please configure \%FDBWebsite::FDBParams in the Apache configuration!\n
unless %FDBParams;
my $FDB = FinkFDB-new(%FDBParams);
my($op, $param) = split(m!/!, $r-path_info());
if ($op) {
$r-content_type('text/plain');
if ($op eq package) {
$r-print(objToJson($FDB-getPackageFiles($param)));
} elsif ($op eq ls) {
$r-print(objToJson(map {
$_-{file_name} .= / if $_-{is_directory};
$_;
} $FDB-getDirectoryFiles($param)));
}
} else {
$r-content_type('text/html');
my $packages = $FDB-getPackages();
$r-print(EOF);
!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN
DTD/xhtml1-strict.dtd
html
head
titleFink File Database/title
link rel=stylesheet type=text/css href=pkgdb.css /
script type=text/javascript src=jquery-latest.pack.js /
script type=text/javascript src=pkgdb.js /
/head
body
h1Fink File Database/h1
h2Filesystem/h2
ul id=filesystemli class=directorya href=#
file_id=0/sw/a/li/ul
h2Packages/h2
ul id=packages
@{[join(\n, map { sprintf(
'li class=packagea href=# package_id=%s%s/a/li',
$_-{package_id},
$_-{package_name})
} @packages)]}
/ul
/body
/html
EOF
}
}
1;
--- fdb.pl DELETED ---
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink/lib/FinkFDB DBI.pm,1.1,1.2
Update of /cvsroot/fink/scripts/buildfink/lib/FinkFDB
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv21412/lib/FinkFDB
Modified Files:
DBI.pm
Log Message:
Start moving web interface to new framework
Index: DBI.pm
===
RCS file: /cvsroot/fink/scripts/buildfink/lib/FinkFDB/DBI.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DBI.pm 1 Apr 2007 04:46:30 - 1.1
+++ DBI.pm 1 Apr 2007 15:23:43 - 1.2
@@ -7,9 +7,7 @@
our %dbqueries = (
add_package = INSERT INTO packages(package_name) VALUES
(?),
add_file_path = INSERT INTO file_paths(parent_id,
file_name, fullpath) VALUES (?, ?, ?),
- get_package_id = SELECT package_id FROM packages WHERE
package_name = ?,
- get_file_id = SELECT file_id FROM file_paths WHERE fullpath
= ?,
- add_file_version = EOF);
+ add_file_version = EOF,
INSERT INTO file_versions(
package_id,
is_directory,
@@ -21,6 +19,30 @@
flags)
VALUES (?, ?, ?, ?, ?, ?, ?, ?)
EOF
+ get_package_id = SELECT package_id FROM packages WHERE
package_name = ?,
+ get_file_id = SELECT file_id FROM file_paths WHERE fullpath
= ?,
+ get_package_files = EOF,
+SELECT fullpath AS 'path',
+ size, posix_user, posix_group, flags
+FROM file_versions LEFT OUTER JOIN packages
+ ON file_versions.package_id = packages.package_id
+WHERE package_name=?
+ORDER BY is_directory DESC, fullpath ASC
+EOF
+ get_directory_files = EOF,
+SELECT file_name,
+ size, posix_user, posix_group, flags,
+ file_paths.file_id AS 'file_id',
+ is_directory, package_name
+FROM file_paths LEFT OUTER JOIN file_versions
+ ON file_paths.file_id = file_versions.file_id
+LEFT OUTER JOIN packages
+ ON packages.package_id = file_versions.package_id
+WHERE parent_id = ?
+ORDER BY is_directory DESC, file_name ASC
+EOF
+ get_packages = SELECT package_name, package_id FROM
packages ORDER BY package_name ASC,
+ );
sub new {
my($pkg, %params) = @_;
@@ -40,29 +62,16 @@
$self-{dbh} = DBI-connect($dbstr, $params{dbuser}, $params{dbpass},
\%dbattrs);
$self-{queries} = {};
- foreach my $key (keys %dbqueries) {
-$self-{queries}-{$key} = $self-prepare($dbqueries{$key});
- }
return $self;
}
sub addPackage {
my($self, $package) = @_;
- $self-{queries}-{add_package}-execute($package);
+ $self-execQuery(add_package, $package);
$self-{dbh}-commit();
}
-sub selectOne {
- my($self, $qname, @bindvals) = @_;
-
- my $query = $self-{queries}-{$qname};
- $query-execute(@bindvals) or return;
- my($val) = $query-fetchrow_array();
- $query-finish();
- return $val;
-}
-
sub addPackageFiles {
my($self, $package, $files) = @_;
@@ -79,6 +88,60 @@
$self-{dbh}-commit();
}
+sub getPackageFiles {
+ my($self, $package_id) = @_;
+ return $self-selectAll(get_package_files, $package_id);
+}
+
+sub getPackages {
+ my($self) = @_;
+ return $self-selectAll(get_packages);
+}
+
+sub getPackageID {
+ my($self, $package_name) = @_;
+ return $self-selectOne(get_package_id, $package_name);
+}
+
+sub getFileID {
+ my($self, $path) = @_;
+ return $self-selectOne(get_file_id, $path);
+}
+
+sub getDirectoryFiles {
+ my($self, $file_id) = @_;
+ return $self-selectAll(get_directory_files, $file_id);
+}
+
+# ===Internal Functions===
+
+sub execQuery {
+ my($self, $qname, @bindvals) = @_;
+
+ my $queries = $self-{queries};
+ my $query = $queries-{$qname};
+ $query = $queries-{$qname} = $self-prepare($qname) if !$query;
+
+ return $query-execute(@bindvals) ? $query : undef;
+}
+
+sub selectOne {
+ my($self, $qname, @bindvals) = @_;
+
+ my $query = $self-execQuery($qname, @bindvals);
+ my($val) = $query-fetchrow_array();
+ $query-finish();
+ return $val;
+}
+
+sub selectAll {
+ my($query, @bindvals) = @_;
+ my $query = $self-execQuery($query, @bindvals);
+ my $ret = $query-fetchall_arrayref({});
+ $query-finish();
+ return @$ret;
+}
+
sub makeFileHierarchy {
my($self, $pkg, $files) = @_;
my %root = (. = , .. = undef, /path/ = );
@@ -117,23 +180,23 @@
my $file_id = $self-selectOne(get_file_id, $file-{/path/});
if(!$file_id) {
-$self-{queries}-{add_file_path}-execute($parent_id, $file-{.},
$file-{/path/});
+$self-execQuery(add_file_path, $parent_id, $file-{.},
$file-{/path/});
$file_id = $self-selectOne(get_file_id, $file-{/path/}) or
die Couldn't fetch or insert file ID for .$file-{/path/}.!\n;
}
if ($file-{/versions/}) {
foreach my $filever (@{$file-{/versions/}}) {
- $self-{queries}-{add_file_version}-execute(
- $pkgid,
- $filever-{isdir},
- $filever-{fullpath},
-
[cvs] scripts/buildfink/fdb FDBWebsite.pm,1.1,1.2
Update of /cvsroot/fink/scripts/buildfink/fdb
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22613/fdb
Modified Files:
FDBWebsite.pm
Log Message:
Return Apache2 constants
Index: FDBWebsite.pm
===
RCS file: /cvsroot/fink/scripts/buildfink/fdb/FDBWebsite.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FDBWebsite.pm 1 Apr 2007 15:23:43 - 1.1
+++ FDBWebsite.pm 1 Apr 2007 15:27:03 - 1.2
@@ -6,6 +6,7 @@
use lib $Bin/../lib;
use FinkFDB;
use Apache2::RequestRec ();
+use Apache2::Const -compile = qw(OK);
use CGI qw(:standard param);
use JSON;
our %FDBParams;
@@ -27,6 +28,8 @@
$_;
} $FDB-getDirectoryFiles($param)));
}
+
+return Apache2::Const::OK;
} else {
$r-content_type('text/html');
my $packages = $FDB-getPackages();
@@ -56,6 +59,8 @@
/html
EOF
}
+
+ return Apache2::Const::OK;
}
1;
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink/lib/FinkFDB DBI.pm,1.2,1.3
Update of /cvsroot/fink/scripts/buildfink/lib/FinkFDB
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32496/lib/FinkFDB
Modified Files:
DBI.pm
Log Message:
Back-end and front-end can talk again
Index: DBI.pm
===
RCS file: /cvsroot/fink/scripts/buildfink/lib/FinkFDB/DBI.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DBI.pm 1 Apr 2007 15:23:43 - 1.2
+++ DBI.pm 2 Apr 2007 04:35:45 - 1.3
@@ -24,9 +24,8 @@
get_package_files = EOF,
SELECT fullpath AS 'path',
size, posix_user, posix_group, flags
-FROM file_versions LEFT OUTER JOIN packages
- ON file_versions.package_id = packages.package_id
-WHERE package_name=?
+FROM file_versions
+WHERE package_id=?
ORDER BY is_directory DESC, fullpath ASC
EOF
get_directory_files = EOF,
@@ -39,7 +38,7 @@
LEFT OUTER JOIN packages
ON packages.package_id = file_versions.package_id
WHERE parent_id = ?
-ORDER BY is_directory DESC, file_name ASC
+ORDER BY is_directory DESC, file_name ASC, package_name ASC
EOF
get_packages = SELECT package_name, package_id FROM
packages ORDER BY package_name ASC,
);
@@ -60,12 +59,30 @@
$dbstr = sprintf(dbi:%s:%s, $self-{dbtype}, $params{db});
}
- $self-{dbh} = DBI-connect($dbstr, $params{dbuser}, $params{dbpass},
\%dbattrs);
- $self-{queries} = {};
+ $self-{dbstr} = $dbstr;
+ $self-{dbuser} = $params{dbuser};
+ $self-{dbpass} = $params{dbpass};
+ $self-{dbattrs} = \%dbattrs;
return $self;
}
+sub connect {
+ my($self) = @_;
+ $self-{dbh} = DBI-connect($self-{dbstr},
+ $self-{dbuser},
+ $self-{dbpass},
+ $self-{dbattrs});
+ $self-{queries} = {};
+}
+
+sub disconnect {
+ my($self) = @_;
+ delete $self-{queries};
+ $self-{dbh}-disconnect();
+ delete $self-{dbh};
+}
+
sub addPackage {
my($self, $package) = @_;
$self-execQuery(add_package, $package);
@@ -135,8 +152,8 @@
}
sub selectAll {
- my($query, @bindvals) = @_;
- my $query = $self-execQuery($query, @bindvals);
+ my($self, $qname, @bindvals) = @_;
+ my $query = $self-execQuery($qname, @bindvals);
my $ret = $query-fetchall_arrayref({});
$query-finish();
return @$ret;
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink buildfink,1.51,1.52 pkgdb.pl,1.3,1.4
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv29235
Modified Files:
buildfink pkgdb.pl
Log Message:
Look at me, ma, I'm an emacs user...
Index: pkgdb.pl
===
RCS file: /cvsroot/fink/scripts/buildfink/pkgdb.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pkgdb.pl26 Mar 2007 02:45:53 - 1.3
+++ pkgdb.pl31 Mar 2007 18:25:00 - 1.4
@@ -86,7 +86,7 @@
script type=text/javascript src=pkgdb.js /
/head
body
-h1Fink Package Database/h1
+h1Fink File Database/h1
h2Filesystem/h2
ul id=filesystemli class=directorya href=# id=0/sw/a/li/ul
h2Packages/h2
Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- buildfink 26 Mar 2007 02:18:16 - 1.51
+++ buildfink 31 Mar 2007 18:25:00 - 1.52
@@ -18,11 +18,11 @@
=pod
-=head1 SYNOPSIS
+=head1 SYNOPSIS
-buildfink -- Build every package in Fink
+buildfink -- Build every package in Fink
-=head1 USAGE
+=head1 USAGE
[...1547 lines suppressed...]
+);
- close CHECKPOINT;
+ close CHECKPOINT;
}
# Updates the checkpoint after a package build.
sub updateCheckpoint {
- my(%changes) = @_;
+ my(%changes) = @_;
- open(CHECKPOINT, , $RunDir/checkpoint);
- print CHECKPOINT \$pkglist-{'$_'} = $changes{$_}; foreach keys
%changes;
- print CHECKPOINT \n;
- close CHECKPOINT;
+ open(CHECKPOINT, , $RunDir/checkpoint);
+ print CHECKPOINT \$pkglist-{'$_'} = $changes{$_}; foreach keys %changes;
+ print CHECKPOINT \n;
+ close CHECKPOINT;
}
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink FinkLib.pm,1.16,1.17 buildfink,1.52,1.53
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv21222
Modified Files:
FinkLib.pm buildfink
Log Message:
Move some functions to FinkLib
Index: FinkLib.pm
===
RCS file: /cvsroot/fink/scripts/buildfink/FinkLib.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- FinkLib.pm 8 Aug 2006 19:25:28 - 1.16
+++ FinkLib.pm 31 Mar 2007 19:27:07 - 1.17
@@ -24,100 +24,100 @@
# Initialize the Fink API
sub initFink($) {
- $FinkDir = shift;
+ $FinkDir = shift;
- unshift @INC, $FinkDir . /lib/perl5;
- require Fink::Config;
- require Fink::Services;
- require Fink::Package;
- require Fink::PkgVersion;
- require Fink::VirtPackage;
- require Fink::Status;
- require Fink::Validation;
+ unshift @INC, $FinkDir . /lib/perl5;
+ require Fink::Config;
+ require Fink::Services;
+ require Fink::Package;
+ require Fink::PkgVersion;
+ require Fink::VirtPackage;
+ require Fink::Status;
+ require Fink::Validation;
- $ENV{PATH} =
$FinkDir/bin:$FinkDir/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin;
- $ENV{PERL5LIB} = $FinkDir/lib/perl5:$FinkDir/lib/perl5/darwin;
+ $ENV{PATH} =
$FinkDir/bin:$FinkDir/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin;
+ $ENV{PERL5LIB} = $FinkDir/lib/perl5:$FinkDir/lib/perl5/darwin;
- $FinkConfig = Fink::Services::read_config($FinkDir/etc/fink.conf);
- Fink::Config::set_options({Verbose = 3, KeepBuildDir = 1});
- readPackages();
+ $FinkConfig = Fink::Services::read_config($FinkDir/etc/fink.conf);
+ Fink::Config::set_options({Verbose = 3, KeepBuildDir = 1});
+ readPackages();
- return $FinkConfig;
+ return $FinkConfig;
}
# Make sure all essential packages are installed
sub installEssentials {
- # This actually breaks stuff because dpkg gets linked to libgettext3
- # instead of gettext.
- return;
+ # This actually breaks stuff because dpkg gets linked to libgettext3
+ # instead of gettext.
+ return;
- my @essentials = Fink::Package-list_essential_packages();
- my $pid = fork();
- if($pid) {
- wait();
- } else {
- close(STDIN);
- system(fink, -y, rebuild, @essentials);
- system(fink, -y, reinstall, @essentials);
- }
+ my @essentials = Fink::Package-list_essential_packages();
+ my $pid = fork();
+ if ($pid) {
+wait();
+ } else {
+close(STDIN);
+system(fink, -y, rebuild, @essentials);
+system(fink, -y, reinstall, @essentials);
+ }
}
sub readPackages {
- $Fink::Status::the_instance ||= Fink::Status-new();
- $Fink::Status::the_instance-read();
+ $Fink::Status::the_instance ||= Fink::Status-new();
+ $Fink::Status::the_instance-read();
- eval {
- Fink::Package-forget_packages(2, 0);
- };
- if($@ and $@ =~ /new API for forget_packages/) {
- Fink::Package-forget_packages({disk = 1});
- } elsif($@) {
- die $@;
- }
- Fink::Package-require_packages();
+ eval {
+Fink::Package-forget_packages(2, 0);
+ };
+ if ($@ and $@ =~ /new API for forget_packages/) {
+Fink::Package-forget_packages({disk = 1});
+ } elsif ($@) {
+die $@;
+ }
+ Fink::Package-require_packages();
}
# Purge packages we may have previously built
sub purgeNonEssential {
- my @essentials = map { quotemeta($_) }
Fink::Package-list_essential_packages();
- my $re = ^(?: . join(|, @essentials) . )\$;
+ my @essentials = map { quotemeta($_) }
Fink::Package-list_essential_packages();
+ my $re = ^(?: . join(|, @essentials) . )\$;
- readPackages();
+ readPackages();
- my @packages = Fink::Package-list_packages();
- my @purgelist;
- foreach my $pkgname (@packages) {
- next if $pkgname =~ /$re/i;
- next if Fink::VirtPackage-query_package($pkgname);
+ my @packages = Fink::Package-list_packages();
+ my @purgelist;
+ foreach my $pkgname (@packages) {
+next if $pkgname =~ /$re/i;
+next if Fink::VirtPackage-query_package($pkgname);
- my $obj;
- eval {
- $obj = Fink::Package-package_by_name($pkgname);
- };
- next if $@ or !$obj;
- next unless $obj-is_any_installed();
- my $vo = Fink::PkgVersion-match_package($pkgname);
- next if $vo-is_type('dummy');
+my $obj;
+eval {
+ $obj = Fink::Package-package_by_name($pkgname);
+};
+next if $@ or !$obj;
+next unless $obj-is_any_installed();
+my $vo = Fink::PkgVersion-match_package($pkgname);
+next if $vo-is_type('dummy');
- push @purgelist, $pkgname;
- }
+push @purgelist, $pkgname;
+ }
- system(dpkg --purge . join( , @purgelist)
[cvs] scripts/buildfink/lib - New directory
Update of /cvsroot/fink/scripts/buildfink/lib In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22112/lib Log Message: Directory /cvsroot/fink/scripts/buildfink/lib added to the repository - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink/analysis - New directory
Update of /cvsroot/fink/scripts/buildfink/analysis In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22581/analysis Log Message: Directory /cvsroot/fink/scripts/buildfink/analysis added to the repository - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink/etc - New directory
Update of /cvsroot/fink/scripts/buildfink/etc In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22894/etc Log Message: Directory /cvsroot/fink/scripts/buildfink/etc added to the repository - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink/fdb - New directory
Update of /cvsroot/fink/scripts/buildfink/fdb In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv23169/fdb Log Message: Directory /cvsroot/fink/scripts/buildfink/fdb added to the repository - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink/contrib - New directory
Update of /cvsroot/fink/scripts/buildfink/contrib In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv23638/contrib Log Message: Directory /cvsroot/fink/scripts/buildfink/contrib added to the repository - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink buildfink, 1.53, 1.54 FinkLib.pm, 1.17, NONE analyze, 1.1, NONE buildstats, 1.1, NONE catdescs, 1.2, NONE cleanfink, 1.1, NONE cmplink, 1.4, NONE cmpruns, 1.1, NONE filter, 1.4
Update of /cvsroot/fink/scripts/buildfink In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv24651 Modified Files: buildfink Removed Files: FinkLib.pm analyze buildstats catdescs cleanfink cmplink cmpruns filter filters-nobody.xml filters.xml finkfilter_sysgcc maintnotify mkfiledb owbuild pkgdb.css pkgdb.js pkgdb.pl report Log Message: Start reorganizing things... --- filters-nobody.xml DELETED --- --- FinkLib.pm DELETED --- --- analyze DELETED --- --- cmplink DELETED --- --- owbuild DELETED --- --- finkfilter_sysgcc DELETED --- --- filters.xml DELETED --- --- mkfiledb DELETED --- --- maintnotify DELETED --- --- pkgdb.js DELETED --- Index: buildfink === RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- buildfink 31 Mar 2007 19:27:07 - 1.53 +++ buildfink 31 Mar 2007 19:35:44 - 1.54 @@ -112,7 +112,7 @@ use POSIX qw(sys_wait_h dup2 setsid); use Getopt::Long; use FindBin qw($Bin); -use lib $Bin; +use lib $Bin/lib; use FinkLib; our($Bin, $FinkBuildFlags, $FinkConfig, $FinkDir, $RunDir, $DryRun, $infofilter, $patchdir, @skiplist, $checkpoint, $CheckFiles, $DoValidate, $BuildNobody, $Dirty, $RebuildDeps, $BuildAll, $NoCopyInfo); --- filter DELETED --- --- pkgdb.css DELETED --- --- cleanfink DELETED --- --- report DELETED --- --- pkgdb.pl DELETED --- --- buildstats DELETED --- --- catdescs DELETED --- --- cmpruns DELETED --- - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink/lib FinkLib.pm,NONE,1.1
Update of /cvsroot/fink/scripts/buildfink/lib
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv24651/lib
Added Files:
FinkLib.pm
Log Message:
Start reorganizing things...
--- NEW FILE: FinkLib.pm ---
# A library of functions for interacting with Fink
#Copyright (c) 2005 Apple Computer, Inc. All Rights Reserved.
#
#This program is free software; you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
#the Free Software Foundation; either version 2 of the License, or
#(at your option) any later version.
#
#This program is distributed in the hope that it will be useful,
#but WITHOUT ANY WARRANTY; without even the implied warranty of
#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#GNU General Public License for more details.
#
#You should have received a copy of the GNU General Public License
#along with this program; if not, write to the Free Software
#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
package FinkLib;
use strict;
use warnings;
our($FinkDir, $FinkConfig);
# Initialize the Fink API
sub initFink($) {
$FinkDir = shift;
unshift @INC, $FinkDir . /lib/perl5;
require Fink::Config;
require Fink::Services;
require Fink::Package;
require Fink::PkgVersion;
require Fink::VirtPackage;
require Fink::Status;
require Fink::Validation;
$ENV{PATH} =
$FinkDir/bin:$FinkDir/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin;
$ENV{PERL5LIB} = $FinkDir/lib/perl5:$FinkDir/lib/perl5/darwin;
$FinkConfig = Fink::Services::read_config($FinkDir/etc/fink.conf);
Fink::Config::set_options({Verbose = 3, KeepBuildDir = 1});
readPackages();
return $FinkConfig;
}
# Make sure all essential packages are installed
sub installEssentials {
# This actually breaks stuff because dpkg gets linked to libgettext3
# instead of gettext.
return;
my @essentials = Fink::Package-list_essential_packages();
my $pid = fork();
if ($pid) {
wait();
} else {
close(STDIN);
system(fink, -y, rebuild, @essentials);
system(fink, -y, reinstall, @essentials);
}
}
sub readPackages {
$Fink::Status::the_instance ||= Fink::Status-new();
$Fink::Status::the_instance-read();
eval {
Fink::Package-forget_packages(2, 0);
};
if ($@ and $@ =~ /new API for forget_packages/) {
Fink::Package-forget_packages({disk = 1});
} elsif ($@) {
die $@;
}
Fink::Package-require_packages();
}
# Purge packages we may have previously built
sub purgeNonEssential {
my @essentials = map { quotemeta($_) }
Fink::Package-list_essential_packages();
my $re = ^(?: . join(|, @essentials) . )\$;
readPackages();
my @packages = Fink::Package-list_packages();
my @purgelist;
foreach my $pkgname (@packages) {
next if $pkgname =~ /$re/i;
next if Fink::VirtPackage-query_package($pkgname);
my $obj;
eval {
$obj = Fink::Package-package_by_name($pkgname);
};
next if $@ or !$obj;
next unless $obj-is_any_installed();
my $vo = Fink::PkgVersion-match_package($pkgname);
next if $vo-is_type('dummy');
push @purgelist, $pkgname;
}
system(dpkg --purge . join( , @purgelist) . 21 | grep -v 'not
installed') if @purgelist;
}
# Get either the name or email address from the value of the maintainer field
sub maintParse {
my $maint = shift;
my($name, $email);
if ($maint =~ m/^(.*) (.*)/) {
($name, $email) = ($1, $2);
$name =~ s///g;
} else {
($name, $email) = (, $maint);
}
return($name, $email);
}
sub maintName { return (maintParse(shift))[0]; }
sub maintEmail { return (maintParse(shift))[1]; }
# Take a list of packages, and return it arranged by maintainer.
# Returns a hash of listrefs. Hash keys are maintainers.
sub sortPackagesByMaintainer {
my %maints;
foreach my $pkg (@_) {
my $obj;
eval {
$obj = Fink::PkgVersion-match_package($pkg);
};
if ($@ or !$obj) {
warn Couldn't get object for $pkg: [EMAIL PROTECTED];
next;
}
my $maint = None [EMAIL PROTECTED];
if ($obj-has_param('maintainer')) {
$maint = $obj-param('maintainer');
# RangerRick has one email per package, but we want them clustered for
maintindex
$maint =~ s/[EMAIL PROTECTED]/[EMAIL PROTECTED]/;
}
$maints{$maint} ||= [];
push @{$maints{$maint}}, $pkg;
}
return %maints;
}
# Get split-offs of a package
sub getRelatives {
my $obj = shift or return;
# _relatives has been replaced by a real method in
# Fink CVS.
my @relatives = $obj-can(get_relatives) ? $obj-get_relatives() :
@{$obj-{_relatives} || []};
return @relatives;
}
# Buildlocks are how Fink stops a package from being built twice
# at the same time. They can get left over if the system crashes
# while building a package.
sub removeBuildLocks {
foreach my $pkgname (Fink::Package-list_packages()) {
next unless $pkgname =~ /^fink-buildlock-.*/;
system(dpkg, -r, $pkgname);
}
}
# Get a flat list of
[cvs] scripts/buildfink/contrib cleanfink, NONE, 1.1 finkfilter_sysgcc, NONE, 1.1 maintnotify, NONE, 1.1 owbuild, NONE, 1.1
Update of /cvsroot/fink/scripts/buildfink/contrib
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv24651/contrib
Added Files:
cleanfink finkfilter_sysgcc maintnotify owbuild
Log Message:
Start reorganizing things...
--- NEW FILE: maintnotify ---
#!/usr/bin/perl
# Notify maintainers about problems with their packages
#Copyright (c) 2005 Apple Computer, Inc. All Rights Reserved.
#
#This program is free software; you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
#the Free Software Foundation; either version 2 of the License, or
#(at your option) any later version.
#
#This program is distributed in the hope that it will be useful,
#but WITHOUT ANY WARRANTY; without even the implied warranty of
#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#GNU General Public License for more details.
#
#You should have received a copy of the GNU General Public License
#along with this program; if not, write to the Free Software
#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
=pod
=head1 SYNOPSIS
maintnotify -- Notify maintainers about problems with their packages
=head1 USAGE
maintnotify --finkdir FINKDIR --pkgfile PKGFILE --template TEMPLATE
--from FROM [--subject SUBJ] [--cc CC] [--attachdir ATTACHDIR]
Cmaintnotify sends an email to the maintainers of all packages which you
specify. It sends one email per maintainer. Messages are sent via the
Mail::Send module.
CFINKDIR specifies the root of your Fink installation; this is usually C/sw.
CPKGFILE is a file containing a list of packages to send emails about.
CTEMPLATE is a file describing the contents of the email; see LEMAIL
TEMPLATES below.
CFROM is the email address which the messages should appear to be from.
CSUBJ is the subject which the emails should have; it will be processed
as a template.
CCC is an optional email address to send copies of all messages to.
CATTACHDIR is an optional path to a directory containing files to
attach to the email. For a message about package foo, any files in that
directory which start with foo. will be attached (for instance foo.info
or foo.patch.) This requires the MIME::Lite and MIME::Types modules.
=head1 EMAIL TEMPLATES
There are some escape codes you can use in emails which will get replaced
by different values for each message.
=over 4
=item B%%
A literal %.
=item B%s
's' if the message is about multiple packages; otherwise, the empty
string. So, Cpackage%s will be either Cpackages or Cpackage.
=item B%s{foo}{foos}
The first alternative if the message is about one package; otherwise,
the second alternative.
=item B%p{and }{0}
A comma-separated list of the packages this message is about.
If the optional parameter is specified, it will be prepended to the last
package if there are more than one; it defaults to and . If the
second optional parameter is set to 1, there will be a comma if
there are only two items; normally, there won't be.
=item B%P
A newline-separated list of the packages this message is about.
=item B%P{foo}{bar}
A newline-separated list of the packages this message is about; each
package will be preceeded by Cfoo and followed by Cbar.
This can be used to indent the list of packages or turn it into a list of URLs.
The suffix is optional.
=back
=cut
use strict;
use warnings;
use Getopt::Long;
use Mail::Send;
use FindBin qw($Bin);
use lib $Bin;
use FinkLib;
our(%options);
my $opts_ok = GetOptions(
finkdir=s = \$options{finkdir},
pkgfile=s = \$options{pkgfile},
template=s = \$options{template},
from=s = \$options{from},
subject=s = \$options{subject},
cc=s = \$options{cc},
attachdir=s = \$options{attachdir},
);
if(@ARGV) {
warn Extra command-line arguments left over after option
processing.\n;
$opts_ok = 0;
}
foreach my $opt(qw(finkdir pkgfile template from subject)) {
if(!$options{$opt}) {
warn You must specify the '$opt' option.\n;
$opts_ok = 0;
}
}
if($opts_ok) {
if(not -d $options{finkdir}) {
die The specified Fink directory does not exist.\n;
} elsif(not -x $options{finkdir} . /bin/fink) {
die The specified Fink directory does not appear to contain a
Fink installation.\n;
}
if(not -f $options{pkgfile}) {
die The specified package file does not exist.\n;
}
if(not -f $options{template}) {
die The specified template file does not exist.\n;
}
if($options{attachdir} and not -d $options{attachdir}) {
die The specified attachments directory does not exist.\n;
}
}
if(!$opts_ok) {
die See 'perldoc $0' for more information.\n;
}
if($options{attachdir}) {
require MIME::Lite;
require MIME::Types;
}
FinkLib::initFink($options{finkdir});
open(PKGFILE,
[cvs] scripts/buildfink/analysis analyze, NONE, 1.1 buildstats, NONE, 1.1 cmplink, NONE, 1.1 cmpruns, NONE, 1.1 filter, NONE, 1.1 report, NONE, 1.1
Update of /cvsroot/fink/scripts/buildfink/analysis
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv24651/analysis
Added Files:
analyze buildstats cmplink cmpruns filter report
Log Message:
Start reorganizing things...
--- NEW FILE: buildstats ---
#!/usr/bin/perl
#Copyright (c) 2005 Apple Computer, Inc. All Rights Reserved.
#
#This program is free software; you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
#the Free Software Foundation; either version 2 of the License, or
#(at your option) any later version.
#
#This program is distributed in the hope that it will be useful,
#but WITHOUT ANY WARRANTY; without even the implied warranty of
#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#GNU General Public License for more details.
#
#You should have received a copy of the GNU General Public License
#along with this program; if not, write to the Free Software
#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
use strict;
use warnings;
use FindBin qw($Bin);
use Config;
use lib $Bin/../plib;
use lib $Bin/../plib/site_perl;
use lib sprintf($Bin/../plib/site_perl/%vd/%s, $^V, $Config{archname});
use Date::Parse;
use File::stat;
# Show build time in seconds and log size in bytes for each package built.
# Run this from the otherworld run directory.
my $starttime;
open(LOG, log.txt) or die Couldn't open log.txt: $!\n;
while(LOG) {
/^(.*?): (.*)/;
my($time, $text) = ($1, $2);
next unless $text and $text =~ /(Build of|Building package) (\S+)/;
my($type, $name) = ($1, $2);
$name =~ s/\.\.\.$//;
if($type eq Building package) {
$starttime = str2time($time);
} else {
my $endtime = str2time($time);
my $buildlen = $endtime - $starttime;
my $logsize = stat(logs/$name.log)-size;
print $name $buildlen $logsize\n;
}
}
--- NEW FILE: cmpruns ---
#!/usr/bin/perl
#Copyright (c) 2005 Apple Computer, Inc. All Rights Reserved.
#
#This program is free software; you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
#the Free Software Foundation; either version 2 of the License, or
#(at your option) any later version.
#
#This program is distributed in the hope that it will be useful,
#but WITHOUT ANY WARRANTY; without even the implied warranty of
#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#GNU General Public License for more details.
#
#You should have received a copy of the GNU General Public License
#along with this program; if not, write to the Free Software
#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
use strict;
use warnings;
die Usage: $0 pkgindex.html pkgindex.html\n unless @ARGV == 2;
sub parseLine {
my $line = shift;
$line =~ m!a.*?(.*?)/a: a.*(.*)/a!;
my($pkg, $cat) = ($1, $2);
$pkg =~ s/\.log$//;
return ($pkg, $cat);
}
sub parsePkgIndex {
my $file = shift;
open(FILE, $file) or die Couldn't open pkgindex: $!\n;
my %ret;
while(FILE) {
my($pkg, $cat) = parseLine($_);
$ret{$pkg} = $cat;
}
return %ret;
}
my(%a) = parsePkgIndex(shift);
my(%b) = parsePkgIndex(shift);
my $wroteheader = 0;
foreach my $pkg (sort keys %a) {
next if exists($b{$pkg});
print New in a:\n if !$wroteheader++;
print \t$pkg\n;
}
$wroteheader = 0;
foreach my $pkg (sort keys %b) {
next if exists($a{$pkg});
print New in b:\n if !$wroteheader++;
print \t$pkg\n;
}
$wroteheader = 0;
foreach my $pkg (sort keys %a) {
next if !exists($b{$pkg}) or $a{$pkg} eq $b{$pkg};
print Changed:\n if !$wroteheader++;
print \t$pkg: $a{$pkg} = $b{$pkg}\n;
}
--- NEW FILE: cmplink ---
#!/usr/bin/perl
#Copyright (c) 2005 Apple Computer, Inc. All Rights Reserved.
#
#This program is free software; you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
#the Free Software Foundation; either version 2 of the License, or
#(at your option) any later version.
#
#This program is distributed in the hope that it will be useful,
#but WITHOUT ANY WARRANTY; without even the implied warranty of
#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#GNU General Public License for more details.
#
#You should have received a copy of the GNU General Public License
#along with this program; if not, write to the Free Software
#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
die Usage: $0 a-dir b-dir\n unless @ARGV == 2;
my($adir, $bdir) = (shift, shift);
print tt\n;
while() {
s!^\s*(.*?): (.*) = (.*)!$1: a href=$adir/logs/$1.log$2/a = a
href=$bdir/logs/$1.log$3/a!;
s!$!br!;
print $_;
}
print /tt\n;
--- NEW FILE: filter ---
[cvs] scripts/buildfink/fdb fdb.css, NONE, 1.1 fdb.js, NONE, 1.1 fdb.pl, NONE, 1.1 mkfdb, NONE, 1.1
Update of /cvsroot/fink/scripts/buildfink/fdb
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv24651/fdb
Added Files:
fdb.css fdb.js fdb.pl mkfdb
Log Message:
Start reorganizing things...
--- NEW FILE: mkfdb ---
#!/usr/bin/perl
use strict;
use warnings;
use DBI;
use FindBin qw($Bin);
@ARGV = 2 or die EOF;
Usage: $0 dbtype dbstr checkpoint
mkfiledb - Convert a buildfink checkpoint file into a database.
dbstr is a DBI connection string, for instance:
foo.sqlite
host:user:pass:db
EOF
my($dbtype, $dbpath) = (shift, shift);
our(%finkfiles, %packages);
# These get replaced by prepared versions when we connect to the database.
our $dbh;
our %dbqueries = (
add_package = INSERT INTO packages(package_name) VALUES (?),
add_file_path = INSERT INTO file_paths(parent_id, file_name, fullpath)
VALUES (?, ?, ?),
add_file_version = EOF);
INSERT INTO file_versions(
package_id,
is_directory,
fullpath,
file_id,
size,
posix_user,
posix_group,
flags)
VALUES (?, ?, ?, ?, ?, ?, ?, ?)
EOF
sub addDBFiles {
my($file, $parent_id) = @_;
$dbqueries{add_file_path}-execute($parent_id, $file-{.},
$file-{/path/});
my $file_id = $dbh-last_insert_id(undef, undef, undef, undef);
if($file-{/versions/}) {
foreach my $filever (@{$file-{/versions/}}) {
$dbqueries{add_file_version}-execute(
$packages{$filever-{pkg}},
$filever-{isdir},
$filever-{fullpath},
$file_id,
$filever-{size},
$filever-{user},
$filever-{group},
$filever-{flags}
);
}
}
foreach my $subfile (keys %$file) {
next if $subfile eq . or $subfile eq .. or $subfile eq /versions/
or $subfile eq /path/;
addDBFiles($file-{$subfile}, $file_id);
}
}
$finkfiles{.} = ;
$finkfiles{..} = undef;
sub addPackageFiles {
my(undef, $pkg, @files) = @_;
$packages{$pkg} = 0;
foreach my $file (@files) {
my $path = delete $file-{path};
if(not $path =~ s!^%p/!!) {
warn $pkg has path not in %p: $path\n;
next;
}
($file-{user}, $file-{group}) = split(m!/!, delete $file-{owners});
$file-{fullpath} = $path;
$file-{isdir} = ($file-{flags} =~ /^d/ ? 1 : 0);
my @pathbits = split(m!/!, $path);
my $finkroot = \%finkfiles;
my $fullpath = ;
foreach my $pathbit(@pathbits) {
$fullpath .= / if $fullpath;
$fullpath .= $pathbit;
$finkroot-{$pathbit} ||= {.. = $finkroot, . = $pathbit,
/path/ = $fullpath};
$finkroot = $finkroot-{$pathbit};
}
$finkroot-{/versions/} ||= [];
push @{$finkroot-{/versions/}}, $file;
$file-{pkg} = $pkg;
}
}
while() {
next unless /^addPackageFiles/;
s/\$pkgfiles/undef/;
eval $_;
}
my($dbstr, $dbuser, $dbpass, %dbattrs);
$dbtype = lc($dbtype);
if($dbtype eq sqlite) {
$dbstr = dbi:SQLite:dbname=$dbpath;
$dbuser = ;
$dbpass = ;
%dbattrs = (RaiseError = 1, AutoCommit = 0);
} else {
die Unknown database type. Valid types are: sqlite\n;
}
$dbh = DBI-connect($dbstr, $dbuser, $dbpass, \%dbattrs);
foreach my $key (keys %dbqueries) {
my $stmt = $dbh-prepare($dbqueries{$key});
$dbqueries{$key} = $stmt;
}
foreach my $pkg(keys %packages) {
$dbqueries{add_package}-execute($pkg);
$packages{$pkg} = $dbh-last_insert_id(undef, undef, undef, undef);
}
foreach my $file(keys %finkfiles) {
next if $file eq . or $file eq .. or $file eq /versions/ or $file eq
/path/;
addDBFiles($finkfiles{$file}, 0);
}
$dbh-do(COMMIT);
--- NEW FILE: fdb.css ---
li {
font-family: monospace;
}
--- NEW FILE: fdb.pl ---
#!/usr/bin/perl
use strict;
use warnings;
use lib /Volumes/SandBox/fink/sw/lib/perl5;
use lib /Volumes/SandBox/fink/sw/lib/perl5/darwin;
use DBI;
use CGI qw(:standard param);
use JSON;
print Status: 200 OK\n;
our $dbh = DBI-connect(dbi:SQLite:dbname=pkgdb.db, , , {
RaiseError = 1,
AutoCommit = 0
});
if(param() and param('op')) {
my $op = param('op');
print Content-type: text/plain\n\n;
if($op eq pkgls) {
my $pkg = param('pkg');
my $sth = $dbh-prepare(
SELECT fullpath AS 'path',
size, posix_user, posix_group, flags
FROM file_versions LEFT OUTER JOIN packages
ON file_versions.package_id = packages.package_id
WHERE package_name=?
ORDER BY is_directory DESC, fullpath ASC
);
$sth-execute($pkg);
print objToJson($sth-fetchall_arrayref({}));
} elsif($op eq ls) {
my $dir_id = param('dir_id');
my $sth = $dbh-prepare(
SELECT file_paths.file_id AS 'file_id', file_name,
is_directory, package_name
FROM file_paths LEFT OUTER JOIN file_versions ON
[cvs] scripts/buildfink/analysis analyze,1.1,1.2 report,1.1,1.2
Update of /cvsroot/fink/scripts/buildfink/analysis
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv28345/analysis
Modified Files:
analyze report
Log Message:
Recognize new directory layout
Index: report
===
RCS file: /cvsroot/fink/scripts/buildfink/analysis/report,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- report 31 Mar 2007 19:35:45 - 1.1
+++ report 31 Mar 2007 19:44:18 - 1.2
@@ -68,43 +68,43 @@
use List::Util qw(sum);
use Getopt::Long;
use FindBin qw($Bin);
-use lib $Bin;
+use lib $Bin/../lib;
use FinkLib;
my %opts;
my $opts_ok = GetOptions(
- comments=s = \$opts{comments},
- catdescs=s = \$opts{catdescs},
- outdir=s = \$opts{outdir},
- finkdir=s = \$opts{finkdir},
-);
-if($opts{comments} and not -f $opts{comments}) {
- warn The specified comments file does not exist.\n;
- $opts_ok = 0;
+comments=s = \$opts{comments},
+catdescs=s = \$opts{catdescs},
+outdir=s = \$opts{outdir},
+finkdir=s = \$opts{finkdir},
+ );
+if ($opts{comments} and not -f $opts{comments}) {
+ warn The specified comments file does not exist.\n;
+ $opts_ok = 0;
}
-if($opts{catdescs} and not -f $opts{catdescs}) {
- warn The specified category descriptions file does not exist.\n;
- $opts_ok = 0;
+if ($opts{catdescs} and not -f $opts{catdescs}) {
+ warn The specified category descriptions file does not exist.\n;
+ $opts_ok = 0;
}
-if(!$opts{outdir}) {
- warn You must specify an output directory.\n;
- $opts_ok = 0;
-} elsif(not -d $opts{outdir}) {
- warn The specified output directory does not exist.\n;
- $opts_ok = 0;
-} elsif(not -f $opts{outdir}/successes) {
- warn You do not appear to have run 'analyze' on this buildfink run,
but proceeding anyway...\n;
+if (!$opts{outdir}) {
+ warn You must specify an output directory.\n;
+ $opts_ok = 0;
+} elsif (not -d $opts{outdir}) {
+ warn The specified output directory does not exist.\n;
+ $opts_ok = 0;
+} elsif (not -f $opts{outdir}/successes) {
+ warn You do not appear to have run 'analyze' on this buildfink run, but
proceeding anyway...\n;
}
-if(!$opts{finkdir}) {
- warn You must specify a Fink directory.\n;
- $opts_ok = 0;
-} elsif(not -f $opts{finkdir}/etc/fink.conf) {
- warn The specified Fink directory does not appear to be valid.\n;
- $opts_ok = 0;
+if (!$opts{finkdir}) {
+ warn You must specify a Fink directory.\n;
+ $opts_ok = 0;
+} elsif (not -f $opts{finkdir}/etc/fink.conf) {
+ warn The specified Fink directory does not appear to be valid.\n;
+ $opts_ok = 0;
}
-if(!$opts_ok) {
- die See 'perldoc $0' for more information.\n;
+if (!$opts_ok) {
+ die See 'perldoc $0' for more information.\n;
}
@@ -112,16 +112,16 @@
chdir($opts{outdir}) or die Couldn't change to output directory: $!\n;
our %catdescs;
-if($opts{catdescs}) {
- open(CATDESCS, $opts{catdescs}) or die Couldn't open category
description file: $!\n;
- my $lineno = 1;
- while(CATDESCS) {
- chomp;
- /^(.*?):\s*(.*)/ or die Line $lineno in category description
file is malformed.\n;
- $catdescs{$1} = $2;
- $lineno++;
- }
- close CATDESCS;
+if ($opts{catdescs}) {
+ open(CATDESCS, $opts{catdescs}) or die Couldn't open category description
file: $!\n;
+ my $lineno = 1;
+ while (CATDESCS) {
+chomp;
+/^(.*?):\s*(.*)/ or die Line $lineno in category description file is
malformed.\n;
+$catdescs{$1} = $2;
+$lineno++;
+ }
+ close CATDESCS;
}
@@ -131,97 +131,97 @@
# It returns a list of packages in the filed defined by this
# particular category.
sub dologs {
- my($file, $depth) = @_;
- my @ret;
+ my($file, $depth) = @_;
+ my @ret;
- open(IN, $file) or die Couldn't open $file: $!\n;
- open(OUT, , $file.html) or die Couldn't open $file.html: $!\n;
+ open(IN, $file) or die Couldn't open $file: $!\n;
+ open(OUT, , $file.html) or die Couldn't open $file.html: $!\n;
- my $back = ../ x $depth;
- $back .= logs/;
- while(IN) {
- s/^(\S*)\.log\s+(.+)/a href=$back$1.log$1\/a ($2)br/
- or
- s/^(\S*)\.log.*/a href=$back$1.log$1\/abr/;;
- print OUT $_;
- push @ret, $1;
- }
+ my $back = ../ x $depth;
+ $back .= logs/;
+ while (IN) {
+s/^(\S*)\.log\s+(.+)/a href=$back$1.log$1\/a ($2)br/
+ or
+ s/^(\S*)\.log.*/a href=$back$1.log$1\/abr/;;
+print OUT $_;
+push @ret, $1;
+ }
- close OUT;
- close IN;
+ close OUT;
+ close IN;
- return @ret;
+ return @ret;
}
sub countlines {
- my $file = shift;
- my $lines = 0;
+ my $file = shift;
+ my
[cvs] scripts/buildfink/contrib cleanfink, 1.1, 1.2 maintnotify, 1.1, 1.2
Update of /cvsroot/fink/scripts/buildfink/contrib
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv28345/contrib
Modified Files:
cleanfink maintnotify
Log Message:
Recognize new directory layout
Index: maintnotify
===
RCS file: /cvsroot/fink/scripts/buildfink/contrib/maintnotify,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- maintnotify 31 Mar 2007 19:35:45 - 1.1
+++ maintnotify 31 Mar 2007 19:44:18 - 1.2
@@ -98,54 +98,54 @@
use Getopt::Long;
use Mail::Send;
use FindBin qw($Bin);
-use lib $Bin;
+use lib $Bin/../lib;
use FinkLib;
our(%options);
my $opts_ok = GetOptions(
- finkdir=s = \$options{finkdir},
- pkgfile=s = \$options{pkgfile},
- template=s = \$options{template},
- from=s = \$options{from},
- subject=s = \$options{subject},
- cc=s = \$options{cc},
- attachdir=s = \$options{attachdir},
-);
-if(@ARGV) {
- warn Extra command-line arguments left over after option
processing.\n;
- $opts_ok = 0;
+finkdir=s = \$options{finkdir},
+pkgfile=s = \$options{pkgfile},
+template=s = \$options{template},
+from=s = \$options{from},
+subject=s = \$options{subject},
+cc=s = \$options{cc},
+attachdir=s = \$options{attachdir},
+ );
+if (@ARGV) {
+ warn Extra command-line arguments left over after option processing.\n;
+ $opts_ok = 0;
}
-foreach my $opt(qw(finkdir pkgfile template from subject)) {
- if(!$options{$opt}) {
- warn You must specify the '$opt' option.\n;
- $opts_ok = 0;
- }
+foreach my $opt (qw(finkdir pkgfile template from subject)) {
+ if (!$options{$opt}) {
+warn You must specify the '$opt' option.\n;
+$opts_ok = 0;
+ }
}
-if($opts_ok) {
- if(not -d $options{finkdir}) {
- die The specified Fink directory does not exist.\n;
- } elsif(not -x $options{finkdir} . /bin/fink) {
- die The specified Fink directory does not appear to contain a
Fink installation.\n;
- }
- if(not -f $options{pkgfile}) {
- die The specified package file does not exist.\n;
- }
- if(not -f $options{template}) {
- die The specified template file does not exist.\n;
- }
- if($options{attachdir} and not -d $options{attachdir}) {
- die The specified attachments directory does not exist.\n;
- }
+if ($opts_ok) {
+ if (not -d $options{finkdir}) {
+die The specified Fink directory does not exist.\n;
+ } elsif (not -x $options{finkdir} . /bin/fink) {
+die The specified Fink directory does not appear to contain a Fink
installation.\n;
+ }
+ if (not -f $options{pkgfile}) {
+die The specified package file does not exist.\n;
+ }
+ if (not -f $options{template}) {
+die The specified template file does not exist.\n;
+ }
+ if ($options{attachdir} and not -d $options{attachdir}) {
+die The specified attachments directory does not exist.\n;
+ }
}
-if(!$opts_ok) {
- die See 'perldoc $0' for more information.\n;
+if (!$opts_ok) {
+ die See 'perldoc $0' for more information.\n;
}
-if($options{attachdir}) {
- require MIME::Lite;
- require MIME::Types;
+if ($options{attachdir}) {
+ require MIME::Lite;
+ require MIME::Types;
}
FinkLib::initFink($options{finkdir});
@@ -160,99 +160,99 @@
close TEMPLATE;
my @attachfiles;
-if($options{attachdir}) {
- opendir(ADIR, $options{attachdir}) or die Couldn't open attachdir:
$!\n;
- @attachfiles = grep { $_ ne . and $_ ne .. } readdir(ADIR);
- close(ADIR);
+if ($options{attachdir}) {
+ opendir(ADIR, $options{attachdir}) or die Couldn't open attachdir: $!\n;
+ @attachfiles = grep { $_ ne . and $_ ne .. } readdir(ADIR);
+ close(ADIR);
}
my %maints = FinkLib::sortPackagesByMaintainer(@packages);
-foreach my $maint(keys %maints) {
- my @pkgs = @{$maints{$maint}};
- my $to = FinkLib::maintEmail($maint);
- my $subject = applyTemplate($options{subject}, @pkgs);
- my $body = applyTemplate($template, @pkgs);
+foreach my $maint (keys %maints) {
+ my @pkgs = @{$maints{$maint}};
+ my $to = FinkLib::maintEmail($maint);
+ my $subject = applyTemplate($options{subject}, @pkgs);
+ my $body = applyTemplate($template, @pkgs);
- my @afiles;
- foreach my $pkg(@pkgs) {
- push @afiles,
- map { $options{attachdir} . /$_ }
- grep { /^\Q$pkg\E\./ } @attachfiles;
- }
- if(@afiles) {
- my(%args) = (
- From = $options{from},
- To = $to,
- Subject = $subject,
- Type = 'multipart/mixed'
+ my @afiles;
[cvs] scripts/buildfink/lib/BFData - New directory
Update of /cvsroot/fink/scripts/buildfink/lib/BFData In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv9154/BFData Log Message: Directory /cvsroot/fink/scripts/buildfink/lib/BFData added to the repository - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink/lib BFData.pm,NONE,1.1
Update of /cvsroot/fink/scripts/buildfink/lib
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv21143/lib
Added Files:
BFData.pm
Log Message:
Start moving buildfink over to direct FDB database access
--- NEW FILE: BFData.pm ---
package BFData;
use strict;
use warnings;
sub new {
my %params = @_;
die BFData::new requires 'store' argument!\n unless $params{store};
eval require BFData::$params{store};;
die $@ if $@;
$params{store}-new(@_);
}
1;
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink/lib/BFData DBI.pm,NONE,1.1
Update of /cvsroot/fink/scripts/buildfink/lib/BFData
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv21143/lib/BFData
Added Files:
DBI.pm
Log Message:
Start moving buildfink over to direct FDB database access
--- NEW FILE: DBI.pm ---
package BFData::DBI;
use strict;
use warnings;
use DBI;
our @ISA = qw(BFData);
our %dbqueries = (
add_package = INSERT INTO packages(package_name) VALUES
(?),
add_file_path = INSERT INTO file_paths(parent_id,
file_name, fullpath) VALUES (?, ?, ?),
get_package_id = SELECT package_id FROM packages WHERE
package_name = ?,
add_file_version = EOF);
INSERT INTO file_versions(
package_id,
is_directory,
fullpath,
file_id,
size,
posix_user,
posix_group,
flags)
VALUES (?, ?, ?, ?, ?, ?, ?, ?)
EOF
sub new {
my($pkg, %params) = @_;
my $self = {};
my $class = ref($pkg) || $pkg || __PACKAGE__;
bless $self, $class;
$self-{dbtype} = $params{dbtype} or die Must specify dbtype for DBI
store.\n;
my $dbstr;
my %dbattrs = (RaiseError = 1, AutoCommit = 0);
if ($self-{dbtype} eq sqlite) {
die Must specify db for DBI SQLite.\n unless $params{db};
$dbstr = sprintf(dbi:SQLite:dbname=%s, $params{db});
} else {
die Unknown dbtype; valid values: sqlite\n;
}
$self-{dbh} = DBI-connect($dbstr, $params{user}, $params{password},
\%dbattrs);
$self-{queries} = {};
foreach my $key (keys %dbqueries) {
$self-{queries}-{$key} = $self-prepare($dbqueries{$key});
}
return $self;
}
sub addPackage {
my($self, $package) = @_;
$self-{queries}-{add_package}-execute($package);
$self-{dbh}-commit();
}
sub addPackageFiles {
my($self, $package, @files) = @_;
if (!$self-{queries}-{get_package_id}-execute($package)) {
$self-addPackage($package);
$self-{queries}-{get_package_id}-execute($package) or
die Couldn't find or add package '$package'!\n;
}
my($package_id) = $self-{queries}-{get_package_id}-fetchrow_array();
$self-{queries}-{get_package_id}-finish();
my $fileroot = $self-makeFileHierarchy($package, [EMAIL PROTECTED]);
$self-addFileTree($package_id, $fileroot, 0);
$self-{dbh}-commit();
}
sub makeFileHierarchy {
my($self, $pkg, $files) = @_;
my %root = (. = , .. = undef);
foreach my $file (@$files) {
my $path = delete $file-{path};
if (not $path =~ s!^%p/!!) {
warn $pkg has path not in %p: $path\n;
next;
}
$file-{fullpath} = $path;
$file-{isdir} = ($file-{flags} =~ /^d/ ? 1 : 0);
my @pathbits = split(m!/!, $path);
my $finkroot = \%root;
my $fullpath = ;
foreach my $pathbit (@pathbits) {
$fullpath .= / if $fullpath;
$fullpath .= $pathbit;
$finkroot-{$pathbit} ||= {.. = $finkroot, . = $pathbit, /path/
= $fullpath};
$finkroot = $finkroot-{$pathbit};
}
$finkroot-{/versions/} ||= [];
push @{$finkroot-{/versions/}}, $file;
$file-{pkg} = $pkg;
}
return \%root;
}
sub addFileTree {
my($self, $pkgid, $file, $parent_id) = @_;
$self-{queries}-{add_file_path}-execute($parent_id, $file-{.},
$file-{/path/});
my $file_id = $dbh-last_insert_id(undef, undef, undef, undef);
if ($file-{/versions/}) {
foreach my $filever (@{$file-{/versions/}}) {
$self-{queries}-{add_file_version}-execute(
$pkgid,
$filever-{isdir},
$filever-{fullpath},
$file_id,
$filever-{size},
$filever-{user},
$filever-{group},
$filever-{flags}
);
}
}
foreach my $subfile (keys %$file) {
next if $subfile eq . or $subfile eq .. or $subfile eq /versions/ or
$subfile eq /path/;
$self-addFileTree($pkgid, $file-{$subfile}, $file_id);
}
}
sub prepare {
my($self, $stmt) = @_;
return $self-{dbh}-prepare($stmt);
}
1;
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink/schemas sqlite.sql,NONE,1.1 sqlite,1.1,NONE
Update of /cvsroot/fink/scripts/buildfink/schemas In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv21143/schemas Added Files: sqlite.sql Removed Files: sqlite Log Message: Start moving buildfink over to direct FDB database access --- sqlite DELETED --- --- NEW FILE: sqlite.sql --- CREATE TABLE file_paths ( file_id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, parent_id INTEGER NOT NULL, file_name VARCHAR NOT NULL, fullpath STRING NOT NULL, UNIQUE (parent_id, file_name) ); CREATE TABLE packages ( package_id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, package_name STRING NOT NULL UNIQUE ); CREATE TABLE file_versions ( file_version_id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, is_directory BOOLEAN NOT NULL, package_id INTEGER NOT NULL, fullpath STRING NOT NULL, file_id INTEGER NOT NULL, size INTEGER NOT NULL, posix_user STRING NULL, posix_group STRING NULL, flags VARCHAR NULL, UNIQUE (package_id, file_id) ); CREATE INDEX file_ver_idx ON file_versions (file_id); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink/fdb mkfdb,1.1,NONE
Update of /cvsroot/fink/scripts/buildfink/fdb In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv21143/fdb Removed Files: mkfdb Log Message: Start moving buildfink over to direct FDB database access --- mkfdb DELETED --- - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink/etc catdescs, NONE, 1.1 filters-nobody.xml, NONE, 1.1 filters.xml, NONE, 1.1
Update of /cvsroot/fink/scripts/buildfink/etc In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv21242/etc Added Files: catdescs filters-nobody.xml filters.xml Log Message: Commit filters --- NEW FILE: filters-nobody.xml --- filters filter name=prefix flags=i(?:install|rm|touch|cp|mv|rmdir|mkdir).*permission denied/filter filter name=chownch(?:own|mod|grp).*Operation not permitted/filter filter name=unanalyzed flags=m^Failed:/filter /filters --- NEW FILE: catdescs --- dylib: Required library not found at run-time obsolete_headtail: Use of deprecated syntax -NUM with head/tail. Use -n NUM instead testharness: Perl Test::Harness not installed 4067357: gcc-4062: ICE in fold-const.c:fold when compiling at -O3 stricter: Things 3.3 warned about which are now errors patch: Failed to apply patch static: Static declaration follows non-static declaration ioctls: asm/ioctls.h: No such file or directory setjmp: tried to inline function which uses setjmp export: tried to exec 'export' (which is a bash built-in) template: No arguments depend on a template parameter varargs: varargs.h parse: parse error array: array type has incomplete element type storage: invalid storage class oldgcc: Project trying to use gcc2 or gcc3.1 ldbl: Undefined symbol $LDBLStub linkedit: Internal link edit command failed permissive: GCC suggests -fpermissive (C++ front-end?) implicit: incompatible implicit declaration mkdirhier: mkdirhier: Command not found cp: Project calls cp with only one argument mkdir: Can't create directory ipush: error: 'I_PUSH' undeclared setscheduler: Darwin doesn't have sched_setscheduler exit1: Project exits with status 1 for no apparent reason intl: libintl.h: No such file or directory tas: Undefined symbols: _tas getaddrinfo: Project says we need to either get a working getaddrinfo() or disable IPv6 support sasl: Undefined symbols: _sasl pkgconfig: A new enough version of pkg-config was not found. xcolor: X color database not found xpm: Undefined symbols: _XpmReadFileToPixmap tex: You don't have a valid teTeX installation norule: No rule to make target cc1opt: Unrecognized command-line option passed to GCC nofiles: Tried to install files which don't exist oldreadline: Project thinks our version of libreadline is too old ldap: Couldn't find an LDAP library sdl: Couldn't find libsdl perl581: Project has Panther Perl version hard-wired into dependencies download: Failed to download project sources nodep: Couldn't resolve dependency nofink: No matching version found for fink conflict: Conflicting packages typeconflict: Conflicting types for 'foo' --- NEW FILE: filters.xml --- !-- Copyright (c) 2005 Apple Computer, Inc. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- filters filter name=failures/oneproj/adnserror: conflicting types for 'adns__parse_domain'/filter filter name=failures/oneproj/applex11toolsYou must have X11User.pkg somewhere in /Volumes or /Users/filter filter name=failures/oneproj/bundle-webmin\*\*\* config (Y/I/N/O/D/Z) [default=N] ? .*/sw/bin/dpkg: error processing webmin-burner (--install):/filter filter name=failures/oneproj/bzflag/usr/include/architecture/ppc/math.h:212: error: expected unqualified-id before float/filter filter name=failures/oneproj/cc65_afailed.c(16): Error: Identifier expected/filter filter name=failures/oneproj/ccache.*/sw/bin/g\+\+: File exists/filter filter name=failures/oneproj/cocoa-sharpERROR: unknown type \(NSObject}/filter filter name=failures/oneproj/cxboarderror: 'clock' redeclared as different kind of symbol/filter filter name=failures/oneproj/dhcpicmp.c:248: warning: pointer targets in passing argument 6 of 'recvfrom' differ in signedness/filter filter name=failures/oneproj/dodschecking for gcc/g\+\+ 2.8 or greater... configure: error: must be at least version 2.7.x/filter filter name=failures/oneproj/exactchown: smmsp: Invalid argument/filter filter name=failures/oneproj/absoftAbsoft Fortran not installed./filter filter name=failures/oneproj/finch-pmCan't locate object method file_name_is_absolute via package ExtUtils::Liblist/filter filter name=failures/oneproj/fontconfig-patherror processing
[cvs] scripts/buildfink/lib/FinkFDB - New directory
Update of /cvsroot/fink/scripts/buildfink/lib/FinkFDB In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv5203/FinkFDB Log Message: Directory /cvsroot/fink/scripts/buildfink/lib/FinkFDB added to the repository - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink/lib FinkFDB.pm,NONE,1.1 BFData.pm,1.1,NONE
Update of /cvsroot/fink/scripts/buildfink/lib
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv10881/lib
Added Files:
FinkFDB.pm
Removed Files:
BFData.pm
Log Message:
Finish integratating FDB support into buildfink
--- BFData.pm DELETED ---
--- NEW FILE: FinkFDB.pm ---
package FinkFDB;
use strict;
use warnings;
sub new {
my($self, %params) = @_;
die FinkFDB::new requires 'store' argument!\n unless $params{store};
eval require FinkFDB::$params{store};;
die $@ if $@;
FinkFDB::$params{store}-new(%params);
}
1;
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink/fdb fdb.pl,1.1,1.2
Update of /cvsroot/fink/scripts/buildfink/fdb
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv10881/fdb
Modified Files:
fdb.pl
Log Message:
Finish integratating FDB support into buildfink
Index: fdb.pl
===
RCS file: /cvsroot/fink/scripts/buildfink/fdb/fdb.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fdb.pl 31 Mar 2007 19:35:45 - 1.1
+++ fdb.pl 1 Apr 2007 04:46:30 - 1.2
@@ -2,17 +2,14 @@
use strict;
use warnings;
-use lib /Volumes/SandBox/fink/sw/lib/perl5;
-use lib /Volumes/SandBox/fink/sw/lib/perl5/darwin;
-use DBI;
+use FindBin qw($Bin);
+use lib $Bin/../lib;
+use FinkFDB;
use CGI qw(:standard param);
use JSON;
print Status: 200 OK\n;
-our $dbh = DBI-connect(dbi:SQLite:dbname=pkgdb.db, , , {
-RaiseError = 1,
-AutoCommit = 0
-});
+
if(param() and param('op')) {
my $op = param('op');
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink buildfink,1.54,1.55
Update of /cvsroot/fink/scripts/buildfink In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv10881 Modified Files: buildfink Log Message: Finish integratating FDB support into buildfink Index: buildfink === RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- buildfink 31 Mar 2007 19:35:44 - 1.54 +++ buildfink 1 Apr 2007 04:46:30 - 1.55 @@ -27,78 +27,89 @@ buildfink [-n] [--infofilter SCRIPT] [--patchdir DIR] [--skip PACKAGE] [--skip PACKAGE] [--find-orphan-files] [--validate] [--build-as-nobody] [--max-log-size [P:]N] [--max-build-time [P:]T] [--packages PKGLIST] [--rebuild-deps] [--dirty] [FINKDIR OUTDIR] buildfink [-r CHECKPOINT] -Cbuildfink builds every package in Fink, taking care of things like avoiding repeated building -of packages and maintaining a log for every package build. It collects all of the logs, package -files, and built packages under a single output directory tree. +Cbuildfink builds every package in Fink, taking care of things like avoiding repeated building +of packages and maintaining a log for every package build. It collects all of the logs, package +files, and built packages under a single output directory tree. -CFINKDIR specifies the root of your Fink installation; this is usually C/sw. +CFINKDIR specifies the root of your Fink installation; this is usually C/sw. -COUTDIR specifies the path to the output directory; this directory must not already exist. +COUTDIR specifies the path to the output directory; this directory must not already exist. -If C-n is given, the script will do nothing but emit an ordered list of packages that it would -build and exit. +If C-n is given, the script will do nothing but emit an ordered list of packages that it would +build and exit. -The C--infofilter option, if specified, allows the package .info and .patch files to be filtered -prior to building packages. The specified script will be invoked with the basename of the info -or patch file as an argument and will receive the contents of the file on standard output; it should -emit the modified file on standard output. +The C--infofilter option, if specified, allows the package .info and .patch files to be filtered +prior to building packages. The specified script will be invoked with the basename of the info +or patch file as an argument and will receive the contents of the file on standard output; it should +emit the modified file on standard output. -The C--patchdir option, if specified, allows you to have an extra directory of .info and -.patch files which will be inserted into the package tree. Any files -obtained via this mechanism are not subject to filtering via C--infofilter. +The C--patchdir option, if specified, allows you to have an extra directory of .info and +.patch files which will be inserted into the package tree. Any files +obtained via this mechanism are not subject to filtering via C--infofilter. -The C--skip option, which may be specified multiple times, allows the given package to be skipped. -Skipped packages will not be built, nor will any packages which depend on them. +The C--skip option, which may be specified multiple times, allows the given package to be skipped. +Skipped packages will not be built, nor will any packages which depend on them. -The C--validate option, if specified, causes buildfink to validate packages -as it builds them and run any test suites specified in an InfoTest section. +The C--validate option, if specified, causes buildfink to validate packages +as it builds them and run any test suites specified in an InfoTest section. -The C--find-orphan-files option, if specified, will detect files installed -into the prefix which aren't actually part of the binary package. +The C--find-orphan-files option, if specified, will detect files installed +into the prefix which aren't actually part of the binary package. -The C--build-as-nobody option, if present, causes buildfink to build -packages as nobody instead of root; if C--build-as-nobody=try is specified, -it will try building as root if that fails and keep track of which packages -only succeed when built as root. +The C--build-as-nobody option, if present, causes buildfink to build +packages as nobody instead of root; if C--build-as-nobody=try is specified, +it will try building as root if that fails and keep track of which packages +only succeed when built as root. -buildfink places limits on the maximum size of the log file for an individual -build and the build time of an individual package to prevent runaway packages -from breaking the build. C--max-log-size N and C--max-build-time T can be -used to adjust these limits. An CN or CT of 0 will
[cvs] scripts/buildfink/lib/FinkFDB DBI.pm,NONE,1.1
Update of /cvsroot/fink/scripts/buildfink/lib/FinkFDB
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv10881/lib/FinkFDB
Added Files:
DBI.pm
Log Message:
Finish integratating FDB support into buildfink
--- NEW FILE: DBI.pm ---
package FinkFDB::DBI;
use strict;
use warnings;
use DBI;
our @ISA = qw(FinkFDB);
our %dbqueries = (
add_package = INSERT INTO packages(package_name) VALUES
(?),
add_file_path = INSERT INTO file_paths(parent_id,
file_name, fullpath) VALUES (?, ?, ?),
get_package_id = SELECT package_id FROM packages WHERE
package_name = ?,
get_file_id = SELECT file_id FROM file_paths WHERE fullpath
= ?,
add_file_version = EOF);
INSERT INTO file_versions(
package_id,
is_directory,
fullpath,
file_id,
size,
posix_user,
posix_group,
flags)
VALUES (?, ?, ?, ?, ?, ?, ?, ?)
EOF
sub new {
my($pkg, %params) = @_;
my $self = {};
my $class = ref($pkg) || $pkg || __PACKAGE__;
bless $self, $class;
$self-{dbtype} = $params{dbtype} or die Must specify dbtype for DBI
store.\n;
my $dbstr;
my %dbattrs = (RaiseError = 1, AutoCommit = 0);
if (lc($self-{dbtype}) eq sqlite) {
die Must specify db for DBI SQLite.\n unless $params{db};
$dbstr = sprintf(dbi:SQLite:dbname=%s, $params{db});
} else {
$dbstr = sprintf(dbi:%s:%s, $self-{dbtype}, $params{db});
}
$self-{dbh} = DBI-connect($dbstr, $params{dbuser}, $params{dbpass},
\%dbattrs);
$self-{queries} = {};
foreach my $key (keys %dbqueries) {
$self-{queries}-{$key} = $self-prepare($dbqueries{$key});
}
return $self;
}
sub addPackage {
my($self, $package) = @_;
$self-{queries}-{add_package}-execute($package);
$self-{dbh}-commit();
}
sub selectOne {
my($self, $qname, @bindvals) = @_;
my $query = $self-{queries}-{$qname};
$query-execute(@bindvals) or return;
my($val) = $query-fetchrow_array();
$query-finish();
return $val;
}
sub addPackageFiles {
my($self, $package, $files) = @_;
my $package_id = $self-selectOne(get_package_id, $package);
if(!$package_id) {
$self-addPackage($package);
$package_id = $self-selectOne(get_package_id, $package) or
die Couldn't find or add package '$package'!\n;
}
$self-{queries}-{get_package_id}-finish();
my $fileroot = $self-makeFileHierarchy($package, $files);
$self-addFileTree($package_id, $fileroot, 0);
$self-{dbh}-commit();
}
sub makeFileHierarchy {
my($self, $pkg, $files) = @_;
my %root = (. = , .. = undef, /path/ = );
foreach my $file (@$files) {
my $path = delete $file-{path};
if (not $path =~ s!^%p/!!) {
warn $pkg has path not in %p: $path\n;
next;
}
$file-{fullpath} = $path;
$file-{isdir} = ($file-{flags} =~ /^d/ ? 1 : 0);
my @pathbits = split(m!/!, $path);
my $finkroot = \%root;
my $fullpath = ;
foreach my $pathbit (@pathbits) {
$fullpath .= / if $fullpath;
$fullpath .= $pathbit;
$finkroot-{$pathbit} ||= {.. = $finkroot, . = $pathbit, /path/
= $fullpath};
$finkroot = $finkroot-{$pathbit};
}
$finkroot-{/versions/} ||= [];
push @{$finkroot-{/versions/}}, $file;
$file-{pkg} = $pkg;
}
return \%root;
}
sub addFileTree {
my($self, $pkgid, $file, $parent_id) = @_;
my $file_id = $self-selectOne(get_file_id, $file-{/path/});
if(!$file_id) {
$self-{queries}-{add_file_path}-execute($parent_id, $file-{.},
$file-{/path/});
$file_id = $self-selectOne(get_file_id, $file-{/path/}) or
die Couldn't fetch or insert file ID for .$file-{/path/}.!\n;
}
if ($file-{/versions/}) {
foreach my $filever (@{$file-{/versions/}}) {
$self-{queries}-{add_file_version}-execute(
$pkgid,
$filever-{isdir},
$filever-{fullpath},
$file_id,
$filever-{size},
$filever-{user},
$filever-{group},
$filever-{flags}
);
}
}
foreach my $subfile (keys %$file) {
next if $subfile eq . or $subfile eq .. or $subfile eq /versions/ or
$subfile eq /path/;
$self-addFileTree($pkgid, $file-{$subfile}, $file_id);
}
}
sub prepare {
my($self, $stmt) = @_;
return $self-{dbh}-prepare($stmt);
}
1;
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
[cvs] scripts/buildfink/lib/BFData DBI.pm,1.1,NONE
Update of /cvsroot/fink/scripts/buildfink/lib/BFData In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv10881/lib/BFData Removed Files: DBI.pm Log Message: Finish integratating FDB support into buildfink --- DBI.pm DELETED --- - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink/schemas - New directory
Update of /cvsroot/fink/scripts/buildfink/schemas In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv21358/schemas Log Message: Directory /cvsroot/fink/scripts/buildfink/schemas added to the repository - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink mkfiledb, NONE, 1.1 pkgdb.css, NONE, 1.1 pkgdb.js, NONE, 1.1 pkgdb.pl, NONE, 1.1 buildfink, 1.49, 1.50
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv21758
Modified Files:
buildfink
Added Files:
mkfiledb pkgdb.css pkgdb.js pkgdb.pl
Log Message:
Check in work in progress in case my laptop doesn't survive the train
--- NEW FILE: mkfiledb ---
#!/usr/bin/perl
use strict;
use warnings;
use DBI;
use FindBin qw($Bin);
my($dbtype, $dbpath) = (shift, shift) or die EOF;
Usage: $0 dbtype dbstr checkpoint
mkfiledb - Convert a buildfink checkpoint file into a database.
dbstr is a DBI connection string, for instance:
foo.sqlite
host:user:pass:db
EOF
our(%finkfiles, %pkgfiles, @filedata);
$finkfiles{.} = ;
$finkfiles{..} = undef;
sub addPackageFiles {
my(undef, $pkg, @files) = @_;
foreach my $file (@files) {
my $path = delete $file-{path};
if(not $path =~ s!^%p/!!) {
warn $pkg has path not in %p: $path\n;
next;
}
push @filedata, $file;
my @pathbits = split(m!/!, $path);
my $finkroot = \%finkfiles;
foreach my $pathbit(@pathbits) {
$finkroot-{$pathbit} ||= {.. = $finkroot, . = $pathbit};
$finkroot = $finkroot-{$pathbit};
}
$finkroot-{/files/} ||= [];
push @{$finkroot-{/files/}}, $file;
$file-{..} = $finkroot;
}
$pkgfiles{$pkg} = [EMAIL PROTECTED];
}
while() {
next unless /^addPackageFiles/;
s/\$pkgfiles/undef/;
eval $_;
}
my($dbstr, $dbuser, $dbpass, %dbattrs);
$dbtype = lc($dbtype);
if($dbtype eq sqlite) {
$dbstr = :dbi:SQLite:dbname=$dbpath;
$dbuser = ;
$dbpass = ;
%dbattrs = {RaiseError = 1, AutoCommit = 1};
} else {
die Unknown database type. Valid types are: sqlite\n;
}
my $dbh = DBI-connect($dbstr, $dbuser, $dbpass, \%dbattrs);
my $schema = require($Bin/schemas/$dbtype);
$dbh-do(BEGIN TRANSACTION);
$dbh-do(EOF);
CREATE TABLE packages(
--- NEW FILE: pkgdb.pl ---
#!/usr/bin/perl
use strict;
use warnings;
use Storable;
use CGI qw(:standard param);
use JSON;
print Status: 200 OK\n;
our $data = retrieve(pkgdb.db);
if(param() and param('op')) {
my $op = param('op');
print Content-type: text/plain\n\n;
if($op eq pkgls) {
my $pkg = param('pkg');
my $pkgfiles = $data-{pkgfiles}-{$pkg};
print objToJson([map {
my @pathbits;
my $root = $_-{..};
while($root) {
unshift @pathbits, $root-{.};
$root = $root-{..};
}
$_-{path} = join(/, @pathbits);
delete $_-{..};
delete $_-{.};
$_;
} @$pkgfiles]);
} elsif($op eq ls) {
my $path = param('path');
$path =~ s!^%p/?!!;
my $root = $data-{finkfiles};
foreach my $pathbit(split(m!/!, $path)) {
$root = $root-{$pathbit};
}
my @dirs;
my @files;
foreach my $name(sort keys %$root) {
next if $name eq . or $name eq .. or $name eq /files/;
my $obj = $root-{$name};
delete $obj-{..};
delete $obj-{.};
push @dirs, $name if grep {$_ ne /files/} keys %$obj;
push @files, $name if $obj-{/files/};
}
print objToJson({dirs = [EMAIL PROTECTED], files = [EMAIL PROTECTED]);
}
exit;
}
print Content-type: text/html\n\n;
my @packages = sort keys %{$data-{pkgfiles}};
print EOF;
!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN
DTD/xhtml1-strict.dtd
html
head
titleFink Package Database/title
link rel=stylesheet type=text/css href=pkgdb.css /
script type=text/javascript src=jquery-latest.pack.js /
script type=text/javascript src=pkgdb.js /
/head
body
h1Fink Package Database/h1
h2Filesystem/h2
ul id=filesystemli class=directorya href=# id=%p/sw/a/li/ul
h2Packages/h2
ul id=packages
@{[join(\n, map { li class=\package\a href=\#\$_/a/li }
@packages)]}
/ul
/body
/html
EOF
--- NEW FILE: pkgdb.js ---
//directory [EMAIL PROTECTED] == ls path at @id
//package [EMAIL PROTECTED] == lspkg contents of a
function ls(elem) {
$.getJSON(pkgdb.pl, {op: ls, path: elem.attr(id)}, function(data) {
got_ls(elem, data);
});
}
function lspkg(elem) {
$.getJSON(pkgdb.pl, {op: pkgls, pkg: elem.text()}, function(data) {
got_lspkg(elem, data);
});
}
function got_ls(node, data) {
var lschildren = ul;
$(data.dirs).each(function() {
lschildren += li class=\directory\ id=\ +
node.attr(id) + / + this + \a href=\#\ + this +
//a/li;
});
$(data.dirs).each(function() {
lschildren += li + this + /li;
});
node.parent().append(lschildren);
$(,directory [EMAIL PROTECTED], node).click(function() { ls($(this)) });
}
function got_lspkg(node, data) {
var lschildren = ul;
$(data).each(function() {
lschildren += li +
this[flags] + +
[cvs] scripts/buildfink buildfink, 1.50, 1.51 mkfiledb, 1.1, 1.2 pkgdb.js, 1.1, 1.2 pkgdb.pl, 1.1, 1.2
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv7522
Modified Files:
buildfink mkfiledb pkgdb.js pkgdb.pl
Log Message:
Prototype of package-file database
Index: mkfiledb
===
RCS file: /cvsroot/fink/scripts/buildfink/mkfiledb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mkfiledb25 Mar 2007 14:40:22 - 1.1
+++ mkfiledb26 Mar 2007 02:18:16 - 1.2
@@ -5,20 +5,67 @@
use DBI;
use FindBin qw($Bin);
-my($dbtype, $dbpath) = (shift, shift) or die EOF;
[EMAIL PROTECTED] = 2 or die EOF;
Usage: $0 dbtype dbstr checkpoint
mkfiledb - Convert a buildfink checkpoint file into a database.
dbstr is a DBI connection string, for instance:
foo.sqlite
host:user:pass:db
EOF
+my($dbtype, $dbpath) = (shift, shift);
+
+our(%finkfiles, %packages);
+
+# These get replaced by prepared versions when we connect to the database.
+our $dbh;
+our %dbqueries = (
+add_package = INSERT INTO packages(package_name) VALUES (?),
+add_file_path = INSERT INTO file_paths(parent_id, file_name, fullpath)
VALUES (?, ?, ?),
+add_file_version = EOF);
+INSERT INTO file_versions(
+package_id,
+is_directory,
+fullpath,
+file_id,
+size,
+posix_user,
+posix_group,
+flags)
+VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+EOF
+sub addDBFiles {
+my($file, $parent_id) = @_;
+
+$dbqueries{add_file_path}-execute($parent_id, $file-{.},
$file-{/path/});
+my $file_id = $dbh-last_insert_id(undef, undef, undef, undef);
+
+if($file-{/versions/}) {
+ foreach my $filever (@{$file-{/versions/}}) {
+ $dbqueries{add_file_version}-execute(
+ $packages{$filever-{pkg}},
+ $filever-{isdir},
+ $filever-{fullpath},
+ $file_id,
+ $filever-{size},
+ $filever-{user},
+ $filever-{group},
+ $filever-{flags}
+ );
+ }
+}
+
+foreach my $subfile (keys %$file) {
+ next if $subfile eq . or $subfile eq .. or $subfile eq /versions/
or $subfile eq /path/;
+ addDBFiles($file-{$subfile}, $file_id);
+}
+}
-our(%finkfiles, %pkgfiles, @filedata);
$finkfiles{.} = ;
$finkfiles{..} = undef;
sub addPackageFiles {
my(undef, $pkg, @files) = @_;
+$packages{$pkg} = 0;
foreach my $file (@files) {
my $path = delete $file-{path};
if(not $path =~ s!^%p/!!) {
@@ -26,21 +73,25 @@
next;
}
- push @filedata, $file;
+ ($file-{user}, $file-{group}) = split(m!/!, delete $file-{owners});
+ $file-{fullpath} = $path;
+ $file-{isdir} = ($file-{flags} =~ /^d/ ? 1 : 0);
+
my @pathbits = split(m!/!, $path);
my $finkroot = \%finkfiles;
+ my $fullpath = ;
foreach my $pathbit(@pathbits) {
- $finkroot-{$pathbit} ||= {.. = $finkroot, . = $pathbit};
+ $fullpath .= / if $fullpath;
+ $fullpath .= $pathbit;
+ $finkroot-{$pathbit} ||= {.. = $finkroot, . = $pathbit,
/path/ = $fullpath};
$finkroot = $finkroot-{$pathbit};
}
- $finkroot-{/files/} ||= [];
- push @{$finkroot-{/files/}}, $file;
- $file-{..} = $finkroot;
+ $finkroot-{/versions/} ||= [];
+ push @{$finkroot-{/versions/}}, $file;
+ $file-{pkg} = $pkg;
}
-
-$pkgfiles{$pkg} = [EMAIL PROTECTED];
}
while() {
@@ -52,16 +103,27 @@
my($dbstr, $dbuser, $dbpass, %dbattrs);
$dbtype = lc($dbtype);
if($dbtype eq sqlite) {
-$dbstr = :dbi:SQLite:dbname=$dbpath;
+$dbstr = dbi:SQLite:dbname=$dbpath;
$dbuser = ;
$dbpass = ;
-%dbattrs = {RaiseError = 1, AutoCommit = 1};
+%dbattrs = (RaiseError = 1, AutoCommit = 0);
} else {
die Unknown database type. Valid types are: sqlite\n;
}
-my $dbh = DBI-connect($dbstr, $dbuser, $dbpass, \%dbattrs);
-my $schema = require($Bin/schemas/$dbtype);
-$dbh-do(BEGIN TRANSACTION);
-$dbh-do(EOF);
-CREATE TABLE packages(
+$dbh = DBI-connect($dbstr, $dbuser, $dbpass, \%dbattrs);
+foreach my $key (keys %dbqueries) {
+my $stmt = $dbh-prepare($dbqueries{$key});
+$dbqueries{$key} = $stmt;
+}
+
+foreach my $pkg(keys %packages) {
+$dbqueries{add_package}-execute($pkg);
+$packages{$pkg} = $dbh-last_insert_id(undef, undef, undef, undef);
+}
+
+foreach my $file(keys %finkfiles) {
+next if $file eq . or $file eq .. or $file eq /versions/ or $file eq
/path/;
+addDBFiles($finkfiles{$file}, 0);
+}
+$dbh-do(COMMIT);
Index: pkgdb.pl
===
RCS file: /cvsroot/fink/scripts/buildfink/pkgdb.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pkgdb.pl25 Mar 2007 14:40:23 - 1.1
+++ pkgdb.pl26 Mar 2007 02:18:16 - 1.2
@@ -2,12 +2,17 @@
use strict;
use warnings;
-use Storable;
+use lib
[cvs] scripts/buildfink/schemas sqlite,NONE,1.1
Update of /cvsroot/fink/scripts/buildfink/schemas In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv7522/schemas Added Files: sqlite Log Message: Prototype of package-file database --- NEW FILE: sqlite --- CREATE TABLE file_paths ( file_id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, parent_id INTEGER NOT NULL, file_name VARCHAR NOT NULL, fullpath STRING NOT NULL, UNIQUE (parent_id, file_name) ); CREATE TABLE packages ( package_id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, package_name STRING NOT NULL UNIQUE ); CREATE TABLE file_versions ( file_version_id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, is_directory BOOLEAN NOT NULL, package_id INTEGER NOT NULL, fullpath STRING NOT NULL, file_id INTEGER NOT NULL, size INTEGER NOT NULL, posix_user STRING NULL, posix_group STRING NULL, flags VARCHAR NULL, UNIQUE (package_id, file_id) ); CREATE INDEX file_ver_idx ON file_versions (file_id); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink pkgdb.pl,1.2,1.3
Update of /cvsroot/fink/scripts/buildfink In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv18467 Modified Files: pkgdb.pl Log Message: Name change Index: pkgdb.pl === RCS file: /cvsroot/fink/scripts/buildfink/pkgdb.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- pkgdb.pl26 Mar 2007 02:18:16 - 1.2 +++ pkgdb.pl26 Mar 2007 02:45:53 - 1.3 @@ -80,7 +80,7 @@ !DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN DTD/xhtml1-strict.dtd html head -titleFink Package Database/title +titleFink File Database/title link rel=stylesheet type=text/css href=pkgdb.css / script type=text/javascript src=jquery-latest.pack.js / script type=text/javascript src=pkgdb.js / - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink filter,1.2,1.3
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv1705
Modified Files:
filter
Log Message:
mkdir on dirname($foo) instead of $foo
Index: filter
===
RCS file: /cvsroot/fink/scripts/buildfink/filter,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- filter 1 Mar 2007 06:43:17 - 1.2
+++ filter 9 Mar 2007 03:34:18 - 1.3
@@ -233,7 +233,7 @@
foreach my $filter(@matched_filters) {
if (defined $filter-{outfile}) {
# have a filename, so append outtext there
- system(mkdir, -p, $filter-{name});
+ system(mkdir, -p, dirname($filter-{name}));
open(my $out_fh, '', $filter-{name}) or die
Couldn't open .$filter-{name}. for output: $!\n;
print $out_fh $filter-{outtext};
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink filter,1.3,1.4
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv
Modified Files:
filter
Log Message:
Write to output directory
Index: filter
===
RCS file: /cvsroot/fink/scripts/buildfink/filter,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- filter 9 Mar 2007 03:34:18 - 1.3
+++ filter 9 Mar 2007 03:42:01 - 1.4
@@ -233,9 +233,9 @@
foreach my $filter(@matched_filters) {
if (defined $filter-{outfile}) {
# have a filename, so append outtext there
- system(mkdir, -p, dirname($filter-{name}));
+ system(mkdir, -p,
dirname($filter-{outfile}));
- open(my $out_fh, '', $filter-{name}) or die
Couldn't open .$filter-{name}. for output: $!\n;
+ open(my $out_fh, '', $filter-{outfile}) or
die Couldn't open .$filter-{name}. for output: $!\n;
print $out_fh $filter-{outtext};
close $out_fh;
} else {
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink README,1.5,1.6
Update of /cvsroot/fink/scripts/buildfink In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv7957 Modified Files: README Log Message: Update my email address Index: README === RCS file: /cvsroot/fink/scripts/buildfink/README,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- README 1 Mar 2006 20:36:38 - 1.5 +++ README 9 Mar 2007 03:51:00 - 1.6 @@ -33,5 +33,5 @@ Running this script from the 'out' subdirectory of a run after running 'analyze' will produce the HTML and text reports. -Any questions should be directed to Matthew Sachs [EMAIL PROTECTED] . +Any questions should be directed to Matthew Sachs [EMAIL PROTECTED] . See COPYING for licensing information. - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink buildfink,1.48,1.49
Update of /cvsroot/fink/scripts/buildfink In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv5314 Modified Files: buildfink Log Message: Fix typo which broke restoring checkpoints, pointed out by drm Index: buildfink === RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- buildfink 16 Nov 2006 22:49:48 - 1.48 +++ buildfink 8 Mar 2007 04:50:20 - 1.49 @@ -1028,7 +1028,7 @@ print CHECKPOINT Data::Dumper-Dump( [$FinkDir, $RunDir, $BuildNobody, $BuildAll, $CheckFiles, $DoValidate, $pkglist, $pkgfiles], - [qw(FinkDir rundir BuildNobody BuildAll CheckFiles DoValidate pkglist pkgfiles)] + [qw(FinkDir RunDir BuildNobody BuildAll CheckFiles DoValidate pkglist pkgfiles)] ); close CHECKPOINT; - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink filters.xml,1.11,1.12
Update of /cvsroot/fink/scripts/buildfink In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv23517 Modified Files: filters.xml Log Message: More liberal parsing for oldgcc error message Index: filters.xml === RCS file: /cvsroot/fink/scripts/buildfink/filters.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- filters.xml 9 Nov 2006 21:54:13 - 1.11 +++ filters.xml 27 Nov 2006 15:55:16 - 1.12 @@ -146,7 +146,7 @@ filter name=failures/fink/nodeInternal error: node for (.*) already exists/filter filter name=failures/fink/testharnessCan't locate Test/Harness.pm/filter filter name=failures/fink/oldreadlineThat looks like readline 1.0!/filter - filter name=failures/fink/oldgcc flags=m^Package gcc.* is an autogenerated virtual package./filter + filter name=failures/fink/oldgcc flags=mPackage gcc.* is an autogenerated virtual package./filter filter name=failures/fink/nolib/ldaperror: could not find an LDAP library/filter filter name=failures/fink/virtpkgFailed: Package is an uninstalled virtual package/filter filter name=failures/fink/nolib/sdl flags=serror: \*\*\* SDL .*not found!|/usr/bin/ld: Undefined symbols:.*_SDL_Init/filter - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] fink/perlmod/Fink ChangeLog,1.1399,1.1400 Config.pm,1.83,1.84
Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22072/perlmod/Fink
Modified Files:
ChangeLog Config.pm
Log Message:
* Config.pm: maintainermode should turn on verbose. Happy Thanksgiving!
Index: Config.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Config.pm,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- Config.pm 17 Nov 2006 05:03:21 - 1.83
+++ Config.pm 23 Nov 2006 17:33:30 - 1.84
@@ -225,6 +225,7 @@
$opts-{maintainermode} = 1;
$opts-{tests} = on;
$opts-{validate} = on;
+ $opts-{verbosity} = 3;
} else {
$val = defined($val) ? lc($val) : ;
$val = on if $val eq ;
Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1399
retrieving revision 1.1400
diff -u -d -r1.1399 -r1.1400
--- ChangeLog 17 Nov 2006 05:03:21 - 1.1399
+++ ChangeLog 23 Nov 2006 17:33:30 - 1.1400
@@ -1,3 +1,8 @@
+2006-11-23 Matthew Sachs [EMAIL PROTECTED]
+
+ * Config.pm: maintainermode should turn on verbose. Happy
+ Thanksgiving!
+
2006-11-16 Matthew Sachs [EMAIL PROTECTED]
* Config.pm: Be a bit stricter about --tests argument checking.
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink buildfink,1.47,1.48
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv23014
Modified Files:
buildfink
Log Message:
rdar://problem/4829044
buildfink should produce an index of packages - installed files
Also, split up --validate and --find-orphan-files, and detect whether
fink supports --tests/--validate and set them to warn if so when
buildfink is asked to validate.
Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- buildfink 7 Nov 2006 20:18:09 - 1.47
+++ buildfink 16 Nov 2006 22:49:48 - 1.48
@@ -24,7 +24,7 @@
=head1 USAGE
- buildfink [-n] [--infofilter SCRIPT] [--patchdir DIR] [--skip PACKAGE]
[--skip PACKAGE] [--validate] [--build-as-nobody] [--max-log-size [P:]N]
[--max-build-time [P:]T] [--packages PKGLIST] [--rebuild-deps] [--dirty]
[FINKDIR OUTDIR]
+ buildfink [-n] [--infofilter SCRIPT] [--patchdir DIR] [--skip PACKAGE]
[--skip PACKAGE] [--find-orphan-files] [--validate] [--build-as-nobody]
[--max-log-size [P:]N] [--max-build-time [P:]T] [--packages PKGLIST]
[--rebuild-deps] [--dirty] [FINKDIR OUTDIR]
buildfink [-r CHECKPOINT]
Cbuildfink builds every package in Fink, taking care of things like avoiding
repeated building
@@ -51,7 +51,10 @@
Skipped packages will not be built, nor will any packages which depend on them.
The C--validate option, if specified, causes buildfink to validate packages
-as it builds them.
+as it builds them and run any test suites specified in an InfoTest section.
+
+The C--find-orphan-files option, if specified, will detect files installed
+into the prefix which aren't actually part of the binary package.
The C--build-as-nobody option, if present, causes buildfink to build
packages as nobody instead of root; if C--build-as-nobody=try is specified,
@@ -112,7 +115,7 @@
use lib $Bin;
use FinkLib;
-our($Bin, $FinkConfig, $FinkDir, $rundir, $dryrun, $infofilter, $patchdir,
@skiplist, $checkpoint, $DoValidate, $BuildNobody, $Dirty, $RebuildDeps,
$BuildAll, $NoCopyInfo);
+our($Bin, $FinkBuildFlags, $FinkConfig, $FinkDir, $RunDir, $DryRun,
$infofilter, $patchdir, @skiplist, $checkpoint, $CheckFiles, $DoValidate,
$BuildNobody, $Dirty, $RebuildDeps, $BuildAll, $NoCopyInfo);
our $VERSION = '$Revision$';
our $max_build_time = 60*60*4;
@@ -168,6 +171,7 @@
use constant PKGSTATUS_SKIP = -2;
$BuildAll = 1;
+$FinkBuildFlags = ;
sub packageList {
my($pkglist, $arg, $val) = @_;
@@ -192,12 +196,13 @@
}
my $opts_ok = GetOptions(
- n = \$dryrun,
+ n = \$DryRun,
infofilter=s = \$infofilter,
patchdir=s = \$patchdir,
skip=s = [EMAIL PROTECTED],
r=s = \$checkpoint,
validate = \$DoValidate,
+ find-orphan-files = \$CheckFiles,
dirty = \$Dirty,
rebuild-deps = \$RebuildDeps,
packages=s = sub {packageList(\%pkglist, @_)},
@@ -209,16 +214,16 @@
max-build-time=s = \limit_arg,
max-log-size=s = \limit_arg
);
-if(@ARGV != 2 and not (($dryrun and @ARGV == 1) or $checkpoint)) {
+if(@ARGV != 2 and not (($DryRun and @ARGV == 1) or $checkpoint)) {
warn You must specify a Fink directory and an output directory.\n;
$opts_ok = 0;
} else {
- ($FinkDir, $rundir) = @ARGV;
+ ($FinkDir, $RunDir) = @ARGV;
}
if($checkpoint and not -f $checkpoint) {
warn The specified checkpoint file does not exist.\n;
$opts_ok = 0;
-} elsif($checkpoint and ($dryrun or $infofilter or $patchdir or @skiplist or
@ARGV)) {
+} elsif($checkpoint and ($DryRun or $infofilter or $patchdir or @skiplist or
@ARGV)) {
warn You may not specify any other options when restoring from a
checkpoint.\n;
$opts_ok = 0;
}
@@ -229,7 +234,7 @@
warn The specified Fink directory does not appear to contain a Fink
installation.\n;
$opts_ok = 0;
}
-if(!$dryrun and $rundir and -d $rundir) {
+if(!$DryRun and $RunDir and -d $RunDir) {
warn The specified output directory already exists.\n;
$opts_ok = 0;
}
@@ -327,7 +332,7 @@
}
}
-if(!$dryrun) {
+if(!$DryRun) {
# Then copy the .info files to our private repository and patch them if
necessary.
patchPackages(keys %pkglist);
@@ -336,8 +341,8 @@
}
# Now do the run
-initCheckpoint(\%pkglist) unless $dryrun;
-FinkLib::installEssentials() unless $dryrun;
+initCheckpoint(\%pkglist) unless $DryRun;
+FinkLib::installEssentials() unless $DryRun;
buildAll(\%pkglist);
doLog(Done building);
restoreSystem();
@@ -347,14 +352,34 @@
# Prepare the system
sub prepSystem {
$FinkConfig = FinkLib::initFink($FinkDir);
- return if $dryrun;
+ return if $DryRun;
- mkdir($rundir);
- mkdir($rundir/$_) for qw(pkginfo logs src out validate nobody);
-
[cvs] fink/perlmod/Fink ChangeLog,1.1398,1.1399 Config.pm,1.82,1.83
Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv8149/perlmod/Fink
Modified Files:
ChangeLog Config.pm
Log Message:
* Config.pm: Be a bit stricter about --tests argument checking.
Index: Config.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Config.pm,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- Config.pm 14 Nov 2006 21:32:13 - 1.82
+++ Config.pm 17 Nov 2006 05:03:21 - 1.83
@@ -226,7 +226,8 @@
$opts-{tests} = on;
$opts-{validate} = on;
} else {
- $val = lc($val) || ;
+ $val = defined($val) ? lc($val) : ;
+ $val = on if $val eq ;
if($val ne on and $val ne warn and $val ne off) {
# We didn't really get an argument.
# Because our argument is optional, if we are
@@ -236,7 +237,7 @@
# it will think that dumpinfo is the argument to
# tests. So, if we get an argument that isn't one
# of our valid argument values, punt it back to @ARGV.
- unshift @ARGV, $val if $val;
+ unshift @ARGV, $val;
$opts-{$arg} = on;
} else {
$val = if $val eq off;
Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1398
retrieving revision 1.1399
diff -u -d -r1.1398 -r1.1399
--- ChangeLog 14 Nov 2006 21:32:13 - 1.1398
+++ ChangeLog 17 Nov 2006 05:03:21 - 1.1399
@@ -1,3 +1,7 @@
+2006-11-16 Matthew Sachs [EMAIL PROTECTED]
+
+ * Config.pm: Be a bit stricter about --tests argument checking.
+
2006-11-14 Matthew Sachs [EMAIL PROTECTED]
* Config.pm: Fix for --tests with no value.
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] fink/perlmod/Fink ChangeLog, 1.1395, 1.1396 Validation.pm, 1.235, 1.236
Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv16478/perlmod/Fink
Modified Files:
ChangeLog Validation.pm
Log Message:
* Validation.pm: Don't require TestScript.
Index: Validation.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Validation.pm,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -d -r1.235 -r1.236
--- Validation.pm 8 Nov 2006 02:59:41 - 1.235
+++ Validation.pm 14 Nov 2006 18:11:29 - 1.236
@@ -280,8 +280,8 @@
'Architecture',
);
-our @infotest_required_fields = map {lc $_}
- qw(TestScript);
+# Some Types may have implicit TestScript, otherwise that would be required.
+our @infotest_required_fields = map {lc $_} ();
# Extra fields valid inside InfoTest
our %infotest_valid_fields = map {lc $_, 1}
Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1395
retrieving revision 1.1396
diff -u -d -r1.1395 -r1.1396
--- ChangeLog 8 Nov 2006 02:59:41 - 1.1395
+++ ChangeLog 14 Nov 2006 18:11:29 - 1.1396
@@ -1,3 +1,7 @@
+2006-11-14 Matthew Sachs [EMAIL PROTECTED]
+
+ * Validation.pm: Don't require TestScript.
+
2006-11-07 Daniel Macks [EMAIL PROTECTED]
* Validation.pm: Fix .svn regex.
-
SF.net email is sponsored by: A Better Job is Waiting for You - Find it Now.
Check out Slashdot's new job board. Browse through tons of technical jobs
posted by companies looking to hire people just like you.
http://jobs.slashdot.org/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] fink ChangeLog,1.444,1.445 fink.8.in,1.62,1.63
Update of /cvsroot/fink/fink In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3 Modified Files: ChangeLog fink.8.in Log Message: * fink.8.in: Document --tests, --validate options. * perlmod/Fink/Config.pm: Add --tests, --validate options. * perlmod/Fink/Engine.pm: Ditto. * perlmod/Fink/PkgVersion.pm: Ditto, plus fix for uninitialized value warning in InfoTest processing. Index: fink.8.in === RCS file: /cvsroot/fink/fink/fink.8.in,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- fink.8.in 4 Oct 2006 05:35:26 - 1.62 +++ fink.8.in 14 Nov 2006 21:14:36 - 1.63 @@ -84,7 +84,29 @@ Perform actions useful to package maintainers: run validation on the .info file before building and on the .deb after building a package; turn certain build-time warnings into fatal errors; run the -test suites as specified in the InfoTest field. +test suites as specified in the InfoTest field. This sets +.Pa --tests +and +.Pa --validate +to +.Pa on . +.It Cm --tests[=on|off|warn] +Causes InfoTest fields to be activated and test suites specified via +TestScript to be executed. If no argument is given to this option or if the +argument is +.Pa on +then failures in test suites will be considered fatal errors during builds. +If the argument is +.Pa warn +then failures will be treated as warnings. +.It Cm --validate[=on|off|warn] +Causes packages to be validated during a build. +If no argument is given to this option or if the argument is +.Pa on +then validation failures will be considered fatal errors during builds. +If the argument is +.Pa warn +then failures will be treated as warnings. .It Cm -l, --log-output Save a copy of the terminal output during each package building process. By default, the file is stored in Index: ChangeLog === RCS file: /cvsroot/fink/fink/ChangeLog,v retrieving revision 1.444 retrieving revision 1.445 diff -u -d -r1.444 -r1.445 --- ChangeLog 4 Oct 2006 05:35:26 - 1.444 +++ ChangeLog 14 Nov 2006 21:14:36 - 1.445 @@ -1,3 +1,7 @@ +2006-11-14 Matthew Sachs [EMAIL PROTECTED] + + * fink.8.in: Document --tests, --validate options. + 2006-10-04 Daniel Macks [EMAIL PROTECTED] * fink.8.in: Rename the flag to --obsolete-packages - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] fink/perlmod/Fink ChangeLog, 1.1396, 1.1397 Engine.pm, 1.389, 1.390 PkgVersion.pm, 1.569, 1.570
{
+ warn Validation of .deb failed.\n;
+ }
+ }
Fink::Config::set_options(\%saved_options);
}
Index: Engine.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Engine.pm,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -d -r1.389 -r1.390
--- Engine.pm 31 Oct 2006 01:30:29 - 1.389
+++ Engine.pm 14 Nov 2006 21:14:36 - 1.390
@@ -1590,7 +1590,7 @@
}
# pedantically validate .info of explicitly requested packages
- if (Fink::Config::get_option(maintainermode)) {
+ if (Fink::Config::get_option(validate)) {
my $info_filename = $package-get_info_filename();
if (not $validated_info_files{$info_filename}++) {
my %saved_options = map { $_ =
Fink::Config::get_option($_) } qw/ verbosity Pedantic /;
@@ -1598,8 +1598,13 @@
'verbosity' = 3,
'Pedantic' = 1
} );
-
Fink::Validation::validate_info_file($info_filename)
- or die Please correct the above
problems and try again!\n;
+
if(!Fink::Validation::validate_info_file($info_filename)) {
+ if(Fink::Config::get_option(validate)
eq on) {
+ die Please correct the above
problems and try again!\n;
+ } else {
+ warn Validation of .info
failed.\n;
+ }
+ }
Fink::Config::set_options(\%saved_options);
}
}
@@ -1731,7 +1736,7 @@
# validate the .info if desired
# only use default level for dependencies of
explicit packages
# (explicitly requested pkgs were severely
validated earlier)
- if (Fink::Config::get_option(maintainermode))
{
+ if (Fink::Config::get_option(validate)) {
my $info_filename =
$item-[PKGVER]-get_info_filename();
if (not
$validated_info_files{$info_filename}++) {
my %saved_options = map { $_ =
Fink::Config::get_option($_) } qw/ Pedantic /;
@@ -1745,7 +1750,13 @@
}
}
}
- $bad_infos die Please correct the above problems and try again!\n;
+ if($bad_infos) {
+ if(Fink::Config::get_option(validate) eq on) {
+ die Please correct the above problems and try
again!\n;
+ } else {
+ warn Validation of .info failed.\n;
+ }
+ }
if ($willbuild) {
if
(Fink::PkgVersion-match_package(broken-gcc)-is_installed()) {
Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1396
retrieving revision 1.1397
diff -u -d -r1.1396 -r1.1397
--- ChangeLog 14 Nov 2006 18:11:29 - 1.1396
+++ ChangeLog 14 Nov 2006 21:14:36 - 1.1397
@@ -1,5 +1,12 @@
2006-11-14 Matthew Sachs [EMAIL PROTECTED]
+ * Config.pm: Add --tests, --validate options.
+ * Engine.pm: Ditto.
+ * PkgVersion.pm: Ditto, plus fix for uninitialized value warning in
+ InfoTest processing.
+
+2006-11-14 Matthew Sachs [EMAIL PROTECTED]
+
* Validation.pm: Don't require TestScript.
2006-11-07 Daniel Macks [EMAIL PROTECTED]
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] fink/perlmod/Fink ChangeLog,1.1397,1.1398 Config.pm,1.81,1.82
Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv4785/perlmod/Fink
Modified Files:
ChangeLog Config.pm
Log Message:
* Config.pm: Fix for --tests with no value.
Index: Config.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Config.pm,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- Config.pm 23 Jun 2006 19:33:28 - 1.81
+++ Config.pm 14 Nov 2006 21:32:13 - 1.82
@@ -214,10 +214,37 @@
my %option_defaults = (
map( { $_ = 0 } qw(dontask interactive verbosity keep_build keep_root
build_as_nobody maintainermode showversion use_binary) ),
+ map( { $_ = } qw(tests validate) ),
map ( { $_ = [] } qw(include_trees exclude_trees) ),
map( { $_ = -1 } qw(use_binary) ),
);
+sub set_checking_opts {
+ my($opts, $arg, $val) = @_;
+ if($arg eq maintainer) {
+ $opts-{maintainermode} = 1;
+ $opts-{tests} = on;
+ $opts-{validate} = on;
+ } else {
+ $val = lc($val) || ;
+ if($val ne on and $val ne warn and $val ne off) {
+ # We didn't really get an argument.
+ # Because our argument is optional, if we are
+ # the last option specified, the fink subcommand
+ # is misinterpreted as our argument. So, if you do:
+ # fink --tests dumpinfo foo.info
+ # it will think that dumpinfo is the argument to
+ # tests. So, if we get an argument that isn't one
+ # of our valid argument values, punt it back to @ARGV.
+ unshift @ARGV, $val if $val;
+ $opts-{$arg} = on;
+ } else {
+ $val = if $val eq off;
+ $opts-{$arg} = $val;
+ }
+ }
+}
+
sub parse_options {
my $class = shift;
my @args = @_;
@@ -238,7 +265,9 @@
'download pre-compiled packages from the binary
distribution '
. 'if available'],
[ 'build-as-nobody'= \$opts{build_as_nobody}, 'see
man page' ],
- [ 'maintainer|m' = \$opts{maintainermode}, 'see
man page' ],
+ [ 'maintainer|m' = sub {set_checking_opts(\%opts, @_);},
'see man page' ],
+ [ 'tests:s'= sub {set_checking_opts(\%opts, @_);},
'see man page' ],
+ [ 'validate:s' = sub {set_checking_opts(\%opts, @_);},
'see man page' ],
[ 'log-output|l!' = \$opts{log_output}, 'see
man page' ],
[ 'logfile=s' = \$opts{logfile},
'see man page' ],
[ 'trees|t=s@' = $opts{include_trees}, 'see
man page' ],
@@ -297,7 +326,7 @@
EOF
exit 0;
}
-
+
set_options(\%opts);
return @args;
Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1397
retrieving revision 1.1398
diff -u -d -r1.1397 -r1.1398
--- ChangeLog 14 Nov 2006 21:14:36 - 1.1397
+++ ChangeLog 14 Nov 2006 21:32:13 - 1.1398
@@ -1,5 +1,9 @@
2006-11-14 Matthew Sachs [EMAIL PROTECTED]
+ * Config.pm: Fix for --tests with no value.
+
+2006-11-14 Matthew Sachs [EMAIL PROTECTED]
+
* Config.pm: Add --tests, --validate options.
* Engine.pm: Ditto.
* PkgVersion.pm: Ditto, plus fix for uninitialized value warning in
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink filters.xml,1.10,1.11
Update of /cvsroot/fink/scripts/buildfink In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv7901 Modified Files: filters.xml Log Message: Unify project/libiconv and project/intl with project/lib-missing and project/header-missing; don't hardcode prefix path Index: filters.xml === RCS file: /cvsroot/fink/scripts/buildfink/filters.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- filters.xml 7 Nov 2006 20:51:20 - 1.10 +++ filters.xml 9 Nov 2006 21:54:13 - 1.11 @@ -18,10 +18,10 @@ filters filter name=failures/oneproj/adnserror: conflicting types for 'adns__parse_domain'/filter filter name=failures/oneproj/applex11toolsYou must have X11User.pkg somewhere in /Volumes or /Users/filter - filter name=failures/oneproj/bundle-webmin\*\*\* config (Y/I/N/O/D/Z) [default=N] ? /Volumes/SandBox/fink/sw/bin/dpkg: error processing webmin-burner (--install):/filter + filter name=failures/oneproj/bundle-webmin\*\*\* config (Y/I/N/O/D/Z) [default=N] ? .*/sw/bin/dpkg: error processing webmin-burner (--install):/filter filter name=failures/oneproj/bzflag/usr/include/architecture/ppc/math.h:212: error: expected unqualified-id before float/filter filter name=failures/oneproj/cc65_afailed.c(16): Error: Identifier expected/filter - filter name=failures/oneproj/ccache/Volumes/SandBox/fink/sw/bin/g\+\+: File exists/filter + filter name=failures/oneproj/ccache.*/sw/bin/g\+\+: File exists/filter filter name=failures/oneproj/cocoa-sharpERROR: unknown type \(NSObject}/filter filter name=failures/oneproj/cxboarderror: 'clock' redeclared as different kind of symbol/filter filter name=failures/oneproj/dhcpicmp.c:248: warning: pointer targets in passing argument 6 of 'recvfrom' differ in signedness/filter @@ -29,7 +29,7 @@ filter name=failures/oneproj/exactchown: smmsp: Invalid argument/filter filter name=failures/oneproj/absoftAbsoft Fortran not installed./filter filter name=failures/oneproj/finch-pmCan't locate object method file_name_is_absolute via package ExtUtils::Liblist/filter - filter name=failures/oneproj/fontconfig-patherror processing /Volumes/SandBox/fink/sw/fink/dists/buildfink/binary-darwin-powerpc/fontconfig-path/filter + filter name=failures/oneproj/fontconfig-patherror processing .*/sw/fink/dists/buildfink/binary-darwin-powerpc/fontconfig-path/filter filter name=failures/oneproj/fteo_messages.cpp:23: error: non-local variable 'lt;anonymous structgt; CRegexp [32]' uses anonymous type/filter filter name=failures/oneproj/griconvert: Command not found/filter filter name=failures/oneproj/hfstarPlease specify the source encoding through --from-code./filter @@ -39,11 +39,11 @@ filter name=failures/oneproj/libofxconfigure: error: unable to link a test program, is OpenSP installed/filter filter name=failures/oneproj/mpgtxmpeg.cxx:2622: error: extra ';'/filter filter name=failures/oneproj/mtoolsfmfr.po:781: duplicate message definition/filter - filter name=failures/oneproj/napmake: \*\*\* No rule to make target `/Volumes/SandBox/fink/sw/include/netcdf.h', needed by `napLib.o'. Stop./filter + filter name=failures/oneproj/napmake: \*\*\* No rule to make target `.*/sw/include/netcdf.h', needed by `napLib.o'. Stop./filter filter name=failures/oneproj/osxutilserror: conflicting types for 'RetrieveStatData'/filter filter name=failures/oneproj/par2error: explicit specialization of 'bool ReedSolomon/filter filter name=failures/oneproj/pari-gperror: conflicting types for 'add_history'/filter - filter name=failures/oneproj/pm581-modsmake: \*\*\* No rule to make target `/Volumes/SandBox/fink/sw/lib/perl5-core/5.8.1/darwin-thread-multi-2level/CORE/objXSUB.h', needed by `.*'. Stop./filter + filter name=failures/oneproj/pm581-modsmake: \*\*\* No rule to make target `.*/sw/lib/perl5-core/5.8.1/darwin-thread-multi-2level/CORE/objXSUB.h', needed by `.*'. Stop./filter filter name=failures/oneproj/ratpoisonerror: \*\*\* Can't find History headers and libs/filter filter name=failures/oneproj/rrdtoolCan't locate object method cmd_head3 via package Pod::Man/filter filter name=failures/oneproj/rubygemshook .*/post-install.rb failed:/filter @@ -102,16 +102,14 @@ filter name=failures/project/perlmodCan't locate (.*) in @INC/filter filter name=failures/project/glib\*\*\* The glib-config script installed by GLIB could not be found/filter filter name=failures/project/overwritetrying to overwrite .*, which is also in package/filter - filter name=failures/project/perlver(/usr/bin/perl.*: Command not found)|(Can't exec /Volumes/SandBox/fink/sw/bin/perl)/filter + filter name=failures/project/perlver(/usr/bin/perl.*:
[cvs] scripts/buildfink buildfink, 1.46, 1.47 filters.xml, 1.8, 1.9 owbuild, 1.3, 1.4
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv16340
Modified Files:
buildfink filters.xml owbuild
Log Message:
Add extra filters
Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- buildfink 5 Nov 2006 18:32:46 - 1.46
+++ buildfink 7 Nov 2006 20:18:09 - 1.47
@@ -637,7 +637,7 @@
@bdeps = $obj-resolve_depends(2, depends);
@rdeps = $obj-resolve_depends(0, depends) if $install;
};
- if($@) {
+ if($@ and $@ =~ /[a-z]/i) {
setPackageFail($pkglist, $pkg, Couldn't get depends: $@);
return;
}
Index: owbuild
===
RCS file: /cvsroot/fink/scripts/buildfink/owbuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- owbuild 31 May 2006 01:11:45 - 1.3
+++ owbuild 7 Nov 2006 20:18:09 - 1.4
@@ -21,7 +21,7 @@
#Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
TOOLDIR=/Volumes/SandBox/Tools/otherworld
-FINKDIR=/Volumes/SandBox/fink/sw
+FINKDIR=/sw
OWDIR=/Volumes/SandBox/fink/otherworld
BFDIR=/Volumes/SandBox/fink/scripts/buildfink
Index: filters.xml
===
RCS file: /cvsroot/fink/scripts/buildfink/filters.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- filters.xml 27 May 2006 18:34:36 - 1.8
+++ filters.xml 7 Nov 2006 20:18:09 - 1.9
@@ -90,6 +90,11 @@
filter name=failures/project/pc-missingPackage (.*) was not found
in the pkg-config search path|can not find package (\S+)/filter
filter name=failures/project/lib-missingcan't locate file for:
-l(.*)|cannot find the library `(.*)'|error: (lib.*) is missing|can't locate
framework for: -framework (.*)|error: Invalid lib(.*) directory|can't find
header files for (.*)/filter
filter name=failures/project/perlmod-missingerror: (.*) perl module
is required/filter
+ filter name=failures/project/la-missing`(.*)' is not a valid
libtool archive/filter
+ filter name=failures/project/prog-missingerror: The important
program (.*) was not found/filter
+ filter name=failures/project/exec-missingerror: (.*) not found or
not executable/filter
+ filter name=failures/project/other-missingerror: Cannot find
(.*)/filter
+ filter name=failures/project/header-missingerror: (.*\.h): No such
file or directory/filter
filter name=failures/project/bad-compiler-optioncc1: error: invalid
option|bad value .* for -mtune/filter
filter name=failures/project/desktop-file-utilsNo directories in
update-desktop-database search path could be processed and updated./filter
@@ -135,7 +140,7 @@
filter name=unbuilt/download flags=m^Failed: file download
failed/filter
filter name=unbuilt/nodep flags=m^Failed: Can't resolve
dependency/filter
- filter name=unbuilt/unbuildableFailed: Can't figure out how to
build/filter
+ filter name=unbuilt/unbuildableFailed: Can't figure out how to
build(?:.*Unsatisfied dependencies: (.*)\.)?/filter
filter name=unbuilt/dependency_failedFailed: Dependency (.*) failed
to build/filter
filter name=unbuilt/skippedFailed: .* is on the skip list/filter
@@ -154,6 +159,9 @@
filter name=failures/fink/pkgdescFailed: no package found for
specification/filter
filter name=failures/fink/patchexecution of patch failed/filter
filter name=failures/fink/depconfigdependency problems prevent
configuration/filter
+ filter name=failures/fink/depCan't resolve dependency
(.*?)/filter
+ filter name=failures/fink/buildlockproblems encountered involve
buildlocks/filter
+ filter name=failures/fink/pkgobjFailed: Couldn't get package
object/filter
filter name=failures/typeconflict/readlinkerror: conflicting types
for 'readlink'/filter
filter name=failures/typeconflict/ether_hosttonerror: conflicting
types for 'ether_hostton'/filter
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink filters.xml,1.9,1.10
Update of /cvsroot/fink/scripts/buildfink In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30051 Modified Files: filters.xml Log Message: Add virtual package filter Index: filters.xml === RCS file: /cvsroot/fink/scripts/buildfink/filters.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- filters.xml 7 Nov 2006 20:18:09 - 1.9 +++ filters.xml 7 Nov 2006 20:51:20 - 1.10 @@ -150,6 +150,7 @@ filter name=failures/fink/oldreadlineThat looks like readline 1.0!/filter filter name=failures/fink/oldgcc flags=m^Package gcc.* is an autogenerated virtual package./filter filter name=failures/fink/nolib/ldaperror: could not find an LDAP library/filter + filter name=failures/fink/virtpkgFailed: Package is an uninstalled virtual package/filter filter name=failures/fink/nolib/sdl flags=serror: \*\*\* SDL .*not found!|/usr/bin/ld: Undefined symbols:.*_SDL_Init/filter filter name=failures/fink/nolib/otherlibtool: link: `/Volumes/SandBox/fink/sw/lib/(.*)\.la' is not a valid libtool archive/filter filter name=failures/fink/perl581 flags=m^Failed: Can't resolve dependency .*perl581/filter - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink buildfink,1.45,1.46
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6073
Modified Files:
buildfink
Log Message:
Fix handling of circular dependencies where some are build and some are run
Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- buildfink 3 Nov 2006 16:35:28 - 1.45
+++ buildfink 5 Nov 2006 18:32:46 - 1.46
@@ -632,49 +632,66 @@
}
# Build deps, and maybe run deps
- my @deps;
+ my(@bdeps, @rdeps);
eval {
- @deps = $obj-resolve_depends(2, depends);
- push @deps, $obj-resolve_depends(0, depends) if $install;
+ @bdeps = $obj-resolve_depends(2, depends);
+ @rdeps = $obj-resolve_depends(0, depends) if $install;
};
if($@) {
setPackageFail($pkglist, $pkg, Couldn't get depends: $@);
return;
}
- # @deps is in disjunctive normal form. That is, it is a list like:
+ # @Xdeps is in disjunctive normal form. That is, it is a list like:
# {{A v B v C} ^ {D v E} ^ {F}}
# In other words, a list of dependencies, and each dependency is a
# list of packages which can satisfy it.
- DEP: foreach my $dep (@deps) {
- my @alts = sort {
- # Prefer already-installed deps.
-
- my $status_a = $pkglist-{$a};
- my $score_a = 0;
- $score_a = 1 if defined($status_a) and $status_a ==
PKGSTATUS_INSTALLED;
- my $status_b = $pkglist-{$b};
- my $score_b = 0;
- $score_b = 1 if defined($status_b) and $status_b ==
PKGSTATUS_INSTALLED;
+ foreach my $depinfo ([EMAIL PROTECTED], build], [EMAIL PROTECTED],
run]) {
+ my($deps, $deptype) = @$depinfo;
- $score_b = $score_a;
- } grep {$_ ne $pkg} filterSplitoffs(map {$_-get_name()} @$dep);
+ # If foo depends on bar, we start processing foo and
+ # then recurse into bar. What if bar then depends on foo?
+ # If bar builddepends on foo, that's bad, don't try to
+ # satisfy that alternative. However, we do want to allow:
+ #
+ # foo: BuildDepends: bar-shlibs
+ # bar: Has two splitoffs, bar-shlibs and bar, bar Depends: foo
+ #
+ # So, if a dep is PKGSTATUS_PROCESSING, that counts as resolved
+ # if it's a non-build depend.
+ my @status_ok = (PKGSTATUS_INSTALLED);
+ push @status_ok, PKGSTATUS_PROCESSING if $deptype eq run;
- next unless @alts;
- foreach my $alt (@alts) {
- my $depstat = $pkglist-{$alt};
- $depstat = PKGSTATUS_INSTALL unless defined($depstat);
- if($depstat == PKGSTATUS_FAILED or $depstat ==
PKGSTATUS_PROCESSING) {
- next;
+ DEP: foreach my $dep (@$deps) {
+ my @alts = sort {
+ # Prefer already-installed deps.
+
+ my $status_a = $pkglist-{$a};
+ my $score_a = 0;
+ $score_a = 1 if defined($status_a) and grep
{$status_a == $_} @status_ok;
+ my $status_b = $pkglist-{$b};
+ my $score_b = 0;
+ $score_b = 1 if defined($status_b) and grep
{$status_b == $_} @status_ok;
+
+ $score_b = $score_a;
+ } grep {$_ ne $pkg} filterSplitoffs(map
{$_-get_name()} @$dep);
+
+ next unless @alts;
+ foreach my $alt (@alts) {
+ my $depstat = $pkglist-{$alt};
+ $depstat = PKGSTATUS_INSTALL unless
defined($depstat);
+ if($depstat == PKGSTATUS_FAILED or ($deptype ne
run and $depstat == PKGSTATUS_PROCESSING)) {
+ next;
+ }
+
+ $pkglist-{$alt} = PKGSTATUS_INSTALL if
!defined($pkglist-{$alt});
+ next DEP if grep {$pkglist-{$alt} == $_}
@status_ok;
+ recurseOnDepends($pkglist, $alt, 1, $finkfiles)
and next DEP;
}
- $pkglist-{$alt} = PKGSTATUS_INSTALL if
!defined($pkglist-{$alt});
- next DEP if $pkglist-{$alt} == PKGSTATUS_INSTALLED;
- recurseOnDepends($pkglist, $alt, 1, $finkfiles) and
next DEP;
[cvs] scripts/buildfink buildfink,1.42,1.43
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv1787
Modified Files:
buildfink
Log Message:
Don't barf if splitoffs depend on their parent
Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- buildfink 1 Nov 2006 14:49:55 - 1.42
+++ buildfink 3 Nov 2006 16:19:40 - 1.43
@@ -659,7 +659,7 @@
$score_b = 1 if defined($status_b) and $status_b ==
PKGSTATUS_INSTALLED;
$score_b = $score_a;
- } filterSplitoffs(map {$_-get_name()} @$dep);
+ } grep {$_ ne $pkg} filterSplitoffs(map {$_-get_name()} @$dep);
foreach my $alt (@alts) {
my $depstat = $pkglist-{$alt};
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink buildfink,1.43,1.44
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3134
Modified Files:
buildfink
Log Message:
Really fix splitoff dependencies
Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- buildfink 3 Nov 2006 16:19:40 - 1.43
+++ buildfink 3 Nov 2006 16:22:24 - 1.44
@@ -340,7 +340,6 @@
FinkLib::installEssentials() unless $dryrun;
buildAll(\%pkglist);
doLog(Done building);
-doLog(Data::Dumper::Dumper(\%pkglist));
restoreSystem();
### buildfink framework functions
@@ -661,6 +660,7 @@
$score_b = $score_a;
} grep {$_ ne $pkg} filterSplitoffs(map {$_-get_name()} @$dep);
+ next unless @alts;
foreach my $alt (@alts) {
my $depstat = $pkglist-{$alt};
$depstat = PKGSTATUS_INSTALL unless defined($depstat);
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink buildfink,1.44,1.45
Update of /cvsroot/fink/scripts/buildfink In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv8797 Modified Files: buildfink Log Message: Fix checkpoint loading Index: buildfink === RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- buildfink 3 Nov 2006 16:22:24 - 1.44 +++ buildfink 3 Nov 2006 16:35:28 - 1.45 @@ -922,8 +922,9 @@ open(CHECKPOINT, $checkpoint) or die Couldn't open checkpoint: $!\n; my $cpdata = join(, CHECKPOINT); close CHECKPOINT; - eval $cpdata or die Checkpoint didn't return true value.\n; + my $ret = eval $cpdata; die [EMAIL PROTECTED] if $@; + die Checkpoint didn't return true value .\n unless $ret; prepSystem(); injectPackages() unless $BuildAll; - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink buildfink,1.41,1.42
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv29723
Modified Files:
buildfink
Log Message:
Quote package names in checkpoint
Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- buildfink 31 Oct 2006 17:54:04 - 1.41
+++ buildfink 1 Nov 2006 14:49:55 - 1.42
@@ -340,7 +340,7 @@
FinkLib::installEssentials() unless $dryrun;
buildAll(\%pkglist);
doLog(Done building);
-
+doLog(Data::Dumper::Dumper(\%pkglist));
restoreSystem();
### buildfink framework functions
@@ -955,7 +955,7 @@
my(%changes) = @_;
open(CHECKPOINT, , $rundir/checkpoint);
- print CHECKPOINT \$pkglist-{$_} = $changes{$_}; foreach keys
%changes;
+ print CHECKPOINT \$pkglist-{'$_'} = $changes{$_}; foreach keys
%changes;
print CHECKPOINT \n;
close CHECKPOINT;
}
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink buildfink,1.38,1.39
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv15174
Modified Files:
buildfink
Log Message:
Fix handling of failed deps
Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- buildfink 31 Oct 2006 05:52:54 - 1.38
+++ buildfink 31 Oct 2006 17:44:16 - 1.39
@@ -670,15 +670,11 @@
$pkglist-{$alt} = PKGSTATUS_INSTALL if
!defined($pkglist-{$alt});
next DEP if $pkglist-{$alt} == PKGSTATUS_INSTALLED;
- recurseOnDepends($pkglist, $alt, 1, $finkfiles);
- if($pkglist-{$alt} == PKGSTATUS_FAILED) {
- next;
- }
-
- next DEP;
- logPackageFail($pkg, Can't figure out how to build.
Unsatisfied dependencies: . join( , @alts));
- return;
+ recurseOnDepends($pkglist, $alt, 1, $finkfiles) and
next DEP;
}
+
+ logPackageFail($pkg, Can't figure out how to build.
Unsatisfied dependencies: . join( , @alts));
+ return;
}
if($DoValidate) {
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink buildfink,1.39,1.40
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv17623
Modified Files:
buildfink
Log Message:
Quote package names in checkpoint
Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- buildfink 31 Oct 2006 17:44:16 - 1.39
+++ buildfink 31 Oct 2006 17:50:22 - 1.40
@@ -955,7 +955,7 @@
my(%changes) = @_;
open(CHECKPOINT, , $rundir/checkpoint);
- print CHECKPOINT \$pkglist-{$_} = $changes{$_}; foreach keys
%changes;
+ print CHECKPOINT \$pkglist-{'$_'} = $changes{$_}; foreach keys
%changes;
print CHECKPOINT \n;
close CHECKPOINT;
}
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink buildfink,1.40,1.41
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv18979
Modified Files:
buildfink
Log Message:
Typo fix
Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- buildfink 31 Oct 2006 17:50:22 - 1.40
+++ buildfink 31 Oct 2006 17:54:04 - 1.41
@@ -930,7 +930,7 @@
removeBuildLocks();
doLog(Restored from checkpoint);
- @skiplist = @$skiplist;
+ @skiplist = $skiplist ? @$skiplist : ();
doLog(Building packages);
buildAll(\%$pkglist);
doLog(Done building);
@@ -955,7 +955,7 @@
my(%changes) = @_;
open(CHECKPOINT, , $rundir/checkpoint);
- print CHECKPOINT \$pkglist-{'$_'} = $changes{$_}; foreach keys
%changes;
+ print CHECKPOINT \$pkglist-{$_} = $changes{$_}; foreach keys
%changes;
print CHECKPOINT \n;
close CHECKPOINT;
}
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink buildfink,1.36,1.37
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32215
Modified Files:
buildfink
Log Message:
Oops, we had dep lists inside-out
Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- buildfink 27 Oct 2006 15:25:40 - 1.36
+++ buildfink 31 Oct 2006 05:33:38 - 1.37
@@ -310,8 +310,8 @@
doLog(Couldn't get dependencies for $pkg: $@);
next;
}
- foreach my $altlist (@deps) {
- foreach my $alt (map {$_-get_name()} @$altlist) {
+ foreach my $dep (@deps) {
+ foreach my $alt (map {$_-get_name()} @$dep) {
$dependents{$alt} ||= {};
$dependents{$alt}-{$pkg} = 1;
}
@@ -643,59 +643,42 @@
return;
}
- # @deps is in conjunctive normal form. That is, it is a list like:
- # {{A ^ B ^ C} v {D ^ E} v {F}}
- # In other words, a list of alternatives, and each alternative is a
- # series of packages which must all be satisfied.
- my $satisfied = 0;
- my @faildep;
- my @satisfiable_alts;
- CHECKSAT: foreach my $alternative (@deps) {
- foreach my $altdep (@$alternative) {
- my $depname = $altdep-get_name();
- my $depstat = $pkglist-{$depname};
+ # @deps is in disjunctive normal form. That is, it is a list like:
+ # {{A v B v C} ^ {D v E} ^ {F}}
+ # In other words, a list of dependencies, and each dependency is a
+ # list of packages which can satisfy it.
+ DEP: foreach my $dep (@deps) {
+ my @alts = sort {
+ # Prefer already-installed deps.
+
+ my $status_a = $pkglist-{$a};
+ my $score_a = 0;
+ $score_a = 1 if defined($status_a) and $status_a ==
PKGSTATUS_INSTALLED;
+ my $status_b = $pkglist-{$b};
+ my $score_b = 0;
+ $score_b = 1 if defined($status_b) and $status_b ==
PKGSTATUS_INSTALLED;
+
+ $score_b = $score_a;
+ } filterSplitoffs(map {$_-get_name()} @$dep);
+
+ foreach my $alt (@alts) {
+ my $depstat = $pkglist-{$alt};
$depstat = PKGSTATUS_INSTALL unless defined($depstat);
if($depstat == PKGSTATUS_FAILED or $depstat ==
PKGSTATUS_PROCESSING) {
- push @faildep, $depname;
- next CHECKSAT;
+ next;
}
- }
- push @satisfiable_alts, $alternative;
- }
-
- foreach my $alternative (sort {
- # Count the number of uninstalled packages in this alternative.
- # If we have an alternative that doesn't require any extra
- # building, pick that one.
-
- my @pkgs_a = map {$_-get_name()} @$a;
- my $unsats_a = grep {!defined($pkglist-{$_}) or $pkglist-{$_}
!= PKGSTATUS_INSTALLED} @pkgs_a;
-
- my @pkgs_b = map {$_-get_name()} @$b;
- my $unsats_b = grep {!defined($pkglist-{$_}) or $pkglist-{$_}
!= PKGSTATUS_INSTALLED} @pkgs_b;
-
- $unsats_a = $unsats_b;
- } @satisfiable_alts) {
- # This alternative is satisfiable
- foreach my $altdep (@$alternative) {
- my $depname = $altdep-get_name();
- $pkglist-{$depname} = PKGSTATUS_INSTALL if
!defined($pkglist-{$depname});
- next if $pkglist-{$depname} == PKGSTATUS_INSTALLED;
- recurseOnDepends($pkglist, filterSplitoffs($depname),
1, $finkfiles);
- if($pkglist-{$depname} == PKGSTATUS_FAILED) {
- push @faildep, $depname;
- next CHECKSAT;
+ $pkglist-{$alt} = PKGSTATUS_INSTALL if
!defined($pkglist-{$alt});
+ next if $pkglist-{$alt} == PKGSTATUS_INSTALLED;
+ recurseOnDepends($pkglist, $alt, 1, $finkfiles);
+ if($pkglist-{$alt} == PKGSTATUS_FAILED) {
+ next;
}
- }
-
- $satisfied = 1;
- last;
- }
- if(!$satisfied) {
- logPackageFail($pkg, Can't figure out how to build.
Unsatisfied dependencies: . join( , sort @faildep));
- return;
+ next DEP;
+
[cvs] scripts/buildfink buildfink,1.37,1.38
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv7289
Modified Files:
buildfink
Log Message:
Package is installed means dep is satisfied
Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- buildfink 31 Oct 2006 05:33:38 - 1.37
+++ buildfink 31 Oct 2006 05:52:54 - 1.38
@@ -669,7 +669,7 @@
}
$pkglist-{$alt} = PKGSTATUS_INSTALL if
!defined($pkglist-{$alt});
- next if $pkglist-{$alt} == PKGSTATUS_INSTALLED;
+ next DEP if $pkglist-{$alt} == PKGSTATUS_INSTALLED;
recurseOnDepends($pkglist, $alt, 1, $finkfiles);
if($pkglist-{$alt} == PKGSTATUS_FAILED) {
next;
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink buildfink,1.34,1.35
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv25304
Modified Files:
buildfink
Log Message:
Set BuildAll = 0 when reading a packagelist file
Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- buildfink 24 Oct 2006 01:38:04 - 1.34
+++ buildfink 27 Oct 2006 15:17:15 - 1.35
@@ -174,10 +174,10 @@
my $status = PKGSTATUS_REBUILD;
$status = PKGSTATUS_INSTALL if $arg =~ s/-no-rebuild//;
+ $BuildAll = 0;
if($arg eq packages) {
$pkglist-{$_} = $status foreach split(/,/, $val);
- $BuildAll = 0;
} else {
open(INPUT, $val) or die Couldn't open packages file $val:
$!\n;
while(INPUT) {
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink buildfink,1.35,1.36
Update of /cvsroot/fink/scripts/buildfink In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv28682 Modified Files: buildfink Log Message: Typo fix, thanks miga Index: buildfink === RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- buildfink 27 Oct 2006 15:17:15 - 1.35 +++ buildfink 27 Oct 2006 15:25:40 - 1.36 @@ -63,7 +63,7 @@ from breaking the build. C--max-log-size N and C--max-build-time T can be used to adjust these limits. An CN or CT of 0 will disable the corresponding limit. CN is in bytes, unless it has a suffix of CK, CM, -or CG indicating kilobytes, megabytes, and gigabytes respsectively. +or CG indicating kilobytes, megabytes, and gigabytes respectively. CT is in seconds, unless it has a suffix of Cm or Ch indicating, respectively, minutes and hours. The defaults are 250 megabytes and 4 hours respectively. Package-specific limits can be provided by specifying - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] dists/10.4/unstable/main/finkinfo/net throttled.info,NONE,1.1
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv12775 Added Files: throttled.info Log Message: New package from Jack Fink --- NEW FILE: throttled.info --- Package: throttled Version: 0.4.6 Revision: 1002 Source: http://www.intrarts.com/Files/%n-%v.tgz GCC: 4.0 CompileScript: perl -pi -e s,/usr/local,%i, Makefile perl -pi -e s,-O3.*sdk,-Os, src/Makefile InstallScript: make install Maintainer: Jack Fink [EMAIL PROTECTED] Homepage: http://www.intrarts.com/throttledcli.html License: GPL Description: Port-based load balancer for TCP/IP Source-MD5: 8e87b3eafa07220bb29a923dc4172d55 DocFiles: COPYING.txt README.txt - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink buildfink,1.33,1.34
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22947
Modified Files:
buildfink
Log Message:
Add --package-file, --packages-no-rebuild, --package-file-no-rebuild, and
--no-copy-info
Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- buildfink 20 Oct 2006 18:16:56 - 1.33
+++ buildfink 24 Oct 2006 01:38:04 - 1.34
@@ -73,12 +73,22 @@
Normally, buildfink will attempt to build every package it knows about. To
build only a subset of packages, give C--packages PKGLIST, where CPKGLIST
-is a comma-separated list of packages. Packages necessary to satisfy
-dependencies of these will be installed or built as necessary. If operating in
-this mode, you may also want the C--dirty option to avoid purging all
+is a comma-separated list of packages or C--package-file PKGFILE, where
+CPKGFILE is a list containing one package name per line (blank lines and
+comments starting with # are also allowed.) To specify packages that you don't
+want to rebuild unless they aren't up to date, use the C--packages-no-rebuild
+(or C--package-file-no-rebuild) options. Dependencies of things you specify
+via C--packages are automatically added with that behaviour.
+
+If only building a fixed list of packages,
+you may also want the C--dirty option to avoid purging all
non-essential packages before performing each build. The
C--rebuild-deps option will add any packages which depend on anything
-in CPKGLIST .
+in CPKGLIST . C--no-copy-info makes symlinks to the .info files from the
+Fink trees into the output directory (instead of copying the files over);
+the copy behaviour is useful if you want to maintain an archive of the package
+versions in your build, but if you don't need that you can save the space
+and time.
=head2 CHECKPOINTS
@@ -102,7 +112,7 @@
use lib $Bin;
use FinkLib;
-our($Bin, $FinkConfig, $FinkDir, $rundir, $dryrun, $infofilter, $patchdir,
@skiplist, $checkpoint, $DoValidate, $BuildNobody, $Dirty, $RebuildDeps,
$BuildAll);
+our($Bin, $FinkConfig, $FinkDir, $rundir, $dryrun, $infofilter, $patchdir,
@skiplist, $checkpoint, $DoValidate, $BuildNobody, $Dirty, $RebuildDeps,
$BuildAll, $NoCopyInfo);
our $VERSION = '$Revision$';
our $max_build_time = 60*60*4;
@@ -158,6 +168,29 @@
use constant PKGSTATUS_SKIP = -2;
$BuildAll = 1;
+
+sub packageList {
+ my($pkglist, $arg, $val) = @_;
+ my $status = PKGSTATUS_REBUILD;
+
+ $status = PKGSTATUS_INSTALL if $arg =~ s/-no-rebuild//;
+
+ if($arg eq packages) {
+ $pkglist-{$_} = $status foreach split(/,/, $val);
+ $BuildAll = 0;
+ } else {
+ open(INPUT, $val) or die Couldn't open packages file $val:
$!\n;
+ while(INPUT) {
+ chomp;
+ s/#.*//;
+ s/^\s+ //; s/\s+ $//;
+ next if /^$/;
+ $pkglist-{$_} = $status;
+ }
+ close INPUT;
+ }
+}
+
my $opts_ok = GetOptions(
n = \$dryrun,
infofilter=s = \$infofilter,
@@ -167,10 +200,11 @@
validate = \$DoValidate,
dirty = \$Dirty,
rebuild-deps = \$RebuildDeps,
- packages=s = sub {
- %pkglist = map { $_ = PKGSTATUS_REBUILD } split(/,/, $_[1]);
- $BuildAll = 0;
- },
+ packages=s = sub {packageList(\%pkglist, @_)},
+ package-file=s = sub {packageList(\%pkglist, @_)},
+ packages-no-rebuild=s = sub {packageList(\%pkglist, @_)},
+ package-file-no-rebuild=s = sub {packageList(\%pkglist, @_)},
+ no-copy-info = \$NoCopyInfo,
build-as-nobody:s = \$BuildNobody,
max-build-time=s = \limit_arg,
max-log-size=s = \limit_arg
@@ -432,7 +466,8 @@
if($file =~ /\.(info|patch)$/) {
patchFile($dir/$file,
$rundir/pkginfo/finkinfo/$newfile);
} else {
- copy($dir/$file,
$rundir/pkginfo/finkinfo/$newfile) or die Couldn't copy $dir/$file: $!\n;
+ my $cpfn = $NoCopyInfo ? \symlink : \copy;
+ $cpfn-($dir/$file,
$rundir/pkginfo/finkinfo/$newfile) or die Couldn't copy/link $dir/$file:
$!\n;
}
}
closedir(INFODIR);
@@ -443,7 +478,8 @@
my @extrapatches = grep {$_ ne . and $_ ne ..}
readdir(PATCHDIR);
closedir(PATCHDIR);
foreach my $patch(@extrapatches) {
- copy($patchdir/$patch,
$rundir/pkginfo/finkinfo/$patch);
+ my $cpfn = $NoCopyInfo ? \symlink : \copy;
+ $cpfn-($patchdir/$patch,
$rundir/pkginfo/finkinfo/$patch)
[cvs] scripts/buildfink buildfink,1.32,1.33
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv24892
Modified Files:
buildfink
Log Message:
Alternative ordering fix, rebuild-deps fix; Panther and bindist fixes from
chris01
Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- buildfink 19 Oct 2006 22:02:11 - 1.32
+++ buildfink 20 Oct 2006 18:16:56 - 1.33
@@ -96,7 +96,7 @@
use File::Copy;
use File::Find;
use Data::Dumper;
-use POSIX qw(dup2 setsid sys_wait_h);
+use POSIX qw(sys_wait_h dup2 setsid);
use Getopt::Long;
use FindBin qw($Bin);
use lib $Bin;
@@ -255,8 +255,38 @@
if(!$BuildAll and $RebuildDeps) {
- foreach my $pkg (keys %pkglist) {
- my @deps = getDependsRecursive($pkg);
+ # Build up a map showing what each package is depended on by
+ my %dependents;
+ foreach my $pkg (filterSplitoffs(Fink::Package-list_packages())) {
+ my $obj;
+ eval {
+ $obj = Fink::PkgVersion-match_package($pkg);
+ };
+ if($@) {
+ doLog(Couldn't get package object for $pkg: $@);
+ next;
+ }
+
+ next if !$obj || $obj-is_type('dummy');
+ my @deps;
+ eval {
+ @deps = $obj-resolve_depends(1, depends);
+ };
+ if($@) {
+ doLog(Couldn't get dependencies for $pkg: $@);
+ next;
+ }
+ foreach my $altlist (@deps) {
+ foreach my $alt (map {$_-get_name()} @$altlist) {
+ $dependents{$alt} ||= {};
+ $dependents{$alt}-{$pkg} = 1;
+ }
+ }
+ }
+
+ foreach my $pkg (grep { $pkglist{$_} == PKGSTATUS_REBUILD } keys
%pkglist) {
+ my @deps = filterSplitoffs(getDependentsRecursive($pkg,
\%dependents));
+ doLog(Recursive inverse deps: . join(, , @deps));
foreach my $dep (@deps) {
$pkglist{$dep} = PKGSTATUS_REBUILD;
}
@@ -481,6 +511,7 @@
doLog(Couldn't open $rundir/logs/$pkg.log: $!);
die Couldn't open $rundir/logs/$pkg.log: $!\n;
};
+ print BUILDLOG $buildcmd\n;
my($rin, $win, $ein) = ('', '', '');
vec($rin, fileno(BUILD), 1) = 1;
@@ -546,6 +577,7 @@
# Try to build an individual package.
sub recurseOnDepends {
my($pkglist, $pkg, $install, $finkfiles) = @_;
+ my $orig_status = $pkglist-{$pkg};
$pkglist-{$pkg} = PKGSTATUS_PROCESSING;
doLog(Trying to satisfy $pkg);
@@ -581,6 +613,7 @@
# series of packages which must all be satisfied.
my $satisfied = 0;
my @faildep;
+ my @satisfiable_alts;
CHECKSAT: foreach my $alternative (@deps) {
foreach my $altdep (@$alternative) {
my $depname = $altdep-get_name();
@@ -592,6 +625,22 @@
}
}
+ push @satisfiable_alts, $alternative;
+ }
+
+ foreach my $alternative (sort {
+ # Count the number of uninstalled packages in this alternative.
+ # If we have an alternative that doesn't require any extra
+ # building, pick that one.
+
+ my @pkgs_a = map {$_-get_name()} @$a;
+ my $unsats_a = grep {!defined($pkglist-{$_}) or $pkglist-{$_}
!= PKGSTATUS_INSTALLED} @pkgs_a;
+
+ my @pkgs_b = map {$_-get_name()} @$b;
+ my $unsats_b = grep {!defined($pkglist-{$_}) or $pkglist-{$_}
!= PKGSTATUS_INSTALLED} @pkgs_b;
+
+ $unsats_a = $unsats_b;
+ } @satisfiable_alts) {
# This alternative is satisfiable
foreach my $altdep (@$alternative) {
my $depname = $altdep-get_name();
@@ -625,9 +674,9 @@
my $srcdir = $Fink::Config::buildpath; # Suppress used only once
warning
$srcdir = $Fink::Config::buildpath/ . $obj-get_fullname();
- my $buildcmd = printf '\n\n' | fink --yes ;
+ my $buildcmd = printf '\n\n' | fink --no-use-binary-dist --yes ;
$buildcmd .= --build-as-nobody if $BuildNobody;
- if($pkglist-{$pkg} == PKGSTATUS_REBUILD) {
+ if($orig_status == PKGSTATUS_REBUILD) {
$buildcmd .= rebuild ;
} else {
$buildcmd .= install ;
@@ -681,9 +730,13 @@
push @okpkgs, $relative-get_name();
my $deb = $relative-get_debname();
- move(readlink($FinkDir/fink/debs/$deb),
$rundir/pkginfo/binary-darwin-powerpc/$deb);
-
[cvs] scripts/buildfink buildfink,1.28,1.29
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv26835
Modified Files:
buildfink
Log Message:
Here's a shot at support for building only a subset of packages...
Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- buildfink 8 Aug 2006 19:25:28 - 1.28
+++ buildfink 19 Oct 2006 20:48:51 - 1.29
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-#Copyright (c) 2005 Apple Computer, Inc. All Rights Reserved.
+#Copyright (c) 2005-2006 Apple Computer, Inc. All Rights Reserved.
#
#This program is free software; you can redistribute it and/or modify
#it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
=head1 USAGE
- buildfink [-n] [--infofilter SCRIPT] [--patchdir DIR] [--skip PACKAGE]
[--skip PACKAGE] [--validate] [--build-as-nobody] [--max-log-size [P:]N]
[--max-build-time [P:]T] [FINKDIR OUTDIR
+ buildfink [-n] [--infofilter SCRIPT] [--patchdir DIR] [--skip PACKAGE]
[--skip PACKAGE] [--validate] [--build-as-nobody] [--max-log-size [P:]N]
[--max-build-time [P:]T] [--packages PKGLIST] [--rebuild-dependents] [--dirty]
[FINKDIR OUTDIR]
buildfink [-r CHECKPOINT]
Cbuildfink builds every package in Fink, taking care of things like avoiding
repeated building
@@ -71,6 +71,15 @@
C--max-build-time openoffice.org:24h would specify a 24-hour limit for
openoffice.org.
+Normally, buildfink will attempt to build every package it knows about. To
+build only a subset of packages, give C--packages PKGLIST, where CPKGLIST
+is a comma-separated list of packages. Packages necessary to satisfy
+dependencies of these will be installed or built as necessary. If operating in
+this mode, you may also want the C--dirty option to avoid purging all
+non-essential packages before performing each build. The
+C--rebuild-dependents option will add any packages which depend on anything
+in CPKGLIST .
+
=head2 CHECKPOINTS
Sometimes there will be system issues partway through a build. For instance,
a recalcitrant
@@ -93,7 +102,7 @@
use lib $Bin;
use FinkLib;
-our($Bin, $FinkConfig, $FinkDir, $rundir, $dryrun, $infofilter, $patchdir,
@skiplist, $checkpoint, $DoValidate, $BuildNobody);
+our($Bin, $FinkConfig, $FinkDir, $rundir, $dryrun, $infofilter, $patchdir,
@skiplist, $checkpoint, $DoValidate, $BuildNobody, $Dirty, $RebuildDeps,
$BuildAll);
our $VERSION = '$Revision$';
our $max_build_time = 60*60*4;
@@ -139,6 +148,16 @@
}
}
+# Keys will be package names. Values will be:
+my %pkglist;
+use constant PKGSTATUS_INSTALLED = 3;
+use constant PKGSTATUS_REBUILD = 2;
+use constant PKGSTATUS_INSTALL = 1;
+use constant PKGSTATUS_PROCESSING = 0;
+use constant PKGSTATUS_FAILED = -1;
+use constant PKGSTATUS_SKIP = -2;
+
+$BuildAll = 1;
my $opts_ok = GetOptions(
n = \$dryrun,
infofilter=s = \$infofilter,
@@ -146,6 +165,12 @@
skip=s = [EMAIL PROTECTED],
r=s = \$checkpoint,
validate = \$DoValidate,
+ dirty = \$Dirty,
+ rebuild-dependents = \$RebuildDeps,
+ packages=s = sub {
+ %pkglist = map { $_ = PKGSTATUS_REBUILD }
filterSplitoffs(split(/,/, $_[1]));
+ $BuildAll = 0;
+ },
build-as-nobody:s = \$BuildNobody,
max-build-time=s = \limit_arg,
max-log-size=s = \limit_arg
@@ -191,44 +216,56 @@
die See 'perldoc $0' for more information.\n;
}
-
if($checkpoint) {
restoreCheckpoint($checkpoint);
exit();
}
-
restoreSystem();
prepSystem();
-FinkLib::purgeNonEssential();
+FinkLib::purgeNonEssential() unless $Dirty;
FinkLib::readPackages();
removeBuildLocks();
-my(@pkglist) = Fink::Package-list_packages();
+%pkglist = map { $_ = PKGSTATUS_REBUILD }
filterSplitoffs(Fink::Package-list_packages()) if $BuildAll;
+foreach (filterSplitoffs(@skiplist)) {
+ $pkglist{$_} = PKGSTATUS_SKIP;
+ logPackageFail($_, Package is on the skip list.);
+}
-if(!$dryrun) {
- # Then copy the .info files to our private repository and patch them if
necessary.
- patchPackages(@pkglist);
+# Don't try to install uninstalled virtual packages.
+# We can't use them to satisfy dependencies and we can't build them...
+my $vpinfo = Fink::VirtPackage-list();
+while(my($pkgname, $hash) = each(%$vpinfo)) {
+ if($hash-{status} !~ / installed$/) {
+ $pkglist{$pkgname} = PKGSTATUS_SKIP;
+ logPackageFail($_, Package is an uninstalled virtual
package.);
+ } else {
+ $pkglist{$pkgname} = PKGSTATUS_INSTALLED;
+ }
+}
- # Only let Fink see our modified packages
- injectPackages();
+
+if(!$BuildAll and $RebuildDeps) {
+ foreach my $pkg (keys %pkglist) {
+ my @deps = getDependsRecursive($pkg);
+ foreach
[cvs] scripts/buildfink buildfink,1.29,1.30
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv29889
Modified Files:
buildfink
Log Message:
Typo fixes
Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- buildfink 19 Oct 2006 20:48:51 - 1.29
+++ buildfink 19 Oct 2006 20:56:18 - 1.30
@@ -168,7 +168,7 @@
dirty = \$Dirty,
rebuild-dependents = \$RebuildDeps,
packages=s = sub {
- %pkglist = map { $_ = PKGSTATUS_REBUILD }
filterSplitoffs(split(/,/, $_[1]));
+ %pkglist = map { $_ = PKGSTATUS_REBUILD } split(/,/, $_[1]);
$BuildAll = 0;
},
build-as-nobody:s = \$BuildNobody,
@@ -226,7 +226,16 @@
FinkLib::purgeNonEssential() unless $Dirty;
FinkLib::readPackages();
removeBuildLocks();
-%pkglist = map { $_ = PKGSTATUS_REBUILD }
filterSplitoffs(Fink::Package-list_packages()) if $BuildAll;
+
+if($BuildAll) {
+ %pkglist = map { $_ = PKGSTATUS_REBUILD }
filterSplitoffs(Fink::Package-list_packages()) if $BuildAll;
+} else {
+ # filterSplitoffs isn't available until we've initialized Fink.
+ # We can't initialize Fink until after option processing is done.
+ # So, --packages doesn't filter splitoffs, and we do it here...
+ %pkglist = map { $_ = PKGSTATUS_REBUILD } filterSplitoffs(keys
%pkglist);
+}
+
foreach (filterSplitoffs(@skiplist)) {
$pkglist{$_} = PKGSTATUS_SKIP;
logPackageFail($_, Package is on the skip list.);
@@ -275,7 +284,6 @@
# Prepare the system
sub prepSystem {
$FinkConfig = FinkLib::initFink($FinkDir);
-
return if $dryrun;
mkdir($rundir);
@@ -824,7 +832,7 @@
# When we have a split-off in the list, replace it with its parent and suppress
# any further instances of members of that family. This preserves our
dependency
# ordering.
-sub filterSplitOffs {
+sub filterSplitoffs {
my(@pkglist) = @_;
my @ret;
my %got_families;
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink buildfink,1.30,1.31
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv7809
Modified Files:
buildfink
Log Message:
Hm, I think this might actually work now, cool\!
Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- buildfink 19 Oct 2006 20:56:18 - 1.30
+++ buildfink 19 Oct 2006 21:22:49 - 1.31
@@ -247,7 +247,7 @@
while(my($pkgname, $hash) = each(%$vpinfo)) {
if($hash-{status} !~ / installed$/) {
$pkglist{$pkgname} = PKGSTATUS_SKIP;
- logPackageFail($_, Package is an uninstalled virtual
package.);
+ logPackageFail($pkgname, Package is an uninstalled virtual
package.);
} else {
$pkglist{$pkgname} = PKGSTATUS_INSTALLED;
}
@@ -534,7 +534,7 @@
sub setPackageStatus {
my($pkglist, $pkg, $status) = @_;
$pkglist-{$pkg} = $status;
- updaetCheckpoint($pkg = $status);
+ updateCheckpoint($pkg = $status);
}
sub setPackageFail {
@@ -583,21 +583,23 @@
my @faildep;
CHECKSAT: foreach my $alternative (@deps) {
foreach my $altdep (@$alternative) {
- my $depstat = $pkglist-{$altdep};
+ my $depname = $altdep-get_name();
+ my $depstat = $pkglist-{$depname};
$depstat = PKGSTATUS_INSTALL unless defined($depstat);
if($depstat == PKGSTATUS_FAILED or $depstat ==
PKGSTATUS_PROCESSING) {
- push @faildep, $altdep;
+ push @faildep, $depname;
next CHECKSAT;
}
}
# This alternative is satisfiable
foreach my $altdep (@$alternative) {
- $pkglist-{$altdep} = PKGSTATUS_INSTALL if
!defined($pkglist-{$altdep});
- next if $pkglist-{$altdep} == PKGSTATUS_INSTALLED;
- recurseOnDepends($pkglist, filterSplitoffs($altdep), 1,
$finkfiles);
- if($pkglist-{$altdep} == PKGSTATUS_FAILED) {
- push @faildep, $altdep;
+ my $depname = $altdep-get_name();
+ $pkglist-{$depname} = PKGSTATUS_INSTALL if
!defined($pkglist-{$depname});
+ next if $pkglist-{$depname} == PKGSTATUS_INSTALLED;
+ recurseOnDepends($pkglist, filterSplitoffs($depname),
1, $finkfiles);
+ if($pkglist-{$depname} == PKGSTATUS_FAILED) {
+ push @faildep, $depname;
next CHECKSAT;
}
}
@@ -752,7 +754,6 @@
doLog(Couldn't figure out how to build: .
join(, , @unsats));
return;
} else {
- doLog(Done!);
return 1;
}
}
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] scripts/buildfink buildfink,1.31,1.32
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv24020
Modified Files:
buildfink
Log Message:
Don't try to move a .deb onto itself
Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- buildfink 19 Oct 2006 21:22:49 - 1.31
+++ buildfink 19 Oct 2006 22:02:11 - 1.32
@@ -24,7 +24,7 @@
=head1 USAGE
- buildfink [-n] [--infofilter SCRIPT] [--patchdir DIR] [--skip PACKAGE]
[--skip PACKAGE] [--validate] [--build-as-nobody] [--max-log-size [P:]N]
[--max-build-time [P:]T] [--packages PKGLIST] [--rebuild-dependents] [--dirty]
[FINKDIR OUTDIR]
+ buildfink [-n] [--infofilter SCRIPT] [--patchdir DIR] [--skip PACKAGE]
[--skip PACKAGE] [--validate] [--build-as-nobody] [--max-log-size [P:]N]
[--max-build-time [P:]T] [--packages PKGLIST] [--rebuild-deps] [--dirty]
[FINKDIR OUTDIR]
buildfink [-r CHECKPOINT]
Cbuildfink builds every package in Fink, taking care of things like avoiding
repeated building
@@ -77,7 +77,7 @@
dependencies of these will be installed or built as necessary. If operating in
this mode, you may also want the C--dirty option to avoid purging all
non-essential packages before performing each build. The
-C--rebuild-dependents option will add any packages which depend on anything
+C--rebuild-deps option will add any packages which depend on anything
in CPKGLIST .
=head2 CHECKPOINTS
@@ -166,7 +166,7 @@
r=s = \$checkpoint,
validate = \$DoValidate,
dirty = \$Dirty,
- rebuild-dependents = \$RebuildDeps,
+ rebuild-deps = \$RebuildDeps,
packages=s = sub {
%pkglist = map { $_ = PKGSTATUS_REBUILD } split(/,/, $_[1]);
$BuildAll = 0;
@@ -668,9 +668,13 @@
system(rm, -rf, $srcdir);
my $deb = $obj-get_debname();
- move(readlink($FinkDir/fink/debs/$deb),
$rundir/pkginfo/binary-darwin-powerpc/$deb);
- unlink($FinkDir/fink/debs/$deb);
- symlink($rundir/pkginfo/binary-darwin-powerpc/$deb,
$FinkDir/fink/debs/$deb);
+ my $src = readlink($FinkDir/fink/debs/$deb);
+ my $dst = $rundir/pkginfo/binary-darwin-powerpc/$deb;
+ if($src ne $dst) {
+ move($src, $dst);
+ unlink($FinkDir/fink/debs/$deb);
+ symlink($rundir/pkginfo/binary-darwin-powerpc/$deb,
$FinkDir/fink/debs/$deb);
+ }
my @okpkgs = $pkg;
foreach my $relative(getRelatives($obj)) {
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] dists/10.4/unstable/main/finkinfo/net bwm-ng.info, NONE, 1.1 iftop.info, NONE, 1.1
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv26115
Added Files:
bwm-ng.info iftop.info
Log Message:
Adding tracker submissions #1570727 and #1570598 from jack-.
--- NEW FILE: bwm-ng.info ---
Package: bwm-ng
Version: 0.5
Revision: 1002
Source: http://www.gropp.org/%n/%n-%v.tar.gz
Depends:
BuildDepends: fink (= 0.24)
Recommends:
GCC: 4.0
Maintainer: Jack Fink [EMAIL PROTECTED]
Homepage: http://www.gropp.org/?id=projectssub=bwm-ng
License: GPL
Description: Bandwidth monitor, next generation
Source-MD5: 4c5197527c985dc8b45973dfd00deca0
SourceDirectory: %n-%v
ConfigureParams: --mandir=%{i}/share/man
PatchScript:
perl -pi -e 's,-O2,-Os,' configure
DocFiles: AUTHORS changelog README bwm-ng.css bwm-ng.conf-example
--- NEW FILE: iftop.info ---
Package: iftop
Version: 0.17
Revision: 1003
Source: http://www.ex-parrot.com/~pdw/%n/download/%n-%v.tar.gz
Depends: libncurses5-shlibs, libpcap-shlibs
BuildDepends: fink (= 0.24), libncurses5-dev, libpcap
Recommends:
GCC: 4.0
Maintainer: Jack Fink [EMAIL PROTECTED]
Homepage: http://www.ex-parrot.com/~pdw/iftop
License: GPL
Description: Bandwidth monitor, similar to top
Source-MD5: 062bc8fb3856580319857326e0b8752d
SourceDirectory: %n-%v
ConfigureParams: --mandir=%{i}/share/man --with-extra-libs=%{p}/lib
--with-extra-includes=%{p}/include
PatchScript:
perl -pi -e 's,-O2,-Os,' configure
DocFiles: AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] dists/10.4/unstable/main/finkinfo/devel appleincludes-copyfile01.info, NONE, 1.1
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv25052 Added Files: appleincludes-copyfile01.info Log Message: Added tracker submission on behalf of chris01 / Matthew Bogosian --- NEW FILE: appleincludes-copyfile01.info --- Info2: #= # $Id: appleincludes-copyfile01.info 436 2006-09-30 18:26:25Z matt $ Package: appleincludes-copyfile01 Version: 0.1 Revision: 2 Description: Apple's copyfile C header file License: Restrictive HomePage: http://www.opensource.apple.com/darwinsource/10.4.3/Libc-391.2.3/ Maintainer: Matthew Bogosian [EMAIL PROTECTED] #= # Unpack phase --- NoSourceDirectory: true Source: http://darwinsource.opendarwin.org/10.4.3/Libc-391.2.3/darwin/copyfile.h Source-MD5: 79b1105c387a1b63ce5e1417f5f07e2b # Compile phase -- CompileScript: #!/bin/sh -ex curl -O http://darwinsource.opendarwin.org/10.4.3/Libc-391.2.3/APPLE_LICENSE # Install phase -- DocFiles: APPLE_LICENSE InstallScript: #!/bin/sh -ex install -d -m 755 '%i/include/copyfile-0.1' install -c -m 644 copyfile.h '%i/include/copyfile-0.1' # Documentation -- DescDetail: Apple's copyfile.h which was not distributed with XCode, but is required when building some applications. - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] web/xml/packaging packaging.en.xml,1.87,1.88
Update of /cvsroot/fink/web/xml/packaging In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30156 Modified Files: packaging.en.xml Log Message: Document InfoTest. Index: packaging.en.xml === RCS file: /cvsroot/fink/web/xml/packaging/packaging.en.xml,v retrieving revision 1.87 retrieving revision 1.88 diff -u -d -r1.87 -r1.88 --- packaging.en.xml22 Feb 2006 06:31:55 - 1.87 +++ packaging.en.xml18 Sep 2006 14:34:38 - 1.88 @@ -1443,7 +1443,10 @@ pIn the emcompile phase/em the source is configured and compiled. Usually this means calling the codeconfigure/code script with some parameters and then issuing a codemake/code command. See the -CompileScript field description for details./p +CompileScript field description for details. If test suites are enabled +for the build (a new feature in fink 0.25, currently achieved by building in +maintainer mode), the TestScript will be run immediately after the +CompileScript./p pIn the eminstall phase/em the package is installed to a temporary directory, filename/sw/src/fink.build/root-gimp-1.2.1-1/filename (= %d). (Note the root- part.) All files that would normally be installed to filename/sw/filename are installed in @@ -1869,7 +1872,9 @@ A list of dependencies that is applied at build time only. This can be used to list tools (e.g. flex) that must be present to build the packages, but which are not used at run time. -Supports the same syntax as Depends. +Supports the same syntax as Depends. If a build is being done +with test suites enabled, the dependencies in the codeTestDepends/code +field will be added to this list. /p /itemd/item @@ -1921,7 +1926,9 @@ being compiled. This can be used to prevent code./configure/code or the compiler from seeing undesired library headers or to avoid use of a version of a tool that is known to be broken (for example, a bug -in a certain version of sed). +in a certain version of sed). If a build is being done +with test suites enabled, the packages in the codeTestConflicts/code +field will be added to this list. /p /itemd/item @@ -2056,6 +2063,10 @@ download). This implicitly-defined codeSource/code form is deprecated (explicitly-stated simple filename/manual download is still okay). +/pp +Sources that are only needed in order to run test suites should +use codeTestSource/code and related fields, inside the +codeInfoTest/code block. /p /itemd/item @@ -2421,7 +2432,9 @@ itemd p Additional parameters to pass to the configure script. (See -CompileScript for details.) +CompileScript for details.) If a build is being done +with test suites enabled, the value of the codeTestConfigureParams/code +field will be appended to this. As of fink 0.13.7, this parameter will also work with perl modules codeType: Perl/code, and will append to the default perl Makefile.PL @@ -2553,6 +2566,46 @@ /itemd/item /itemtable +pemTest Suites:/em/p +itemtable + +itemitemtInfoTest/itemt +itemd +p +emIntroduced in fink 0.25./em +This field encapsulates information that will only be used when performing +a build with test suites enabled. It contains other fields. +If present, this field emmust/em contain a codeTestScript/code. +All other fields are optional. The following fields are allowed inside +codeInfoTest/code: +/pul +licodeTestScript/code: A script which runs the test suite. This script should exit +with status 0 if the suite passes, 1 to indicate warnings, or any other +value to indicate failures serious enough to be considered fatal. +Because of this tri-state logic, you should explicitly set an exit value in +this script. For instance, codemake check/code is a bad script, +since it will exit with status 1 if the check target doesn't exist. +codemake check || exit 2/code would be a better script./li +licodeTestConfigureParams/code: A value which will be appended to codeConfigureParams/code./li +licodeTestDepends/code and codeTestConflicts/code: Lists of packages that will be added to the codeBuildDepends/code or codeBuildConflicts/code lists./li +licodeTestSource/code: Extra sources necessary to run the test suite. All of the +affiliated fields are also supported, so you emmust/em also specify +codeTestSource-MD5/code, and you may also have +codeTestSourceN/code and corresponding codeTestSourceN-MD5/code, +codeTestTarFilesRename/code, etc./li +licodeTestSuiteSize/code: Describes approximately how long the test suite takes to +run. Valid values are codesmall/code, codemedium/code, and codelarge/code. +This field is currently ignored./li +liAny other standard field. If a field is specified both inside and outside +codeInfoTest/code, the value inside codeInfoTest/code will replace +the other value when test suites are active./li +/ulpHere's an example: +/pcodeblockInfoTest: lt;lt; +TestScript: make check || exit 2 +TestConfigureParams:
[cvs] web/doc/packaging packaging.en.html,1.84,1.85
Update of /cvsroot/fink/web/doc/packaging In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv1166 Modified Files: packaging.en.html Log Message: Document InfoTest. Index: packaging.en.html === RCS file: /cvsroot/fink/web/doc/packaging/packaging.en.html,v retrieving revision 1.84 retrieving revision 1.85 diff -u -d -r1.84 -r1.85 --- packaging.en.html 26 Jun 2006 21:15:18 - 1.84 +++ packaging.en.html 18 Sep 2006 14:43:03 - 1.85 @@ -1,7 +1,7 @@ !DOCTYPE html PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN http://www.w3.org/TR/html4/loose.dtd; htmlheadmeta http-equiv=Content-Type content=text/html; charset=utf-8 !-- -Generated from $Fink: packaging.en.xml,v 1.87 2006/02/22 06:31:55 dmacks Exp $ +Generated from $Fink: packaging.en.xml,v 1.88 2006/09/18 14:34:38 msachs Exp $ -- titleFink Documentation - Creating Fink Packages/title/headbody table width=100% cellspacing=0 @@ -1320,7 +1320,10 @@ pIn the bcompile phase/b the source is configured and compiled. Usually this means calling the tt style=white-space: nowrap;configure/tt script with some parameters and then issuing a tt style=white-space: nowrap;make/tt command. See the -CompileScript field description for details./p +CompileScript field description for details. If test suites are enabled +for the build (a new feature in fink 0.25, currently achieved by building in +maintainer mode), the TestScript will be run immediately after the +CompileScript./p pIn the binstall phase/b the package is installed to a temporary directory, tt style=white-space: nowrap;/sw/src/fink.build/root-gimp-1.2.1-1/tt (= %d). (Note the root- part.) All files that would normally be installed to tt style=white-space: nowrap;/sw/tt are installed in @@ -1706,7 +1709,9 @@ A list of dependencies that is applied at build time only. This can be used to list tools (e.g. flex) that must be present to build the packages, but which are not used at run time. -Supports the same syntax as Depends. +Supports the same syntax as Depends. If a build is being done +with test suites enabled, the dependencies in the tt style=white-space: nowrap;TestDepends/tt +field will be added to this list. /p /td/trtr valign=toptdProvides/tdtd p @@ -1749,7 +1754,9 @@ being compiled. This can be used to prevent tt style=white-space: nowrap;./configure/tt or the compiler from seeing undesired library headers or to avoid use of a version of a tool that is known to be broken (for example, a bug -in a certain version of sed). +in a certain version of sed). If a build is being done +with test suites enabled, the packages in the tt style=white-space: nowrap;TestConflicts/tt +field will be added to this list. /p /td/trtr valign=toptdReplaces/tdtd p @@ -1860,6 +1867,10 @@ download). This implicitly-defined tt style=white-space: nowrap;Source/tt form is deprecated (explicitly-stated simple filename/manual download is still okay). +/pp +Sources that are only needed in order to run test suites should +use tt style=white-space: nowrap;TestSource/tt and related fields, inside the +tt style=white-space: nowrap;InfoTest/tt block. /p /td/trtr valign=toptdSourcebN/b/tdtd p @@ -2153,7 +2164,9 @@ /td/trtr valign=toptdConfigureParams/tdtd p Additional parameters to pass to the configure script. (See -CompileScript for details.) +CompileScript for details.) If a build is being done +with test suites enabled, the value of the tt style=white-space: nowrap;TestConfigureParams/tt +field will be appended to this. As of fink gt; 0.13.7, this parameter will also work with perl modules tt style=white-space: nowrap;Type: Perl/tt, and will append to the default perl Makefile.PL @@ -2273,6 +2286,42 @@ for that specific perl module package. /p /td/tr/table +pbTest Suites:/b/p +table border=0 cellpadding=0 cellspacing=10tr valign=bottomth align=leftField/thth align=leftValue/th/trtr valign=toptdInfoTest/tdtd +p +bIntroduced in fink 0.25./b +This field encapsulates information that will only be used when performing +a build with test suites enabled. It contains other fields. +If present, this field bmust/b contain a tt style=white-space: nowrap;TestScript/tt. +All other fields are optional. The following fields are allowed inside +tt style=white-space: nowrap;InfoTest/tt: +/pul +litt style=white-space: nowrap;TestScript/tt: A script which runs the test suite. This script should exit +with status 0 if the suite passes, 1 to indicate warnings, or any other +value to indicate failures serious enough to be considered fatal. +Because of this tri-state logic, you should explicitly set an exit value in +this script. For instance, tt style=white-space: nowrap;make check/tt is a bad script, +since it will exit with status 1 if the check target doesn't exist. +tt style=white-space: nowrap;make check || exit 2/tt would be a better script./li +litt style=white-space:
[cvs] scripts/installer/dmg/doc/packaging packaging.en.html, 1.80, 1.81
Update of /cvsroot/fink/scripts/installer/dmg/doc/packaging In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv1939/scripts/installer/dmg/doc/packaging Modified Files: packaging.en.html Log Message: Document InfoTest. Index: packaging.en.html === RCS file: /cvsroot/fink/scripts/installer/dmg/doc/packaging/packaging.en.html,v retrieving revision 1.80 retrieving revision 1.81 diff -u -d -r1.80 -r1.81 --- packaging.en.html 26 Jun 2006 21:15:09 - 1.80 +++ packaging.en.html 18 Sep 2006 14:44:08 - 1.81 @@ -1,7 +1,7 @@ !DOCTYPE html PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN http://www.w3.org/TR/html4/loose.dtd; htmlheadmeta http-equiv=Content-Type content=text/html; charset=utf-8 !-- -Generated from $Fink: packaging.en.xml,v 1.87 2006/02/22 06:31:55 dmacks Exp $ +Generated from $Fink: packaging.en.xml,v 1.88 2006/09/18 14:34:38 msachs Exp $ -- titleFink Documentation - Creating Fink Packages/title/headbody table width=100% cellspacing=0 @@ -1320,7 +1320,10 @@ pIn the bcompile phase/b the source is configured and compiled. Usually this means calling the tt style=white-space: nowrap;configure/tt script with some parameters and then issuing a tt style=white-space: nowrap;make/tt command. See the -CompileScript field description for details./p +CompileScript field description for details. If test suites are enabled +for the build (a new feature in fink 0.25, currently achieved by building in +maintainer mode), the TestScript will be run immediately after the +CompileScript./p pIn the binstall phase/b the package is installed to a temporary directory, tt style=white-space: nowrap;/sw/src/fink.build/root-gimp-1.2.1-1/tt (= %d). (Note the root- part.) All files that would normally be installed to tt style=white-space: nowrap;/sw/tt are installed in @@ -1706,7 +1709,9 @@ A list of dependencies that is applied at build time only. This can be used to list tools (e.g. flex) that must be present to build the packages, but which are not used at run time. -Supports the same syntax as Depends. +Supports the same syntax as Depends. If a build is being done +with test suites enabled, the dependencies in the tt style=white-space: nowrap;TestDepends/tt +field will be added to this list. /p /td/trtr valign=toptdProvides/tdtd p @@ -1749,7 +1754,9 @@ being compiled. This can be used to prevent tt style=white-space: nowrap;./configure/tt or the compiler from seeing undesired library headers or to avoid use of a version of a tool that is known to be broken (for example, a bug -in a certain version of sed). +in a certain version of sed). If a build is being done +with test suites enabled, the packages in the tt style=white-space: nowrap;TestConflicts/tt +field will be added to this list. /p /td/trtr valign=toptdReplaces/tdtd p @@ -1860,6 +1867,10 @@ download). This implicitly-defined tt style=white-space: nowrap;Source/tt form is deprecated (explicitly-stated simple filename/manual download is still okay). +/pp +Sources that are only needed in order to run test suites should +use tt style=white-space: nowrap;TestSource/tt and related fields, inside the +tt style=white-space: nowrap;InfoTest/tt block. /p /td/trtr valign=toptdSourcebN/b/tdtd p @@ -2153,7 +2164,9 @@ /td/trtr valign=toptdConfigureParams/tdtd p Additional parameters to pass to the configure script. (See -CompileScript for details.) +CompileScript for details.) If a build is being done +with test suites enabled, the value of the tt style=white-space: nowrap;TestConfigureParams/tt +field will be appended to this. As of fink gt; 0.13.7, this parameter will also work with perl modules tt style=white-space: nowrap;Type: Perl/tt, and will append to the default perl Makefile.PL @@ -2273,6 +2286,42 @@ for that specific perl module package. /p /td/tr/table +pbTest Suites:/b/p +table border=0 cellpadding=0 cellspacing=10tr valign=bottomth align=leftField/thth align=leftValue/th/trtr valign=toptdInfoTest/tdtd +p +bIntroduced in fink 0.25./b +This field encapsulates information that will only be used when performing +a build with test suites enabled. It contains other fields. +If present, this field bmust/b contain a tt style=white-space: nowrap;TestScript/tt. +All other fields are optional. The following fields are allowed inside +tt style=white-space: nowrap;InfoTest/tt: +/pul +litt style=white-space: nowrap;TestScript/tt: A script which runs the test suite. This script should exit +with status 0 if the suite passes, 1 to indicate warnings, or any other +value to indicate failures serious enough to be considered fatal. +Because of this tri-state logic, you should explicitly set an exit value in +this script. For instance, tt style=white-space: nowrap;make check/tt is a bad script, +since it will exit with status 1 if the check target doesn't exist. +tt style=white-space: nowrap;make check ||
[cvs] web/doc/packaging compilers.en.php, 1.17, 1.18 format.en.php, 1.71, 1.72 fslayout.en.php, 1.70, 1.71 index.en.php, 1.71, 1.72 intro.en.php, 1.70, 1.71 policy.en.php, 1.71, 1.72 reference.en.php,
Update of /cvsroot/fink/web/doc/packaging In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3303 Modified Files: compilers.en.php format.en.php fslayout.en.php index.en.php intro.en.php policy.en.php reference.en.php Log Message: Document InfoTest Index: compilers.en.php === RCS file: /cvsroot/fink/web/doc/packaging/compilers.en.php,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- compilers.en.php22 Feb 2006 06:33:11 - 1.17 +++ compilers.en.php18 Sep 2006 14:47:46 - 1.18 @@ -1,7 +1,7 @@ ? $title = Packaging - Compilers; -$cvs_author = 'Author: dmacks'; -$cvs_date = 'Date: 2006/02/22 06:31:55'; +$cvs_author = 'Author: msachs'; +$cvs_date = 'Date: 2006/09/18 14:34:38'; $metatags = 'link rel=contents href=index.php?phpLang=en title=Packaging Contentslink rel=next href=reference.php?phpLang=en title=Referencelink rel=prev href=fslayout.php?phpLang=en title=Filesystem Layout'; Index: intro.en.php === RCS file: /cvsroot/fink/web/doc/packaging/intro.en.php,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- intro.en.php22 Feb 2006 06:33:11 - 1.70 +++ intro.en.php18 Sep 2006 14:47:46 - 1.71 @@ -1,7 +1,7 @@ ? $title = Packaging - Intro; -$cvs_author = 'Author: dmacks'; -$cvs_date = 'Date: 2006/02/22 06:31:55'; +$cvs_author = 'Author: msachs'; +$cvs_date = 'Date: 2006/09/18 14:34:38'; $metatags = 'link rel=contents href=index.php?phpLang=en title=Packaging Contentslink rel=next href=format.php?phpLang=en title=Package Descriptionslink rel=prev href=index.php?phpLang=en title=Packaging Contents'; Index: format.en.php === RCS file: /cvsroot/fink/web/doc/packaging/format.en.php,v retrieving revision 1.71 retrieving revision 1.72 diff -u -d -r1.71 -r1.72 --- format.en.php 22 Feb 2006 06:33:11 - 1.71 +++ format.en.php 18 Sep 2006 14:47:46 - 1.72 @@ -1,7 +1,7 @@ ? $title = Packaging - Package Descriptions; -$cvs_author = 'Author: dmacks'; -$cvs_date = 'Date: 2006/02/22 06:31:55'; +$cvs_author = 'Author: msachs'; +$cvs_date = 'Date: 2006/09/18 14:34:38'; $metatags = 'link rel=contents href=index.php?phpLang=en title=Packaging Contentslink rel=next href=policy.php?phpLang=en title=Packaging Policylink rel=prev href=intro.php?phpLang=en title=Introduction'; Index: policy.en.php === RCS file: /cvsroot/fink/web/doc/packaging/policy.en.php,v retrieving revision 1.71 retrieving revision 1.72 diff -u -d -r1.71 -r1.72 --- policy.en.php 22 Feb 2006 06:33:11 - 1.71 +++ policy.en.php 18 Sep 2006 14:47:46 - 1.72 @@ -1,7 +1,7 @@ ? $title = Packaging - Policy; -$cvs_author = 'Author: dmacks'; -$cvs_date = 'Date: 2006/02/22 06:31:55'; +$cvs_author = 'Author: msachs'; +$cvs_date = 'Date: 2006/09/18 14:34:38'; $metatags = 'link rel=contents href=index.php?phpLang=en title=Packaging Contentslink rel=next href=fslayout.php?phpLang=en title=Filesystem Layoutlink rel=prev href=format.php?phpLang=en title=Package Descriptions'; Index: reference.en.php === RCS file: /cvsroot/fink/web/doc/packaging/reference.en.php,v retrieving revision 1.73 retrieving revision 1.74 diff -u -d -r1.73 -r1.74 --- reference.en.php22 Feb 2006 06:33:11 - 1.73 +++ reference.en.php18 Sep 2006 14:47:46 - 1.74 @@ -1,7 +1,7 @@ ? $title = Packaging - Reference; -$cvs_author = 'Author: dmacks'; -$cvs_date = 'Date: 2006/02/22 06:31:55'; +$cvs_author = 'Author: msachs'; +$cvs_date = 'Date: 2006/09/18 14:34:38'; $metatags = 'link rel=contents href=index.php?phpLang=en title=Packaging Contentslink rel=prev href=compilers.php?phpLang=en title=Compilers'; @@ -32,7 +32,10 @@ pIn the bcompile phase/b the source is configured and compiled. Usually this means calling the codeconfigure/code script with some parameters and then issuing a codemake/code command. See the -CompileScript field description for details./p +CompileScript field description for details. If test suites are enabled +for the build (a new feature in fink 0.25, currently achieved by building in +maintainer mode), the TestScript will be run immediately after the +CompileScript./p pIn the binstall phase/b the package is installed to a temporary directory, code/sw/src/fink.build/root-gimp-1.2.1-1/code (= %d). (Note the root- part.) All files that would normally be installed to code/sw/code are installed in @@ -418,7 +421,9 @@ A list of dependencies that is applied at build time only. This can be used to list tools (e.g. flex) that must be present to build the packages, but which are not used at run time. -Supports the
[cvs] fink/perlmod/Fink ChangeLog, 1.1375, 1.1376 Validation.pm, 1.231, 1.232
Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv2518/perlmod/Fink
Modified Files:
ChangeLog Validation.pm
Log Message:
* Validation.pm: Fix validation for InfoTest-less packages.
Index: Validation.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Validation.pm,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -d -r1.231 -r1.232
--- Validation.pm 12 Sep 2006 21:51:01 - 1.231
+++ Validation.pm 13 Sep 2006 17:46:22 - 1.232
@@ -401,7 +401,7 @@
return 0 unless keys %$properties;
$test_properties = read_properties_var(
InfoTest of $filename,
- $properties-{infotest}, {remove_space = 1});
+ $properties-{infotest}, {remove_space = 1}) if
$properties-{infotest};
# determine the base path
if (defined $val_prefix) {
@@ -591,7 +591,7 @@
if (validate_info_component($properties, , $filename, $info_level)
== 0) {
$looks_good = 0;
- } elsif (validate_info_component($test_properties, , $filename,
$info_level, 1) == 0) {
+ } elsif ($properties-{infotest} and
validate_info_component($test_properties, , $filename, $info_level, 1) == 0)
{
$looks_good = 0;
}
Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1375
retrieving revision 1.1376
diff -u -d -r1.1375 -r1.1376
--- ChangeLog 12 Sep 2006 21:51:01 - 1.1375
+++ ChangeLog 13 Sep 2006 17:46:22 - 1.1376
@@ -1,3 +1,7 @@
+2006-09-13 Matthew Sachs [EMAIL PROTECTED]
+
+ * Validation.pm: Fix validation for InfoTest-less packages.
+
2006-09-12 Matthew Sachs [EMAIL PROTECTED]
* PkgVersion.pm: Support TestSource(N)-Checksum.
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] fink/perlmod/Fink ChangeLog, 1.1373, 1.1374 Engine.pm, 1.379, 1.380 PkgVersion.pm, 1.561, 1.562 Validation.pm, 1.229, 1.230
= $properties-{patchscript};
+ $value = $properties-{patchscript} || $test_properties-{patchscript};
if ($value) {
@patchfiles = ($value =~ /\%a\/.*?\.patch/g);
# strip directory if info is simple filename (in $PWD)
@@ -757,7 +778,7 @@
}
# the contents if Patch (if any)
- $value = $properties-{patch};
+ $value = $properties-{patch} || $test_properties-{patch};
if ($value) {
# add directory if info is not simple filename (not in $PWD)
$value = \%a/ .$value if $pkgpatchpath;
@@ -894,6 +915,7 @@
my $splitoff_field = shift; # splitoffN, or null or undef in parent
my $filename = shift;
my $info_level = shift;
+ my $is_infotest = shift || 0;
my (@pkg_required_fields, %pkg_valid_fields);
@@ -904,6 +926,9 @@
$splitoff_field = sprintf ' of %s', $splitoff_field;
@pkg_required_fields = @splitoff_required_fields;
%pkg_valid_fields = %splitoff_valid_fields;
+ } elsif($is_infotest) {
+ @pkg_required_fields = @infotest_required_fields;
+ %pkg_valid_fields = (%infotest_valid_fields, %valid_fields);
} else {
@pkg_required_fields = @required_fields;
%pkg_valid_fields = %valid_fields;
@@ -917,7 +942,9 @@
# Verify that all required fields are present
foreach my $field (@pkg_required_fields) {
unless (exists $properties-{$field}) {
- print Error: Required field \$field\$splitoff_field
missing. ($filename)\n;
+ my $test = ;
+ $test = from InfoTest if $is_infotest;
+ print Error: Required field \$field\$splitoff_field
missing${test}. ($filename)\n;
$looks_good = 0;
}
}
@@ -972,10 +999,12 @@
# Warn if field is unknown
unless ($pkg_valid_fields{$field}) {
unless (!$is_splitoff and
- ( $field =~
m/^source([2-9]|[1-9]\d+)(|extractdir|rename|-md5|-checksum)$/
- or $field =~
m/^tar([2-9]|[1-9]\d+)filesrename$/
+ ( $field =~
m/^(test)?source([2-9]|[1-9]\d+)(|extractdir|rename|-md5|-checksum)$/
+ or $field =~
m/^(test)?tar([2-9]|[1-9]\d+)filesrename$/
) ) {
- print Warning: Field \$field\$splitoff_field
is unknown. ($filename)\n;
+ my $test = ;
+ $test = inside InfoTest if $is_infotest;
+ print Warning: Field \$field\$splitoff_field
is unknown${test}. ($filename)\n;
$looks_good = 0;
}
}
@@ -1085,7 +1114,7 @@
# Explicit interpretters in fink package building script should be
# called with -ev or -ex so that they abort if any command fails
- foreach my $field (qw/patchscript compilescript installscript/) {
+ foreach my $field (qw/patchscript compilescript installscript
testscript/) {
next unless defined ($value = $properties-{$field});
if ($value =~ /^\s*\#!\s*(\S+)([^\n]*)/) {
my ($shell, $args) = ($1, $2);
Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1373
retrieving revision 1.1374
diff -u -d -r1.1373 -r1.1374
--- ChangeLog 12 Sep 2006 05:21:05 - 1.1373
+++ ChangeLog 12 Sep 2006 20:35:53 - 1.1374
@@ -1,5 +1,11 @@
2006-09-12 Matthew Sachs [EMAIL PROTECTED]
+ * Engine.pm: Show TestScript in dumpinfo.
+ * PkgVersion.pm: Fix for sources inside InfoTest.
+ * Validation.pm: Look inside InfoTest.
+
+2006-09-12 Matthew Sachs [EMAIL PROTECTED]
+
* Engine.pm: Allow maintainer mode with dumpinfo.
* PkgVersion.pm: Implement InfoTest.
* Validation.pm: Preliminary support for InfoTest.
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
[cvs] fink/perlmod/Fink ChangeLog, 1.1374, 1.1375 PkgVersion.pm, 1.562, 1.563 Validation.pm, 1.230, 1.231
Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv23896
Modified Files:
ChangeLog PkgVersion.pm Validation.pm
Log Message:
* PkgVersion.pm: Support TestSource(N)-Checksum.
* Validation.pm: Likewise.
Index: PkgVersion.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.562
retrieving revision 1.563
diff -u -d -r1.562 -r1.563
--- PkgVersion.pm 12 Sep 2006 20:35:53 - 1.562
+++ PkgVersion.pm 12 Sep 2006 21:51:01 - 1.563
@@ -1081,7 +1081,7 @@
$self-param_default('ConfigureParams', ) .
$val);
$self-prepare_percent_c;
- } elsif($key =~
/^Test(Source|Tar)(\d*)(ExtractDir|FilesRename|Rename|-MD5)?$/i) {
+ } elsif($key =~
/^Test(Source|Tar)(\d*)(ExtractDir|FilesRename|Rename|-MD5|-Checksum)?$/i) {
my $source_num = $max_source + ($2 || 1);
$source_num = if $source_num == 1;
my $src_param = $1$source_num$3;
Index: Validation.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Validation.pm,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -d -r1.230 -r1.231
--- Validation.pm 12 Sep 2006 20:35:53 - 1.230
+++ Validation.pm 12 Sep 2006 21:51:01 - 1.231
@@ -295,6 +295,7 @@
'testsourceextractdir',
'testsourcerename',
'testsource-md5',
+'testsource-checksum',
'testtarfilesrename',
);
Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1374
retrieving revision 1.1375
diff -u -d -r1.1374 -r1.1375
--- ChangeLog 12 Sep 2006 20:35:53 - 1.1374
+++ ChangeLog 12 Sep 2006 21:51:01 - 1.1375
@@ -1,5 +1,10 @@
2006-09-12 Matthew Sachs [EMAIL PROTECTED]
+ * PkgVersion.pm: Support TestSource(N)-Checksum.
+ * Validation.pm: Likewise.
+
+2006-09-12 Matthew Sachs [EMAIL PROTECTED]
+
* Engine.pm: Show TestScript in dumpinfo.
* PkgVersion.pm: Fix for sources inside InfoTest.
* Validation.pm: Look inside InfoTest.
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
