/[gentoo-x86]/eclass/subversion.eclass
Gentoo

Diff of /eclass/subversion.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.41 Revision 1.52
1# Copyright 1999-2007 Gentoo Foundation 1# Copyright 1999-2008 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.41 2007/04/01 14:48:37 hattya Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.52 2008/02/20 22:35:40 zlin Exp $
4 4
5## --------------------------------------------------------------------------- # 5# @ECLASS: subversion.eclass
6# @MAINTAINER:
7# Akinori Hattori <hattya@gentoo.org>
8# Bo ├śrsted Andresen <zlin@gentoo.org>
9#
6# Author: Akinori Hattori <hattya@gentoo.org> 10# Original Author: Akinori Hattori <hattya@gentoo.org>
7# 11#
8# The subversion eclass is written to fetch the software sources from 12# @BLURB: The subversion eclass is written to fetch software sources from subversion repositories
9# subversion repositories like the cvs eclass. 13# @DESCRIPTION:
10# 14# The subversion eclass provides functions to fetch, patch and bootstrap
11# 15# software sources from subversion repositories.
12# Description:
13# If you use this eclass, the ${S} is ${WORKDIR}/${P}.
14# It is necessary to define the ESVN_REPO_URI variable at least.
15#
16## --------------------------------------------------------------------------- #
17 16
18inherit eutils 17inherit eutils
19 18
20ESVN="subversion.eclass" 19ESVN="${ECLASS}"
21 20
22EXPORT_FUNCTIONS src_unpack 21EXPORT_FUNCTIONS src_unpack pkg_preinst
23 22
24HOMEPAGE="http://subversion.tigris.org/"
25DESCRIPTION="Based on the ${ECLASS} eclass" 23DESCRIPTION="Based on the ${ECLASS} eclass"
26 24
27
28## -- add subversion in DEPEND
29#
30DEPEND="dev-util/subversion" 25DEPEND="dev-util/subversion
26 net-misc/rsync"
31 27
32 28# @ECLASS-VARIABLE: ESVN_STORE_DIR
33## -- ESVN_STORE_DIR: subversion sources store directory 29# @DESCRIPTION:
34# 30# subversion sources store directory. Users may override this in /etc/make.conf
35ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/svn-src" 31[[ -z ${ESVN_STORE_DIR} ]] && ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src"
36 32
37 33# @ECLASS-VARIABLE: ESVN_FETCH_CMD
38## -- ESVN_FETCH_CMD: subversion fetch command 34# @DESCRIPTION:
39# 35# subversion checkout command
40ESVN_FETCH_CMD="svn checkout" 36ESVN_FETCH_CMD="svn checkout"
41 37
42## -- ESVN_UPDATE_CMD: subversion update command 38# @ECLASS-VARIABLE: ESVN_UPDATE_CMD
43# 39# @DESCRIPTION:
40# subversion update command
44ESVN_UPDATE_CMD="svn update" 41ESVN_UPDATE_CMD="svn update"
45 42
43# @ECLASS-VARIABLE: ESVN_SWITCH_CMD
44# @DESCRIPTION:
45# subversion switch command
46ESVN_SWITCH_CMD="svn switch"
46 47
47## -- ESVN_OPTIONS: 48# @ECLASS-VARIABLE: ESVN_OPTIONS
48# 49# @DESCRIPTION:
49# the options passed to checkout or update. 50# the options passed to checkout or update. If you want a specific revision see
50# 51# ESVN_REPO_URI instead of using -rREV.
51: ESVN_OPTIONS=${ESVN_OPTIONS:=} 52ESVN_OPTIONS="${ESVN_OPTIONS:-}"
52 53
53 54# @ECLASS-VARIABLE: ESVN_REPO_URI
54## -- ESVN_REPO_URI: repository uri 55# @DESCRIPTION:
56# repository uri
55# 57#
56# e.g. http://foo/trunk, svn://bar/trunk 58# e.g. http://foo/trunk, svn://bar/trunk, svn://bar/branch/foo@1234
57# 59#
58# supported protocols: 60# supported protocols:
59# http:// 61# http://
60# https:// 62# https://
61# svn:// 63# svn://
62# svn+ssh:// 64# svn+ssh://
63# 65#
66# to peg to a specific revision, append @REV to the repo's uri
64: ESVN_REPO_URI=${ESVN_REPO_URI:=} 67ESVN_REPO_URI="${ESVN_REPO_URI:-}"
65 68
69# @ECLASS-VARIABLE: ESVN_REVISION
70# @DESCRIPTION:
71# User configurable revision checkout or update to from the repository
72#
73# Useful for live svn or trunk svn ebuilds allowing the user to peg
74# to a specific revision
75#
76# Note: This should never be set in an ebuild!
77ESVN_REVISION="${ESVN_REVISION:-}"
66 78
79# @ECLASS-VARIABLE: ESVN_PROJECT
80# @DESCRIPTION:
67## -- ESVN_PROJECT: project name of your ebuild (= name space) 81# project name of your ebuild (= name space)
68# 82#
69# subversion eclass will check out the subversion repository like: 83# subversion eclass will check out the subversion repository like:
70# 84#
71# ${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/} 85# ${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/}
72# 86#
81# 95#
82# # jakarta commons-loggin 96# # jakarta commons-loggin
83# ESVN_PROJECT=commons/logging 97# ESVN_PROJECT=commons/logging
84# 98#
85# default: ${PN/-svn}. 99# default: ${PN/-svn}.
86#
87: ESVN_PROJECT=${ESVN_PROJECT:=${PN/-svn}} 100ESVN_PROJECT="${ESVN_PROJECT:-${PN/-svn}}"
88 101
89 102# @ECLASS-VARIABLE: ESVN_BOOTSTRAP
90## -- ESVN_BOOTSTRAP: 103# @DESCRIPTION:
91#
92# bootstrap script or command like autogen.sh or etc.. 104# bootstrap script or command like autogen.sh or etc..
93#
94: ESVN_BOOTSTRAP=${ESVN_BOOTSTRAP:=} 105ESVN_BOOTSTRAP="${ESVN_BOOTSTRAP:-}"
95 106
96 107# @ECLASS-VARIABLE: ESVN_PATCHES
97## -- ESVN_PATCHES: 108# @DESCRIPTION:
98#
99# subversion eclass can apply pathces in subversion_bootstrap(). 109# subversion eclass can apply patches in subversion_bootstrap().
100# you can use regexp in this valiable like *.diff or *.patch or etc. 110# you can use regexp in this variable like *.diff or *.patch or etc.
101# NOTE: this patches will apply before eval ESVN_BOOTSTRAP. 111# NOTE: patches will be applied before ESVN_BOOTSTRAP is processed.
102# 112#
103# the process of applying the patch is: 113# Patches are searched both in ${PWD} and ${FILESDIR}, if not found in either
104# 1. just epatch it, if the patch exists in the path. 114# location, the installation dies.
105# 2. scan it under FILESDIR and epatch it, if the patch exists in FILESDIR.
106# 3. die.
107#
108: ESVN_PATCHES=${ESVN_PATCHES:=} 115ESVN_PATCHES="${ESVN_PATCHES:-}"
109 116
110 117# @ECLASS-VARIABLE: ESVN_RESTRICT
111## -- ESVN_RESTRICT: 118# @DESCRIPTION:
112#
113# this should be a space delimited list of subversion eclass features to 119# this should be a space delimited list of subversion eclass features to
114# restrict. 120# restrict.
115# export) 121# export)
116# don't export the working copy to S. 122# don't export the working copy to S.
117#
118: ESVN_RESTRICT=${ESVN_RESTRICT:=} 123ESVN_RESTRICT="${ESVN_RESTRICT:-}"
119 124
125# @ECLASS-VARIABLE: ESVN_OFFLINE
126# @DESCRIPTION:
127# Set this variable to a non-empty value to disable the automatic updating of
128# an svn source tree. This is intended to be set outside the subversion source
129# tree by users.
130ESVN_OFFLINE="${ESVN_OFFLINE:-${ESCM_OFFLINE}}"
120 131
121## -- subversion_fetch() ----------------------------------------------------- # 132# @ECLASS-VARIABLE: ESVN_UP_FREQ
133# @DESCRIPTION:
134# Set the minimum number of hours between svn up'ing in any given svn module. This is particularly
135# useful for split KDE ebuilds where we want to ensure that all submodules are compiled for the same
136# revision. It should also be kept user overrideable.
137ESVN_UP_FREQ="${ESVN_UP_FREQ:=}"
138
139# @ECLASS-VARIABLE: ESCM_LOGDIR
140# @DESCRIPTION:
141# User configuration variable. If set to a path such as e.g. /var/log/scm any
142# package inheriting from subversion.eclass will record svn revision to
143# ${CATEGORY}/${PN}.log in that path in pkg_preinst. This is not supposed to be
144# set by ebuilds/eclasses. It defaults to empty so users need to opt in.
145ESCM_LOGDIR="${ESCM_LOGDIR:=}"
146
147# @FUNCTION: subversion_fetch
148# @USAGE: [repo_uri] [destination]
149# @DESCRIPTION:
150# Wrapper function to fetch sources from subversion via svn checkout or svn update,
151# depending on whether there is an existing working copy in ${ESVN_STORE_DIR}.
122# 152#
153# Can take two optional parameters:
123# @param $1 - a repository URI. default is the ESVN_REPO_URI. 154# repo_uri - a repository URI. default is ESVN_REPO_URI.
124# @param $2 - a check out path in S. 155# destination - a check out path in S.
125#
126function subversion_fetch() { 156subversion_fetch() {
127
128 local repo_uri="$(subversion__get_repository_uri "${1}")" 157 local repo_uri="$(subversion__get_repository_uri "${1:-${ESVN_REPO_URI}}")"
158 local revision="$(subversion__get_peg_revision "${1:-${ESVN_REPO_URI}}")"
129 local S_dest="${2}" 159 local S_dest="${2}"
160
161 if [[ -z ${repo_uri} ]]; then
162 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty."
163 fi
164
165 [[ -n "${ESVN_REVISION}" ]] && revision="${ESVN_REVISION}"
130 166
131 # check for the protocol 167 # check for the protocol
132 local protocol="${repo_uri%%:*}" 168 local protocol="${repo_uri%%:*}"
133 169
134 case "${protocol}" in 170 case "${protocol}" in
142 fi 178 fi
143 ;; 179 ;;
144 svn|svn+ssh) 180 svn|svn+ssh)
145 ;; 181 ;;
146 *) 182 *)
147 die "${ESVN}: fetch from "${protocol}" is not yet implemented." 183 die "${ESVN}: fetch from '${protocol}' is not yet implemented."
148 ;; 184 ;;
149 esac 185 esac
150 186
151 # every time
152 addread "/etc/subversion" 187 addread "/etc/subversion"
153 addwrite "${ESVN_STORE_DIR}" 188 addwrite "${ESVN_STORE_DIR}"
154 189
155 if [[ ! -d "${ESVN_STORE_DIR}" ]]; then 190 if [[ ! -d ${ESVN_STORE_DIR} ]]; then
156 debug-print "${FUNCNAME}: initial checkout. creating subversion directory" 191 debug-print "${FUNCNAME}: initial checkout. creating subversion directory"
157 mkdir -p "${ESVN_STORE_DIR}" || die "${ESVN}: can't mkdir ${ESVN_STORE_DIR}." 192 mkdir -p "${ESVN_STORE_DIR}" || die "${ESVN}: can't mkdir ${ESVN_STORE_DIR}."
158 fi 193 fi
159 194
160 cd "${ESVN_STORE_DIR}" || die "${ESVN}: can't chdir to ${ESVN_STORE_DIR}" 195 cd "${ESVN_STORE_DIR}" || die "${ESVN}: can't chdir to ${ESVN_STORE_DIR}"
161 196
162 local wc_path="$(subversion__get_wc_path "${repo_uri}")" 197 local wc_path="$(subversion__get_wc_path "${repo_uri}")"
163 local options="${ESVN_OPTIONS} --config-dir ${ESVN_STORE_DIR}/.subversion" 198 local options="${ESVN_OPTIONS} --config-dir ${ESVN_STORE_DIR}/.subversion"
199
200 [[ -n "${revision}" ]] && options="${options} -r ${revision}"
201
202 if [[ "${ESVN_OPTIONS}" = *-r* ]]; then
203 ewarn "\${ESVN_OPTIONS} contains -r, this usage is unsupported. Please"
204 ewarn "see \${ESVN_REPO_URI}"
205 fi
164 206
165 debug-print "${FUNCNAME}: wc_path = \"${wc_path}\"" 207 debug-print "${FUNCNAME}: wc_path = \"${wc_path}\""
166 debug-print "${FUNCNAME}: ESVN_OPTIONS = \"${ESVN_OPTIONS}\"" 208 debug-print "${FUNCNAME}: ESVN_OPTIONS = \"${ESVN_OPTIONS}\""
167 debug-print "${FUNCNAME}: options = \"${options}\"" 209 debug-print "${FUNCNAME}: options = \"${options}\""
168 210
169 if [[ ! -d "${wc_path}/.svn" ]]; then 211 if [[ ! -d ${wc_path}/.svn ]]; then
170 # first check out 212 # first check out
171 einfo "subversion check out start -->" 213 einfo "subversion check out start -->"
172 einfo " repository: ${repo_uri}" 214 einfo " repository: ${repo_uri}${revision:+@}${revision}"
173 215
174 debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}" 216 debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}"
175 217
176 mkdir -p "${ESVN_PROJECT}" || die "${ESVN}: can't mkdir ${ESVN_PROJECT}." 218 mkdir -p "${ESVN_PROJECT}" || die "${ESVN}: can't mkdir ${ESVN_PROJECT}."
177 cd "${ESVN_PROJECT}" || die "${ESVN}: can't chdir to ${ESVN_PROJECT}" 219 cd "${ESVN_PROJECT}" || die "${ESVN}: can't chdir to ${ESVN_PROJECT}"
178 ${ESVN_FETCH_CMD} ${options} "${repo_uri}" || die "${ESVN}: can't fetch from ${repo_uri}." 220 ${ESVN_FETCH_CMD} ${options} "${repo_uri}" || die "${ESVN}: can't fetch from ${repo_uri}."
179 221
222 elif [[ -n ${ESVN_OFFLINE} ]]; then
223 subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy."
224 if [[ -n ${ESVN_REVISION} && ${ESVN_REVISION} != ${ESVN_WC_REVISION} ]]; then
225 die "${ESVN}: You requested off-line updating and revision ${ESVN_REVISION} but only revision ${ESVN_WC_REVISION} is available locally."
226 fi
227 einfo "Fetching disabled: Using existing repository copy"
180 else 228 else
181 subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy." 229 subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy."
182 230
231 local esvn_up_freq=
232 if [[ -n ${ESVN_UP_FREQ} ]]; then
233 if [[ -n ${ESVN_UP_FREQ//[[:digit:]]} ]]; then
234 die "${ESVN}: ESVN_UP_FREQ must be an integer value corresponding to the minimum number of hours between svn up."
235 elif [[ -z $(find "${wc_path}/.svn/entries" -mmin "+$((ESVN_UP_FREQ*60))") ]]; then
236 einfo "Fetching disabled since ${ESVN_UP_FREQ} hours hasn't passed since last update."
237 esvn_up_freq=no_update
238 fi
239 fi
240
241 if [[ -z ${esvn_up_freq} ]]; then
183 if [ "${ESVN_WC_URL}" != "$(subversion__get_repository_uri "${repo_uri}" 1)" ]; then 242 if [[ ${ESVN_WC_URL} != $(subversion__get_repository_uri "${repo_uri}") ]]; then
184 die "${ESVN}: ESVN_REPO_URI (or specified URI) and working copy's URL are not matched."
185 fi
186
187 # update working copy
188 einfo "subversion update start -->" 243 einfo "suversion switch start -->"
189 einfo " repository: ${repo_uri}" 244 einfo " old repository: ${ESVN_WC_URL}@${ESVN_WC_REVISION}"
245 einfo " new repository: ${repo_uri}${revision:+@}${revision}"
190 246
191 debug-print "${FUNCNAME}: ${ESVN_UPDATE_CMD} ${options}" 247 debug-print "${FUNCNAME}: ${ESVN_SWITCH_CMD} ${options} ${repo_uri}"
192 248
193 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}" 249 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}"
250 ${ESVN_SWITCH_CMD} ${options} ${repo_uri} || die "${ESVN}: can't update from ${repo_uri}"
251 else
252 # update working copy
253 einfo "subversion update start -->"
254 einfo " repository: ${repo_uri}${revision:+@}${revision}"
255
256 debug-print "${FUNCNAME}: ${ESVN_UPDATE_CMD} ${options}"
257
258 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}"
194 ${ESVN_UPDATE_CMD} ${options} || die "${ESVN}: can't update from ${repo_uri}." 259 ${ESVN_UPDATE_CMD} ${options} || die "${ESVN}: can't update from ${repo_uri}."
195 260 fi
261 fi
196 fi 262 fi
197 263
198 einfo " working copy: ${wc_path}" 264 einfo " working copy: ${wc_path}"
199 265
200 if ! has "export" ${ESVN_RESTRICT}; then 266 if ! has "export" ${ESVN_RESTRICT}; then
207 #* svn export . "${S}" || die "${ESVN}: can't export to ${S}." 273 #* svn export . "${S}" || die "${ESVN}: can't export to ${S}."
208 rsync -rlpgo --exclude=".svn/" . "${S}" || die "${ESVN}: can't export to ${S}." 274 rsync -rlpgo --exclude=".svn/" . "${S}" || die "${ESVN}: can't export to ${S}."
209 fi 275 fi
210 276
211 echo 277 echo
212
213} 278}
214 279
215 280# @FUNCTION: subversion_bootstrap
216## -- subversion_bootstrap() ------------------------------------------------ # 281# @DESCRIPTION:
217# 282# Apply patches in ${ESVN_PATCHES} and run ${ESVN_BOOTSTRAP} if specified.
218function subversion_bootstrap() { 283subversion_bootstrap() {
219
220 if has "export" ${ESVN_RESTRICT}; then 284 if has "export" ${ESVN_RESTRICT}; then
221 return 285 return
222 fi 286 fi
223 287
224 cd "${S}" 288 cd "${S}"
225 289
226 if [[ -n "${ESVN_PATCHES}" ]]; then 290 if [[ -n ${ESVN_PATCHES} ]]; then
227 einfo "apply patches -->" 291 einfo "apply patches -->"
228 292
229 local p= 293 local patch fpatch
230 294
231 for p in ${ESVN_PATCHES}; do 295 for patch in ${ESVN_PATCHES}; do
232 if [[ -f "${p}" ]]; then 296 if [[ -f ${patch} ]]; then
233 epatch "${p}" 297 epatch "${patch}"
234 298
235 else 299 else
236 local q=
237
238 for q in ${FILESDIR}/${p}; do 300 for fpatch in ${FILESDIR}/${patch}; do
239 if [[ -f "${q}" ]]; then 301 if [[ -f ${fpatch} ]]; then
240 epatch "${q}" 302 epatch "${fpatch}"
241 303
242 else 304 else
243 die "${ESVN}; ${p} is not found" 305 die "${ESVN}: ${patch} not found"
244 306
245 fi 307 fi
246 done 308 done
309
247 fi 310 fi
248 done 311 done
249 312
250 echo 313 echo
251
252 fi 314 fi
253 315
254 if [[ -n "${ESVN_BOOTSTRAP}" ]]; then 316 if [[ -n ${ESVN_BOOTSTRAP} ]]; then
255 einfo "begin bootstrap -->" 317 einfo "begin bootstrap -->"
256 318
257 if [[ -f "${ESVN_BOOTSTRAP}" && -x "${ESVN_BOOTSTRAP}" ]]; then 319 if [[ -f ${ESVN_BOOTSTRAP} && -x ${ESVN_BOOTSTRAP} ]]; then
258 einfo " bootstrap with a file: ${ESVN_BOOTSTRAP}" 320 einfo " bootstrap with a file: ${ESVN_BOOTSTRAP}"
259 eval "./${ESVN_BOOTSTRAP}" || die "${ESVN}: can't execute ESVN_BOOTSTRAP." 321 eval "./${ESVN_BOOTSTRAP}" || die "${ESVN}: can't execute ESVN_BOOTSTRAP."
260 322
261 else 323 else
262 einfo " bootstrap with commands: ${ESVN_BOOTSTRAP}" 324 einfo " bootstrap with command: ${ESVN_BOOTSTRAP}"
263 eval "${ESVN_BOOTSTRAP}" || die "${ESVN}: can't eval ESVN_BOOTSTRAP." 325 eval "${ESVN_BOOTSTRAP}" || die "${ESVN}: can't eval ESVN_BOOTSTRAP."
264 326
265 fi 327 fi
266 fi 328 fi
267
268} 329}
269 330
270 331# @FUNCTION: subversion_src_unpack
271## -- subversion_src_unpack() ------------------------------------------------ # 332# @DESCRIPTION:
272# 333# default src_unpack. fetch and bootstrap.
273function subversion_src_unpack() { 334subversion_src_unpack() {
274
275 subversion_fetch || die "${ESVN}: unknown problem occurred in subversion_fetch." 335 subversion_fetch || die "${ESVN}: unknown problem occurred in subversion_fetch."
276 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap." 336 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap."
277
278} 337}
279 338
280 339# @FUNCTION: subversion_wc_info
281## -- subversion_wc_info() --------------------------------------------------- # 340# @USAGE: [repo_uri]
341# @RETURN: ESVN_WC_URL, ESVN_WC_ROOT, ESVN_WC_UUID, ESVN_WC_REVISION and ESVN_WC_PATH
342# @DESCRIPTION:
343# Get svn info for the specified repo_uri. The default repo_uri is ESVN_REPO_URI.
282# 344#
283# @param $1 - repository URI. default is ESVN_REPO_URI. 345# The working copy information on the specified repository URI are set to
284# 346# ESVN_WC_* variables.
285function subversion_wc_info() { 347subversion_wc_info() {
286
287 local repo_uri="$(subversion__get_repository_uri "${1}")" 348 local repo_uri="$(subversion__get_repository_uri "${1}")"
288 local wc_path="$(subversion__get_wc_path "${repo_uri}")" 349 local wc_path="$(subversion__get_wc_path "${repo_uri}")"
289 350
290 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 351 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
291 debug-print "${FUNCNAME}: wc_path = ${wc_path}" 352 debug-print "${FUNCNAME}: wc_path = ${wc_path}"
292 353
293 if [[ ! -e "${wc_path}" ]]; then 354 if [[ ! -d ${wc_path} ]]; then
294 return 1 355 return 1
295 fi 356 fi
296 357
297 local k 358 export ESVN_WC_URL="$(subversion__svn_info "${wc_path}" "URL")"
298 359 export ESVN_WC_ROOT="$(subversion__svn_info "${wc_path}" "Repository Root")"
299 for k in url revision; do 360 export ESVN_WC_UUID="$(subversion__svn_info "${wc_path}" "Repository UUID")"
300 export ESVN_WC_$(subversion__to_upper_case "${k}")="$(subversion__svn_info "${wc_path}" "${k}")" 361 export ESVN_WC_REVISION="$(subversion__svn_info "${wc_path}" "Revision")"
301 done 362 export ESVN_WC_PATH="${wc_path}"
302
303} 363}
304
305 364
306## -- Private Functions 365## -- Private Functions
307 366
308
309## -- subversion__svn_info() ------------------------------------------------- # 367## -- subversion__svn_info() ------------------------------------------------- #
310# 368#
311# @param $1 - a target. 369# param $1 - a target.
312# @param $2 - a key name. 370# param $2 - a key name.
313# 371#
314function subversion__svn_info() { 372subversion__svn_info() {
315
316 local target="${1}" 373 local target="${1}"
317 local key="${2}" 374 local key="${2}"
318 375
319 env LC_ALL=C svn info "${target}" | grep -i "^${key}" | cut -d" " -f2- 376 env LC_ALL=C svn info "${target}" | grep -i "^${key}" | cut -d" " -f2-
320
321} 377}
322
323 378
324## -- subversion__get_repository_uri() --------------------------------------- # 379## -- subversion__get_repository_uri() --------------------------------------- #
325# 380#
326# @param $1 - a repository URI. 381# param $1 - a repository URI.
327# @param $2 - a peg revision is deleted from a return value if this is
328# specified.
329#
330function subversion__get_repository_uri() { 382subversion__get_repository_uri() {
331 383 local repo_uri="${1}"
332 local repo_uri="${1:-${ESVN_REPO_URI}}"
333 local remove_peg_revision="${2}"
334 384
335 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 385 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
336 debug-print "${FUNCNAME}: remove_peg_revision = ${remove_peg_revision}"
337 386
338 if [[ -z "${repo_uri}" ]]; then 387 if [[ -z ${repo_uri} ]]; then
339 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty." 388 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty."
340 fi 389 fi
341 390
342 # delete trailing slash 391 # delete trailing slash
343 if [[ -z "${repo_uri##*/}" ]]; then 392 if [[ -z ${repo_uri##*/} ]]; then
344 repo_uri="${repo_uri%/}" 393 repo_uri="${repo_uri%/}"
345 fi 394 fi
346 395
347 if [[ -n "${remove_peg_revision}" ]]; then
348 if subversion__has_peg_revision "${repo_uri}"; then
349 repo_uri="${repo_uri%@*}" 396 repo_uri="${repo_uri%@*}"
350
351 debug-print "${FUNCNAME}: repo_uri has a peg revision"
352 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
353 fi
354 fi
355 397
356 echo "${repo_uri}" 398 echo "${repo_uri}"
357
358} 399}
359
360 400
361## -- subversion__get_wc_path() ---------------------------------------------- # 401## -- subversion__get_wc_path() ---------------------------------------------- #
362# 402#
363# @param $1 - a repository URI. 403# param $1 - a repository URI.
364#
365function subversion__get_wc_path() { 404subversion__get_wc_path() {
366
367 local repo_uri="$(subversion__get_repository_uri "${1}" 1)" 405 local repo_uri="$(subversion__get_repository_uri "${1}")"
368 406
369 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 407 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
370 408
371 echo "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${repo_uri##*/}" 409 echo "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${repo_uri##*/}"
372
373} 410}
374 411
375
376## -- subversion__has_peg_revision() ----------------------------------------- # 412## -- subversion__get_peg_revision() ----------------------------------------- #
377# 413#
378# @param $1 - a repository URI. 414# param $1 - a repository URI.
379#
380function subversion__has_peg_revision() { 415subversion__get_peg_revision() {
381
382 local repo_uri="${1}" 416 local repo_uri="${1}"
383 417
384 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 418 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
385 419
386 # repo_uri has peg revision ? 420 # repo_uri has peg revision ?
387 if [[ "${repo_uri}" != *@* ]]; then 421 if [[ ${repo_uri} != *@* ]]; then
388 debug-print "${FUNCNAME}: repo_uri does not have a peg revision." 422 debug-print "${FUNCNAME}: repo_uri does not have a peg revision."
389 return 1
390 fi 423 fi
391 424
392 local peg_rev="${repo_uri##*@}" 425 local peg_rev=
393 426 [[ ${repo_uri} = *@* ]] && peg_rev="${repo_uri##*@}"
394 case "$(subversion__to_upper_case "${peg_rev}")" in
395 [[:digit:]]*)
396 # NUMBER
397 ;;
398 HEAD|BASE|COMMITED|PREV)
399 ;;
400 {[^}]*})
401 # DATE
402 ;;
403 *)
404 debug-print "${FUNCNAME}: repo_uri does not have a peg revision."
405 return 1
406 ;;
407 esac
408 427
409 debug-print "${FUNCNAME}: peg_rev = ${peg_rev}" 428 debug-print "${FUNCNAME}: peg_rev = ${peg_rev}"
410 429
411 return 0 430 echo "${peg_rev}"
412
413} 431}
414 432
415 433# @FUNCTION: subversion_pkg_preinst
416## -- subversion__to_upper_case() ----------------------------------------- # 434# @DESCRIPTION:
417# 435# Log the svn revision of source code. Doing this in pkg_preinst because we
418# @param $@ - the strings to upper case. 436# want the logs to stick around if packages are uninstalled without messing with
419# 437# config protection.
420function subversion__to_upper_case() { 438subversion_pkg_preinst() {
421 echo "${@}" | tr "[a-z]" "[A-Z]" 439 local pkgdate=$(date "+%Y%m%d %H:%M:%S")
440 subversion_wc_info
441 if [[ -n ${ESCM_LOGDIR} ]]; then
442 local dir="${ROOT}/${ESCM_LOGDIR}/${CATEGORY}"
443 if [[ ! -d ${dir} ]]; then
444 mkdir -p "${dir}" || \
445 eerror "Failed to create '${dir}' for logging svn revision to '${PORTDIR_SCM}'"
446 fi
447 local logmessage="svn: ${pkgdate} - ${PF}:${SLOT} was merged at revision ${ESVN_WC_REVISION}"
448 if [[ -d ${dir} ]]; then
449 echo "${logmessage}" >> "${dir}/${PN}.log"
450 else
451 eerror "Could not log the message '${logmessage}' to '${dir}/${PN}.log'"
452 fi
453 fi
422} 454}

Legend:
Removed from v.1.41  
changed lines
  Added in v.1.52

  ViewVC Help
Powered by ViewVC 1.1.20