Ignore:
Timestamp:
Jan 17, 2008, 6:11:54 AM (10 years ago)
Author:
jmpp@…
Message:

Merged revisions 32096-32193,32195-32335,32337-32365,32367-32499,32502-32721,32724-32800,32802-32999 via svnmerge from
http://svn.macports.org/repository/macports/trunk/base

........

r32096 | jmpp@… | 2007-12-16 16:00:13 -0400 (Sun, 16 Dec 2007) | 1 line


Manually merge in 1.6.0 release date into the trunk ChangeLog, off from its branches/release_1_6 guise.

........

r32097 | jmpp@… | 2007-12-16 16:01:50 -0400 (Sun, 16 Dec 2007) | 1 line


Correct a URL to our svn repo.

........

r32100 | jmpp@… | 2007-12-16 18:20:41 -0400 (Sun, 16 Dec 2007) | 5 lines



We only produce tarballs for major releases, which should always come with the "archive" tarballs, so always advise to create them
(with alternate advise on how to not create them).

........

r32101 | jmpp@… | 2007-12-16 19:11:48 -0400 (Sun, 16 Dec 2007) | 7 lines



It makes much more sense to group all three types of checksums for a single tarball together
in the chk file that comes with each release (from the base/Makefile's "distfromsvn" target), as in
{md5,sha1,ripemd160} for tar.gz and then for tar.bz2, rather than all types of tarballs for a single
checksum type, as in {tar.gz,tar.bz2} for md5 and then for sha1 and ripemd160.

........

r32102 | jmpp@… | 2007-12-16 19:24:21 -0400 (Sun, 16 Dec 2007) | 4 lines



Move the UPGRADECHECK abstraction variable into the base/Mk/macports.upgrade.mk where it belongs.

........

r32103 | jmpp@… | 2007-12-16 19:36:49 -0400 (Sun, 16 Dec 2007) | 4 lines



Release 1.6.0 for selfupdate, dmg's will follow.

........

r32105 | jmpp@… | 2007-12-16 21:17:00 -0400 (Sun, 16 Dec 2007) | 9 lines



Pass the generated static cregistry.a archive through ranlib to fix it for universal building,
which is enforced by the MacPorts portfile on Tiger or newer.


This patch will be applied manaully while building the dmg's, since the alternative is merging it
now into the release branch and hence invalidating all the work I've done so far in the release process
(release tag, tarballs, selfupdate, etc...)

........

r32111 | jmpp@… | 2007-12-17 01:20:40 -0400 (Mon, 17 Dec 2007) | 1 line


Whitespace cleanups only, no functional changes. Add modeline.

........

r32113 | jmpp@… | 2007-12-17 01:35:36 -0400 (Mon, 17 Dec 2007) | 4 lines



Explain that resource files in the MacPorts' port's files dir are fetched through svn:externals now.

........

r32114 | jmpp@… | 2007-12-17 01:52:46 -0400 (Mon, 17 Dec 2007) | 7 lines



  • Update checksums instructions for the dmg to output them in the same fashion as we now do for the source tarballs;
  • Include the ${destroot}/opt/local/share/macports/Tcl/registry2.0/registry.dylib library for linking validation when validating the contents of the pkg installer;
  • Add a check for binaries with two architectures when building universal dmg's.

........

r32116 | jmpp@… | 2007-12-17 02:14:28 -0400 (Mon, 17 Dec 2007) | 1 line


More whitespace fixes.

........

r32132 | jmpp@… | 2007-12-17 14:20:49 -0400 (Mon, 17 Dec 2007) | 5 lines



We now have an announcements list (http://lists.macosforge.org/mailman/listinfo/macports-announce/), so use it as such
(also remove the long domain names from this document, we all know them).

........

r32133 | jmpp@… | 2007-12-17 14:22:00 -0400 (Mon, 17 Dec 2007) | 1 line


Remove unnecessary launchd plist, the guide regen job runs as a post-commit hook to the trunk/doc-new directory.

........

r32134 | jmpp@… | 2007-12-17 14:23:09 -0400 (Mon, 17 Dec 2007) | 1 line


Correct comment about the new guide.

........

r32167 | jmpp@… | 2007-12-18 19:11:29 -0400 (Tue, 18 Dec 2007) | 8 lines



  • base/configure.ac: reorder the macros reading our version number from the base/config/mp_version file, export MP_VERSION (It would be great to figure out how to use the result of $MP_VERSION in AC_INIT, to avoid the code duplication that's

present with the esyscmd command);

  • configure: regen;
  • base/src/macports1.0/macports_autoconf.tcl.in: save the MacPorts version number in the macports1.0 namespace as macports_version.

........

r32169 | jmpp@… | 2007-12-18 19:53:32 -0400 (Tue, 18 Dec 2007) | 4 lines



Use the new $macports::autoconf::macports_version variable to get our own version and remove some now unnecessary code.

........

r32170 | jmpp@… | 2007-12-18 20:17:14 -0400 (Tue, 18 Dec 2007) | 4 lines



Simplify the macports::version proc by use of the $macports::autoconf::macports_version variable (also remove some globals that weren't necessary in any case).

........

r32172 | jmpp@… | 2007-12-18 20:47:53 -0400 (Tue, 18 Dec 2007) | 1 line


Whitespace cleanup.

........

r32202 | jmpp@… | 2007-12-19 17:29:34 -0400 (Wed, 19 Dec 2007) | 1 line


Add sourceforge to our list of 3rd party sites we submit our downloads to, reorder other site entries a bit.

........

r32206 | wsiegrist@… | 2007-12-19 20:31:31 -0400 (Wed, 19 Dec 2007) | 1 line


generalized script to /tmp/mpdocs instead of /Users/... Also removed any PATH assumptions. Added MacOSForge sysadmin to the mail address list.

........

r32208 | jmpp@… | 2007-12-20 04:20:37 -0400 (Thu, 20 Dec 2007) | 1 line


Whitespace cleanups.

........

r32209 | jmpp@… | 2007-12-20 04:27:05 -0400 (Thu, 20 Dec 2007) | 1 line


Simple whitespace fix.

........

r32210 | jmpp@… | 2007-12-20 04:30:45 -0400 (Thu, 20 Dec 2007) | 1 line


Whitespace cleanups.

........

r32212 | jmpp@… | 2007-12-20 04:45:23 -0400 (Thu, 20 Dec 2007) | 8 lines



When building on Panther, the new registry sources (cregistry and registry2.0) fail 'cause there's no sqlite3
on that platform. In this case we build with our bundled sqlite3, so if we're doing that go ahead and append
a "-I../sqlite-3.1.3" rule to our includes search path, so that sqlite3 headers are found.


Maun Suang, can you please try building trunk + this patch on Panther?

........

r32223 | jmpp@… | 2007-12-20 15:53:51 -0400 (Thu, 20 Dec 2007) | 5 lines



Rename the $mp_base_path variable to $mp_source_path in the selfupdate proc, to make its intent clearer from its name.
Also change a debug comment accordingly.

........

r32224 | jmpp@… | 2007-12-20 16:02:53 -0400 (Thu, 20 Dec 2007) | 4 lines



Another variable rename, no functional changes: $mp_version_new to $macports_version_new, to match the naming of $macports::autoconf::macports_version.

........

r32353 | jmpp@… | 2007-12-27 03:35:22 -0400 (Thu, 27 Dec 2007) | 12 lines



$(find . -type f \! -path "*.svn/*" | xargs grep -nH mp_version) assures me nothing else but macports::selfupdate and macports::version
reads the ${prefix}/etc/macports/mp_version installed file, and I've already taken care of those to to read $macports::autoconf::macports_version
for our version number instead, so let's not install the base/config/mp_version file anymore.


Note that base/config/mp_version cannot disappear from svn, though, as that's what's read by macports::selfupdate to determine if the
selfupdate'd sources are newer than what's installed.


BRAINSTORM: After this commit, the ${prefix}/etc/macports/mp_version installed file is going to stall and thus might confuse people,
so should we delete it upon installing a new release?

........

r32354 | jmpp@… | 2007-12-27 03:36:48 -0400 (Thu, 27 Dec 2007) | 1 line


Grammar++

........

r32363 | jmpp@… | 2007-12-27 15:03:53 -0400 (Thu, 27 Dec 2007) | 7 lines



Delete the base/config/dp_version file as a sort of stealth test: only pre dp2mp-move sources use it
and will not be able to selfupdate without it (but don't worry, the problem is easily solved by forcing
the selfupdate through port(1)'s -f flag). The number of complaints we get about a missing dp_version file
will give us a hint about how many out there are still using pre dp2mp-move MacPorts releases (if small,
we might be able to remove all the related upgrade code).

........

r32364 | jmpp@… | 2007-12-27 16:07:33 -0400 (Thu, 27 Dec 2007) | 13 lines



Don't use plain arithmetical comparison to determine if the downloaded sources are newer than the installed MacPorts,
but rather our own rpm-vercomp to compare $macports_version_new against $macports::autoconf::macports_version.
As of this moment, the result is the same (and will be the same when we release 1.xyz, with x > 6 and/or y,z > 0)
as the arithmetical comparison, but in the future this change will allow us to introduce real version numbers into
MacPorts.


My current idea is to create a base/config/macports_version file holding something like 1.6.1, but the selfupdate
logic of reading the latter over base/config/mp_version has to be thoroughly thought out: 600 (from base/config/mp_version's 1.600)
is greater than 6, so if we flat out select base/config/macports_version to read the new version we will break
selfupdating for everyone, as rpm-vercomp will not see 1.6.1 as greater than 1.600.

........

r32365 | jmpp@… | 2007-12-27 16:31:52 -0400 (Thu, 27 Dec 2007) | 11 lines



Add the base/config/macports_version file holding the 1.7.0 version number (for trunk), with limited usage for the time being:


  • Read it in for the autoconf @MACPORTS_VERSION@ variable;
  • Stop the Snoopy talk in configure.ac to convert the floating point format to a regular versions, reading base/config/macports_version directly instead;
  • Switch files with @VER@ substitution over to @MACPORTS_VERSION@.


The $macports::autoconf::macports_version will still read from @MP_VERSION@, the floating point format,
until a good logic for selfupdate magically emerges (cf. r32364).

........

r32394 | jmpp@… | 2007-12-29 00:43:49 -0400 (Sat, 29 Dec 2007) | 16 lines



A thoroughly rewritten selfupdate proc:


  • steps now happen in a more logical order: first we sync the ports tree, then the base sources, then see if we're being forced or if we're using version numbers to discern upgrading or not and, lastly, we rebuild accordingly;
  • the above reordering allows us to force the selfupdate to get around no rsync'd version file being found for whatever reason; previously such event would lead to a situation in which not even forcing would help, affected users had to grab the dmg or rebuild from source manually;
  • in case we're not being forced, choose between two rsync'd version files: the old, floating point format (mp_version) or the new, real version number format (macports_version); we're still using the old one (cf. r32364), but when we release something like 2.0.0 we'll switch to the new one;
  • improved MacPorts installation owner detection and setting upon reinstallation: we now read ${prefix}'s attributes;
  • ${prefix} permissions are now also preserved across selfupdates (REMINDER: this should be a NEWS & ChangeLog entry);
  • renamed some variables to clearer names;
  • improved many informational and debug messages and in-source comments.

........

r32395 | jmpp@… | 2007-12-29 01:08:23 -0400 (Sat, 29 Dec 2007) | 4 lines



Remove the ${sysconfdir}/macports/mp_version file prior to reinstalling MacPorts, as its installation is now deprecated.

........

r32396 | jmpp@… | 2007-12-29 01:17:25 -0400 (Sat, 29 Dec 2007) | 6 lines



Include my r32395 deletion of the /opt/local/etc/macports/mp_version file deletion into the preflight script of the pkg, for future major version releases.
Note that this is not the best place to put this rule, as currently preflight takes care of the dp2mp-move for the pkg installer and they are orthogonal sets
of upgrading rules..., but I simply don't know of anywhere else to put this one so that it is performed when installing from the pkg.

........

r32397 | jmpp@… | 2007-12-29 01:29:39 -0400 (Sat, 29 Dec 2007) | 8 lines



Some syntax tweaks:


  • we're using bash, to use echo's -e flag and remove useless echo calls for newline characters;
  • whitespace cleanups;
  • remove useless semicolons.

........

r32398 | jmpp@… | 2007-12-29 01:37:39 -0400 (Sat, 29 Dec 2007) | 1 line


Whitespace cleanups.

........

r32430 | afb@… | 2007-12-31 06:19:09 -0400 (Mon, 31 Dec 2007) | 1 line


make configure.pipe hackable from Portfiles too (#13636)

........

r32441 | jberry@… | 2008-01-01 12:39:21 -0430 (Tue, 01 Jan 2008) | 4 lines


If checksum is mismatched, and in verbose mode, present a corrected pre-fabricated
checksum statement to make it easy to update a port.

........

r32480 | afb@… | 2008-01-04 05:15:34 -0430 (Fri, 04 Jan 2008) | 1 line


recognize non-canonical modelines (#13496)

........

r32514 | eridius@… | 2008-01-05 20:50:25 -0430 (Sat, 05 Jan 2008) | 1 line


Replace the ui_channels if statement with a try-catch to try and fix the mysterious 10.3 issue

........

r32525 | eridius@… | 2008-01-06 18:08:34 -0430 (Sun, 06 Jan 2008) | 1 line


Change the ui_prefix if-else block to a try-catch block

........

r32526 | ryandesign@… | 2008-01-06 18:44:15 -0430 (Sun, 06 Jan 2008) | 1 line


fix typo in comment

........

r32537 | jmpp@… | 2008-01-07 05:31:03 -0430 (Mon, 07 Jan 2008) | 5 lines



Simplify the test that errors out if we're not selfupdating with the needed power: bail out right away if $installing_user doesn't own ${prefix}.
Also improve some of the comments we output.

........

r32541 | eridius@… | 2008-01-07 14:58:25 -0430 (Mon, 07 Jan 2008) | 1 line


Tweak autoconf scripts to avoid duplication of the shell stuff to read macports_version

........

r32542 | jmpp@… | 2008-01-07 15:17:37 -0430 (Mon, 07 Jan 2008) | 7 lines



Move all autoconf macros files into a dedicated m4 directory, adapting aclocal.m4 to load them
from their new home (but leaving the latter right next to configure.ac, as otherwise the loading
paths become a bit cumbersome -- even though aclocal.m4 can indeed be moved into the base/m4/
directory).

........

r32543 | jmpp@… | 2008-01-07 15:24:26 -0430 (Mon, 07 Jan 2008) | 4 lines


Add svn:eol-style to all autoconf m4 macros files, remove the Id keyword from base/m4/tcl.m4 as we're probably not meant to be touching it in any case.
Use $Id$ in aclocal.m4.

........

r32544 | eridius@… | 2008-01-07 16:03:17 -0430 (Mon, 07 Jan 2008) | 2 lines


Fix permissions code in selfupdate.
Change from /usr/bin/whoami to /usr/bin/id -un as whoami is deprecated

........

r32546 | jmpp@… | 2008-01-07 16:44:11 -0430 (Mon, 07 Jan 2008) | 5 lines



If selfupdate is forced, the setting of the $macports_version_new var is skipped, so the if {[rpm-vercomp $macports_version_new $macports::autoconf::macports_version] > 0 || $use_the_force_luke == "yes"}
test fails because the $macports_version_new variable is not defined. Swap the two tests in the if clause so that we can short circuit around the second one and thus not fail if forcing is requested.

........

r32549 | jmpp@… | 2008-01-07 18:20:38 -0430 (Mon, 07 Jan 2008) | 4 lines


Tweak the visual aspect of the selfupdate output yet again, updating the documentation URLs we hand off to users through the main base/Makefile
(mentioning our new guide).

........

r32597 | jmpp@… | 2008-01-08 17:29:50 -0430 (Tue, 08 Jan 2008) | 4 lines



Add a README file that explains how our server side jobs work and when (how often).

........

r32598 | jmpp@… | 2008-01-08 17:31:22 -0430 (Tue, 08 Jan 2008) | 1 line


Little rewording.

........

r32600 | jmpp@… | 2008-01-08 17:43:07 -0430 (Tue, 08 Jan 2008) | 1 line


Itemize binaries that need linking verification when building the dmg, for better readability.

........

r32605 | jmpp@… | 2008-01-08 23:22:37 -0430 (Tue, 08 Jan 2008) | 4 lines



The start of the documentation of the potential chanegs that will go into the 1.6.1 release.

........

r32606 | jmpp@… | 2008-01-08 23:23:50 -0430 (Tue, 08 Jan 2008) | 1 line


Add the svn:eol-style keyword to the NEWS file.

........

r32615 | ryandesign@… | 2008-01-09 05:09:51 -0430 (Wed, 09 Jan 2008) | 1 line


typos and hyphenation

........

r32631 | boeyms@… | 2008-01-10 01:26:22 -0430 (Thu, 10 Jan 2008) | 2 lines


portmgr/ReleaseProcess: add note that daemondo is not built on Panther and so does not need checking.

........

r32720 | afb@… | 2008-01-12 05:56:59 -0430 (Sat, 12 Jan 2008) | 1 line


make sure install depends on scripts

........

r32721 | afb@… | 2008-01-12 06:04:00 -0430 (Sat, 12 Jan 2008) | 4 lines


  • Sort in NVR (name@version_revision) order (#13031)
  • currently resorts the "port installed" list, it was showing in string order even ::installed was sorted?

........

r32724 | afb@… | 2008-01-12 07:39:50 -0430 (Sat, 12 Jan 2008) | 1 line


port platform, info target (#12302)

........

r32725 | eridius@… | 2008-01-12 10:41:57 -0430 (Sat, 12 Jan 2008) | 1 line


Teach port info that depends_run is a list

........

r32741 | ryandesign@… | 2008-01-12 18:27:57 -0430 (Sat, 12 Jan 2008) | 1 line


add archive to apache mirror sites so older versions of things can still be downloaded; fixes #13891

........

r32821 | jmpp@… | 2008-01-13 23:08:58 -0430 (Sun, 13 Jan 2008) | 5 lines



Follow the proper error reporting procedure if stale lock files are found (put together a mail and send it to the people in charge),
don't just exit with an error line to the console as that can be easily lost.

........

r32822 | wsiegrist@… | 2008-01-13 23:17:01 -0430 (Sun, 13 Jan 2008) | 1 line


removing dluke from error emails per his request

........

r32824 | eridius@… | 2008-01-13 23:49:33 -0430 (Sun, 13 Jan 2008) | 1 line


Add our version to the User-Agent in libcurl

........

r32832 | jmpp@… | 2008-01-14 00:36:34 -0430 (Mon, 14 Jan 2008) | 1 line


Whitespace fix.

........

r32893 | jmpp@… | 2008-01-14 11:04:44 -0430 (Mon, 14 Jan 2008) | 1 line


Use new variable names controling our website.

........

r32999 | afb@… | 2008-01-16 08:25:44 -0430 (Wed, 16 Jan 2008) | 1 line


update changelog for r32194 and r32724

........

Location:
branches/release_1_6/base
Files:
2 edited

Legend:

Unmodified
Added
Removed
Note: See TracChangeset for help on using the changeset viewer.