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

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

  ViewVC Help
Powered by ViewVC 1.1.20