← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to m4/pandora_vc_build.m4

  • Committer: Monty Taylor
  • Date: 2011-02-02 04:47:40 UTC
  • mfrom: (2135.1.2 build)
  • Revision ID: mordred@inaugust.com-20110202044740-fsf0yjrqrkgzgdf3
Merge Lee: Valgrind Suppressions
Merge Monty: Build tarballs from bzr tags if they're there.

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/pandora_vc_build.m4
60
60
        PANDORA_VC_REVNO="${PANDORA_BZR_REVNO}"
61
61
        PANDORA_VC_REVID=`bzr log -r-1 --show-ids | grep revision-id | cut -f2 -d' ' | head -1`
62
62
        PANDORA_VC_BRANCH=`bzr nick`
 
63
        PANDORA_VC_TAG=`bzr tags -r-1 | cut -f1 -d' ' | head -1`
63
64
        if test "x${vc_changelog}" = "xyes"; then
64
65
          bzr log --gnu > ChangeLog
65
66
        fi
75
76
PANDORA_VC_REVNO=${PANDORA_VC_REVNO}
76
77
PANDORA_VC_REVID=${PANDORA_VC_REVID}
77
78
PANDORA_VC_BRANCH=${PANDORA_VC_BRANCH}
 
79
PANDORA_VC_TAG=${PANDORA_VC_TAG}
78
80
PANDORA_RELEASE_DATE=${PANDORA_RELEASE_DATE}
79
81
PANDORA_RELEASE_NODOTS_DATE=${PANDORA_RELEASE_NODOTS_DATE}
80
82
EOF
100
102
    _PANDORA_READ_FROM_FILE([PANDORA_VC_REVID],${srcdir}/config/pandora_vc_revinfo)
101
103
    _PANDORA_READ_FROM_FILE([PANDORA_VC_BRANCH],
102
104
                            ${srcdir}/config/pandora_vc_revinfo)
 
105
    _PANDORA_READ_FROM_FILE([PANDORA_VC_TAG],
 
106
                            ${srcdir}/config/pandora_vc_revinfo)
103
107
    _PANDORA_READ_FROM_FILE([PANDORA_RELEASE_DATE],
104
108
                            ${srcdir}/config/pandora_vc_revinfo)
105
109
    _PANDORA_READ_FROM_FILE([PANDORA_RELEASE_NODOTS_DATE],
111
115
    PANDORA_RELEASE_COMMENT="trunk"
112
116
  ])
113
117
    
114
 
  PANDORA_RELEASE_VERSION="${PANDORA_RELEASE_DATE}.${PANDORA_VC_REVNO}"
 
118
  AS_IF([test "x${PANDORA_VC_TAG}" = "x"],[
 
119
    PANDORA_RELEASE_VERSION="${PANDORA_RELEASE_DATE}.${PANDORA_VC_REVNO}"
 
120
  ],[
 
121
    PANDORA_RELEASE_VERSION="${PANDORA_VC_TAG}"
 
122
  ])
115
123
  PANDORA_RELEASE_ID="${PANDORA_RELEASE_NODOTS_DATE}${PANDORA_VC_REVNO}"
116
124
 
117
125
  VERSION="${PANDORA_RELEASE_VERSION}"