/[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.83
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.39 2007/01/19 10:39:51 hattya Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.83 2012/07/29 05:54:17 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
23
24HOMEPAGE="http://subversion.tigris.org/"
25DESCRIPTION="Based on the ${ECLASS} eclass"
26
27
28## -- add subversion in DEPEND
29#
30DEPEND="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
31 29
30DEPEND+=" net-misc/rsync"
32 31
33## -- ESVN_STORE_DIR: subversion sources store directory 32# @ECLASS-VARIABLE: ESVN_STORE_DIR
34# 33# @DESCRIPTION:
34# subversion sources store directory. Users may override this in /etc/make.conf
35ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/svn-src" 35[[ -z ${ESVN_STORE_DIR} ]] && ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src"
36 36
37 37# @ECLASS-VARIABLE: ESVN_FETCH_CMD
38## -- ESVN_FETCH_CMD: subversion fetch command 38# @DESCRIPTION:
39# 39# subversion checkout command
40ESVN_FETCH_CMD="svn checkout" 40ESVN_FETCH_CMD="svn checkout"
41 41
42## -- ESVN_UPDATE_CMD: subversion update command 42# @ECLASS-VARIABLE: ESVN_UPDATE_CMD
43# 43# @DESCRIPTION:
44# subversion update command
44ESVN_UPDATE_CMD="svn update" 45ESVN_UPDATE_CMD="svn update"
45 46
47# @ECLASS-VARIABLE: ESVN_SWITCH_CMD
48# @DESCRIPTION:
49# subversion switch command
50ESVN_SWITCH_CMD="svn switch"
46 51
47## -- ESVN_OPTIONS: 52# @ECLASS-VARIABLE: ESVN_OPTIONS
48# 53# @DESCRIPTION:
49# the options passed to checkout or update. 54# the options passed to checkout or update. If you want a specific revision see
50# 55# ESVN_REPO_URI instead of using -rREV.
51: ESVN_OPTIONS=${ESVN_OPTIONS:=} 56ESVN_OPTIONS="${ESVN_OPTIONS:-}"
52 57
53 58# @ECLASS-VARIABLE: ESVN_REPO_URI
54## -- ESVN_REPO_URI: repository uri 59# @DESCRIPTION:
60# repository uri
55# 61#
56# e.g. http://foo/trunk, svn://bar/trunk 62# e.g. http://foo/trunk, svn://bar/trunk, svn://bar/branch/foo@1234
57# 63#
58# supported protocols: 64# supported URI schemes:
59# http:// 65# http://
60# https:// 66# https://
61# svn:// 67# svn://
62# svn+ssh:// 68# svn+ssh://
69# file://
63# 70#
71# to peg to a specific revision, append @REV to the repo's uri
64: ESVN_REPO_URI=${ESVN_REPO_URI:=} 72ESVN_REPO_URI="${ESVN_REPO_URI:-}"
65 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:-}"
66 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:
67## -- ESVN_PROJECT: project name of your ebuild (= name space) 96# project name of your ebuild (= name space)
68# 97#
69# subversion eclass will check out the subversion repository like: 98# subversion eclass will check out the subversion repository like:
70# 99#
71# ${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/} 100# ${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/}
72# 101#
81# 110#
82# # jakarta commons-loggin 111# # jakarta commons-loggin
83# ESVN_PROJECT=commons/logging 112# ESVN_PROJECT=commons/logging
84# 113#
85# default: ${PN/-svn}. 114# default: ${PN/-svn}.
86#
87: ESVN_PROJECT=${ESVN_PROJECT:=${PN/-svn}} 115ESVN_PROJECT="${ESVN_PROJECT:-${PN/-svn}}"
88 116
89 117# @ECLASS-VARIABLE: ESVN_BOOTSTRAP
90## -- ESVN_BOOTSTRAP: 118# @DESCRIPTION:
91#
92# bootstrap script or command like autogen.sh or etc.. 119# bootstrap script or command like autogen.sh or etc..
93#
94: ESVN_BOOTSTRAP=${ESVN_BOOTSTRAP:=} 120ESVN_BOOTSTRAP="${ESVN_BOOTSTRAP:-}"
95 121
96 122# @ECLASS-VARIABLE: ESVN_PATCHES
97## -- ESVN_PATCHES: 123# @DESCRIPTION:
98#
99# subversion eclass can apply pathces in subversion_bootstrap(). 124# subversion eclass can apply patches in subversion_bootstrap().
100# you can use regexp in this valiable like *.diff or *.patch or etc. 125# you can use regexp in this variable like *.diff or *.patch or etc.
101# NOTE: this patches will apply before eval ESVN_BOOTSTRAP. 126# NOTE: patches will be applied before ESVN_BOOTSTRAP is processed.
102# 127#
103# the process of applying the patch is: 128# 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. 129# 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:=} 130ESVN_PATCHES="${ESVN_PATCHES:-}"
109 131
110 132# @ECLASS-VARIABLE: ESVN_RESTRICT
111## -- ESVN_RESTRICT: 133# @DESCRIPTION:
112#
113# 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
114# restrict. 135# restrict.
115# export) 136# export)
116# don't export the working copy to S. 137# don't export the working copy to S.
117#
118: ESVN_RESTRICT=${ESVN_RESTRICT:=} 138ESVN_RESTRICT="${ESVN_RESTRICT:-}"
119 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}}"
120 146
121## -- 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}.
122# 177#
178# Can take two optional parameters:
123# @param $1 - a repository URI. default is the ESVN_REPO_URI. 179# repo_uri - a repository URI. default is ESVN_REPO_URI.
124# 180# destination - a check out path in S.
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
327 fi
328 fi
194 329
330 if [[ -n "${ESVN_UMASK}" ]]; then
331 eumask_pop
195 fi 332 fi
196 333
197 einfo " working copy: ${wc_path}" 334 einfo " working copy: ${wc_path}"
198 335
199 if ! has "export" ${ESVN_RESTRICT}; then 336 if ! has "export" ${ESVN_RESTRICT}; then
200 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}" 337 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}"
201 338
202 local S="${S}/${S_dest}" 339 local S="${S}/${S_dest}"
340 mkdir -p "${S}"
203 341
204 # export to the ${WORKDIR} 342 # export to the ${WORKDIR}
205 #* "svn export" has a bug. see http://bugs.gentoo.org/119236 343 #* "svn export" has a bug. see http://bugs.gentoo.org/119236
206 #* svn export . "${S}" || die "${ESVN}: can't export to ${S}." 344 #* svn export . "${S}" || die "${ESVN}: can't export to ${S}."
207 rsync -rlpgo --exclude=".svn/" . "${S}" || die "${ESVN}: can't export to ${S}." 345 rsync -rlpgo --exclude=".svn/" . "${S}" || die "${ESVN}: can't export to ${S}."
208 fi 346 fi
209 347
348 popd >/dev/null
210 echo 349 echo
211
212} 350}
213 351
214 352# @FUNCTION: subversion_bootstrap
215## -- subversion_bootstrap() ------------------------------------------------ # 353# @DESCRIPTION:
216# 354# Apply patches in ${ESVN_PATCHES} and run ${ESVN_BOOTSTRAP} if specified.
217function subversion_bootstrap() { 355subversion_bootstrap() {
218
219 if has "export" ${ESVN_RESTRICT}; then 356 if has "export" ${ESVN_RESTRICT}; then
220 return 357 return
221 fi 358 fi
222 359
223 cd "${S}" 360 cd "${S}"
224 361
225 if [[ -n "${ESVN_PATCHES}" ]]; then 362 if [[ -n ${ESVN_PATCHES} ]]; then
363 local patch fpatch
226 einfo "apply patches -->" 364 einfo "apply patches -->"
227
228 local p=
229
230 for p in ${ESVN_PATCHES}; do 365 for patch in ${ESVN_PATCHES}; do
231 if [[ -f "${p}" ]]; then 366 if [[ -f ${patch} ]]; then
232 epatch "${p}" 367 epatch "${patch}"
233
234 else 368 else
235 local q=
236
237 for q in ${FILESDIR}/${p}; do 369 for fpatch in ${FILESDIR}/${patch}; do
238 if [[ -f "${q}" ]]; then 370 if [[ -f ${fpatch} ]]; then
239 epatch "${q}" 371 epatch "${fpatch}"
240
241 else 372 else
242 die "${ESVN}; ${p} is not found" 373 die "${ESVN}: ${patch} not found"
243
244 fi 374 fi
245 done 375 done
246 fi 376 fi
247 done 377 done
248
249 echo 378 echo
250
251 fi 379 fi
252 380
253 if [[ -n "${ESVN_BOOTSTRAP}" ]]; then 381 if [[ -n ${ESVN_BOOTSTRAP} ]]; then
254 einfo "begin bootstrap -->" 382 einfo "begin bootstrap -->"
255
256 if [[ -f "${ESVN_BOOTSTRAP}" && -x "${ESVN_BOOTSTRAP}" ]]; then 383 if [[ -f ${ESVN_BOOTSTRAP} && -x ${ESVN_BOOTSTRAP} ]]; then
257 einfo " bootstrap with a file: ${ESVN_BOOTSTRAP}" 384 einfo " bootstrap with a file: ${ESVN_BOOTSTRAP}"
258 eval "./${ESVN_BOOTSTRAP}" || die "${ESVN}: can't execute ESVN_BOOTSTRAP." 385 eval "./${ESVN_BOOTSTRAP}" || die "${ESVN}: can't execute ESVN_BOOTSTRAP."
259
260 else 386 else
261 einfo " bootstrap with commands: ${ESVN_BOOTSTRAP}" 387 einfo " bootstrap with command: ${ESVN_BOOTSTRAP}"
262 eval "${ESVN_BOOTSTRAP}" || die "${ESVN}: can't eval ESVN_BOOTSTRAP." 388 eval "${ESVN_BOOTSTRAP}" || die "${ESVN}: can't eval ESVN_BOOTSTRAP."
263
264 fi
265 fi 389 fi
266 390 fi
267} 391}
268 392
269 393# @FUNCTION: subversion_wc_info
270## -- subversion_src_unpack() ------------------------------------------------ # 394# @USAGE: [repo_uri]
395# @RETURN: ESVN_WC_URL, ESVN_WC_ROOT, ESVN_WC_UUID, ESVN_WC_REVISION and ESVN_WC_PATH
396# @DESCRIPTION:
397# Get svn info for the specified repo_uri. The default repo_uri is ESVN_REPO_URI.
271# 398#
272function subversion_src_unpack() { 399# The working copy information on the specified repository URI are set to
273 400# ESVN_WC_* variables.
274 subversion_fetch || die "${ESVN}: unknown problem occurred in subversion_fetch."
275 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap."
276
277}
278
279
280## -- subversion_wc_info() --------------------------------------------------- #
281#
282# @param $1 - repository URI. default is ESVN_REPO_URI.
283#
284function subversion_wc_info() { 401subversion_wc_info() {
285
286 local repo_uri="$(subversion__get_repository_uri "${1}")" 402 local repo_uri="$(subversion__get_repository_uri "${1:-${ESVN_REPO_URI}}")"
287 local wc_path="$(subversion__get_wc_path "${repo_uri}")" 403 local wc_path="$(subversion__get_wc_path "${repo_uri}")"
288 404
289 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 405 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
290 debug-print "${FUNCNAME}: wc_path = ${wc_path}" 406 debug-print "${FUNCNAME}: wc_path = ${wc_path}"
291 407
292 if [[ ! -e "${wc_path}" ]]; then 408 if [[ ! -d ${wc_path} ]]; then
293 return 1 409 return 1
294 fi 410 fi
295 411
296 local k 412 export ESVN_WC_URL="$(subversion__svn_info "${wc_path}" "URL")"
297 413 export ESVN_WC_ROOT="$(subversion__svn_info "${wc_path}" "Repository Root")"
298 for k in url revision; do 414 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}")" 415 export ESVN_WC_REVISION="$(subversion__svn_info "${wc_path}" "Revision")"
300 done 416 export ESVN_WC_PATH="${wc_path}"
301
302} 417}
303 418
419# @FUNCTION: subversion_src_unpack
420# @DESCRIPTION:
421# Default src_unpack. Fetch and, in older EAPIs, bootstrap.
422subversion_src_unpack() {
423 subversion_fetch || die "${ESVN}: unknown problem occurred in subversion_fetch."
424 if has "${EAPI:-0}" 0 1; then
425 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap."
426 fi
427}
428
429# @FUNCTION: subversion_src_prepare
430# @DESCRIPTION:
431# Default src_prepare. Bootstrap.
432subversion_src_prepare() {
433 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap."
434}
435
436# @FUNCTION: subversion_pkg_preinst
437# @USAGE: [repo_uri]
438# @DESCRIPTION:
439# Log the svn revision of source code. Doing this in pkg_preinst because we
440# want the logs to stick around if packages are uninstalled without messing with
441# config protection.
442subversion_pkg_preinst() {
443 local pkgdate=$(date "+%Y%m%d %H:%M:%S")
444 subversion_wc_info "${1}"
445 if [[ -n ${ESCM_LOGDIR} ]]; then
446 local dir="${ROOT}/${ESCM_LOGDIR}/${CATEGORY}"
447 if [[ ! -d ${dir} ]]; then
448 mkdir -p "${dir}" || eerror "Failed to create '${dir}' for logging svn revision"
449 fi
450 local logmessage="svn: ${pkgdate} - ${PF}:${SLOT} was merged at revision ${ESVN_WC_REVISION}"
451 if [[ -d ${dir} ]]; then
452 echo "${logmessage}" >>"${dir}/${PN}.log"
453 else
454 eerror "Could not log the message '${logmessage}' to '${dir}/${PN}.log'"
455 fi
456 fi
457}
304 458
305## -- Private Functions 459## -- Private Functions
306 460
307
308## -- subversion__svn_info() ------------------------------------------------- # 461## -- subversion__svn_info() ------------------------------------------------- #
309# 462#
310# @param $1 - a target. 463# param $1 - a target.
311# @param $2 - a key name. 464# param $2 - a key name.
312# 465#
313function subversion__svn_info() { 466subversion__svn_info() {
314
315 local target="${1}" 467 local target="${1}"
316 local key="${2}" 468 local key="${2}"
317 469
318 env LC_ALL=C svn info "${target}" | grep -i "^${key}" | cut -d" " -f2- 470 env LC_ALL=C svn info ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" "${target}" \
319 471 | grep -i "^${key}" \
472 | cut -d" " -f2-
320} 473}
321
322 474
323## -- subversion__get_repository_uri() --------------------------------------- # 475## -- subversion__get_repository_uri() --------------------------------------- #
324# 476#
325# @param $1 - a repository URI. 477# 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() { 478subversion__get_repository_uri() {
330 479 local repo_uri="${1}"
331 local repo_uri="${1:-${ESVN_REPO_URI}}"
332 local remove_peg_revision="${2}"
333 480
334 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 481 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
335 debug-print "${FUNCNAME}: remove_peg_revision = ${remove_peg_revision}"
336
337 if [[ -z "${repo_uri}" ]]; then 482 if [[ -z ${repo_uri} ]]; then
338 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty." 483 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty."
339 fi 484 fi
340
341 # delete trailing slash 485 # delete trailing slash
342 if [[ -z "${repo_uri##*/}" ]]; then 486 if [[ -z ${repo_uri##*/} ]]; then
343 repo_uri="${repo_uri%/}" 487 repo_uri="${repo_uri%/}"
344 fi 488 fi
345
346 if [[ -n "${remove_peg_revision}" ]]; then
347 if subversion__has_peg_revision "${repo_uri}"; then
348 repo_uri="${repo_uri%@*}" 489 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 490
355 echo "${repo_uri}" 491 echo "${repo_uri}"
356
357} 492}
358
359 493
360## -- subversion__get_wc_path() ---------------------------------------------- # 494## -- subversion__get_wc_path() ---------------------------------------------- #
361# 495#
362# @param $1 - a repository URI. 496# param $1 - a repository URI.
363#
364function subversion__get_wc_path() { 497subversion__get_wc_path() {
365
366 local repo_uri="$(subversion__get_repository_uri "${1}" 1)" 498 local repo_uri="$(subversion__get_repository_uri "${1}")"
367 499
368 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 500 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
369 501
370 echo "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${repo_uri##*/}" 502 echo "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${repo_uri##*/}"
371
372} 503}
373 504
374
375## -- subversion__has_peg_revision() ----------------------------------------- # 505## -- subversion__get_peg_revision() ----------------------------------------- #
376# 506#
377# @param $1 - a repository URI. 507# param $1 - a repository URI.
378#
379function subversion__has_peg_revision() { 508subversion__get_peg_revision() {
380
381 local repo_uri="${1}" 509 local repo_uri="${1}"
510 local peg_rev=
382 511
383 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 512 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
384
385 # repo_uri has peg revision ? 513 # repo_uri has peg revision?
386 if [[ "${repo_uri}" != *@* ]]; then 514 if [[ ${repo_uri} = *@* ]]; then
515 peg_rev="${repo_uri##*@}"
516 debug-print "${FUNCNAME}: peg_rev = ${peg_rev}"
517 else
387 debug-print "${FUNCNAME}: repo_uri does not have a peg revision." 518 debug-print "${FUNCNAME}: repo_uri does not have a peg revision."
388 return 1
389 fi 519 fi
390 520
391 local peg_rev="${repo_uri##*@}" 521 echo "${peg_rev}"
392 local rev=$(subversion__svn_info "${repo_uri}" "revision")
393
394 debug-print "${FUNCNAME}: peg_rev = ${peg_rev}"
395 debug-print "${FUNCNAME}: rev = ${rev} "
396
397 if [[ "${peg_rev}" -eq "${rev}" ]]; then
398 return 0
399 fi
400
401 return 1
402
403} 522}

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

  ViewVC Help
Powered by ViewVC 1.1.20