/[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.68
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.44 2007/07/03 08:27:40 peper Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.68 2010/06/22 18:34:29 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
24DESCRIPTION="Based on the ${ECLASS} eclass" 31DESCRIPTION="Based on the ${ECLASS} eclass"
25 32
33SUBVERSION_DEPEND="dev-vcs/subversion
34 net-misc/rsync"
26 35
27## -- add subversion in DEPEND 36if [[ -z "${ESVN_DISABLE_DEPENDENCIES}" ]]; then
28# 37 DEPEND="${SUBVERSION_DEPEND}"
29DEPEND="dev-util/subversion" 38fi
30 39
31 40# @ECLASS-VARIABLE: ESVN_STORE_DIR
32## -- ESVN_STORE_DIR: subversion sources store directory 41# @DESCRIPTION:
33# 42# subversion sources store directory. Users may override this in /etc/make.conf
34ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/svn-src" 43[[ -z ${ESVN_STORE_DIR} ]] && ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src"
35 44
36 45# @ECLASS-VARIABLE: ESVN_FETCH_CMD
37## -- ESVN_FETCH_CMD: subversion fetch command 46# @DESCRIPTION:
38# 47# subversion checkout command
39ESVN_FETCH_CMD="svn checkout" 48ESVN_FETCH_CMD="svn checkout"
40 49
41## -- ESVN_UPDATE_CMD: subversion update command 50# @ECLASS-VARIABLE: ESVN_UPDATE_CMD
42# 51# @DESCRIPTION:
52# subversion update command
43ESVN_UPDATE_CMD="svn update" 53ESVN_UPDATE_CMD="svn update"
44 54
55# @ECLASS-VARIABLE: ESVN_SWITCH_CMD
56# @DESCRIPTION:
57# subversion switch command
58ESVN_SWITCH_CMD="svn switch"
45 59
46## -- ESVN_OPTIONS: 60# @ECLASS-VARIABLE: ESVN_OPTIONS
47# 61# @DESCRIPTION:
48# the options passed to checkout or update. 62# the options passed to checkout or update. If you want a specific revision see
49# 63# ESVN_REPO_URI instead of using -rREV.
50: ${ESVN_OPTIONS=} 64ESVN_OPTIONS="${ESVN_OPTIONS:-}"
51 65
52 66# @ECLASS-VARIABLE: ESVN_REPO_URI
53## -- ESVN_REPO_URI: repository uri 67# @DESCRIPTION:
68# repository uri
54# 69#
55# e.g. http://foo/trunk, svn://bar/trunk 70# e.g. http://foo/trunk, svn://bar/trunk, svn://bar/branch/foo@1234
56# 71#
57# supported protocols: 72# supported protocols:
58# http:// 73# http://
59# https:// 74# https://
60# svn:// 75# svn://
61# svn+ssh:// 76# svn+ssh://
62# 77#
63: ${ESVN_REPO_URI=} 78# to peg to a specific revision, append @REV to the repo's uri
79ESVN_REPO_URI="${ESVN_REPO_URI:-}"
64 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:-}"
65 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:
66## -- ESVN_PROJECT: project name of your ebuild (= name space) 103# project name of your ebuild (= name space)
67# 104#
68# subversion eclass will check out the subversion repository like: 105# subversion eclass will check out the subversion repository like:
69# 106#
70# ${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/} 107# ${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/}
71# 108#
80# 117#
81# # jakarta commons-loggin 118# # jakarta commons-loggin
82# ESVN_PROJECT=commons/logging 119# ESVN_PROJECT=commons/logging
83# 120#
84# default: ${PN/-svn}. 121# default: ${PN/-svn}.
85# 122ESVN_PROJECT="${ESVN_PROJECT:-${PN/-svn}}"
86: ${ESVN_PROJECT:=${PN/-svn}}
87 123
88 124# @ECLASS-VARIABLE: ESVN_BOOTSTRAP
89## -- ESVN_BOOTSTRAP: 125# @DESCRIPTION:
90#
91# bootstrap script or command like autogen.sh or etc.. 126# bootstrap script or command like autogen.sh or etc..
92# 127ESVN_BOOTSTRAP="${ESVN_BOOTSTRAP:-}"
93: ${ESVN_BOOTSTRAP=}
94 128
95 129# @ECLASS-VARIABLE: ESVN_PATCHES
96## -- ESVN_PATCHES: 130# @DESCRIPTION:
97#
98# subversion eclass can apply pathces in subversion_bootstrap(). 131# subversion eclass can apply patches in subversion_bootstrap().
99# you can use regexp in this variable like *.diff or *.patch or etc. 132# you can use regexp in this variable like *.diff or *.patch or etc.
100# NOTE: patches will be applied before ESVN_BOOTSTRAP is processed. 133# NOTE: patches will be applied before ESVN_BOOTSTRAP is processed.
101# 134#
102# Patches are searched both in / and ${FILESDIR}, if not found in both locations, 135# Patches are searched both in ${PWD} and ${FILESDIR}, if not found in either
103# the installation dies. 136# location, the installation dies.
104# 137ESVN_PATCHES="${ESVN_PATCHES:-}"
105: ${ESVN_PATCHES=}
106 138
107 139# @ECLASS-VARIABLE: ESVN_RESTRICT
108## -- ESVN_RESTRICT: 140# @DESCRIPTION:
109#
110# 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
111# restrict. 142# restrict.
112# export) 143# export)
113# don't export the working copy to S. 144# don't export the working copy to S.
114# 145ESVN_RESTRICT="${ESVN_RESTRICT:-}"
115: ${ESVN_RESTRICT=}
116 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:-}"
117 152
118## -- 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}.
119# 180#
181# Can take two optional parameters:
120# @param $1 - a repository URI. default is the ESVN_REPO_URI. 182# repo_uri - a repository URI. default is ESVN_REPO_URI.
121# @param $2 - a check out path in S. 183# destination - a check out path in S.
122#
123function subversion_fetch() { 184subversion_fetch() {
124 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}}")"
125 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}"
126 194
127 # check for the protocol 195 # check for the protocol
128 local protocol="${repo_uri%%:*}" 196 local protocol="${repo_uri%%:*}"
129 197
130 case "${protocol}" in 198 case "${protocol}" in
131 http|https) 199 http|https)
132 if built_with_use dev-util/subversion nowebdav; then 200 if ! built_with_use -o dev-vcs/subversion webdav-neon webdav-serf; then
133 echo 201 echo
134 eerror "In order to emerge this package, you need to" 202 eerror "In order to emerge this package, you need to"
135 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."
136 echo 205 echo
137 die "${ESVN}: please run 'USE=-nowebdav emerge subversion'" 206 die "${ESVN}: reinstall Subversion with support for WebDAV."
138 fi 207 fi
139 ;; 208 ;;
140 svn|svn+ssh) 209 svn|svn+ssh)
141 ;; 210 ;;
142 *) 211 *)
143 die "${ESVN}: fetch from "${protocol}" is not yet implemented." 212 die "${ESVN}: fetch from '${protocol}' is not yet implemented."
144 ;; 213 ;;
145 esac 214 esac
146 215
147 addread "/etc/subversion" 216 addread "/etc/subversion"
148 addwrite "${ESVN_STORE_DIR}" 217 addwrite "${ESVN_STORE_DIR}"
149 218
150 if [[ ! -d "${ESVN_STORE_DIR}" ]]; then 219 if [[ ! -d ${ESVN_STORE_DIR} ]]; then
151 debug-print "${FUNCNAME}: initial checkout. creating subversion directory" 220 debug-print "${FUNCNAME}: initial checkout. creating subversion directory"
152 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}."
153 fi 222 fi
154 223
155 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}"
156 225
157 local wc_path="$(subversion__get_wc_path "${repo_uri}")" 226 local wc_path="$(subversion__get_wc_path "${repo_uri}")"
158 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-vcs/subversion-1.6.0"; then
237 options="${options} --config-option=config:auth:password-stores="
238 fi
159 239
160 debug-print "${FUNCNAME}: wc_path = \"${wc_path}\"" 240 debug-print "${FUNCNAME}: wc_path = \"${wc_path}\""
161 debug-print "${FUNCNAME}: ESVN_OPTIONS = \"${ESVN_OPTIONS}\"" 241 debug-print "${FUNCNAME}: ESVN_OPTIONS = \"${ESVN_OPTIONS}\""
162 debug-print "${FUNCNAME}: options = \"${options}\"" 242 debug-print "${FUNCNAME}: options = \"${options}\""
163 243
164 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
165 # first check out 248 # first check out
166 einfo "subversion check out start -->" 249 einfo "subversion check out start -->"
167 einfo " repository: ${repo_uri}" 250 einfo " repository: ${repo_uri}${revision:+@}${revision}"
168 251
169 debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}" 252 debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}"
170 253
171 mkdir -p "${ESVN_PROJECT}" || die "${ESVN}: can't mkdir ${ESVN_PROJECT}." 254 mkdir -p "${ESVN_PROJECT}" || die "${ESVN}: can't mkdir ${ESVN_PROJECT}."
172 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
173 ${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
174 261
262 elif [[ -n ${ESVN_OFFLINE} ]]; then
263 svn upgrade "${wc_path}" &>/dev/null
264 svn cleanup "${wc_path}" &>/dev/null
175 subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy." 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}."
176 else 270 else
271 svn upgrade "${wc_path}" &>/dev/null
272 svn cleanup "${wc_path}" &>/dev/null
177 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."
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
178 if [ "${ESVN_WC_URL}" != "$(subversion__get_repository_uri "${repo_uri}" 1)" ]; then 287 if [[ ${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 -->" 288 einfo "subversion switch start -->"
184 einfo " repository: ${repo_uri}" 289 einfo " old repository: ${ESVN_WC_URL}@${ESVN_WC_REVISION}"
290 einfo " new repository: ${repo_uri}${revision:+@}${revision}"
185 291
186 debug-print "${FUNCNAME}: ${ESVN_UPDATE_CMD} ${options}" 292 debug-print "${FUNCNAME}: ${ESVN_SWITCH_CMD} ${options} ${repo_uri}"
187 293
188 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
189 ${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}."
312 fi
313 fi
314 fi
190 fi 315 fi
191 316
192 einfo " working copy: ${wc_path}" 317 einfo " working copy: ${wc_path}"
193 318
194 if ! has "export" ${ESVN_RESTRICT}; then 319 if ! has "export" ${ESVN_RESTRICT}; then
195 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}" 320 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}"
196 321
197 local S="${S}/${S_dest}" 322 local S="${S}/${S_dest}"
323 mkdir -p "${S}"
198 324
199 # export to the ${WORKDIR} 325 # export to the ${WORKDIR}
200 #* "svn export" has a bug. see http://bugs.gentoo.org/119236 326 #* "svn export" has a bug. see http://bugs.gentoo.org/119236
201 #* svn export . "${S}" || die "${ESVN}: can't export to ${S}." 327 #* svn export . "${S}" || die "${ESVN}: can't export to ${S}."
202 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}."
203 fi 329 fi
204 330
205 echo 331 echo
206} 332}
207 333
208 334# @FUNCTION: subversion_bootstrap
209## -- subversion_bootstrap() ------------------------------------------------ # 335# @DESCRIPTION:
210# 336# Apply patches in ${ESVN_PATCHES} and run ${ESVN_BOOTSTRAP} if specified.
211function subversion_bootstrap() { 337subversion_bootstrap() {
212 if has "export" ${ESVN_RESTRICT}; then 338 if has "export" ${ESVN_RESTRICT}; then
213 return 339 return
214 fi 340 fi
215 341
216 cd "${S}" 342 cd "${S}"
217 343
218 if [[ -n "${ESVN_PATCHES}" ]]; then 344 if [[ -n ${ESVN_PATCHES} ]]; then
219 einfo "apply patches -->" 345 einfo "apply patches -->"
220 346
221 local patch fpatch 347 local patch fpatch
348
222 for patch in ${ESVN_PATCHES}; do 349 for patch in ${ESVN_PATCHES}; do
223 if [[ -f "${patch}" ]]; then 350 if [[ -f ${patch} ]]; then
224 epatch "${patch}" 351 epatch "${patch}"
352
225 else 353 else
226 for fpatch in ${FILESDIR}/${patch}; do 354 for fpatch in ${FILESDIR}/${patch}; do
227 if [[ -f "${fpatch}" ]]; then 355 if [[ -f ${fpatch} ]]; then
228 epatch "${fpatch}" 356 epatch "${fpatch}"
357
229 else 358 else
230 die "${ESVN}: ${patch} not found" 359 die "${ESVN}: ${patch} not found"
360
231 fi 361 fi
232 done 362 done
363
233 fi 364 fi
234 done 365 done
366
235 echo 367 echo
236 fi 368 fi
237 369
238 if [[ -n "${ESVN_BOOTSTRAP}" ]]; then 370 if [[ -n ${ESVN_BOOTSTRAP} ]]; then
239 einfo "begin bootstrap -->" 371 einfo "begin bootstrap -->"
240 372
241 if [[ -f "${ESVN_BOOTSTRAP}" && -x "${ESVN_BOOTSTRAP}" ]]; then 373 if [[ -f ${ESVN_BOOTSTRAP} && -x ${ESVN_BOOTSTRAP} ]]; then
242 einfo " bootstrap with a file: ${ESVN_BOOTSTRAP}" 374 einfo " bootstrap with a file: ${ESVN_BOOTSTRAP}"
243 eval "./${ESVN_BOOTSTRAP}" || die "${ESVN}: can't execute ESVN_BOOTSTRAP." 375 eval "./${ESVN_BOOTSTRAP}" || die "${ESVN}: can't execute ESVN_BOOTSTRAP."
376
244 else 377 else
245 einfo " bootstrap with command: ${ESVN_BOOTSTRAP}" 378 einfo " bootstrap with command: ${ESVN_BOOTSTRAP}"
246 eval "${ESVN_BOOTSTRAP}" || die "${ESVN}: can't eval ESVN_BOOTSTRAP." 379 eval "${ESVN_BOOTSTRAP}" || die "${ESVN}: can't eval ESVN_BOOTSTRAP."
247 fi 380
248 fi 381 fi
382 fi
249} 383}
250 384
251## -- subversion_src_unpack() ------------------------------------------------ # 385# @FUNCTION: subversion_src_unpack
252# 386# @DESCRIPTION:
387# Default src_unpack. Fetch and, in older EAPIs, bootstrap.
253function subversion_src_unpack() { 388subversion_src_unpack() {
254 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() {
255 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap." 399 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap."
256} 400}
257 401
258 402# @FUNCTION: subversion_wc_info
259## -- 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.
260# 407#
261# @param $1 - repository URI. default is ESVN_REPO_URI. 408# The working copy information on the specified repository URI are set to
262# 409# ESVN_WC_* variables.
263function subversion_wc_info() { 410subversion_wc_info() {
264 local repo_uri="$(subversion__get_repository_uri "${1}")" 411 local repo_uri="$(subversion__get_repository_uri "${1:-${ESVN_REPO_URI}}")"
265 local wc_path="$(subversion__get_wc_path "${repo_uri}")" 412 local wc_path="$(subversion__get_wc_path "${repo_uri}")"
266 413
267 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 414 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
268 debug-print "${FUNCNAME}: wc_path = ${wc_path}" 415 debug-print "${FUNCNAME}: wc_path = ${wc_path}"
269 416
270 if [[ ! -e "${wc_path}" ]]; then 417 if [[ ! -d ${wc_path} ]]; then
271 return 1 418 return 1
272 fi 419 fi
273 420
274 local k 421 export ESVN_WC_URL="$(subversion__svn_info "${wc_path}" "URL")"
275 for k in url revision; do 422 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}")" 423 export ESVN_WC_UUID="$(subversion__svn_info "${wc_path}" "Repository UUID")"
277 done 424 export ESVN_WC_REVISION="$(subversion__svn_info "${wc_path}" "Revision")"
425 export ESVN_WC_PATH="${wc_path}"
278} 426}
279 427
280## -- Private Functions 428## -- Private Functions
281 429
282
283## -- subversion__svn_info() ------------------------------------------------- # 430## -- subversion__svn_info() ------------------------------------------------- #
284# 431#
285# @param $1 - a target. 432# param $1 - a target.
286# @param $2 - a key name. 433# param $2 - a key name.
287# 434#
288function subversion__svn_info() { 435subversion__svn_info() {
289 local target="${1}" 436 local target="${1}"
290 local key="${2}" 437 local key="${2}"
291 438
292 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-
293} 440}
294 441
295
296## -- subversion__get_repository_uri() --------------------------------------- # 442## -- subversion__get_repository_uri() --------------------------------------- #
297# 443#
298# @param $1 - a repository URI. 444# 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() { 445subversion__get_repository_uri() {
303 local repo_uri="${1:-${ESVN_REPO_URI}}" 446 local repo_uri="${1}"
304 local remove_peg_revision="${2}"
305 447
306 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 448 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
307 debug-print "${FUNCNAME}: remove_peg_revision = ${remove_peg_revision}"
308 449
309 if [[ -z "${repo_uri}" ]]; then 450 if [[ -z ${repo_uri} ]]; then
310 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty." 451 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty."
311 fi 452 fi
312 453
313 # delete trailing slash 454 # delete trailing slash
314 if [[ -z "${repo_uri##*/}" ]]; then 455 if [[ -z ${repo_uri##*/} ]]; then
315 repo_uri="${repo_uri%/}" 456 repo_uri="${repo_uri%/}"
316 fi 457 fi
317 458
318 if [[ -n "${remove_peg_revision}" ]]; then
319 if subversion__has_peg_revision "${repo_uri}"; then
320 repo_uri="${repo_uri%@*}" 459 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 460
327 echo "${repo_uri}" 461 echo "${repo_uri}"
328} 462}
329 463
330
331## -- subversion__get_wc_path() ---------------------------------------------- # 464## -- subversion__get_wc_path() ---------------------------------------------- #
332# 465#
333# @param $1 - a repository URI. 466# param $1 - a repository URI.
334#
335function subversion__get_wc_path() { 467subversion__get_wc_path() {
336 local repo_uri="$(subversion__get_repository_uri "${1}" 1)" 468 local repo_uri="$(subversion__get_repository_uri "${1}")"
337 469
338 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 470 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
339 471
340 echo "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${repo_uri##*/}" 472 echo "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${repo_uri##*/}"
341} 473}
342 474
343
344## -- subversion__has_peg_revision() ----------------------------------------- # 475## -- subversion__get_peg_revision() ----------------------------------------- #
345# 476#
346# @param $1 - a repository URI. 477# param $1 - a repository URI.
347#
348function subversion__has_peg_revision() { 478subversion__get_peg_revision() {
349 local repo_uri="${1}" 479 local repo_uri="${1}"
350 480
351 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 481 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
352 482
353 # repo_uri has peg revision ? 483 # repo_uri has peg revision ?
354 if [[ "${repo_uri}" != *@* ]]; then 484 if [[ ${repo_uri} != *@* ]]; then
355 debug-print "${FUNCNAME}: repo_uri does not have a peg revision." 485 debug-print "${FUNCNAME}: repo_uri does not have a peg revision."
356 return 1
357 fi 486 fi
358 487
359 local peg_rev="${repo_uri##*@}" 488 local peg_rev=
360 489 [[ ${repo_uri} = *@* ]] && peg_rev="${repo_uri##*@}"
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 490
376 debug-print "${FUNCNAME}: peg_rev = ${peg_rev}" 491 debug-print "${FUNCNAME}: peg_rev = ${peg_rev}"
377 492
378 return 0 493 echo "${peg_rev}"
379} 494}
380 495
381 496# @FUNCTION: subversion_pkg_preinst
382## -- subversion__to_upper_case() ----------------------------------------- # 497# @USAGE: [repo_uri]
383# 498# @DESCRIPTION:
384# @param $@ - the strings to upper case. 499# Log the svn revision of source code. Doing this in pkg_preinst because we
385# 500# want the logs to stick around if packages are uninstalled without messing with
386function subversion__to_upper_case() { 501# config protection.
387 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
388} 518}

Legend:
Removed from v.1.44  
changed lines
  Added in v.1.68

  ViewVC Help
Powered by ViewVC 1.1.20