[87861] users/pixilla/base

Fri Dec 9 10:57:22 PST 2011

Revision: 87861
          http://trac.macports.org/changeset/87861
Author:   pixilla at macports.org
Date:     2011-12-09 10:57:19 -0800 (Fri, 09 Dec 2011)
Log Message:
-----------
users/pixilla/base:
- Add svn revision to port version.

Modified Paths:
--------------
    users/pixilla/base/configure
    users/pixilla/base/configure.ac

Added Paths:
-----------
    users/pixilla/base/getversion.sh

Modified: users/pixilla/base/configure
===================================================================

--- users/pixilla/base/configure	2011-12-09 18:03:29 UTC (rev 87860)
+++ users/pixilla/base/configure	2011-12-09 18:57:19 UTC (rev 87861)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for MacPorts 2.0.99.
+# Generated by GNU Autoconf 2.68 for MacPorts 2.0.99-87860.
 #
 # Report bugs to <macports-dev at lists.macosforge.org>.
 #
@@ -560,8 +560,8 @@
 # Identity of this package.
 PACKAGE_NAME='MacPorts'
 PACKAGE_TARNAME='macports'
-PACKAGE_VERSION='2.0.99'
-PACKAGE_STRING='MacPorts 2.0.99'
+PACKAGE_VERSION='2.0.99-87860'
+PACKAGE_STRING='MacPorts 2.0.99-87860'
 PACKAGE_BUGREPORT='macports-dev at lists.macosforge.org'
 PACKAGE_URL=''
 
@@ -1388,7 +1388,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 2.0.99 to adapt to many kinds of systems.
+\`configure' configures MacPorts 2.0.99-87860 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1454,7 +1454,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of MacPorts 2.0.99:";;
+     short | recursive ) echo "Configuration of MacPorts 2.0.99-87860:";;
    esac
   cat <<\_ACEOF
 
@@ -1599,7 +1599,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-MacPorts configure 2.0.99
+MacPorts configure 2.0.99-87860
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2268,7 +2268,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 2.0.99, which was
+It was created by MacPorts $as_me 2.0.99-87860, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2763,7 +2763,8 @@
 # Read in the MacPorts version from the base/config/macports_version file
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking MacPorts version" >&5
 $as_echo_n "checking MacPorts version... " >&6; }
-MACPORTS_VERSION=2.0.99
+MACPORTS_VERSION_PARTS_MACRO
+MACPORTS_VERSION=2.0.99-87860
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MACPORTS_VERSION" >&5
 $as_echo "$MACPORTS_VERSION" >&6; }
 
@@ -10264,7 +10265,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 2.0.99, which was
+This file was extended by MacPorts $as_me 2.0.99-87860, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10326,7 +10327,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-MacPorts config.status 2.0.99
+MacPorts config.status 2.0.99-87860
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

Modified: users/pixilla/base/configure.ac
===================================================================
--- users/pixilla/base/configure.ac	2011-12-09 18:03:29 UTC (rev 87860)
+++ users/pixilla/base/configure.ac	2011-12-09 18:57:19 UTC (rev 87861)
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl $Id$
 AC_PREREQ(2.63)
-AC_DEFUN([MACPORTS_VERSION_MACRO], [esyscmd(<config/macports_version tr -d '\n')])
+AC_DEFUN([MACPORTS_VERSION_MACRO], [esyscmd(./getversion.sh)])
 AC_INIT([MacPorts],MACPORTS_VERSION_MACRO,[macports-dev at lists.macosforge.org],[macports])
 AC_CONFIG_SRCDIR([src/pextlib1.0/Pextlib.c])
 AC_CONFIG_HEADERS([src/config.h])
@@ -10,6 +10,7 @@
 
 # Read in the MacPorts version from the base/config/macports_version file
 AC_MSG_CHECKING(MacPorts version)
+MACPORTS_VERSION_PARTS_MACRO
 MACPORTS_VERSION=MACPORTS_VERSION_MACRO
 AC_MSG_RESULT([$MACPORTS_VERSION])
 AC_SUBST(MACPORTS_VERSION)

Added: users/pixilla/base/getversion.sh
===================================================================
--- users/pixilla/base/getversion.sh	                        (rev 0)
+++ users/pixilla/base/getversion.sh	2011-12-09 18:57:19 UTC (rev 87861)
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# Path to me.
+DIRNAME=$(dirname $0)
+
+# Get version strings.
+IFS=.
+read MAJOR MINOR REVISION <$DIRNAME/config/macports_version
+unset IFS
+MACPORTS_VERSION="${MAJOR}.${MINOR}.${REVISION}"
+
+# Get svn revision.
+SVN_REVISION=
+SVNCMD=$(which svn)
+if [[ "x$SVNCMD" != "x" ]]
+then
+    SVN_REVISION=$($SVNCMD info $DIRNAME | grep "Revision:" | awk '{print $NF}')
+fi
+
+# If revision is 99 and we have an svn revision number add it to the macports version.
+if [[ $REVISION -eq 99 && "x$SVN_REVISION" != "x" ]]
+then
+    echo "$MACPORTS_VERSION-$SVN_REVISION" | tr -d '\n'
+else
+    echo "$MACPORTS_VERSION" | tr -d '\n'
+fi


Property changes on: users/pixilla/base/getversion.sh
___________________________________________________________________
Added: svn:executable
   + *
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111209/0f539696/attachment.html>
