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

  ViewVC Help
Powered by ViewVC 1.1.20