Changeset 32365


Ignore:
Timestamp:
Dec 27, 2007, 8:31:52 PM (10 years ago)
Author:
jmpp@…
Message:

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).

Location:
trunk/base
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/configure.ac

    r32212 r32365  
    22dnl $Id$
    33AC_PREREQ(2.52)
    4 AC_INIT([MacPorts], [esyscmd(cat config/mp_version | tr -d '\n')], [macports-dev@lists.macosforge.org], [macports])
     4AC_INIT([MacPorts], [esyscmd(cat config/macports_version | tr -d '\n')], [macports-dev@lists.macosforge.org], [macports])
    55AC_CONFIG_SRCDIR([src/pextlib1.0/Pextlib.c])
    66AC_CONFIG_HEADERS([src/config.h])
    77AC_CANONICAL_SYSTEM
    88
    9 # Read in the MacPorts version from the base/config/mp_vesion file and translate it (e.g. 1.600) to regular version (1.6.0)
     9# Read in the MacPorts version from the base/config/macports_vesion file
    1010AC_MSG_CHECKING(MacPorts version)
     11MACPORTS_VERSION=$(cat config/macports_version | tr -d '\n')
     12AC_MSG_RESULT([$MACPORTS_VERSION])
     13AC_SUBST(MACPORTS_VERSION)
     14# Read the old, floating point format version, which we still use internally, and export it for the $macports::autoconf::macports_version variable
    1115MP_VERSION=$(cat config/mp_version | tr -d '\n')
    12 VER=`echo $MP_VERSION | sed -e 's/\([[0-9]]\)\.\([[0-9]]\)0\{0,1\}\([[0-9]][[1-9]]\{0,1\}\)0\{0,1\}/\1.\2.\3/'`
    13 AC_MSG_RESULT([$VER])
    14 AC_SUBST(VER)
    1516AC_SUBST(MP_VERSION)
    1617
  • trunk/base/portmgr/fedora/macports.spec.in

    r30388 r32365  
    11Summary: MacPorts allows installing software on Mac OS X (and other platforms)
    22Name: macports
    3 Version: @VER@
     3Version: @MACPORTS_VERSION@
    44Release: 0%{?dist}
    55License: BSD
  • trunk/base/portmgr/freebsd/Makefile.in

    r30388 r32365  
    77
    88PORTNAME=       macports
    9 PORTVERSION=    @VER@
     9PORTVERSION=    @MACPORTS_VERSION@
    1010CATEGORIES=     sysutils
    1111MASTER_SITES=   http://svn.macosforge.org/repository/macports/distfiles/MacPorts/
Note: See TracChangeset for help on using the changeset viewer.