← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to m4/pandora_vc_build.m4

  • Committer: Lee Bieber
  • Date: 2010-12-23 23:11:00 UTC
  • mfrom: (2024.1.1 clean)
  • Revision ID: kalebral@gmail.com-20101223231100-0rqirgz7ugkl10yp
Merge Brian - session list cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/pandora_vc_build.m4
36
36
])
37
37
 
38
38
AC_DEFUN([PANDORA_BUILDING_FROM_VC],[
39
 
  m4_syscmd(PANDORA_TEST_VC_DIR
40
 
    m4_if(PCT_NO_VC_CHANGELOG,yes,[
41
 
      vc_changelog=no
42
 
      ],[
43
 
      vc_changelog=yes
44
 
      ])
45
 
  
46
 
    [
 
39
  m4_syscmd(PANDORA_TEST_VC_DIR [
47
40
 
48
41
    PANDORA_RELEASE_DATE=`date +%Y.%m`
49
42
    PANDORA_RELEASE_NODOTS_DATE=`date +%Y%m`
60
53
        PANDORA_VC_REVNO="${PANDORA_BZR_REVNO}"
61
54
        PANDORA_VC_REVID=`bzr log -r-1 --show-ids | grep revision-id | cut -f2 -d' ' | head -1`
62
55
        PANDORA_VC_BRANCH=`bzr nick`
63
 
        PANDORA_VC_TAG=`bzr tags -r-1 | cut -f1 -d' ' | head -1`
64
 
        if test "x${vc_changelog}" = "xyes"; then
65
 
          bzr log --gnu > ChangeLog
66
 
        fi
 
56
        bzr log --gnu > ChangeLog
67
57
      fi
68
58
    fi
69
59
 
76
66
PANDORA_VC_REVNO=${PANDORA_VC_REVNO}
77
67
PANDORA_VC_REVID=${PANDORA_VC_REVID}
78
68
PANDORA_VC_BRANCH=${PANDORA_VC_BRANCH}
79
 
PANDORA_VC_TAG=${PANDORA_VC_TAG}
80
69
PANDORA_RELEASE_DATE=${PANDORA_RELEASE_DATE}
81
70
PANDORA_RELEASE_NODOTS_DATE=${PANDORA_RELEASE_NODOTS_DATE}
82
71
EOF
102
91
    _PANDORA_READ_FROM_FILE([PANDORA_VC_REVID],${srcdir}/config/pandora_vc_revinfo)
103
92
    _PANDORA_READ_FROM_FILE([PANDORA_VC_BRANCH],
104
93
                            ${srcdir}/config/pandora_vc_revinfo)
105
 
    _PANDORA_READ_FROM_FILE([PANDORA_VC_TAG],
106
 
                            ${srcdir}/config/pandora_vc_revinfo)
107
94
    _PANDORA_READ_FROM_FILE([PANDORA_RELEASE_DATE],
108
95
                            ${srcdir}/config/pandora_vc_revinfo)
109
96
    _PANDORA_READ_FROM_FILE([PANDORA_RELEASE_NODOTS_DATE],
115
102
    PANDORA_RELEASE_COMMENT="trunk"
116
103
  ])
117
104
    
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
 
  ])
 
105
  PANDORA_RELEASE_VERSION="${PANDORA_RELEASE_DATE}.${PANDORA_VC_REVNO}"
123
106
  PANDORA_RELEASE_ID="${PANDORA_RELEASE_NODOTS_DATE}${PANDORA_VC_REVNO}"
124
107
 
125
108
  VERSION="${PANDORA_RELEASE_VERSION}"