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

Diff of /eclass/subversion.eclass

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

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

Legend:
Removed from v.1.42  
changed lines
  Added in v.1.75

  ViewVC Help
Powered by ViewVC 1.1.20