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

Diff of /eclass/subversion.eclass

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

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

Legend:
Removed from v.1.45  
changed lines
  Added in v.1.86

  ViewVC Help
Powered by ViewVC 1.1.20