Updated pandora-build files to version 0.175

diff --git a/.quickly b/.quickly
index e274c88f50d96e7e5de4f3ff4e68b1fafc8605f4..637e364ce93d2e28c9e47a3c343e7d4c9a34bcea 100644 (file)
--- a/.quickly
+++ b/.quickly
@@ -2,4 +2,4 @@ project = libmemcached
 version = 0.4.2
 template = pandora-build
 project-type = library
 version = 0.4.2
 template = pandora-build
 project-type = library

-pandora-version = 0.174
+pandora-version = 0.175

diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4
index 30113045c2a89717ec704eba17b2f7d05689bcb0..ceb859af2dd74cf3a32c31af623431378093cce0 100644 (file)
--- a/m4/pandora_canonical.m4
+++ b/m4/pandora_canonical.m4
@@ -4,7 +4,7 @@ dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl Which version of the canonical setup we're using
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl Which version of the canonical setup we're using

-AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.174])
+AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.175])

 
 AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
   AC_ARG_ENABLE([fat-binaries],
 
 AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
   AC_ARG_ENABLE([fat-binaries],

diff --git a/m4/pandora_vc_build.m4 b/m4/pandora_vc_build.m4
index 494e7e23de19c30b0ac12a985beddb088d23808d..a1fb60b3dd1d2fc077af8c58ca82673f219deea9 100644 (file)
--- a/m4/pandora_vc_build.m4
+++ b/m4/pandora_vc_build.m4
@@ -61,10 +61,18 @@ AC_DEFUN([PANDORA_BUILDING_FROM_VC],[
         PANDORA_VC_REVID=`bzr log -r-1 --show-ids | grep revision-id | cut -f2 -d' ' | head -1`
         PANDORA_VC_BRANCH=`bzr nick`
         PANDORA_VC_TAG=`bzr tags -r-1 | cut -f1 -d' ' | head -1`
         PANDORA_VC_REVID=`bzr log -r-1 --show-ids | grep revision-id | cut -f2 -d' ' | head -1`
         PANDORA_VC_BRANCH=`bzr nick`
         PANDORA_VC_TAG=`bzr tags -r-1 | cut -f1 -d' ' | head -1`

+        PANDORA_VC_LATEST_TAG=`bzr tags --sort=time | grep -v '\?'| cut -f1 -d' '  | tail -1`

         if test "x${vc_changelog}" = "xyes"; then
           bzr log --gnu > ChangeLog
         fi
       fi
         if test "x${vc_changelog}" = "xyes"; then
           bzr log --gnu > ChangeLog
         fi
       fi

+    elif test "${pandora_building_from_git}" = "yes"; then
+      echo "# Grabbing changelog and version information from git"
+      PANDORA_GIT_REVID=`git --no-pager log --max-count=1 | cut -f2 -d' ' | head -1`
+      if test "x$PANDORA_GIT_REVID" != "x${PANDORA_VC_REVNO}" ; then
+         PANDORA_VC_REVID="${PANDORA_GIT_REVID}"
+         PANDORA_VC_BRANCH=`git branch | grep -Ei "\* (.*)" | cut -f2 -d' '`
+      fi

     fi
 
     if ! test -d config ; then
     fi
 
     if ! test -d config ; then


@@ -77,6 +85,7 @@ PANDORA_VC_REVNO=${PANDORA_VC_REVNO}
 PANDORA_VC_REVID=${PANDORA_VC_REVID}
 PANDORA_VC_BRANCH=${PANDORA_VC_BRANCH}
 PANDORA_VC_TAG=${PANDORA_VC_TAG}
 PANDORA_VC_REVID=${PANDORA_VC_REVID}
 PANDORA_VC_BRANCH=${PANDORA_VC_BRANCH}
 PANDORA_VC_TAG=${PANDORA_VC_TAG}

+PANDORA_VC_LATEST_TAG=${PANDORA_VC_LATEST_TAG}

 PANDORA_RELEASE_DATE=${PANDORA_RELEASE_DATE}
 PANDORA_RELEASE_NODOTS_DATE=${PANDORA_RELEASE_NODOTS_DATE}
 EOF
 PANDORA_RELEASE_DATE=${PANDORA_RELEASE_DATE}
 PANDORA_RELEASE_NODOTS_DATE=${PANDORA_RELEASE_NODOTS_DATE}
 EOF


@@ -104,6 +113,8 @@ AC_DEFUN([PANDORA_VC_VERSION],[
                             ${srcdir}/config/pandora_vc_revinfo)
     _PANDORA_READ_FROM_FILE([PANDORA_VC_TAG],
                             ${srcdir}/config/pandora_vc_revinfo)
                             ${srcdir}/config/pandora_vc_revinfo)
     _PANDORA_READ_FROM_FILE([PANDORA_VC_TAG],
                             ${srcdir}/config/pandora_vc_revinfo)

+    _PANDORA_READ_FROM_FILE([PANDORA_VC_LATEST_TAG],
+                            ${srcdir}/config/pandora_vc_revinfo)

     _PANDORA_READ_FROM_FILE([PANDORA_RELEASE_DATE],
                             ${srcdir}/config/pandora_vc_revinfo)
     _PANDORA_READ_FROM_FILE([PANDORA_RELEASE_NODOTS_DATE],
     _PANDORA_READ_FROM_FILE([PANDORA_RELEASE_DATE],
                             ${srcdir}/config/pandora_vc_revinfo)
     _PANDORA_READ_FROM_FILE([PANDORA_RELEASE_NODOTS_DATE],


@@ -115,12 +126,19 @@ AC_DEFUN([PANDORA_VC_VERSION],[
     PANDORA_RELEASE_COMMENT="trunk"
   ])
     
     PANDORA_RELEASE_COMMENT="trunk"
   ])
     

-  AS_IF([test "x${PANDORA_VC_TAG}" = "x"],[
-    PANDORA_RELEASE_VERSION="${PANDORA_RELEASE_DATE}.${PANDORA_VC_REVNO}"
-  ],[
+  AS_IF([test "x${PANDORA_VC_TAG}" != "x"],[

     PANDORA_RELEASE_VERSION="${PANDORA_VC_TAG}"
     PANDORA_RELEASE_VERSION="${PANDORA_VC_TAG}"

+  ],[
+    AS_IF([test "x${PANDORA_VC_LATEST_TAG}" != "x"],[
+      PANDORA_RELEASE_VERSION="${PANDORA_VC_LATEST_TAG}.${PANDORA_VC_REVNO}"
+    ],[
+      PANDORA_RELEASE_VERSION="${PANDORA_RELEASE_DATE}.${PANDORA_VC_REVNO}"
+    ])

   ])
   ])

-  PANDORA_RELEASE_ID="${PANDORA_RELEASE_NODOTS_DATE}${PANDORA_VC_REVNO}"
+  changequote(<<, >>)dnl
+  PANDORA_RELEASE_ID=`echo ${PANDORA_RELEASE_VERSION} | sed 's/[^0-9]//g'`
+  changequote([, ])dnl
+

 
   VERSION="${PANDORA_RELEASE_VERSION}"
   AC_DEFINE_UNQUOTED([PANDORA_RELEASE_VERSION],["${PANDORA_RELEASE_VERSION}"],
 
   VERSION="${PANDORA_RELEASE_VERSION}"
   AC_DEFINE_UNQUOTED([PANDORA_RELEASE_VERSION],["${PANDORA_RELEASE_VERSION}"],