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

Diff of /eclass/subversion.eclass

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

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

Legend:
Removed from v.1.40  
changed lines
  Added in v.1.59

  ViewVC Help
Powered by ViewVC 1.1.20