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

Diff of /eclass/subversion.eclass

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

Revision 1.39 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.39 2007/01/19 10:39:51 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# 155# destination - a check out path in S.
125function subversion_fetch() { 156subversion_fetch() {
126
127 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}}")"
128 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}"
129 166
130 # check for the protocol 167 # check for the protocol
131 local protocol="${repo_uri%%:*}" 168 local protocol="${repo_uri%%:*}"
132 169
133 case "${protocol}" in 170 case "${protocol}" in
141 fi 178 fi
142 ;; 179 ;;
143 svn|svn+ssh) 180 svn|svn+ssh)
144 ;; 181 ;;
145 *) 182 *)
146 die "${ESVN}: fetch from "${protocol}" is not yet implemented." 183 die "${ESVN}: fetch from '${protocol}' is not yet implemented."
147 ;; 184 ;;
148 esac 185 esac
149 186
150 # every time
151 addread "/etc/subversion" 187 addread "/etc/subversion"
152 addwrite "${ESVN_STORE_DIR}" 188 addwrite "${ESVN_STORE_DIR}"
153 189
154 if [[ ! -d "${ESVN_STORE_DIR}" ]]; then 190 if [[ ! -d ${ESVN_STORE_DIR} ]]; then
155 debug-print "${FUNCNAME}: initial checkout. creating subversion directory" 191 debug-print "${FUNCNAME}: initial checkout. creating subversion directory"
156 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}."
157 fi 193 fi
158 194
159 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}"
160 196
161 local wc_path="$(subversion__get_wc_path "${repo_uri}")" 197 local wc_path="$(subversion__get_wc_path "${repo_uri}")"
162 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
163 206
164 debug-print "${FUNCNAME}: wc_path = \"${wc_path}\"" 207 debug-print "${FUNCNAME}: wc_path = \"${wc_path}\""
165 debug-print "${FUNCNAME}: ESVN_OPTIONS = \"${ESVN_OPTIONS}\"" 208 debug-print "${FUNCNAME}: ESVN_OPTIONS = \"${ESVN_OPTIONS}\""
166 debug-print "${FUNCNAME}: options = \"${options}\"" 209 debug-print "${FUNCNAME}: options = \"${options}\""
167 210
168 if [[ ! -d "${wc_path}/.svn" ]]; then 211 if [[ ! -d ${wc_path}/.svn ]]; then
169 # first check out 212 # first check out
170 einfo "subversion check out start -->" 213 einfo "subversion check out start -->"
171 einfo " repository: ${repo_uri}" 214 einfo " repository: ${repo_uri}${revision:+@}${revision}"
172 215
173 debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}" 216 debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}"
174 217
175 mkdir -p "${ESVN_PROJECT}" || die "${ESVN}: can't mkdir ${ESVN_PROJECT}." 218 mkdir -p "${ESVN_PROJECT}" || die "${ESVN}: can't mkdir ${ESVN_PROJECT}."
176 cd "${ESVN_PROJECT}" || die "${ESVN}: can't chdir to ${ESVN_PROJECT}" 219 cd "${ESVN_PROJECT}" || die "${ESVN}: can't chdir to ${ESVN_PROJECT}"
177 ${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}."
178 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"
179 else 228 else
180 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."
181 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
182 if [ "${ESVN_WC_URL}" != "$(subversion__get_repository_uri "${repo_uri}" 1)" ]; then 242 if [[ ${ESVN_WC_URL} != $(subversion__get_repository_uri "${repo_uri}") ]]; then
183 die "${ESVN}: ESVN_REPO_URI (or specified URI) and working copy's URL are not matched."
184 fi
185
186 # update working copy
187 einfo "subversion update start -->" 243 einfo "suversion switch start -->"
188 einfo " repository: ${repo_uri}" 244 einfo " old repository: ${ESVN_WC_URL}@${ESVN_WC_REVISION}"
245 einfo " new repository: ${repo_uri}${revision:+@}${revision}"
189 246
190 debug-print "${FUNCNAME}: ${ESVN_UPDATE_CMD} ${options}" 247 debug-print "${FUNCNAME}: ${ESVN_SWITCH_CMD} ${options} ${repo_uri}"
191 248
192 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}"
193 ${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}."
194 260 fi
261 fi
195 fi 262 fi
196 263
197 einfo " working copy: ${wc_path}" 264 einfo " working copy: ${wc_path}"
198 265
199 if ! has "export" ${ESVN_RESTRICT}; then 266 if ! has "export" ${ESVN_RESTRICT}; then
206 #* svn export . "${S}" || die "${ESVN}: can't export to ${S}." 273 #* svn export . "${S}" || die "${ESVN}: can't export to ${S}."
207 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}."
208 fi 275 fi
209 276
210 echo 277 echo
211
212} 278}
213 279
214 280# @FUNCTION: subversion_bootstrap
215## -- subversion_bootstrap() ------------------------------------------------ # 281# @DESCRIPTION:
216# 282# Apply patches in ${ESVN_PATCHES} and run ${ESVN_BOOTSTRAP} if specified.
217function subversion_bootstrap() { 283subversion_bootstrap() {
218
219 if has "export" ${ESVN_RESTRICT}; then 284 if has "export" ${ESVN_RESTRICT}; then
220 return 285 return
221 fi 286 fi
222 287
223 cd "${S}" 288 cd "${S}"
224 289
225 if [[ -n "${ESVN_PATCHES}" ]]; then 290 if [[ -n ${ESVN_PATCHES} ]]; then
226 einfo "apply patches -->" 291 einfo "apply patches -->"
227 292
228 local p= 293 local patch fpatch
229 294
230 for p in ${ESVN_PATCHES}; do 295 for patch in ${ESVN_PATCHES}; do
231 if [[ -f "${p}" ]]; then 296 if [[ -f ${patch} ]]; then
232 epatch "${p}" 297 epatch "${patch}"
233 298
234 else 299 else
235 local q=
236
237 for q in ${FILESDIR}/${p}; do 300 for fpatch in ${FILESDIR}/${patch}; do
238 if [[ -f "${q}" ]]; then 301 if [[ -f ${fpatch} ]]; then
239 epatch "${q}" 302 epatch "${fpatch}"
240 303
241 else 304 else
242 die "${ESVN}; ${p} is not found" 305 die "${ESVN}: ${patch} not found"
243 306
244 fi 307 fi
245 done 308 done
309
246 fi 310 fi
247 done 311 done
248 312
249 echo 313 echo
250
251 fi 314 fi
252 315
253 if [[ -n "${ESVN_BOOTSTRAP}" ]]; then 316 if [[ -n ${ESVN_BOOTSTRAP} ]]; then
254 einfo "begin bootstrap -->" 317 einfo "begin bootstrap -->"
255 318
256 if [[ -f "${ESVN_BOOTSTRAP}" && -x "${ESVN_BOOTSTRAP}" ]]; then 319 if [[ -f ${ESVN_BOOTSTRAP} && -x ${ESVN_BOOTSTRAP} ]]; then
257 einfo " bootstrap with a file: ${ESVN_BOOTSTRAP}" 320 einfo " bootstrap with a file: ${ESVN_BOOTSTRAP}"
258 eval "./${ESVN_BOOTSTRAP}" || die "${ESVN}: can't execute ESVN_BOOTSTRAP." 321 eval "./${ESVN_BOOTSTRAP}" || die "${ESVN}: can't execute ESVN_BOOTSTRAP."
259 322
260 else 323 else
261 einfo " bootstrap with commands: ${ESVN_BOOTSTRAP}" 324 einfo " bootstrap with command: ${ESVN_BOOTSTRAP}"
262 eval "${ESVN_BOOTSTRAP}" || die "${ESVN}: can't eval ESVN_BOOTSTRAP." 325 eval "${ESVN_BOOTSTRAP}" || die "${ESVN}: can't eval ESVN_BOOTSTRAP."
263 326
264 fi 327 fi
265 fi 328 fi
266
267} 329}
268 330
269 331# @FUNCTION: subversion_src_unpack
270## -- subversion_src_unpack() ------------------------------------------------ # 332# @DESCRIPTION:
271# 333# default src_unpack. fetch and bootstrap.
272function subversion_src_unpack() { 334subversion_src_unpack() {
273
274 subversion_fetch || die "${ESVN}: unknown problem occurred in subversion_fetch." 335 subversion_fetch || die "${ESVN}: unknown problem occurred in subversion_fetch."
275 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap." 336 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap."
276
277} 337}
278 338
279 339# @FUNCTION: subversion_wc_info
280## -- 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.
281# 344#
282# @param $1 - repository URI. default is ESVN_REPO_URI. 345# The working copy information on the specified repository URI are set to
283# 346# ESVN_WC_* variables.
284function subversion_wc_info() { 347subversion_wc_info() {
285
286 local repo_uri="$(subversion__get_repository_uri "${1}")" 348 local repo_uri="$(subversion__get_repository_uri "${1}")"
287 local wc_path="$(subversion__get_wc_path "${repo_uri}")" 349 local wc_path="$(subversion__get_wc_path "${repo_uri}")"
288 350
289 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 351 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
290 debug-print "${FUNCNAME}: wc_path = ${wc_path}" 352 debug-print "${FUNCNAME}: wc_path = ${wc_path}"
291 353
292 if [[ ! -e "${wc_path}" ]]; then 354 if [[ ! -d ${wc_path} ]]; then
293 return 1 355 return 1
294 fi 356 fi
295 357
296 local k 358 export ESVN_WC_URL="$(subversion__svn_info "${wc_path}" "URL")"
297 359 export ESVN_WC_ROOT="$(subversion__svn_info "${wc_path}" "Repository Root")"
298 for k in url revision; do 360 export ESVN_WC_UUID="$(subversion__svn_info "${wc_path}" "Repository UUID")"
299 export ESVN_WC_$(echo "${k}" | tr "[a-z]" "[A-Z]")="$(subversion__svn_info "${wc_path}" "${k}")" 361 export ESVN_WC_REVISION="$(subversion__svn_info "${wc_path}" "Revision")"
300 done 362 export ESVN_WC_PATH="${wc_path}"
301
302} 363}
303
304 364
305## -- Private Functions 365## -- Private Functions
306 366
307
308## -- subversion__svn_info() ------------------------------------------------- # 367## -- subversion__svn_info() ------------------------------------------------- #
309# 368#
310# @param $1 - a target. 369# param $1 - a target.
311# @param $2 - a key name. 370# param $2 - a key name.
312# 371#
313function subversion__svn_info() { 372subversion__svn_info() {
314
315 local target="${1}" 373 local target="${1}"
316 local key="${2}" 374 local key="${2}"
317 375
318 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-
319
320} 377}
321
322 378
323## -- subversion__get_repository_uri() --------------------------------------- # 379## -- subversion__get_repository_uri() --------------------------------------- #
324# 380#
325# @param $1 - a repository URI. 381# param $1 - a repository URI.
326# @param $2 - a peg revision is deleted from a return value if this is
327# specified.
328#
329function subversion__get_repository_uri() { 382subversion__get_repository_uri() {
330 383 local repo_uri="${1}"
331 local repo_uri="${1:-${ESVN_REPO_URI}}"
332 local remove_peg_revision="${2}"
333 384
334 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 385 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
335 debug-print "${FUNCNAME}: remove_peg_revision = ${remove_peg_revision}"
336 386
337 if [[ -z "${repo_uri}" ]]; then 387 if [[ -z ${repo_uri} ]]; then
338 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty." 388 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty."
339 fi 389 fi
340 390
341 # delete trailing slash 391 # delete trailing slash
342 if [[ -z "${repo_uri##*/}" ]]; then 392 if [[ -z ${repo_uri##*/} ]]; then
343 repo_uri="${repo_uri%/}" 393 repo_uri="${repo_uri%/}"
344 fi 394 fi
345 395
346 if [[ -n "${remove_peg_revision}" ]]; then
347 if subversion__has_peg_revision "${repo_uri}"; then
348 repo_uri="${repo_uri%@*}" 396 repo_uri="${repo_uri%@*}"
349
350 debug-print "${FUNCNAME}: repo_uri has a peg revision"
351 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
352 fi
353 fi
354 397
355 echo "${repo_uri}" 398 echo "${repo_uri}"
356
357} 399}
358
359 400
360## -- subversion__get_wc_path() ---------------------------------------------- # 401## -- subversion__get_wc_path() ---------------------------------------------- #
361# 402#
362# @param $1 - a repository URI. 403# param $1 - a repository URI.
363#
364function subversion__get_wc_path() { 404subversion__get_wc_path() {
365
366 local repo_uri="$(subversion__get_repository_uri "${1}" 1)" 405 local repo_uri="$(subversion__get_repository_uri "${1}")"
367 406
368 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 407 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
369 408
370 echo "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${repo_uri##*/}" 409 echo "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${repo_uri##*/}"
371
372} 410}
373 411
374
375## -- subversion__has_peg_revision() ----------------------------------------- # 412## -- subversion__get_peg_revision() ----------------------------------------- #
376# 413#
377# @param $1 - a repository URI. 414# param $1 - a repository URI.
378#
379function subversion__has_peg_revision() { 415subversion__get_peg_revision() {
380
381 local repo_uri="${1}" 416 local repo_uri="${1}"
382 417
383 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 418 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
384 419
385 # repo_uri has peg revision ? 420 # repo_uri has peg revision ?
386 if [[ "${repo_uri}" != *@* ]]; then 421 if [[ ${repo_uri} != *@* ]]; then
387 debug-print "${FUNCNAME}: repo_uri does not have a peg revision." 422 debug-print "${FUNCNAME}: repo_uri does not have a peg revision."
388 return 1
389 fi 423 fi
390 424
391 local peg_rev="${repo_uri##*@}" 425 local peg_rev=
392 local rev=$(subversion__svn_info "${repo_uri}" "revision") 426 [[ ${repo_uri} = *@* ]] && peg_rev="${repo_uri##*@}"
393 427
394 debug-print "${FUNCNAME}: peg_rev = ${peg_rev}" 428 debug-print "${FUNCNAME}: peg_rev = ${peg_rev}"
395 debug-print "${FUNCNAME}: rev = ${rev} "
396 429
397 if [[ "${peg_rev}" -eq "${rev}" ]]; then 430 echo "${peg_rev}"
398 return 0 431}
432
433# @FUNCTION: subversion_pkg_preinst
434# @DESCRIPTION:
435# Log the svn revision of source code. Doing this in pkg_preinst because we
436# want the logs to stick around if packages are uninstalled without messing with
437# config protection.
438subversion_pkg_preinst() {
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}'"
399 fi 446 fi
400 447 local logmessage="svn: ${pkgdate} - ${PF}:${SLOT} was merged at revision ${ESVN_WC_REVISION}"
401 return 1 448 if [[ -d ${dir} ]]; then
402 449 echo "${logmessage}" >> "${dir}/${PN}.log"
450 else
451 eerror "Could not log the message '${logmessage}' to '${dir}/${PN}.log'"
452 fi
453 fi
403} 454}

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

  ViewVC Help
Powered by ViewVC 1.1.20