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

Diff of /eclass/subversion.eclass

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

Revision 1.44 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.44 2007/07/03 08:27:40 peper 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
24DESCRIPTION="Based on the ${ECLASS} eclass" 23DESCRIPTION="Based on the ${ECLASS} eclass"
25 24
26
27## -- add subversion in DEPEND
28#
29DEPEND="dev-util/subversion" 25DEPEND="dev-util/subversion
26 net-misc/rsync"
30 27
31 28# @ECLASS-VARIABLE: ESVN_STORE_DIR
32## -- ESVN_STORE_DIR: subversion sources store directory 29# @DESCRIPTION:
33# 30# subversion sources store directory. Users may override this in /etc/make.conf
34ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/svn-src" 31[[ -z ${ESVN_STORE_DIR} ]] && ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src"
35 32
36 33# @ECLASS-VARIABLE: ESVN_FETCH_CMD
37## -- ESVN_FETCH_CMD: subversion fetch command 34# @DESCRIPTION:
38# 35# subversion checkout command
39ESVN_FETCH_CMD="svn checkout" 36ESVN_FETCH_CMD="svn checkout"
40 37
41## -- ESVN_UPDATE_CMD: subversion update command 38# @ECLASS-VARIABLE: ESVN_UPDATE_CMD
42# 39# @DESCRIPTION:
40# subversion update command
43ESVN_UPDATE_CMD="svn update" 41ESVN_UPDATE_CMD="svn update"
44 42
43# @ECLASS-VARIABLE: ESVN_SWITCH_CMD
44# @DESCRIPTION:
45# subversion switch command
46ESVN_SWITCH_CMD="svn switch"
45 47
46## -- ESVN_OPTIONS: 48# @ECLASS-VARIABLE: ESVN_OPTIONS
47# 49# @DESCRIPTION:
48# the options passed to checkout or update. 50# the options passed to checkout or update. If you want a specific revision see
49# 51# ESVN_REPO_URI instead of using -rREV.
50: ${ESVN_OPTIONS=} 52ESVN_OPTIONS="${ESVN_OPTIONS:-}"
51 53
52 54# @ECLASS-VARIABLE: ESVN_REPO_URI
53## -- ESVN_REPO_URI: repository uri 55# @DESCRIPTION:
56# repository uri
54# 57#
55# e.g. http://foo/trunk, svn://bar/trunk 58# e.g. http://foo/trunk, svn://bar/trunk, svn://bar/branch/foo@1234
56# 59#
57# supported protocols: 60# supported protocols:
58# http:// 61# http://
59# https:// 62# https://
60# svn:// 63# svn://
61# svn+ssh:// 64# svn+ssh://
62# 65#
63: ${ESVN_REPO_URI=} 66# to peg to a specific revision, append @REV to the repo's uri
67ESVN_REPO_URI="${ESVN_REPO_URI:-}"
64 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:-}"
65 78
79# @ECLASS-VARIABLE: ESVN_PROJECT
80# @DESCRIPTION:
66## -- ESVN_PROJECT: project name of your ebuild (= name space) 81# project name of your ebuild (= name space)
67# 82#
68# subversion eclass will check out the subversion repository like: 83# subversion eclass will check out the subversion repository like:
69# 84#
70# ${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/} 85# ${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/}
71# 86#
80# 95#
81# # jakarta commons-loggin 96# # jakarta commons-loggin
82# ESVN_PROJECT=commons/logging 97# ESVN_PROJECT=commons/logging
83# 98#
84# default: ${PN/-svn}. 99# default: ${PN/-svn}.
85# 100ESVN_PROJECT="${ESVN_PROJECT:-${PN/-svn}}"
86: ${ESVN_PROJECT:=${PN/-svn}}
87 101
88 102# @ECLASS-VARIABLE: ESVN_BOOTSTRAP
89## -- ESVN_BOOTSTRAP: 103# @DESCRIPTION:
90#
91# bootstrap script or command like autogen.sh or etc.. 104# bootstrap script or command like autogen.sh or etc..
92# 105ESVN_BOOTSTRAP="${ESVN_BOOTSTRAP:-}"
93: ${ESVN_BOOTSTRAP=}
94 106
95 107# @ECLASS-VARIABLE: ESVN_PATCHES
96## -- ESVN_PATCHES: 108# @DESCRIPTION:
97#
98# subversion eclass can apply pathces in subversion_bootstrap(). 109# subversion eclass can apply patches in subversion_bootstrap().
99# you can use regexp in this variable like *.diff or *.patch or etc. 110# you can use regexp in this variable like *.diff or *.patch or etc.
100# NOTE: patches will be applied before ESVN_BOOTSTRAP is processed. 111# NOTE: patches will be applied before ESVN_BOOTSTRAP is processed.
101# 112#
102# Patches are searched both in / and ${FILESDIR}, if not found in both locations, 113# Patches are searched both in ${PWD} and ${FILESDIR}, if not found in either
103# the installation dies. 114# location, the installation dies.
104# 115ESVN_PATCHES="${ESVN_PATCHES:-}"
105: ${ESVN_PATCHES=}
106 116
107 117# @ECLASS-VARIABLE: ESVN_RESTRICT
108## -- ESVN_RESTRICT: 118# @DESCRIPTION:
109#
110# 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
111# restrict. 120# restrict.
112# export) 121# export)
113# don't export the working copy to S. 122# don't export the working copy to S.
114# 123ESVN_RESTRICT="${ESVN_RESTRICT:-}"
115: ${ESVN_RESTRICT=}
116 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}}"
117 131
118## -- 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}.
119# 152#
153# Can take two optional parameters:
120# @param $1 - a repository URI. default is the ESVN_REPO_URI. 154# repo_uri - a repository URI. default is ESVN_REPO_URI.
121# @param $2 - a check out path in S. 155# destination - a check out path in S.
122#
123function subversion_fetch() { 156subversion_fetch() {
124 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}}")"
125 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}"
126 166
127 # check for the protocol 167 # check for the protocol
128 local protocol="${repo_uri%%:*}" 168 local protocol="${repo_uri%%:*}"
129 169
130 case "${protocol}" in 170 case "${protocol}" in
138 fi 178 fi
139 ;; 179 ;;
140 svn|svn+ssh) 180 svn|svn+ssh)
141 ;; 181 ;;
142 *) 182 *)
143 die "${ESVN}: fetch from "${protocol}" is not yet implemented." 183 die "${ESVN}: fetch from '${protocol}' is not yet implemented."
144 ;; 184 ;;
145 esac 185 esac
146 186
147 addread "/etc/subversion" 187 addread "/etc/subversion"
148 addwrite "${ESVN_STORE_DIR}" 188 addwrite "${ESVN_STORE_DIR}"
149 189
150 if [[ ! -d "${ESVN_STORE_DIR}" ]]; then 190 if [[ ! -d ${ESVN_STORE_DIR} ]]; then
151 debug-print "${FUNCNAME}: initial checkout. creating subversion directory" 191 debug-print "${FUNCNAME}: initial checkout. creating subversion directory"
152 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}."
153 fi 193 fi
154 194
155 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}"
156 196
157 local wc_path="$(subversion__get_wc_path "${repo_uri}")" 197 local wc_path="$(subversion__get_wc_path "${repo_uri}")"
158 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
159 206
160 debug-print "${FUNCNAME}: wc_path = \"${wc_path}\"" 207 debug-print "${FUNCNAME}: wc_path = \"${wc_path}\""
161 debug-print "${FUNCNAME}: ESVN_OPTIONS = \"${ESVN_OPTIONS}\"" 208 debug-print "${FUNCNAME}: ESVN_OPTIONS = \"${ESVN_OPTIONS}\""
162 debug-print "${FUNCNAME}: options = \"${options}\"" 209 debug-print "${FUNCNAME}: options = \"${options}\""
163 210
164 if [[ ! -d "${wc_path}/.svn" ]]; then 211 if [[ ! -d ${wc_path}/.svn ]]; then
165 # first check out 212 # first check out
166 einfo "subversion check out start -->" 213 einfo "subversion check out start -->"
167 einfo " repository: ${repo_uri}" 214 einfo " repository: ${repo_uri}${revision:+@}${revision}"
168 215
169 debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}" 216 debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}"
170 217
171 mkdir -p "${ESVN_PROJECT}" || die "${ESVN}: can't mkdir ${ESVN_PROJECT}." 218 mkdir -p "${ESVN_PROJECT}" || die "${ESVN}: can't mkdir ${ESVN_PROJECT}."
172 cd "${ESVN_PROJECT}" || die "${ESVN}: can't chdir to ${ESVN_PROJECT}" 219 cd "${ESVN_PROJECT}" || die "${ESVN}: can't chdir to ${ESVN_PROJECT}"
173 ${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}."
174 221
222 elif [[ -n ${ESVN_OFFLINE} ]]; then
175 subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy." 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"
176 else 228 else
177 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."
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
178 if [ "${ESVN_WC_URL}" != "$(subversion__get_repository_uri "${repo_uri}" 1)" ]; then 242 if [[ ${ESVN_WC_URL} != $(subversion__get_repository_uri "${repo_uri}") ]]; then
179 die "${ESVN}: ESVN_REPO_URI (or specified URI) and working copy's URL are not matched."
180 fi
181
182 # update working copy
183 einfo "subversion update start -->" 243 einfo "suversion switch start -->"
184 einfo " repository: ${repo_uri}" 244 einfo " old repository: ${ESVN_WC_URL}@${ESVN_WC_REVISION}"
245 einfo " new repository: ${repo_uri}${revision:+@}${revision}"
185 246
186 debug-print "${FUNCNAME}: ${ESVN_UPDATE_CMD} ${options}" 247 debug-print "${FUNCNAME}: ${ESVN_SWITCH_CMD} ${options} ${repo_uri}"
187 248
188 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}"
189 ${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}."
260 fi
261 fi
190 fi 262 fi
191 263
192 einfo " working copy: ${wc_path}" 264 einfo " working copy: ${wc_path}"
193 265
194 if ! has "export" ${ESVN_RESTRICT}; then 266 if ! has "export" ${ESVN_RESTRICT}; then
203 fi 275 fi
204 276
205 echo 277 echo
206} 278}
207 279
208 280# @FUNCTION: subversion_bootstrap
209## -- subversion_bootstrap() ------------------------------------------------ # 281# @DESCRIPTION:
210# 282# Apply patches in ${ESVN_PATCHES} and run ${ESVN_BOOTSTRAP} if specified.
211function subversion_bootstrap() { 283subversion_bootstrap() {
212 if has "export" ${ESVN_RESTRICT}; then 284 if has "export" ${ESVN_RESTRICT}; then
213 return 285 return
214 fi 286 fi
215 287
216 cd "${S}" 288 cd "${S}"
217 289
218 if [[ -n "${ESVN_PATCHES}" ]]; then 290 if [[ -n ${ESVN_PATCHES} ]]; then
219 einfo "apply patches -->" 291 einfo "apply patches -->"
220 292
221 local patch fpatch 293 local patch fpatch
294
222 for patch in ${ESVN_PATCHES}; do 295 for patch in ${ESVN_PATCHES}; do
223 if [[ -f "${patch}" ]]; then 296 if [[ -f ${patch} ]]; then
224 epatch "${patch}" 297 epatch "${patch}"
298
225 else 299 else
226 for fpatch in ${FILESDIR}/${patch}; do 300 for fpatch in ${FILESDIR}/${patch}; do
227 if [[ -f "${fpatch}" ]]; then 301 if [[ -f ${fpatch} ]]; then
228 epatch "${fpatch}" 302 epatch "${fpatch}"
303
229 else 304 else
230 die "${ESVN}: ${patch} not found" 305 die "${ESVN}: ${patch} not found"
306
231 fi 307 fi
232 done 308 done
309
233 fi 310 fi
234 done 311 done
312
235 echo 313 echo
236 fi 314 fi
237 315
238 if [[ -n "${ESVN_BOOTSTRAP}" ]]; then 316 if [[ -n ${ESVN_BOOTSTRAP} ]]; then
239 einfo "begin bootstrap -->" 317 einfo "begin bootstrap -->"
240 318
241 if [[ -f "${ESVN_BOOTSTRAP}" && -x "${ESVN_BOOTSTRAP}" ]]; then 319 if [[ -f ${ESVN_BOOTSTRAP} && -x ${ESVN_BOOTSTRAP} ]]; then
242 einfo " bootstrap with a file: ${ESVN_BOOTSTRAP}" 320 einfo " bootstrap with a file: ${ESVN_BOOTSTRAP}"
243 eval "./${ESVN_BOOTSTRAP}" || die "${ESVN}: can't execute ESVN_BOOTSTRAP." 321 eval "./${ESVN_BOOTSTRAP}" || die "${ESVN}: can't execute ESVN_BOOTSTRAP."
322
244 else 323 else
245 einfo " bootstrap with command: ${ESVN_BOOTSTRAP}" 324 einfo " bootstrap with command: ${ESVN_BOOTSTRAP}"
246 eval "${ESVN_BOOTSTRAP}" || die "${ESVN}: can't eval ESVN_BOOTSTRAP." 325 eval "${ESVN_BOOTSTRAP}" || die "${ESVN}: can't eval ESVN_BOOTSTRAP."
247 fi 326
248 fi 327 fi
328 fi
249} 329}
250 330
251## -- subversion_src_unpack() ------------------------------------------------ # 331# @FUNCTION: subversion_src_unpack
252# 332# @DESCRIPTION:
333# default src_unpack. fetch and bootstrap.
253function subversion_src_unpack() { 334subversion_src_unpack() {
254 subversion_fetch || die "${ESVN}: unknown problem occurred in subversion_fetch." 335 subversion_fetch || die "${ESVN}: unknown problem occurred in subversion_fetch."
255 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap." 336 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap."
256} 337}
257 338
258 339# @FUNCTION: subversion_wc_info
259## -- 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.
260# 344#
261# @param $1 - repository URI. default is ESVN_REPO_URI. 345# The working copy information on the specified repository URI are set to
262# 346# ESVN_WC_* variables.
263function subversion_wc_info() { 347subversion_wc_info() {
264 local repo_uri="$(subversion__get_repository_uri "${1}")" 348 local repo_uri="$(subversion__get_repository_uri "${1}")"
265 local wc_path="$(subversion__get_wc_path "${repo_uri}")" 349 local wc_path="$(subversion__get_wc_path "${repo_uri}")"
266 350
267 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 351 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
268 debug-print "${FUNCNAME}: wc_path = ${wc_path}" 352 debug-print "${FUNCNAME}: wc_path = ${wc_path}"
269 353
270 if [[ ! -e "${wc_path}" ]]; then 354 if [[ ! -d ${wc_path} ]]; then
271 return 1 355 return 1
272 fi 356 fi
273 357
274 local k 358 export ESVN_WC_URL="$(subversion__svn_info "${wc_path}" "URL")"
275 for k in url revision; do 359 export ESVN_WC_ROOT="$(subversion__svn_info "${wc_path}" "Repository Root")"
276 export ESVN_WC_$(subversion__to_upper_case "${k}")="$(subversion__svn_info "${wc_path}" "${k}")" 360 export ESVN_WC_UUID="$(subversion__svn_info "${wc_path}" "Repository UUID")"
277 done 361 export ESVN_WC_REVISION="$(subversion__svn_info "${wc_path}" "Revision")"
362 export ESVN_WC_PATH="${wc_path}"
278} 363}
279 364
280## -- Private Functions 365## -- Private Functions
281 366
282
283## -- subversion__svn_info() ------------------------------------------------- # 367## -- subversion__svn_info() ------------------------------------------------- #
284# 368#
285# @param $1 - a target. 369# param $1 - a target.
286# @param $2 - a key name. 370# param $2 - a key name.
287# 371#
288function subversion__svn_info() { 372subversion__svn_info() {
289 local target="${1}" 373 local target="${1}"
290 local key="${2}" 374 local key="${2}"
291 375
292 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-
293} 377}
294 378
295
296## -- subversion__get_repository_uri() --------------------------------------- # 379## -- subversion__get_repository_uri() --------------------------------------- #
297# 380#
298# @param $1 - a repository URI. 381# param $1 - a repository URI.
299# @param $2 - a peg revision is deleted from a return value if this is
300# specified.
301#
302function subversion__get_repository_uri() { 382subversion__get_repository_uri() {
303 local repo_uri="${1:-${ESVN_REPO_URI}}" 383 local repo_uri="${1}"
304 local remove_peg_revision="${2}"
305 384
306 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 385 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
307 debug-print "${FUNCNAME}: remove_peg_revision = ${remove_peg_revision}"
308 386
309 if [[ -z "${repo_uri}" ]]; then 387 if [[ -z ${repo_uri} ]]; then
310 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty." 388 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty."
311 fi 389 fi
312 390
313 # delete trailing slash 391 # delete trailing slash
314 if [[ -z "${repo_uri##*/}" ]]; then 392 if [[ -z ${repo_uri##*/} ]]; then
315 repo_uri="${repo_uri%/}" 393 repo_uri="${repo_uri%/}"
316 fi 394 fi
317 395
318 if [[ -n "${remove_peg_revision}" ]]; then
319 if subversion__has_peg_revision "${repo_uri}"; then
320 repo_uri="${repo_uri%@*}" 396 repo_uri="${repo_uri%@*}"
321
322 debug-print "${FUNCNAME}: repo_uri has a peg revision"
323 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
324 fi
325 fi
326 397
327 echo "${repo_uri}" 398 echo "${repo_uri}"
328} 399}
329 400
330
331## -- subversion__get_wc_path() ---------------------------------------------- # 401## -- subversion__get_wc_path() ---------------------------------------------- #
332# 402#
333# @param $1 - a repository URI. 403# param $1 - a repository URI.
334#
335function subversion__get_wc_path() { 404subversion__get_wc_path() {
336 local repo_uri="$(subversion__get_repository_uri "${1}" 1)" 405 local repo_uri="$(subversion__get_repository_uri "${1}")"
337 406
338 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 407 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
339 408
340 echo "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${repo_uri##*/}" 409 echo "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${repo_uri##*/}"
341} 410}
342 411
343
344## -- subversion__has_peg_revision() ----------------------------------------- # 412## -- subversion__get_peg_revision() ----------------------------------------- #
345# 413#
346# @param $1 - a repository URI. 414# param $1 - a repository URI.
347#
348function subversion__has_peg_revision() { 415subversion__get_peg_revision() {
349 local repo_uri="${1}" 416 local repo_uri="${1}"
350 417
351 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 418 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
352 419
353 # repo_uri has peg revision ? 420 # repo_uri has peg revision ?
354 if [[ "${repo_uri}" != *@* ]]; then 421 if [[ ${repo_uri} != *@* ]]; then
355 debug-print "${FUNCNAME}: repo_uri does not have a peg revision." 422 debug-print "${FUNCNAME}: repo_uri does not have a peg revision."
356 return 1
357 fi 423 fi
358 424
359 local peg_rev="${repo_uri##*@}" 425 local peg_rev=
360 426 [[ ${repo_uri} = *@* ]] && peg_rev="${repo_uri##*@}"
361 case "$(subversion__to_upper_case "${peg_rev}")" in
362 [[:digit:]]*)
363 # NUMBER
364 ;;
365 HEAD|BASE|COMMITED|PREV)
366 ;;
367 {[^}]*})
368 # DATE
369 ;;
370 *)
371 debug-print "${FUNCNAME}: repo_uri does not have a peg revision."
372 return 1
373 ;;
374 esac
375 427
376 debug-print "${FUNCNAME}: peg_rev = ${peg_rev}" 428 debug-print "${FUNCNAME}: peg_rev = ${peg_rev}"
377 429
378 return 0 430 echo "${peg_rev}"
379} 431}
380 432
381 433# @FUNCTION: subversion_pkg_preinst
382## -- subversion__to_upper_case() ----------------------------------------- # 434# @DESCRIPTION:
383# 435# Log the svn revision of source code. Doing this in pkg_preinst because we
384# @param $@ - the strings to upper case. 436# want the logs to stick around if packages are uninstalled without messing with
385# 437# config protection.
386function subversion__to_upper_case() { 438subversion_pkg_preinst() {
387 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
388} 454}

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

  ViewVC Help
Powered by ViewVC 1.1.20