/[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.77
1# Copyright 1999-2007 Gentoo Foundation 1# Copyright 1999-2012 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.77 2012/06/10 10:08:36 hattya Exp $
4 4
5## --------------------------------------------------------------------------- # 5# @ECLASS: subversion.eclass
6# @MAINTAINER:
7# Akinori Hattori <hattya@gentoo.org>
8# @AUTHOR:
6# Author: Akinori Hattori <hattya@gentoo.org> 9# Original Author: Akinori Hattori <hattya@gentoo.org>
7#
8# The subversion eclass is written to fetch the software sources from 10# @BLURB: The subversion eclass is written to fetch software sources from subversion repositories
9# subversion repositories like the cvs eclass. 11# @DESCRIPTION:
10# 12# The subversion eclass provides functions to fetch, patch and bootstrap
11# 13# 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 14
18inherit eutils 15inherit eutils
19 16
20ESVN="subversion.eclass" 17ESVN="${ECLASS}"
21 18
19case "${EAPI:-0}" in
20 0|1)
22EXPORT_FUNCTIONS src_unpack 21 EXPORT_FUNCTIONS src_unpack pkg_preinst
22 ;;
23 *)
24 EXPORT_FUNCTIONS src_unpack src_prepare pkg_preinst
25 ;;
26esac
23 27
24DESCRIPTION="Based on the ${ECLASS} eclass" 28DESCRIPTION="Based on the ${ECLASS} eclass"
25 29
30SUBVERSION_DEPEND="dev-vcs/subversion
31 net-misc/rsync"
26 32
27## -- add subversion in DEPEND 33if [[ -z "${ESVN_DISABLE_DEPENDENCIES}" ]]; then
28# 34 DEPEND="${SUBVERSION_DEPEND}"
29DEPEND="dev-util/subversion" 35fi
30 36
31 37# @ECLASS-VARIABLE: ESVN_STORE_DIR
32## -- ESVN_STORE_DIR: subversion sources store directory 38# @DESCRIPTION:
33# 39# subversion sources store directory. Users may override this in /etc/make.conf
34ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/svn-src" 40[[ -z ${ESVN_STORE_DIR} ]] && ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src"
35 41
36 42# @ECLASS-VARIABLE: ESVN_FETCH_CMD
37## -- ESVN_FETCH_CMD: subversion fetch command 43# @DESCRIPTION:
38# 44# subversion checkout command
39ESVN_FETCH_CMD="svn checkout" 45ESVN_FETCH_CMD="svn checkout"
40 46
41## -- ESVN_UPDATE_CMD: subversion update command 47# @ECLASS-VARIABLE: ESVN_UPDATE_CMD
42# 48# @DESCRIPTION:
49# subversion update command
43ESVN_UPDATE_CMD="svn update" 50ESVN_UPDATE_CMD="svn update"
44 51
52# @ECLASS-VARIABLE: ESVN_SWITCH_CMD
53# @DESCRIPTION:
54# subversion switch command
55ESVN_SWITCH_CMD="svn switch"
45 56
46## -- ESVN_OPTIONS: 57# @ECLASS-VARIABLE: ESVN_OPTIONS
47# 58# @DESCRIPTION:
48# the options passed to checkout or update. 59# the options passed to checkout or update. If you want a specific revision see
49# 60# ESVN_REPO_URI instead of using -rREV.
50: ${ESVN_OPTIONS=} 61ESVN_OPTIONS="${ESVN_OPTIONS:-}"
51 62
52 63# @ECLASS-VARIABLE: ESVN_REPO_URI
53## -- ESVN_REPO_URI: repository uri 64# @DESCRIPTION:
65# repository uri
54# 66#
55# e.g. http://foo/trunk, svn://bar/trunk 67# e.g. http://foo/trunk, svn://bar/trunk, svn://bar/branch/foo@1234
56# 68#
57# supported protocols: 69# supported protocols:
58# http:// 70# http://
59# https:// 71# https://
60# svn:// 72# svn://
61# svn+ssh:// 73# svn+ssh://
62# 74#
63: ${ESVN_REPO_URI=} 75# to peg to a specific revision, append @REV to the repo's uri
76ESVN_REPO_URI="${ESVN_REPO_URI:-}"
64 77
78# @ECLASS-VARIABLE: ESVN_REVISION
79# @DESCRIPTION:
80# User configurable revision checkout or update to from the repository
81#
82# Useful for live svn or trunk svn ebuilds allowing the user to peg
83# to a specific revision
84#
85# Note: This should never be set in an ebuild!
86ESVN_REVISION="${ESVN_REVISION:-}"
65 87
88# @ECLASS-VARIABLE: ESVN_USER
89# @DESCRIPTION:
90# User name
91ESVN_USER="${ESVN_USER:-}"
92
93# @ECLASS-VARIABLE: ESVN_PASSWORD
94# @DESCRIPTION:
95# Password
96ESVN_PASSWORD="${ESVN_PASSWORD:-}"
97
98# @ECLASS-VARIABLE: ESVN_PROJECT
99# @DESCRIPTION:
66## -- ESVN_PROJECT: project name of your ebuild (= name space) 100# project name of your ebuild (= name space)
67# 101#
68# subversion eclass will check out the subversion repository like: 102# subversion eclass will check out the subversion repository like:
69# 103#
70# ${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/} 104# ${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/}
71# 105#
80# 114#
81# # jakarta commons-loggin 115# # jakarta commons-loggin
82# ESVN_PROJECT=commons/logging 116# ESVN_PROJECT=commons/logging
83# 117#
84# default: ${PN/-svn}. 118# default: ${PN/-svn}.
85# 119ESVN_PROJECT="${ESVN_PROJECT:-${PN/-svn}}"
86: ${ESVN_PROJECT:=${PN/-svn}}
87 120
88 121# @ECLASS-VARIABLE: ESVN_BOOTSTRAP
89## -- ESVN_BOOTSTRAP: 122# @DESCRIPTION:
90#
91# bootstrap script or command like autogen.sh or etc.. 123# bootstrap script or command like autogen.sh or etc..
92# 124ESVN_BOOTSTRAP="${ESVN_BOOTSTRAP:-}"
93: ${ESVN_BOOTSTRAP=}
94 125
95 126# @ECLASS-VARIABLE: ESVN_PATCHES
96## -- ESVN_PATCHES: 127# @DESCRIPTION:
97#
98# subversion eclass can apply pathces in subversion_bootstrap(). 128# subversion eclass can apply patches in subversion_bootstrap().
99# you can use regexp in this variable like *.diff or *.patch or etc. 129# you can use regexp in this variable like *.diff or *.patch or etc.
100# NOTE: patches will be applied before ESVN_BOOTSTRAP is processed. 130# NOTE: patches will be applied before ESVN_BOOTSTRAP is processed.
101# 131#
102# Patches are searched both in / and ${FILESDIR}, if not found in both locations, 132# Patches are searched both in ${PWD} and ${FILESDIR}, if not found in either
103# the installation dies. 133# location, the installation dies.
104# 134ESVN_PATCHES="${ESVN_PATCHES:-}"
105: ${ESVN_PATCHES=}
106 135
107 136# @ECLASS-VARIABLE: ESVN_RESTRICT
108## -- ESVN_RESTRICT: 137# @DESCRIPTION:
109#
110# this should be a space delimited list of subversion eclass features to 138# this should be a space delimited list of subversion eclass features to
111# restrict. 139# restrict.
112# export) 140# export)
113# don't export the working copy to S. 141# don't export the working copy to S.
114# 142ESVN_RESTRICT="${ESVN_RESTRICT:-}"
115: ${ESVN_RESTRICT=}
116 143
144# @ECLASS-VARIABLE: ESVN_DISABLE_DEPENDENCIES
145# @DESCRIPTION:
146# Set this variable to a non-empty value to disable the automatic inclusion of
147# Subversion in dependencies.
148ESVN_DISABLE_DEPENDENCIES="${ESVN_DISABLE_DEPENDENCIES:-}"
117 149
118## -- subversion_fetch() ----------------------------------------------------- # 150# @ECLASS-VARIABLE: ESVN_OFFLINE
151# @DESCRIPTION:
152# Set this variable to a non-empty value to disable the automatic updating of
153# an svn source tree. This is intended to be set outside the subversion source
154# tree by users.
155ESVN_OFFLINE="${ESVN_OFFLINE:-${EVCS_OFFLINE}}"
156
157# @ECLASS-VARIABLE: ESVN_UMASK
158# @DESCRIPTION:
159# Set this variable to a custom umask. This is intended to be set by users.
160# By setting this to something like 002, it can make life easier for people
161# who do development as non-root (but are in the portage group), and then
162# switch over to building with FEATURES=userpriv. Or vice-versa. Shouldn't
163# be a security issue here as anyone who has portage group write access
164# already can screw the system over in more creative ways.
165ESVN_UMASK="${ESVN_UMASK:-${EVCS_UMASK}}"
166
167# @ECLASS-VARIABLE: ESVN_UP_FREQ
168# @DESCRIPTION:
169# Set the minimum number of hours between svn up'ing in any given svn module. This is particularly
170# useful for split KDE ebuilds where we want to ensure that all submodules are compiled for the same
171# revision. It should also be kept user overrideable.
172ESVN_UP_FREQ="${ESVN_UP_FREQ:=}"
173
174# @ECLASS-VARIABLE: ESCM_LOGDIR
175# @DESCRIPTION:
176# User configuration variable. If set to a path such as e.g. /var/log/scm any
177# package inheriting from subversion.eclass will record svn revision to
178# ${CATEGORY}/${PN}.log in that path in pkg_preinst. This is not supposed to be
179# set by ebuilds/eclasses. It defaults to empty so users need to opt in.
180ESCM_LOGDIR="${ESCM_LOGDIR:=}"
181
182# @FUNCTION: subversion_fetch
183# @USAGE: [repo_uri] [destination]
184# @DESCRIPTION:
185# Wrapper function to fetch sources from subversion via svn checkout or svn update,
186# depending on whether there is an existing working copy in ${ESVN_STORE_DIR}.
119# 187#
188# Can take two optional parameters:
120# @param $1 - a repository URI. default is the ESVN_REPO_URI. 189# repo_uri - a repository URI. default is ESVN_REPO_URI.
121# @param $2 - a check out path in S. 190# destination - a check out path in S.
122#
123function subversion_fetch() { 191subversion_fetch() {
124 local repo_uri="$(subversion__get_repository_uri "${1}")" 192 local repo_uri="$(subversion__get_repository_uri "${1:-${ESVN_REPO_URI}}")"
193 local revision="$(subversion__get_peg_revision "${1:-${ESVN_REPO_URI}}")"
125 local S_dest="${2}" 194 local S_dest="${2}"
195
196 if [[ -z ${repo_uri} ]]; then
197 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty."
198 fi
199
200 [[ -n "${ESVN_REVISION}" ]] && revision="${ESVN_REVISION}"
126 201
127 # check for the protocol 202 # check for the protocol
128 local protocol="${repo_uri%%:*}" 203 local protocol="${repo_uri%%:*}"
129
130 case "${protocol}" in 204 case "${protocol}" in
131 http|https) 205 http|https)
132 if built_with_use dev-util/subversion nowebdav; then 206 if ! built_with_use -o dev-vcs/subversion webdav-neon webdav-serf; then
133 echo 207 echo
134 eerror "In order to emerge this package, you need to" 208 eerror "In order to emerge this package, you need to"
135 eerror "re-emerge subversion with USE=-nowebdav" 209 eerror "reinstall Subversion with support for WebDAV."
210 eerror "Subversion requires either Neon or Serf to support WebDAV."
136 echo 211 echo
137 die "${ESVN}: please run 'USE=-nowebdav emerge subversion'" 212 die "${ESVN}: reinstall Subversion with support for WebDAV."
138 fi 213 fi
139 ;; 214 ;;
140 svn|svn+ssh) 215 svn|svn+ssh)
141 ;; 216 ;;
142 *) 217 *)
143 die "${ESVN}: fetch from "${protocol}" is not yet implemented." 218 die "${ESVN}: fetch from '${protocol}' is not yet implemented."
144 ;; 219 ;;
145 esac 220 esac
146 221
147 addread "/etc/subversion" 222 addread "/etc/subversion"
148 addwrite "${ESVN_STORE_DIR}" 223 addwrite "${ESVN_STORE_DIR}"
149 224
225 if [[ -n "${ESVN_UMASK}" ]]; then
226 eumask_push "${ESVN_UMASK}"
227 fi
228
150 if [[ ! -d "${ESVN_STORE_DIR}" ]]; then 229 if [[ ! -d ${ESVN_STORE_DIR} ]]; then
151 debug-print "${FUNCNAME}: initial checkout. creating subversion directory" 230 debug-print "${FUNCNAME}: initial checkout. creating subversion directory"
152 mkdir -p "${ESVN_STORE_DIR}" || die "${ESVN}: can't mkdir ${ESVN_STORE_DIR}." 231 mkdir -m 775 -p "${ESVN_STORE_DIR}" || die "${ESVN}: can't mkdir ${ESVN_STORE_DIR}."
153 fi 232 fi
154 233
155 cd "${ESVN_STORE_DIR}" || die "${ESVN}: can't chdir to ${ESVN_STORE_DIR}" 234 pushd "${ESVN_STORE_DIR}" > /dev/null || die "${ESVN}: can't chdir to ${ESVN_STORE_DIR}"
156 235
157 local wc_path="$(subversion__get_wc_path "${repo_uri}")" 236 local wc_path="$(subversion__get_wc_path "${repo_uri}")"
158 local options="${ESVN_OPTIONS} --config-dir ${ESVN_STORE_DIR}/.subversion" 237 local options="${ESVN_OPTIONS} --config-dir ${ESVN_STORE_DIR}/.subversion"
238
239 [[ -n "${revision}" ]] && options="${options} -r ${revision}"
240
241 if [[ "${ESVN_OPTIONS}" = *-r* ]]; then
242 ewarn "\${ESVN_OPTIONS} contains -r, this usage is unsupported. Please"
243 ewarn "see \${ESVN_REPO_URI}"
244 fi
245
246 if has_version ">=dev-vcs/subversion-1.6.0"; then
247 options="${options} --config-option=config:auth:password-stores="
248 fi
159 249
160 debug-print "${FUNCNAME}: wc_path = \"${wc_path}\"" 250 debug-print "${FUNCNAME}: wc_path = \"${wc_path}\""
161 debug-print "${FUNCNAME}: ESVN_OPTIONS = \"${ESVN_OPTIONS}\"" 251 debug-print "${FUNCNAME}: ESVN_OPTIONS = \"${ESVN_OPTIONS}\""
162 debug-print "${FUNCNAME}: options = \"${options}\"" 252 debug-print "${FUNCNAME}: options = \"${options}\""
163 253
164 if [[ ! -d "${wc_path}/.svn" ]]; then 254 if [[ ! -d ${wc_path}/.svn ]]; then
255 if [[ -n ${ESVN_OFFLINE} ]]; then
256 ewarn "ESVN_OFFLINE cannot be used when there is no existing checkout."
257 fi
165 # first check out 258 # first check out
166 einfo "subversion check out start -->" 259 einfo "subversion check out start -->"
167 einfo " repository: ${repo_uri}" 260 einfo " repository: ${repo_uri}${revision:+@}${revision}"
168 261
169 debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}" 262 debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}"
170 263
171 mkdir -p "${ESVN_PROJECT}" || die "${ESVN}: can't mkdir ${ESVN_PROJECT}." 264 mkdir -m 775 -p "${ESVN_PROJECT}" || die "${ESVN}: can't mkdir ${ESVN_PROJECT}."
172 cd "${ESVN_PROJECT}" || die "${ESVN}: can't chdir to ${ESVN_PROJECT}" 265 cd "${ESVN_PROJECT}" || die "${ESVN}: can't chdir to ${ESVN_PROJECT}"
266 if [[ -n "${ESVN_USER}" ]]; then
267 ${ESVN_FETCH_CMD} ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" "${repo_uri}" || die "${ESVN}: can't fetch to ${wc_path} from ${repo_uri}."
268 else
173 ${ESVN_FETCH_CMD} ${options} "${repo_uri}" || die "${ESVN}: can't fetch from ${repo_uri}." 269 ${ESVN_FETCH_CMD} ${options} "${repo_uri}" || die "${ESVN}: can't fetch to ${wc_path} from ${repo_uri}."
270 fi
174 271
272 elif [[ -n ${ESVN_OFFLINE} ]]; then
273 svn upgrade "${wc_path}" &>/dev/null
274 svn cleanup "${wc_path}" &>/dev/null
175 subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy." 275 subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy."
276
277 if [[ -n ${ESVN_REVISION} && ${ESVN_REVISION} != ${ESVN_WC_REVISION} ]]; then
278 die "${ESVN}: You requested off-line updating and revision ${ESVN_REVISION} but only revision ${ESVN_WC_REVISION} is available locally."
279 fi
280 einfo "Fetching disabled: Using existing repository copy at revision ${ESVN_WC_REVISION}."
176 else 281 else
282 svn upgrade "${wc_path}" &>/dev/null
283 svn cleanup "${wc_path}" &>/dev/null
177 subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy." 284 subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy."
285
286 local esvn_up_freq=
287 if [[ -n ${ESVN_UP_FREQ} ]]; then
288 if [[ -n ${ESVN_UP_FREQ//[[:digit:]]} ]]; then
289 die "${ESVN}: ESVN_UP_FREQ must be an integer value corresponding to the minimum number of hours between svn up."
290 elif [[ -z $(find "${wc_path}/.svn/entries" -mmin "+$((ESVN_UP_FREQ*60))") ]]; then
291 einfo "Fetching disabled since ${ESVN_UP_FREQ} hours has not passed since last update."
292 einfo "Using existing repository copy at revision ${ESVN_WC_REVISION}."
293 esvn_up_freq=no_update
294 fi
295 fi
296
297 if [[ -z ${esvn_up_freq} ]]; then
298 if [[ ${ESVN_WC_UUID} != $(subversion__svn_info "${repo_uri}" "Repository UUID") ]]; then
299 # UUID mismatch. Delete working copy and check out it again.
300 einfo "subversion recheck out start -->"
301 einfo " old UUID: ${ESVN_WC_UUID}"
302 einfo " new UUID: $(subversion__svn_info "${repo_uri}" "Repository UUID")"
303 einfo " repository: ${repo_uri}${revision:+@}${revision}"
304
305 rm -fr "${ESVN_PROJECT}" || die
306
307 debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}"
308
309 mkdir -m 775 -p "${ESVN_PROJECT}" || die "${ESVN}: can't mkdir ${ESVN_PROJECT}."
310 cd "${ESVN_PROJECT}" || die "${ESVN}: can't chdir to ${ESVN_PROJECT}"
311 if [[ -n "${ESVN_USER}" ]]; then
312 ${ESVN_FETCH_CMD} ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" "${repo_uri}" || die "${ESVN}: can't fetch to ${wc_path} from ${repo_uri}."
313 else
314 ${ESVN_FETCH_CMD} ${options} "${repo_uri}" || die "${ESVN}: can't fetch to ${wc_path} from ${repo_uri}."
315 fi
178 if [ "${ESVN_WC_URL}" != "$(subversion__get_repository_uri "${repo_uri}" 1)" ]; then 316 elif [[ ${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 -->" 317 einfo "subversion switch start -->"
184 einfo " repository: ${repo_uri}" 318 einfo " old repository: ${ESVN_WC_URL}@${ESVN_WC_REVISION}"
319 einfo " new repository: ${repo_uri}${revision:+@}${revision}"
185 320
186 debug-print "${FUNCNAME}: ${ESVN_UPDATE_CMD} ${options}" 321 debug-print "${FUNCNAME}: ${ESVN_SWITCH_CMD} ${options} ${repo_uri}"
187 322
188 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}" 323 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}"
324 if [[ -n "${ESVN_USER}" ]]; then
325 ${ESVN_SWITCH_CMD} ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" ${repo_uri} || die "${ESVN}: can't update ${wc_path} from ${repo_uri}."
326 else
327 ${ESVN_SWITCH_CMD} ${options} ${repo_uri} || die "${ESVN}: can't update ${wc_path} from ${repo_uri}."
328 fi
329 else
330 # update working copy
331 einfo "subversion update start -->"
332 einfo " repository: ${repo_uri}${revision:+@}${revision}"
333
334 debug-print "${FUNCNAME}: ${ESVN_UPDATE_CMD} ${options}"
335
336 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}"
337 if [[ -n "${ESVN_USER}" ]]; then
338 ${ESVN_UPDATE_CMD} ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" || die "${ESVN}: can't update ${wc_path} from ${repo_uri}."
339 else
189 ${ESVN_UPDATE_CMD} ${options} || die "${ESVN}: can't update from ${repo_uri}." 340 ${ESVN_UPDATE_CMD} ${options} || die "${ESVN}: can't update ${wc_path} from ${repo_uri}."
341 fi
342 fi
343 fi
344 fi
345
346 if [[ -n "${ESVN_UMASK}" ]]; then
347 eumask_pop
190 fi 348 fi
191 349
192 einfo " working copy: ${wc_path}" 350 einfo " working copy: ${wc_path}"
193 351
194 if ! has "export" ${ESVN_RESTRICT}; then 352 if ! has "export" ${ESVN_RESTRICT}; then
195 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}" 353 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}"
196 354
197 local S="${S}/${S_dest}" 355 local S="${S}/${S_dest}"
356 mkdir -p "${S}"
198 357
199 # export to the ${WORKDIR} 358 # export to the ${WORKDIR}
200 #* "svn export" has a bug. see http://bugs.gentoo.org/119236 359 #* "svn export" has a bug. see http://bugs.gentoo.org/119236
201 #* svn export . "${S}" || die "${ESVN}: can't export to ${S}." 360 #* svn export . "${S}" || die "${ESVN}: can't export to ${S}."
202 rsync -rlpgo --exclude=".svn/" . "${S}" || die "${ESVN}: can't export to ${S}." 361 rsync -rlpgo --exclude=".svn/" . "${S}" || die "${ESVN}: can't export to ${S}."
203 fi 362 fi
204 363
364 popd > /dev/null
205 echo 365 echo
206} 366}
207 367
208 368# @FUNCTION: subversion_bootstrap
209## -- subversion_bootstrap() ------------------------------------------------ # 369# @DESCRIPTION:
210# 370# Apply patches in ${ESVN_PATCHES} and run ${ESVN_BOOTSTRAP} if specified.
211function subversion_bootstrap() { 371subversion_bootstrap() {
212 if has "export" ${ESVN_RESTRICT}; then 372 if has "export" ${ESVN_RESTRICT}; then
213 return 373 return
214 fi 374 fi
215 375
216 cd "${S}" 376 cd "${S}"
217 377
218 if [[ -n "${ESVN_PATCHES}" ]]; then 378 if [[ -n ${ESVN_PATCHES} ]]; then
379 local patch fpatch
219 einfo "apply patches -->" 380 einfo "apply patches -->"
220
221 local patch fpatch
222 for patch in ${ESVN_PATCHES}; do 381 for patch in ${ESVN_PATCHES}; do
223 if [[ -f "${patch}" ]]; then 382 if [[ -f ${patch} ]]; then
224 epatch "${patch}" 383 epatch "${patch}"
225 else 384 else
226 for fpatch in ${FILESDIR}/${patch}; do 385 for fpatch in ${FILESDIR}/${patch}; do
227 if [[ -f "${fpatch}" ]]; then 386 if [[ -f ${fpatch} ]]; then
228 epatch "${fpatch}" 387 epatch "${fpatch}"
229 else 388 else
230 die "${ESVN}: ${patch} not found" 389 die "${ESVN}: ${patch} not found"
231 fi 390 fi
232 done 391 done
233 fi 392 fi
234 done 393 done
235 echo 394 echo
236 fi 395 fi
237 396
238 if [[ -n "${ESVN_BOOTSTRAP}" ]]; then 397 if [[ -n ${ESVN_BOOTSTRAP} ]]; then
239 einfo "begin bootstrap -->" 398 einfo "begin bootstrap -->"
240
241 if [[ -f "${ESVN_BOOTSTRAP}" && -x "${ESVN_BOOTSTRAP}" ]]; then 399 if [[ -f ${ESVN_BOOTSTRAP} && -x ${ESVN_BOOTSTRAP} ]]; then
242 einfo " bootstrap with a file: ${ESVN_BOOTSTRAP}" 400 einfo " bootstrap with a file: ${ESVN_BOOTSTRAP}"
243 eval "./${ESVN_BOOTSTRAP}" || die "${ESVN}: can't execute ESVN_BOOTSTRAP." 401 eval "./${ESVN_BOOTSTRAP}" || die "${ESVN}: can't execute ESVN_BOOTSTRAP."
244 else 402 else
245 einfo " bootstrap with command: ${ESVN_BOOTSTRAP}" 403 einfo " bootstrap with command: ${ESVN_BOOTSTRAP}"
246 eval "${ESVN_BOOTSTRAP}" || die "${ESVN}: can't eval ESVN_BOOTSTRAP." 404 eval "${ESVN_BOOTSTRAP}" || die "${ESVN}: can't eval ESVN_BOOTSTRAP."
247 fi 405 fi
248 fi 406 fi
249} 407}
250 408
251## -- subversion_src_unpack() ------------------------------------------------ # 409# @FUNCTION: subversion_src_unpack
252# 410# @DESCRIPTION:
411# Default src_unpack. Fetch and, in older EAPIs, bootstrap.
253function subversion_src_unpack() { 412subversion_src_unpack() {
254 subversion_fetch || die "${ESVN}: unknown problem occurred in subversion_fetch." 413 subversion_fetch || die "${ESVN}: unknown problem occurred in subversion_fetch."
414 if has "${EAPI:-0}" 0 1; then
415 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap."
416 fi
417}
418
419# @FUNCTION: subversion_src_prepare
420# @DESCRIPTION:
421# Default src_prepare. Bootstrap.
422subversion_src_prepare() {
255 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap." 423 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap."
256} 424}
257 425
258 426# @FUNCTION: subversion_wc_info
259## -- subversion_wc_info() --------------------------------------------------- # 427# @USAGE: [repo_uri]
428# @RETURN: ESVN_WC_URL, ESVN_WC_ROOT, ESVN_WC_UUID, ESVN_WC_REVISION and ESVN_WC_PATH
429# @DESCRIPTION:
430# Get svn info for the specified repo_uri. The default repo_uri is ESVN_REPO_URI.
260# 431#
261# @param $1 - repository URI. default is ESVN_REPO_URI. 432# The working copy information on the specified repository URI are set to
262# 433# ESVN_WC_* variables.
263function subversion_wc_info() { 434subversion_wc_info() {
264 local repo_uri="$(subversion__get_repository_uri "${1}")" 435 local repo_uri="$(subversion__get_repository_uri "${1:-${ESVN_REPO_URI}}")"
265 local wc_path="$(subversion__get_wc_path "${repo_uri}")" 436 local wc_path="$(subversion__get_wc_path "${repo_uri}")"
266 437
267 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 438 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
268 debug-print "${FUNCNAME}: wc_path = ${wc_path}" 439 debug-print "${FUNCNAME}: wc_path = ${wc_path}"
269 440
270 if [[ ! -e "${wc_path}" ]]; then 441 if [[ ! -d ${wc_path} ]]; then
271 return 1 442 return 1
272 fi 443 fi
273 444
274 local k 445 export ESVN_WC_URL="$(subversion__svn_info "${wc_path}" "URL")"
275 for k in url revision; do 446 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}")" 447 export ESVN_WC_UUID="$(subversion__svn_info "${wc_path}" "Repository UUID")"
277 done 448 export ESVN_WC_REVISION="$(subversion__svn_info "${wc_path}" "Revision")"
449 export ESVN_WC_PATH="${wc_path}"
278} 450}
279 451
280## -- Private Functions 452## -- Private Functions
281 453
282
283## -- subversion__svn_info() ------------------------------------------------- # 454## -- subversion__svn_info() ------------------------------------------------- #
284# 455#
285# @param $1 - a target. 456# param $1 - a target.
286# @param $2 - a key name. 457# param $2 - a key name.
287# 458#
288function subversion__svn_info() { 459subversion__svn_info() {
289 local target="${1}" 460 local target="${1}"
290 local key="${2}" 461 local key="${2}"
291 462
292 env LC_ALL=C svn info "${target}" | grep -i "^${key}" | cut -d" " -f2- 463 env LC_ALL=C svn info ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" "${target}" \
464 | grep -i "^${key}" \
465 | cut -d" " -f2-
293} 466}
294
295 467
296## -- subversion__get_repository_uri() --------------------------------------- # 468## -- subversion__get_repository_uri() --------------------------------------- #
297# 469#
298# @param $1 - a repository URI. 470# 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() { 471subversion__get_repository_uri() {
303 local repo_uri="${1:-${ESVN_REPO_URI}}" 472 local repo_uri="${1}"
304 local remove_peg_revision="${2}"
305 473
306 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 474 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
307 debug-print "${FUNCNAME}: remove_peg_revision = ${remove_peg_revision}"
308
309 if [[ -z "${repo_uri}" ]]; then 475 if [[ -z ${repo_uri} ]]; then
310 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty." 476 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty."
311 fi 477 fi
312
313 # delete trailing slash 478 # delete trailing slash
314 if [[ -z "${repo_uri##*/}" ]]; then 479 if [[ -z ${repo_uri##*/} ]]; then
315 repo_uri="${repo_uri%/}" 480 repo_uri="${repo_uri%/}"
316 fi 481 fi
317
318 if [[ -n "${remove_peg_revision}" ]]; then
319 if subversion__has_peg_revision "${repo_uri}"; then
320 repo_uri="${repo_uri%@*}" 482 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 483
327 echo "${repo_uri}" 484 echo "${repo_uri}"
328} 485}
329 486
330
331## -- subversion__get_wc_path() ---------------------------------------------- # 487## -- subversion__get_wc_path() ---------------------------------------------- #
332# 488#
333# @param $1 - a repository URI. 489# param $1 - a repository URI.
334#
335function subversion__get_wc_path() { 490subversion__get_wc_path() {
336 local repo_uri="$(subversion__get_repository_uri "${1}" 1)" 491 local repo_uri="$(subversion__get_repository_uri "${1}")"
337 492
338 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 493 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
339 494
340 echo "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${repo_uri##*/}" 495 echo "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${repo_uri##*/}"
341} 496}
342 497
343
344## -- subversion__has_peg_revision() ----------------------------------------- # 498## -- subversion__get_peg_revision() ----------------------------------------- #
345# 499#
346# @param $1 - a repository URI. 500# param $1 - a repository URI.
347#
348function subversion__has_peg_revision() { 501subversion__get_peg_revision() {
349 local repo_uri="${1}" 502 local repo_uri="${1}"
503 local peg_rev=
350 504
351 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 505 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
352
353 # repo_uri has peg revision ? 506 # repo_uri has peg revision?
354 if [[ "${repo_uri}" != *@* ]]; then 507 if [[ ${repo_uri} = *@* ]]; then
508 peg_rev="${repo_uri##*@}"
509 debug-print "${FUNCNAME}: peg_rev = ${peg_rev}"
510 else
355 debug-print "${FUNCNAME}: repo_uri does not have a peg revision." 511 debug-print "${FUNCNAME}: repo_uri does not have a peg revision."
356 return 1 512 fi
513
514 echo "${peg_rev}"
515}
516
517# @FUNCTION: subversion_pkg_preinst
518# @USAGE: [repo_uri]
519# @DESCRIPTION:
520# Log the svn revision of source code. Doing this in pkg_preinst because we
521# want the logs to stick around if packages are uninstalled without messing with
522# config protection.
523subversion_pkg_preinst() {
524 local pkgdate=$(date "+%Y%m%d %H:%M:%S")
525 subversion_wc_info "${1:-${ESVN_REPO_URI}}"
526 if [[ -n ${ESCM_LOGDIR} ]]; then
527 local dir="${ROOT}/${ESCM_LOGDIR}/${CATEGORY}"
528 if [[ ! -d ${dir} ]]; then
529 mkdir -p "${dir}" || \
530 eerror "Failed to create '${dir}' for logging svn revision to '${PORTDIR_SCM}'"
357 fi 531 fi
358 532 local logmessage="svn: ${pkgdate} - ${PF}:${SLOT} was merged at revision ${ESVN_WC_REVISION}"
359 local peg_rev="${repo_uri##*@}" 533 if [[ -d ${dir} ]]; then
360 534 echo "${logmessage}" >> "${dir}/${PN}.log"
361 case "$(subversion__to_upper_case "${peg_rev}")" in 535 else
362 [[:digit:]]*) 536 eerror "Could not log the message '${logmessage}' to '${dir}/${PN}.log'"
363 # NUMBER 537 fi
364 ;; 538 fi
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
376 debug-print "${FUNCNAME}: peg_rev = ${peg_rev}"
377
378 return 0
379} 539}
380
381
382## -- subversion__to_upper_case() ----------------------------------------- #
383#
384# @param $@ - the strings to upper case.
385#
386function subversion__to_upper_case() {
387 echo "${@}" | tr "[a-z]" "[A-Z]"
388}

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

  ViewVC Help
Powered by ViewVC 1.1.20