Update of /cvsroot/fink/scripts/10.4-update
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv29044
Modified Files:
ChangeLog README VERSION update.pl
Log Message:
* update.pl: check for correct version of XCode; allow a user to re-run
the script on a 10.4 distribution (after confirmation)
* README: mention required XCode version
* VERSION: releasing version 0.2
Index: README
===================================================================
RCS file: /cvsroot/fink/scripts/10.4-update/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README 14 Jun 2006 18:44:58 -0000 1.1
+++ README 17 Jun 2006 16:28:17 -0000 1.2
@@ -1,6 +1,8 @@
The enclosed script update.pl is designed to update an existing fink
installation from the 10.3 or 10.4-transitional distributions to the 10.4
-distribution, on PowerPC hardware only.
+distribution, on PowerPC hardware only. If you have XCode installed,
+you must update your XCode to version 2.2.1 or later before running this
+script.
This update process is not easy or seamless, and many users will prefer to
erase their old installation and reinstall Fink anew, using the 0.8.1
Index: update.pl
===================================================================
RCS file: /cvsroot/fink/scripts/10.4-update/update.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- update.pl 14 Jun 2006 21:15:11 -0000 1.11
+++ update.pl 17 Jun 2006 16:28:17 -0000 1.12
@@ -79,7 +79,11 @@
### check if this distribution is allowed
-die "This script is only for updating 10.3 or 10.4-transitional
distributions.\n" unless (($distribution eq "10.3") or ($distribution eq
"10.4-transitional"));
+if ($distribtuion eq "10.4") {
+ die "In that case, I will exit now. Goodbye.\n" unless
&Fink::CLI::prompt_boolean("You are already using the 10.4 distribution. You
should only run this script again if it somehow failed the first time. Is that
what you are trying to do?", default => 0);
+} else {
+ die "This script is only for updating 10.3 or 10.4-transitional
distributions.\n" unless (($distribution eq "10.3") or ($distribution eq
"10.4-transitional"));
+}
## check whether $basepath/fink.old exists, and ask the user if it's OK to
## remove
@@ -92,6 +96,39 @@
}
}
+### Check on the version of XCode (taken from Fink::Bootstrap::check_host)
+
+my $build;
+if (-x '/usr/bin/gcc-3.3') {
+ foreach(`/usr/bin/gcc-3.3 --version 2>&1`) {
+ if (/build (\d+)\)/) {
+ $build = $1;
+ last;
+ }
+ }
+ ($build >= 1493) or die <<END;
+
+Your version of the gcc 3.3 compiler is out of date. Please update to the
+August 2003 Developer Tools update, or to Xcode, and try again.
+
+END
+}
+
+if (-x '/usr/bin/gcc-4.0') {
+ foreach(`/usr/bin/gcc-4.0 --version 2>&1`) {
+ if (/build (\d+)\)/) {
+ $build = $1;
+ last;
+ }
+ }
+ ($build >= 5247) or die <<END;
+
+You have an old version of XCode installed, and the 10.4 tree requires a
+more recent version. Please update your XCode to XCode 2.2.1 (or later),
+and try again.
+
+END
+}
### update fink and fink-mirrors, unless already done (as signalled by the
### FINK-UPDATED environment variable)
Index: VERSION
===================================================================
RCS file: /cvsroot/fink/scripts/10.4-update/VERSION,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- VERSION 13 Jun 2006 04:18:29 -0000 1.1
+++ VERSION 17 Jun 2006 16:28:17 -0000 1.2
@@ -1 +1 @@
-0.1.cvs
\ No newline at end of file
+0.2.cvs
\ No newline at end of file
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/scripts/10.4-update/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ChangeLog 14 Jun 2006 21:15:11 -0000 1.9
+++ ChangeLog 17 Jun 2006 16:28:17 -0000 1.10
@@ -1,3 +1,10 @@
+2006-06-14 Dave Morrison <[EMAIL PROTECTED]>
+
+ * update.pl: check for correct version of XCode; allow a user to re-run
+ the script on a 10.4 distribution (after confirmation)
+ * README: mention required XCode version
+ * VERSION: releasing version 0.2
+
2006-06-14 Daniel Macks <[EMAIL PROTECTED]>
* update.pl: print_breaking accepts multiple paragraphs. Don't
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
