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

Diff of /eclass/subversion.eclass

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

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

Legend:
Removed from v.1.41  
changed lines
  Added in v.1.67

  ViewVC Help
Powered by ViewVC 1.1.20