Changeset 31601


Ignore:
Timestamp:
Nov 29, 2007, 6:27:42 AM (13 years ago)
Author:
jmpp@…
Message:

Merged revisions 31415-31499,31501-31600 via svnmerge from
http://svn.macports.org/repository/macports/trunk/base

........

r31415 | jmpp@… | 2007-11-22 14:55:12 -0400 (Thu, 22 Nov 2007) | 1 line


The primary key should not be incremented monolithically, I misunderstood its intent at first.

........

r31427 | jmpp@… | 2007-11-22 20:29:20 -0400 (Thu, 22 Nov 2007) | 8 lines



  • Rework the script to execute less expensive stuff first and thus bail out early with minimal fuss if needed;
  • Resort to puts(n) rather than ui_error for error reporting before we initialize macports1.0 through mportinit;
  • Catch around the sourcing and loading of the macports1.0 files & Tcl package, report error if needed;
  • Provide an absolute example path for the password file;
  • Do not use 'IF NOT EXISTS' when creating the log table if we are dropping it right before: if the table creation instruction fails, we might want to know about it;

........

r31429 | jmpp@… | 2007-11-22 20:49:15 -0400 (Thu, 22 Nov 2007) | 1 line


Cleanup sql file here too, after the reordering.

........

r31442 | ryandesign@… | 2007-11-24 05:58:27 -0400 (Sat, 24 Nov 2007) | 1 line


set svn:keywords to Id and svn:eol-style to native to match other files

........

r31455 | jmpp@… | 2007-11-24 14:39:52 -0400 (Sat, 24 Nov 2007) | 1 line


Standardize db variables naming with those found on the trunk/www/includes/common.inc file.

........

r31483 | ryandesign@… | 2007-11-25 08:36:24 -0400 (Sun, 25 Nov 2007) | 1 line


ReleaseProcess: typos, minor wording

........

r31486 | jmpp@… | 2007-11-25 12:17:19 -0400 (Sun, 25 Nov 2007) | 5 lines



Don't output anything to a temporary file to then try to read from it, as there is a non-zero chance that mktemp call may fail (even if very small).
Instead, grep out path from the output of "/usr/bin/printenv PATH" directly. Thanks to asigel@… for the suggestion, closes #8401.

........

r31487 | jmpp@… | 2007-11-25 12:20:26 -0400 (Sun, 25 Nov 2007) | 1 line


Whitespace cleanups.

........

r31491 | jberry@… | 2007-11-25 17:07:29 -0400 (Sun, 25 Nov 2007) | 1 line


Add support for Leopard's /etc/paths.d and /etc/manpaths.d scheme for configuration of path and manpath, however wrong-headed is the setting of MANPATH by path_helper.

........

r31492 | jberry@… | 2007-11-25 17:08:40 -0400 (Sun, 25 Nov 2007) | 1 line


autoreconf following addition of support for /etc/paths.d and /etc/manpaths.d

........

r31495 | eridius@… | 2007-11-25 20:39:40 -0400 (Sun, 25 Nov 2007) | 1 line


Add dummy clean target

........

r31496 | eridius@… | 2007-11-25 23:29:01 -0400 (Sun, 25 Nov 2007) | 1 line


Add @prefix@/sbin to default paths

........

r31519 | jmpp@… | 2007-11-27 00:10:57 -0400 (Tue, 27 Nov 2007) | 4 lines



Add Ryan's suggested chmod call to make the script executable upon regen (how silly of me to not have thought of this... thinking about an install(1) call, sheeeshh!!).

........

r31520 | jberry@… | 2007-11-27 01:20:02 -0400 (Tue, 27 Nov 2007) | 1 line


Install paths files only if our prefix will be /opt/local. For all other cases, let the user be warned.

........

r31521 | jberry@… | 2007-11-27 01:36:20 -0400 (Tue, 27 Nov 2007) | 1 line


Eliminate a warning about ignoring --datarootdir, and some gratuitous whitespace changes.

........

r31522 | jmpp@… | 2007-11-27 02:18:20 -0400 (Tue, 27 Nov 2007) | 6 lines



Quote variables passed to the shell in the dp2mp-move upgrade code when looking for the user homefolder, as there are cases in which that path may contain spaces.
Not doing this for the rest of the variables used in this code as we don't really support installing MacPorts into a path with embedded spaces.
Fixes #13145.

........

r31562 | jmpp@… | 2007-11-28 01:57:29 -0400 (Wed, 28 Nov 2007) | 8 lines



You're right Ryan, is not this script's job to keep a MacPorts installation up to date.
Switch to an mportsync call, because it is this script's job to always keep a ports tree current ;-)


Looking into this made me wonder... why isn't the 'mportsync' proc in the macports
namespace? That's so inconsistent! (/me promises to look into that after 1.6.0)

........

r31565 | jmpp@… | 2007-11-28 03:53:04 -0400 (Wed, 28 Nov 2007) | 1 line


Accept new naming suggestion for our dmgs, starting with the upcoming 1.6.0

........

r31600 | jmpp@… | 2007-11-29 01:35:54 -0400 (Thu, 29 Nov 2007) | 5 lines



Check if we're on Leopard before running, we already install stuff into /etc/{man,}path.d so we don't need to adjust anything on that platform.
Also cleanup the script somewhat: use echo -e since our shebang assures us we're using bash.

........

Location:
branches/release_1_6/base
Files:
13 edited
4 copied

Legend:

Unmodified
Added
Removed
  • branches/release_1_6/base

  • branches/release_1_6/base/Mk/macports.autoconf.mk.in

    r30816 r31601  
    1919
    2020READLINE_CFLAGS         =
    21 MD5_CFLAGS              =
     21MD5_CFLAGS                      =
    2222SQLITE3_CFLAGS          =
    23 CURL_CFLAGS             = @CFLAGS_LIBCURL@
     23CURL_CFLAGS                     = @CFLAGS_LIBCURL@
    2424
    2525OBJC_RUNTIME            = @OBJC_RUNTIME@
    2626OBJC_RUNTIME_FLAGS      = @OBJC_RUNTIME_FLAGS@
    27 OBJC_LIBS               = @OBJC_LIBS@
     27OBJC_LIBS                       = @OBJC_LIBS@
    2828
    2929OBJC_FOUNDATION         = @OBJC_FOUNDATION@
    3030OBJC_FOUNDATION_CPPFLAGS        = @OBJC_FOUNDATION_CPPFLAGS@
    31 OBJC_FOUNDATION_LDFLAGS = @OBJC_FOUNDATION_LDFLAGS@
     31OBJC_FOUNDATION_LDFLAGS         = @OBJC_FOUNDATION_LDFLAGS@
    3232OBJC_FOUNDATION_LIBS            = @OBJC_FOUNDATION_LIBS@
    3333
     
    3636STLIB_LD                = @STLIB_LD@
    3737LDFLAGS                 = -L/usr/local/lib @LDFLAGS@
    38 SHLIB_LDFLAGS           = @SHLIB_LDFLAGS@ ${LDFLAGS}
     38SHLIB_LDFLAGS   = @SHLIB_LDFLAGS@ ${LDFLAGS}
    3939SHLIB_SUFFIX            = @SHLIB_SUFFIX@
    4040TCL_STUB_LIB_SPEC       = @TCL_STUB_LIB_SPEC@
    4141
    4242LIBS                    = @LIBS@
    43 READLINE_LIBS           = @READLINE_LIBS@
     43READLINE_LIBS   = @READLINE_LIBS@
    4444MD5_LIBS                = @MD5_LIBS@
    45 SQLITE3_LIBS            = @SQLITE3_LIBS@
     45SQLITE3_LIBS    = @SQLITE3_LIBS@
    4646CURL_LIBS               = @LDFLAGS_LIBCURL@
    4747INSTALL                 = @INSTALL@
     
    5252
    5353TCLSH                   = @TCLSH@
    54 TCL_PACKAGE_DIR         = @TCL_PACKAGE_DIR@
     54TCL_PACKAGE_DIR = @TCL_PACKAGE_DIR@
    5555
    5656DSTUSR                  = @DSTUSR@
     
    6363exec_prefix             = @exec_prefix@
    6464bindir                  = @bindir@
     65datarootdir             = @datarootdir@
    6566datadir                 = @datadir@
    6667libdir                  = @libdir@
    67 localstatedir           = @localstatedir@
     68localstatedir   = @localstatedir@
    6869infodir                 = @infodir@
    6970
  • branches/release_1_6/base/Mk/macports.upgrade.mk

    r30816 r31601  
    8787## 7) useless --delete option is removed from the default rsync flags (--delete is implied by --delete-after);
    8888## 8) references to the old ports.conf(5) man page are updated to the new macports.conf(5) page;
    89         [ ! \( -f $${HOME}/.macports/ports.conf -a ! -f ${UPGRADECHECK} \) ] || { \
    90                 mv -v $${HOME}/.macports/ports.conf $${HOME}/.macports/macports.conf.mpsaved; \
    91                 sed 's/etc\/ports/etc\/macports/g' $${HOME}/.macports/macports.conf.mpsaved > $${HOME}/.macports/macports.conf.tmp && \
    92                         mv -v $${HOME}/.macports/macports.conf.tmp $${HOME}/.macports/macports.conf; \
    93                 sed 's/db\/dports/macports/g' $${HOME}/.macports/macports.conf > $${HOME}/.macports/macports.conf.tmp && \
    94                         mv -v $${HOME}/.macports/macports.conf.tmp $${HOME}/.macports/macports.conf; \
    95                 sed 's/darwinports/macports/g' $${HOME}/.macports/macports.conf > $${HOME}/.macports/macports.conf.tmp && \
    96                         mv -v $${HOME}/.macports/macports.conf.tmp $${HOME}/.macports/macports.conf; \
    97                 sed 's/dpupdate1\/base/release\/base/g' $${HOME}/.macports/macports.conf > $${HOME}/.macports/macports.conf.tmp && \
    98                         mv -v $${HOME}/.macports/macports.conf.tmp $${HOME}/.macports/macports.conf; \
    99                 sed 's/dpupdate\/base\/\{0,1\}/trunk\/base\//g' $${HOME}/.macports/macports.conf > $${HOME}/.macports/macports.conf.tmp && \
    100                         mv -v $${HOME}/.macports/macports.conf.tmp $${HOME}/.macports/macports.conf; \
    101                 sed '/^rsync_options/s/"\(.*\)"/\1/' $${HOME}/.macports/macports.conf > $${HOME}/.macports/macports.conf.tmp && \
    102                         mv -v $${HOME}/.macports/macports.conf.tmp $${HOME}/.macports/macports.conf; \
    103                 sed 's/ --delete / /' $${HOME}/.macports/macports.conf > $${HOME}/.macports/macports.conf.tmp && \
    104                         mv -v $${HOME}/.macports/macports.conf.tmp $${HOME}/.macports/macports.conf; \
    105                 sed 's/ ports.conf(5)/ macports.conf(5)/g' $${HOME}/.macports/macports.conf > $${HOME}/.macports/macports.conf.tmp && \
    106                         mv -v $${HOME}/.macports/macports.conf.tmp $${HOME}/.macports/macports.conf; \
     89        [ ! \( -f "$${HOME}/.macports/ports.conf" -a ! -f ${UPGRADECHECK} \) ] || { \
     90                mv -v "$${HOME}/.macports/ports.conf" "$${HOME}/.macports/macports.conf.mpsaved"; \
     91                sed 's/etc\/ports/etc\/macports/g' "$${HOME}/.macports/macports.conf.mpsaved" > "$${HOME}/.macports/macports.conf.tmp" && \
     92                        mv -v "$${HOME}/.macports/macports.conf.tmp" "$${HOME}/.macports/macports.conf"; \
     93                sed 's/db\/dports/macports/g' "$${HOME}/.macports/macports.conf" > "$${HOME}/.macports/macports.conf.tmp" && \
     94                        mv -v "$${HOME}/.macports/macports.conf.tmp" "$${HOME}/.macports/macports.conf"; \
     95                sed 's/darwinports/macports/g' "$${HOME}/.macports/macports.conf" > "$${HOME}/.macports/macports.conf.tmp" && \
     96                        mv -v "$${HOME}/.macports/macports.conf.tmp" "$${HOME}/.macports/macports.conf"; \
     97                sed 's/dpupdate1\/base/release\/base/g' "$${HOME}/.macports/macports.conf" > "$${HOME}/.macports/macports.conf.tmp" && \
     98                        mv -v "$${HOME}/.macports/macports.conf.tmp" "$${HOME}/.macports/macports.conf"; \
     99                sed 's/dpupdate\/base\/\{0,1\}/trunk\/base\//g' "$${HOME}/.macports/macports.conf" > "$${HOME}/.macports/macports.conf.tmp" && \
     100                        mv -v "$${HOME}/.macports/macports.conf.tmp" "$${HOME}/.macports/macports.conf"; \
     101                sed '/^rsync_options/s/"\(.*\)"/\1/' "$${HOME}/.macports/macports.conf" > "$${HOME}/.macports/macports.conf.tmp" && \
     102                        mv -v "$${HOME}/.macports/macports.conf.tmp" "$${HOME}/.macports/macports.conf"; \
     103                sed 's/ --delete / /' "$${HOME}/.macports/macports.conf" > "$${HOME}/.macports/macports.conf.tmp" && \
     104                        mv -v "$${HOME}/.macports/macports.conf.tmp" "$${HOME}/.macports/macports.conf"; \
     105                sed 's/ ports.conf(5)/ macports.conf(5)/g' "$${HOME}/.macports/macports.conf" > "$${HOME}/.macports/macports.conf.tmp" && \
     106                        mv -v "$${HOME}/.macports/macports.conf.tmp" "$${HOME}/.macports/macports.conf"; \
    107107        }
    108108
  • branches/release_1_6/base/configure

    r31190 r31601  
    755755SQLITE3_LIBS
    756756SQLITE3_DIR
    757 OUR_INCLUDED_PACKAGES
    758757INCLUDES
    759758CFLAGS_DEBUG
    760759CFLAGS_OPTIMIZE
    761 TCL_DEFS
     760PATHCONF
    762761STLIB_LD
    763762SHLIB_LD
     
    765764SHLIB_LDFLAGS
    766765SHLIB_SUFFIX
     766TCL_DEFS
    767767TCL_CC
     768OUR_INCLUDED_PACKAGES
    768769prefix_expanded
    769770MPCONFIGDIR_EXPANDED
     
    1203512036
    1203612037
    12037 
    12038 
    1203912038# Check whether --with-trace-sdk was given.
    1204012039if test "${with_trace_sdk+set}" = set; then
     
    1204312042_ACEOF
    1204412043
     12044fi
     12045
     12046
     12047
     12048# If /etc/paths.d and /etc/manpaths.d then we can install our path configuration
     12049{ echo "$as_me:$LINENO: checking whether to install macports paths into /etc/paths.d and /etc/manpaths.d" >&5
     12050echo $ECHO_N "checking whether to install macports paths into /etc/paths.d and /etc/manpaths.d... $ECHO_C" >&6; }
     12051mpprefix=$prefix
     12052test "x$mpprefix" = "xNONE" && mpprefix=$ac_default_prefix
     12053if test -d /etc/paths.d -a -d /etc/manpaths.d -a "$mpprefix" = "$ac_default_prefix"; then
     12054        PATHCONF=pathconf
     12055        { echo "$as_me:$LINENO: result: yes" >&5
     12056echo "${ECHO_T}yes" >&6; }
     12057else
     12058        { echo "$as_me:$LINENO: result: no" >&5
     12059echo "${ECHO_T}no" >&6; }
    1204512060fi
    1204612061
     
    1210312118
    1210412119
     12120
     12121
    1210512122# misc variables that need to be expanded for substitution into tcl
    1210612123
     
    1212412141
    1212512142# Output
    12126 ac_config_files="$ac_config_files Makefile Mk/macports.autoconf.mk doc/prefix.mtree doc/macosx.mtree doc/macports.conf portmgr/freebsd/Makefile portmgr/fedora/macports.spec src/Makefile src/macports1.0/macports_autoconf.tcl src/tclobjc1.0/Makefile src/port1.0/port_autoconf.tcl src/registry1.0/registry_autoconf.tcl src/programs/Makefile src/macports1.0/macports_fastload.tcl"
     12143ac_config_files="$ac_config_files Makefile Mk/macports.autoconf.mk doc/prefix.mtree doc/macosx.mtree doc/macports.conf portmgr/freebsd/Makefile portmgr/fedora/macports.spec src/Makefile src/macports1.0/macports_autoconf.tcl src/tclobjc1.0/Makefile src/pathconf/Makefile src/pathconf/paths src/pathconf/manpaths src/port1.0/port_autoconf.tcl src/registry1.0/registry_autoconf.tcl src/programs/Makefile src/macports1.0/macports_fastload.tcl"
    1212712144
    1212812145
     
    1269212709    "src/macports1.0/macports_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/macports1.0/macports_autoconf.tcl" ;;
    1269312710    "src/tclobjc1.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/tclobjc1.0/Makefile" ;;
     12711    "src/pathconf/Makefile") CONFIG_FILES="$CONFIG_FILES src/pathconf/Makefile" ;;
     12712    "src/pathconf/paths") CONFIG_FILES="$CONFIG_FILES src/pathconf/paths" ;;
     12713    "src/pathconf/manpaths") CONFIG_FILES="$CONFIG_FILES src/pathconf/manpaths" ;;
    1269412714    "src/port1.0/port_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/port1.0/port_autoconf.tcl" ;;
    1269512715    "src/registry1.0/registry_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/registry1.0/registry_autoconf.tcl" ;;
     
    1293612956SQLITE3_LIBS!$SQLITE3_LIBS$ac_delim
    1293712957SQLITE3_DIR!$SQLITE3_DIR$ac_delim
    12938 OUR_INCLUDED_PACKAGES!$OUR_INCLUDED_PACKAGES$ac_delim
    1293912958INCLUDES!$INCLUDES$ac_delim
    1294012959CFLAGS_DEBUG!$CFLAGS_DEBUG$ac_delim
    1294112960CFLAGS_OPTIMIZE!$CFLAGS_OPTIMIZE$ac_delim
    12942 TCL_DEFS!$TCL_DEFS$ac_delim
     12961PATHCONF!$PATHCONF$ac_delim
    1294312962STLIB_LD!$STLIB_LD$ac_delim
    1294412963SHLIB_LD!$SHLIB_LD$ac_delim
     
    1294612965SHLIB_LDFLAGS!$SHLIB_LDFLAGS$ac_delim
    1294712966SHLIB_SUFFIX!$SHLIB_SUFFIX$ac_delim
     12967TCL_DEFS!$TCL_DEFS$ac_delim
    1294812968TCL_CC!$TCL_CC$ac_delim
     12969OUR_INCLUDED_PACKAGES!$OUR_INCLUDED_PACKAGES$ac_delim
    1294912970prefix_expanded!$prefix_expanded$ac_delim
    1295012971MPCONFIGDIR_EXPANDED!$MPCONFIGDIR_EXPANDED$ac_delim
     
    1295412975_ACEOF
    1295512976
    12956   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 57; then
     12977  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 58; then
    1295712978    break
    1295812979  elif $ac_last_try; then
  • branches/release_1_6/base/configure.ac

    r31190 r31601  
    288288AC_SUBST(SQLITE3_DIR)
    289289
    290 AC_SUBST(OUR_INCLUDED_PACKAGES)
    291 
    292290AH_TEMPLATE([TRACE_SDK], [SDK for SDK redirect in tracelib])
    293291AC_ARG_WITH(
     
    296294                [SDK for redirection in trace lib (for example MacOSX10.4u.sdk)]),
    297295        [test -d /Developer/SDKs/$withval && AC_DEFINE_UNQUOTED([TRACE_SDK], "${withval}")], [])
     296       
     297       
     298# If /etc/paths.d and /etc/manpaths.d then we can install our path configuration
     299AC_MSG_CHECKING(whether to install macports paths into /etc/paths.d and /etc/manpaths.d)
     300mpprefix=$prefix
     301test "x$mpprefix" = "xNONE" && mpprefix=$ac_default_prefix
     302if test -d /etc/paths.d -a -d /etc/manpaths.d -a "$mpprefix" = "$ac_default_prefix"; then
     303        PATHCONF=pathconf
     304        AC_MSG_RESULT([yes])
     305else
     306        AC_MSG_RESULT([no])
     307fi
     308
    298309
    299310# Allows building of shared libraries
     
    313324AC_SUBST(CFLAGS_DEBUG)
    314325AC_SUBST(CFLAGS_OPTIMIZE)
    315 AC_SUBST(TCL_DEFS)
     326AC_SUBST(PATHCONF)
    316327AC_SUBST(STLIB_LD)
    317328AC_SUBST(SHLIB_LD)
     
    319330AC_SUBST(SHLIB_LDFLAGS)
    320331AC_SUBST(SHLIB_SUFFIX)
     332AC_SUBST(TCL_DEFS)
    321333AC_SUBST(TCL_STUB_LIB_SPEC)
    322334AC_SUBST(TCL_CC)
     335AC_SUBST(OUR_INCLUDED_PACKAGES)
    323336
    324337# misc variables that need to be expanded for substitution into tcl
     
    357370        src/macports1.0/macports_autoconf.tcl
    358371        src/tclobjc1.0/Makefile
     372        src/pathconf/Makefile
     373        src/pathconf/paths
     374        src/pathconf/manpaths
    359375        src/port1.0/port_autoconf.tcl
    360376        src/registry1.0/registry_autoconf.tcl
  • branches/release_1_6/base/portmgr/ReleaseProcess

    r31129 r31601  
    5151
    5252It is strongly recommended to use the svnmerge.py tool (provided by the subversion port) to
    53 maintain merge tracking information between release branches and trunk/base if you pretend to
     53maintain merge tracking information between release branches and trunk/base if you intend to
    5454merge revisions back and forth between them, which is a very likely scenario. To do this, you
    5555must initialize the tracking information from within the "base" directory of your checkout of
     
    6666In preparation for a release, several things should be completed within the code:
    6767
    68  * Update the file base/ChangeLog in both trunk and the relase branch to reflect the appropriate changes.
     68 * Update the file base/ChangeLog in both trunk and the release branch to reflect the appropriate changes.
    6969 * Update the file base/config/mp_version with the target release number. Note that this is a floating
    7070   point number that corresponds to the release number; it should correspond roughly to the release number
     
    7676 * Update the autoconf 'configure' script through the provided base/regen.sh script once the version number
    7777   in mp_version has been changed, since the former reads the latter.
    78  * Make sure that these, and any other changes or bug fixes are made on and/or merged between the release branch
    79    and trunk as needded. For instance, if you've made changes to ChangeLog only on the release branch,
     78 * Make sure that these and any other changes or bug fixes are made on and/or merged between the release branch
     79   and trunk as needed. For instance, if you've made changes to ChangeLog only on the release branch,
    8080   those changes should be merged back into trunk as well.
    8181
     
    8484
    8585Once the release is ready, it must be tagged so that the release components may be fetched in the future,
    86 to ensure replicatability. Generally, a release candidate is first tagged and built. When and if it is
     86to ensure replicability. Generally, a release candidate is first tagged and built. When and if it is
    8787approved as the actual release, an additional tag is created that names the same sources.
    8888
     
    9494 * release_1_6_1 (1.6.1 release)
    9595
    96 We first tag the branched base directory to make up for the final release:
     96We first tag the branched base directory to make up the final release:
    9797
    9898 svn cp -m "commit-message" http://svn.macports.org/repository/macports/branches/release_1_6 \
    9999     http://svn.macports.org/repository/macports/tags/release_1_6_0
    100100
    101 Although only the base subdirectory is branched and tagged for a given major release, we also create a 
     101Although only the base subdirectory is branched and tagged for a given major release, we also create a
    102102separate tag for the entire tree (base sources and full ports tree) at the time the final release tag is
    103103created (only for major releases, 1.x.0), in order to provide a stake in the ground that specifies a set
     
    106106
    107107The necessary working copy to create such a tag is created by checking out all of trunk at the specific
    108 revision of the final tagging of base and then switching the base directory inturn to the appropriate
    109 release tag URL. For instance:
     108revision of the final tagging of base and then switching the base directory to the appropriate release
     109tag URL. For instance:
    110110
    111111 svn co [-r<rev>] http://svn.macports.org/repository/macports/trunk release_1.6.0-archive
     
    121121=== Create & Post Release Tarballs ===
    122122
    123 The release tarballs are tar.bz2 and tar.gz archives of the  base directory only and of the entire svn tree
     123The release tarballs are tar.bz2 and tar.gz archives of the base directory only and of the entire svn tree
    124124for a particular release. They are named with the following naming convention:
    125125
     
    147147=== Create Release Disk Image(s) ===
    148148
    149 The dmg is a Mac OS X disk image that contains a standalone and default configured installer for major
     149The dmg is a Mac OS X disk image that contains a standalone installer, configured in the usual way, for major
    150150MacPorts releases (1.x.0), named in a consistent fashion and incorporating the OS version for which it
    151151was built.
    152152
    153  MacPorts-1.6.0-10.4.dmg
    154  MacPorts-1.6.0-10.5.dmg
    155 
    156 To create the disk image use the MacPorts port. The Portfile will need to be updated to incorporate the
     153 MacPorts-1.6.0-10.4-Tiger.dmg
     154 MacPorts-1.6.0-10.5-Leopard.dmg
     155
     156To create a disk image, use the MacPorts port. The Portfile will need to be updated to incorporate the
    157157proper release version and checksums, and the release tarballs will need to be already uploaded to the
    158158downloads section of the site (wherefrom the sources are fetched by the MacPorts port to build the dmg
     
    163163
    164164Name the dmg appropriately, and generate checksums, which will need to be added to the existing checksums
    165 file up at the downloads directory:
     165file in the downloads directory:
    166166
    167167 cd work
    168  mv MacPorts-1.6.0.dmg MacPorts-1.6.0-10.5.dmg
    169  for type in -md5 -sha1 -ripemd160; do openssl dgst $type MacPorts-1.6.0-10.5.dmg; done
     168 mv MacPorts-1.6.0.dmg MacPorts-1.6.0-10.5-Leopard.dmg
     169 for type in -md5 -sha1 -ripemd160; do openssl dgst $type MacPorts-1.6.0-10.5-Leopard.dmg; done
    170170
    171171These new products, along with the new checksums, also have to be posted to the appropriate downloads
     
    178178   on a vanilla Mac OS X installation + developer tools, excluding even the MacPorts installation prefix;
    179179   this can be accomplished through the use of otool's -L flag. Currently the libraries and binaries in need
    180    of linking validation are: ${destroot}/Library/Tcl/macports1.0/MacPorts.dylib, ${dstroot}/opt/local/bin/daemondo
     180   of linking validation are: ${destroot}/Library/Tcl/macports1.0/MacPorts.dylib, ${destroot}/opt/local/bin/daemondo
    181181   ${destroot}/opt/local/share/macports/Tcl/darwintrace1.0/darwintrace.dylib, ${destroot}/opt/local/share/macports/\
    182182   Tcl/pextlib1.0/Pextlib.dylib and ${destroot}/opt/local/share/macports/Tcl/tclobjc1.0/tclobjc.dylib.
     
    187187             exec /usr/bin/tclsh "$0" "$@"
    188188   thus ensuring that the default Mac OS X bundled Tcl is used in our scripts.
    189  * macports1.0 Tcl package: The macports1.0 Tcl package should be source off its default location in /Library/Tcl/macports1.0
     189 * macports1.0 Tcl package: The macports1.0 Tcl package should be sourced off its default location in /Library/Tcl/macports1.0
    190190   in every single one of our scripts in ${destroot}/opt/local/bin.
    191  * Miscellaneous: anything else that might seem out of the ordinary for a fully default configured MacPorts
     191 * Miscellaneous: anything else that might seem out of the ordinary for a fully default-configured MacPorts
    192192   installation.
    193193
    194 Once the above requirements have been possitively asserted, the one remaining test is to make sure that, both,
    195 the dmg mounts on the Finder when double clicking it and the pkg cointained therein properly starts up Installer.app
    196 when double clicked in turn.
     194Once the above requirements have been positively asserted, the one remaining test is to make sure that the
     195dmg mounts in the Finder when double-clicked, and that the pkg contained therein properly starts up Installer.app
     196when it's double-clicked.
    197197
    198198
     
    214214 * [http://freshmeat.net/projects/macports/ Freshmeat] (submitter: mww@)
    215215 * [http://www.versiontracker.com/dyn/moreinfo/macosx/26679 VersionTracker] (submitter: mij@)
    216  * (Where else? -- MacUpdate?)
     216 * [http://www.macupdate.com/info.php/id/21309/macports MacUpdate] (submitter: ???)
     217 * (Where else?)
  • branches/release_1_6/base/portmgr/dmg/postflight

    r26517 r31601  
    3131# $Id$
    3232
    33 echo ""
    34 echo "Checking the PATH variable for $USER..."
    35 echo ""
    3633
    3734BINPATH=/opt/local/bin
    3835SBINPATH=/opt/local/sbin
    39 TMP=`/usr/bin/mktemp /tmp/mp.$$`
    40 $SHELL -l <<EOF > $TMP
    41     /usr/bin/printenv PATH
    42     exit
    43 EOF
    4436
    45 if grep $BINPATH $TMP >/dev/null 2>&1; then
    46         echo "You already have the right PATH - l337!"
     37
     38echo -e "\nChecking the PATH variable for $USER...\n"
     39
     40# No need to do any path adjustments if we're on Leopard, as we already install our path configs into /etc/paths.d/ and /etc/manpaths.d/
     41if [ $(sw_vers -productVersion | awk -F . '{print $2}') -eq 5 ]; then
     42    echo "No need to adjust the PATH and MANPATH environment variables on Leopard!"
     43    exit 0
     44fi
     45
     46if $SHELL -c "/usr/bin/printenv PATH" | grep -c $BINPATH > /dev/null; then
     47    echo "You already have the right PATH!"
    4748else
    4849    USHELL=`basename $SHELL`
    49    echo "Setting the PATH of $USHELL for $USER in ${HOME:=/Users/$USER}..."
     50    echo "Setting the PATH of $USHELL for $USER in ${HOME:=/Users/$USER}..."
    5051    case $USHELL in
    51       *csh)
    52         /bin/cp -fp $HOME/.cshrc $HOME/.cshrc.mpsaved   # we backup the original
    53         echo "#" >> $HOME/.cshrc
    54         echo "# Your previous .cshrc (if any) is saved as .cshrc.mpsaved" >> $HOME/.cshrc
    55         echo "# Setting the path for MacPorts." >> $HOME/.cshrc
    56         echo "set path=($BINPATH $SBINPATH" '$path'")" >> $HOME/.cshrc
    57         chown $USER $HOME/.cshrc
    58         echo "Finished modifying $HOME/.cshrc"
    59        ;;
    60       *sh)
    61         /bin/cp -fp $HOME/.profile $HOME/.profile.mpsaved # we backup the original
    62         echo "#" >> $HOME/.profile
    63         echo "# Your previous .profile  (if any) is saved as .profile.mpsaved" >> $HOME/.profile
    64         echo "# Setting the path for MacPorts." >> $HOME/.profile
    65         echo "export PATH=$BINPATH:$SBINPATH:\$PATH" >> $HOME/.profile
    66         chown $USER $HOME/.profile
    67         echo "Finished modifying $HOME/.profile"
     52        *csh)
     53            # we backup the original
     54            /bin/cp -fp $HOME/.cshrc $HOME/.cshrc.mpsaved
     55            echo "#" >> $HOME/.cshrc
     56            echo "# Your previous .cshrc (if any) is saved as .cshrc.mpsaved" >> $HOME/.cshrc
     57            echo "# Setting the path for MacPorts." >> $HOME/.cshrc
     58            echo "set path=($BINPATH $SBINPATH" '$path'")" >> $HOME/.cshrc
     59            chown $USER $HOME/.cshrc
     60            echo "Finished modifying $HOME/.cshrc"
    6861        ;;
    69       *)
    70         echo "Unknown shell! Please set your own PATH manually."
     62        *sh)
     63            # we backup the original
     64            /bin/cp -fp $HOME/.profile $HOME/.profile.mpsaved
     65            echo "#" >> $HOME/.profile
     66            echo "# Your previous .profile  (if any) is saved as .profile.mpsaved" >> $HOME/.profile
     67            echo "# Setting the path for MacPorts." >> $HOME/.profile
     68            echo "export PATH=$BINPATH:$SBINPATH:\$PATH" >> $HOME/.profile
     69            chown $USER $HOME/.profile
     70            echo "Finished modifying $HOME/.profile"
     71        ;;
     72        *)
     73            echo "Unknown shell! Please set your own PATH manually."
    7174        ;;
    7275    esac
     
    7780# run selfupdate
    7881
    79 echo""
    80 echo "Selfupdating The MacPorts system ..."
    81 echo ""
     82echo -e "\nSelfupdating The MacPorts system ...\n"
    8283
    8384port -d selfupdate
    8485if [ $? != 0 ]; then
    8586    echo "An attempt to synchronize your recent MacPorts installation with the rsync server failed, please run 'port -d selfupdate' manually to find out the cause of the error."
    86     exit
     87    exit 1
    8788fi
    8889
    89 # done !!
    90 echo ""
    91 echo "You have succesfully installed the MacPorts system."
    92 echo ""
     90# Postflight script is done with its job!
     91echo -e "\nYou have succesfully installed the MacPorts system.\n"
    9392echo "Launch a terminal and try it out !!"
    94 echo "Read the port manual page for help."
    95 echo ""
     93echo -e "Read the port manual page for help.\n"
  • branches/release_1_6/base/portmgr/jobs/Makefile

    r30447 r31601  
    1414PortIndex2MySQL: PortIndex2MySQL.tcl
    1515        ${edit} $< > $@
     16        chmod 755 $@
    1617
    1718clean:
  • branches/release_1_6/base/portmgr/jobs/PortIndex2MySQL.tcl

    r30879 r31601  
    66# 3-Oct-2002
    77# Juan Manuel Palacios | jmpp@macports.org
    8 # 30-Jul-2007
     8# 22-Nov-2007
    99# $Id$
    1010#
     
    3838# POSSIBILITY OF SUCH DAMAGE.
    3939
     40
    4041#####
    4142# The PortIndex2MySQL script populates a database with key information extracted
     
    5859
    5960
    60 # Load macports1.0 so that we can use some of its procs and the portinfo array.
    61 catch {source \
    62     [file join "@TCL_PACKAGE_DIR@" macports1.0 macports_fastload.tcl]}
    63 package require macports
    64 
    65 
    6661# Runtime information log file and reciepient.
    6762set runlog "/tmp/portsdb.log"
     
    7368set SPAM_LOVERS macports-dev@lists.macosforge.org
    7469
     70
    7571# House keeping on exit.
    7672proc cleanup {args} {
     
    9591}
    9692
     93
     94# We first initialize the runlog with a proper mail subject.
     95puts $runlog_fd "Subject: $subject"
     96
     97# Check if there are any stray sibling jobs before moving on, bail in such case.
     98if {[file exists $lockfile]} {
     99    puts $runlog_fd "PortIndex2MySQL lock file found, is another job running?"
     100    terminate 1
     101} else {
     102    set lockfile_fd [open $lockfile a]
     103}
     104
     105
     106# Load macports1.0 so that we can use some of its procs and the portinfo array.
     107if {[catch { source [file join "@TCL_PACKAGE_DIR@" macports1.0 macports_fastload.tcl] } errstr]} {
     108    puts $runlog_fd "${::errorInfo}"
     109    puts $runlog_fd "Failed to locate the macports1.0 Tcl package file: $errstr"
     110    cleanup lockfile
     111    terminate 1
     112}
     113if {[catch { package require macports } errstr]} {
     114    puts $runlog_fd "${::errorInfo}"
     115    puts $runlog_fd "Failed to load the macports1.0 Tcl package: $errstr"
     116    cleanup lockfile
     117    terminate 1
     118}
    97119
    98120# UI instantiation to route information/error messages wherever we want.
     
    130152}
    131153
    132 
    133 # We first initialize the runlog with a proper mail subject:
    134 puts $runlog_fd "Subject: $subject"
    135 
    136 # Check if there are any stray sibling jobs before moving on, bail in such case.
    137 if {[file exists $lockfile]} {
    138     ui_error "PortIndex2MySQL lock file found, is another job running?"
    139     terminate 1
    140 } else {
    141     set lockfile_fd [open $lockfile a]
    142 }
    143 
    144 
    145154# Initialize macports1.0 and its UI, in order to find the sources.conf file
    146155# (which is what will point us to the PortIndex we're gonna use) and use
     
    148157array set ui_options {ports_verbose yes}
    149158if {[catch {mportinit ui_options} errstr]} {
    150     ui_error "${::errorInfo}"
    151     ui_error "Failed to initialize MacPorts, $errstr"
    152     cleanup lockfile
    153     terminate 1
    154 }
    155 
    156 # Call the selfupdate procedure to make sure the MacPorts installation
    157 # is up-to-date and with a fresh ports tree.
    158 if {[catch {macports::selfupdate} errstr]} {
    159     ui_error "${::errorInfo}"
    160     ui_error "Failed to update the ports tree, $errstr"
     159    puts $runlog_fd "${::errorInfo}"
     160    puts $runlog_fd "Failed to initialize MacPorts: $errstr"
    161161    cleanup lockfile
    162162    terminate 1
     
    185185# Database abstraction variables:
    186186set sqlfile "/tmp/portsdb.sql"
    187 set dbcmd [macports::findBinary mysql5]
    188 set dbhost 127.0.0.1
    189 set dbuser macports
    190 set passwdfile "./password_file"
    191 set dbpasswd [getpasswd $passwdfile]
    192 set dbname macports
     187set portsdb_host localhost
     188set portsdb_name macports
     189set portsdb_user macports
     190set passwdfile "/opt/local/share/macports/resources/portmgr/password_file"
     191set portsdb_passwd [getpasswd $passwdfile]
     192set portsdb_cmd [macports::findBinary mysql5]
    193193
    194194
     
    199199    terminate 1
    200200}
     201
     202
     203# Call the sync procedure to make sure we always have a fresh ports tree.
     204if {[catch {mportsync} errstr]} {
     205    ui_error "${::errorInfo}"
     206    ui_error "Failed to update the ports tree, $errstr"
     207    cleanup sqlfile lockfile
     208    terminate 1
     209}
     210
     211# Load every port in the index through a search that matches everything.
     212if {[catch {set ports [mportsearch ".+"]} errstr]} {
     213    ui_error "${::errorInfo}"
     214    ui_error "port search failed: $errstr"
     215    cleanup sqlfile lockfile
     216    terminate 1
     217}
     218
    201219
    202220# SQL string escaping.
     
    211229# Do we need any other?
    212230puts $sqlfile_fd "DROP TABLE IF EXISTS log;"
    213 puts $sqlfile_fd "CREATE TABLE IF NOT EXISTS log (activity VARCHAR(255), activity_time TIMESTAMP(14));"
     231puts $sqlfile_fd "CREATE TABLE log (activity VARCHAR(255), activity_time TIMESTAMP(14));"
    214232puts $sqlfile_fd "INSERT INTO log VALUES ('update', NOW());"
    215233
     
    232250puts $sqlfile_fd "CREATE TABLE platforms (portfile VARCHAR(255), platform VARCHAR(255));"
    233251
    234 
    235 # Load every port in the index through a search that matches everything.
    236 if {[catch {set ports [mportsearch ".+"]} errstr]} {
    237     ui_error "${::errorInfo}"
    238     ui_error "port search failed: $errstr"
    239     cleanup sqlfile lockfile
    240     terminate 1
    241 }
    242252
    243253# Iterate over each matching port, extracting its information from the
     
    302312        set category [sql_escape $category]
    303313        puts $sqlfile_fd "INSERT INTO categories VALUES ('$portname', '$category', $primary);"
    304         incr primary
     314        set primary 0
    305315    }
    306316   
     
    309319        set maintainer [sql_escape $maintainer]
    310320        puts $sqlfile_fd "INSERT INTO maintainers VALUES ('$portname', '$maintainer', $primary);"
    311         incr primary
     321        set primary 0
    312322    }
    313323
     
    347357    terminate 1
    348358}
    349 if {[catch {exec -- $dbcmd --host=$dbhost --user=$dbuser --password=$dbpasswd --database=$dbname <@ $sqlfile_fd} errstr]} {
     359if {[catch {exec -- $portsdb_cmd --host=$portsdb_host --user=$portsdb_user --password=$portsdb_passwd --database=$portsdb_name <@ $sqlfile_fd} errstr]} {
    350360    ui_error "${::errorCode}: $errstr"
    351361    cleanup sqlfile lockfile
  • branches/release_1_6/base/src/Makefile.in

    r27520 r31601  
    99                        darwintracelib1.0 \
    1010                        tclobjc1.0
    11 SUBDIR=         ${TCLPKG} port programs
     11SUBDIR=         ${TCLPKG} @PATHCONF@ port programs
    1212
    1313all::
  • branches/release_1_6/base/src/package1.0/portsrpm.tcl

    • Property svn:eol-style set to native
    • Property svn:keywords set to Id
    r26737 r31601  
    11# et:ts=4
    22# portsrpm.tcl
    3 # $Id: portsrpm.tcl $
     3# $Id$
    44#
    55# Copyright (c) 2002 - 2003 Apple Computer, Inc.
  • branches/release_1_6/base/src/port1.0/resources/group/python25-1.0.tcl

    • Property svn:eol-style set to native
    • Property svn:keywords set to Id
    r23667 r31601  
    22# python25-1.0.tcl
    33#
    4 # $Id: $
     4# $Id$
    55#
    66# Copyright (c) 2007 Markus W. Weissman <mww@macports.org>,
  • branches/release_1_6/base/src/port1.0/resources/group/python30-1.0.tcl

    • Property svn:eol-style set to native
    • Property svn:keywords set to Id
    r28463 r31601  
    22# python30-1.0.tcl
    33#
    4 # $Id: $
     4# $Id$
    55#
    66# Copyright (c) 2007 Markus W. Weissman <mww@macports.org>,
Note: See TracChangeset for help on using the changeset viewer.