[27313] trunk/base

[source_changes at macosforge.org]

Revision: 27313
          http://trac.macosforge.org/projects/macports/changeset/27313
Author:   jmpp at macports.org
Date:     2007-07-28 14:08:46 -0700 (Sat, 28 Jul 2007)

Log Message:
-----------

Read the version number into the autoconf system through the esyscmd command,
finally eliminating the need to define the same thing in two places (and the
unavoidable discrepancy when one of them is forgotten).

Now that this is in place I hope eridius will finally implement a new MacPorts
versioning system for 'port version' and 'port selfupdate' using rpm-vercomp
and standard x.y.z version numbers, since he said back in 'them days, iirc,
that reading this number into autoconf was necessary (or was that just an
added bonus? ;-).

Modified Paths:
--------------
    trunk/base/configure
    trunk/base/configure.ac

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2007-07-28 20:00:53 UTC (rev 27312)
+++ trunk/base/configure	2007-07-28 21:08:46 UTC (rev 27313)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for MacPorts 1.6.0.
+# Generated by GNU Autoconf 2.61 for MacPorts 1.600.
 #
 # Report bugs to <macports-dev at lists.macosforge.org>.
 #
@@ -574,8 +574,8 @@
 # Identity of this package.
 PACKAGE_NAME='MacPorts'
 PACKAGE_TARNAME='macports'
-PACKAGE_VERSION='1.6.0'
-PACKAGE_STRING='MacPorts 1.6.0'
+PACKAGE_VERSION='1.600'
+PACKAGE_STRING='MacPorts 1.600'
 PACKAGE_BUGREPORT='macports-dev at lists.macosforge.org'
 
 ac_unique_file="src/pextlib1.0/Pextlib.c"
@@ -1290,7 +1290,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures MacPorts 1.6.0 to adapt to many kinds of systems.
+\`configure' configures MacPorts 1.600 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1360,7 +1360,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of MacPorts 1.6.0:";;
+     short | recursive ) echo "Configuration of MacPorts 1.600:";;
    esac
   cat <<\_ACEOF
 
@@ -1479,7 +1479,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-MacPorts configure 1.6.0
+MacPorts configure 1.600
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1493,7 +1493,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by MacPorts $as_me 1.6.0, which was
+It was created by MacPorts $as_me 1.600, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -12091,7 +12091,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by MacPorts $as_me 1.6.0, which was
+This file was extended by MacPorts $as_me 1.600, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12140,7 +12140,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-MacPorts config.status 1.6.0
+MacPorts config.status 1.600
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

Modified: trunk/base/configure.ac
===================================================================
--- trunk/base/configure.ac	2007-07-28 20:00:53 UTC (rev 27312)
+++ trunk/base/configure.ac	2007-07-28 21:08:46 UTC (rev 27313)
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
-AC_INIT([MacPorts], [1.6.0], [macports-dev at lists.macosforge.org], [macports])
+AC_INIT([MacPorts], [esyscmd(cat config/mp_version | tr -d '\n')], [macports-dev at lists.macosforge.org], [macports])
 AC_CONFIG_SRCDIR([src/pextlib1.0/Pextlib.c])
 AC_CONFIG_HEADERS([src/config.h])
 AC_CANONICAL_SYSTEM

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070728/50279de3/attachment.html