Update of /cvsroot/fink/fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28770
Modified Files:
Tag: branch_0_24
ChangeLog bootstrap.pl bootstrap.sh
Removed Files:
Tag: branch_0_24
BINDISTS
Log Message:
find the default name for the binary distribution using the new
default_binary_version function from FinkVersion.pm
Index: bootstrap.pl
===================================================================
RCS file: /cvsroot/fink/fink/bootstrap.pl,v
retrieving revision 1.60.2.8
retrieving revision 1.60.2.9
diff -u -d -r1.60.2.8 -r1.60.2.9
--- bootstrap.pl 12 Mar 2006 00:43:51 -0000 1.60.2.8
+++ bootstrap.pl 21 Mar 2006 22:58:06 -0000 1.60.2.9
@@ -74,7 +74,7 @@
require Fink::Bootstrap;
import Fink::Bootstrap qw(&check_host &check_files);
require Fink::FinkVersion;
-import Fink::FinkVersion qw(&fink_version);
+import Fink::FinkVersion qw(&fink_version &default_binary_version);
my $res = check_files();
if( $res == 1 ) {
@@ -425,16 +425,7 @@
my $endmsg = "Internal error.";
chdir $homebase;
-my %bindists;
-if (-f "BINDISTS") {
- open(IN,"BINDISTS") or die "Can't open BINDISTS: $!";
- while(<IN>) {
- chomp;
- /(.*):\s*(.*)/;
- $bindists{$1} = $2;
- }
- close(IN);
- }
+my $dbv = default_binary_version($distribution);
if (-d "pkginfo") {
if (&execute("cd pkginfo && ./inject.pl $installto -quiet")) {
# inject failed
@@ -445,8 +436,8 @@
compile packages yourself.
You can get them
EOF
-if (defined($bindists{$distribution})) {
-$endmsg .= "by installing the
dists-$distribution-$bindists{$distribution}.tar.gz
+if (not $dbv eq "none") {
+$endmsg .= "by installing the dists-$distribution-$dbv.tar.gz
tarball, or";
}
$endmsg .= " by running the command 'fink selfupdate'.";
@@ -463,8 +454,8 @@
You still need package descriptions if you want to compile packages yourself.
You can get them
EOF
-if (defined($bindists{$distribution})) {
-$endmsg .= "by installing the
dists-$distribution-$bindists{$distribution}.tar.gz
+if (not $dbv eq "none") {
+$endmsg .= "by installing the dists-$distribution-$dbv.tar.gz
tarball, or";
}
$endmsg .= " by running the command 'fink selfupdate'.";
Index: bootstrap.sh
===================================================================
RCS file: /cvsroot/fink/fink/bootstrap.sh,v
retrieving revision 1.8.4.1
retrieving revision 1.8.4.2
diff -u -d -r1.8.4.1 -r1.8.4.2
--- bootstrap.sh 3 Jan 2006 20:14:47 -0000 1.8.4.1
+++ bootstrap.sh 21 Mar 2006 22:58:06 -0000 1.8.4.2
@@ -49,10 +49,12 @@
### create FinkVersion.pm for bootstrap
-if [ ! -f perlmod/Fink/FinkVersion.pm ]; then
+if [ -f perlmod/Fink/FinkVersion.pm ]; then
+ rm -f perlmod/Fink/FinkVersion.pm
+fi
version=`cat VERSION`
sed -e "s|@VERSION@|$version|g" <perlmod/Fink/FinkVersion.pm.in
>perlmod/Fink/FinkVersion.pm
-fi
+
### start bootstrap.pl
--- BINDISTS DELETED ---
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/ChangeLog,v
retrieving revision 1.304.2.44
retrieving revision 1.304.2.45
diff -u -d -r1.304.2.44 -r1.304.2.45
--- ChangeLog 12 Mar 2006 00:43:51 -0000 1.304.2.44
+++ ChangeLog 21 Mar 2006 22:58:06 -0000 1.304.2.45
@@ -1,3 +1,10 @@
+2006-03-21 Dave Morrison <[EMAIL PROTECTED]>
+
+ * bootstrap.sh: generate a new FinkVersion.pm on every bootstrap run
+ * bootstrap.pl: find the default name for the binary distribution
+ using the new default_binary_version function from FinkVersion.pm
+ * BINDISTS: obsolete
+
2006-03-11 Dave Morrison <[EMAIL PROTECTED]>
* BINDISTS, bootstrap.pl: Message to users at end of bootstrap should
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
