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

Diff of /eclass/cvs.eclass

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

Revision 1.2 Revision 1.31
1# Copyright 1999-2000 Gentoo Technologies, Inc. 1# Copyright 1999-2003 Gentoo Technologies, Inc.
2# Distributed under the terms of the GNU General Public License, v2 or later 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.31 2003/02/16 04:26:21 vapier Exp $
4#
3# Author Dan Armak <danarmak@gentoo.org> 5# Author Dan Armak <danarmak@gentoo.org>
4# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.2 2002/07/17 21:14:56 danarmak Exp $ 6#
5# This eclass provides the generic cvs fetching functions. 7# This eclass provides the generic cvs fetching functions.
6 8
7ECLASS=cvs 9ECLASS=cvs
8INHERITED="$INHERITED $ECLASS" 10INHERITED="$INHERITED $ECLASS"
9 11
16# cvs command to run. you can set fex. "cvs -t" for extensive debug information 18# cvs command to run. you can set fex. "cvs -t" for extensive debug information
17# on the cvs onnection. the default of "cvs -q -f -z4" means to be quiet, to disregard 19# on the cvs onnection. the default of "cvs -q -f -z4" means to be quiet, to disregard
18# the ~/.cvsrc config file and to use maximum compression. 20# the ~/.cvsrc config file and to use maximum compression.
19[ -z "$ECVS_CVS_COMMAND" ] && ECVS_CVS_COMMAND="cvs -q -f -z4" 21[ -z "$ECVS_CVS_COMMAND" ] && ECVS_CVS_COMMAND="cvs -q -f -z4"
20 22
23# cvs options given after the command (i.e. cvs update foo)
24# don't remove -dP or things won't work
25[ -z "$ECVS_CVS_OPTIONS" ] && ECVS_CVS_OPTIONS="-dP"
26
27# set this for the module/subdir to be fetched non-recursively
28#[ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l"
29
21# Where the cvs modules are stored/accessed 30# Where the cvs modules are stored/accessed
22[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="/usr/src" 31[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${DISTDIR}/cvs-src"
23 32
24# Name of cvs server, set to "" to disable fetching 33# Name of cvs server, set to "offline" to disable fetching
25# (i.e. to assume module is checked out already and don't update it). 34# (i.e. to assume module is checked out already and don't update it).
26# Format is server:/dir e.g. "anoncvs.kde.org:/home/kde". remove the other 35# Format is server:/dir e.g. "anoncvs.kde.org:/home/kde". remove the other
27# parts of the full CVSROOT (which looks like 36# parts of the full CVSROOT (which looks like
28# ":pserver:anonymous@anoncvs.kde.org:/home/kde"); these are added from 37# ":pserver:anonymous@anoncvs.kde.org:/home/kde"); these are added from
29# other settings 38# other settings
30[ -z "$ECVS_SERVER" ] && ECVS_SERVER="" 39[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline"
40
41# Anonymous cvs login?
42# if 'yes' uses :pserver: with empty password, if 'no' uses :ext: with $ECVS_PASS, other values not allowed
43[ -z "$ECVS_ANON" ] && ECVS_ANON="yes"
44
45# Authentication method to use on ECVS_ANON="no" - possible values are "pserver" and "ext"
46[ -z "$ECVS_AUTH" ] && ECVS_AUTH="ext"
47
48# Use su to run cvs as user
49[ -z "$ECVS_RUNAS" ] && ECVS_RUNAS="`whoami`"
31 50
32# Username to use 51# Username to use
33[ -z "$ECVS_USER" ] && ECVS_USER="anonymous" 52[ -z "$ECVS_USER" ] && ECVS_USER="anonymous"
34 53
35# Password to use (NOT (YET) SUPPORTED, because cvs doesn't store passwords in plaintext in .cvspass) 54# Password to use if anonymous login is off
36[ -z "$ECVS_PASS" ] && ECVS_PASS="" 55[ -z "$ECVS_PASS" ] && ECVS_PASS=""
37 56
38# Module to be fetched, must be set explicitly - 57# Module to be fetched, must be set explicitly -
39# I don't like the former ="$NP" default setting 58# I don't like the former ="$PN" default setting
40[ -z "$ECVS_MODULE" ] && die "$ECLASS: error: ECVS_MODULE not set, cannot continue" 59[ -z "$ECVS_MODULE" ] && debug-print "$ECLASS: error: ECVS_MODULE not set, cannot continue"
41 60
61# Branch/tag to use, default is HEAD
62# uncomment the following line to enable the reset-branch-to-HEAD behaviour
63[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD"
64
42# Subdirectory in module to be fetched, default is root "/" = whole module (NOT YET IMPLEMENTED) 65# Subdirectory in module to be fetched, default is not defined = whole module
66# DO NOT set default to "", if it's defined at all code will break!
67# don't uncomment following line!
43[ -z "$ECVS_MODULE_SUBDIR" ] && ECVS_MODULE_SUBDIR="/" 68#[ -z "$ECVS_SUBDIR" ] && ECVS_SUBDIR=""
44 69
45# --- end ebuild-configurable settings --- 70# --- end ebuild-configurable settings ---
46 71
47debug-print "$ECLASS: init: ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND 72# add cvs to deps
73DEPEND="$DEPEND dev-util/cvs dev-python/pexpect"
74
75# since we now longer have src_fetch as a redefinable ebuild function,
76# we are forced to call this function from cvs_src_unpack
77cvs_fetch() {
78
79 debug-print-function $FUNCNAME $*
80
81 debug-print "$FUNCNAME: init:
82ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND
83ECVS_CVS_OPTIONS=$ECVS_CVS_OPTIONS
48ECVS_TOP_DIR=$ECVS_TOP_DIR 84ECVS_TOP_DIR=$ECVS_TOP_DIR
49ECVS_SERVER=$ECVS_SERVER 85ECVS_SERVER=$ECVS_SERVER
86ECVS_ANON=$ECVS_ANON
50ECVS_USER=$ECVS_USER 87ECVS_USER=$ECVS_USER
51ECVS_PASS=$ECVS_PASS 88ECVS_PASS=$ECVS_PASS
52ECS_MODULE=$ECVS_MODULE 89ECS_MODULE=$ECVS_MODULE
53ECVS_MODULE_SUBDIR=$ECVS_MODULE_SUBDIR" 90ECVS_SUBDIR=$ECVS_SUBDIR
91ECVS_LOCAL=$ECVS_LOCAL
92DIR=$DIR"
54 93
55# since we now longer have src_fetch as a redefinable ebuild function, 94 # a shorthand
56# we are forced to call this function from cvs_src_unpack 95 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}"
57cvs_fetch() { 96 debug-print "$FUNCNAME: now DIR=$DIR"
58 97
59 debug-print-function $FUNCNAME $* 98 if [ "$ECVS_SERVER" == "offline" ]; then
99 # we're not required to fetch anything, the module already exists and shouldn't be updated
100 if [ -d "$DIR" ]; then
101 debug-print "$FUNCNAME: offline mode, exiting"
102 return 0
103 else
104 einfo "ERROR: Offline mode specified, but module/subdir not found. Aborting."
105 debug-print "$FUNCNAME: offline mode specified but module/subdir not found, exiting with error"
106 return 1
107 fi
108 fi
60 109
110 # create target directory as needed
111 if [ ! -d "$DIR" ]; then
112 debug-print "$FUNCNAME: creating cvs directory $DIR"
113 #export SANDBOX_WRITE="$SANDBOX_WRITE:/foobar:/"
114 addwrite /foobar
115 addwrite /
116 mkdir -p "/$DIR"
117 export SANDBOX_WRITE="${SANDBOX_WRITE//:\/foobar:\/}"
118 fi
119
120 # in case ECVS_TOP_DIR is a symlink to a dir, get the real dir's path,
121 # otherwise addwrite() doesn't work.
122 cd -P "$ECVS_TOP_DIR" > /dev/null
123 ECVS_TOP_DIR="`/bin/pwd`"
124 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}"
125 cd "$OLDPWD"
126
127 debug-print "$FUNCNAME: now DIR=$DIR"
128
61 # disable the sandbox for this dir 129 # disable the sandbox for this dir
62 [ ! -d "$ECVS_TOP_DIR" ] && mkdir -p $ECVS_TOP_DIR 130 # not just $DIR because we want to create moduletopdir/CVS too
63 addread ${ECVS_TOP_DIR} 131 addwrite "$ECVS_TOP_DIR/$ECVS_MODULE"
64 addwrite ${ECVS_TOP_DIR}
65 132
133 # add option for local (non-recursive) fetching
134 [ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l"
135
66 # prepare a cvspass file just for this session so that cvs thinks we're logged 136 # prepare a cvspass file just for this session so that cvs thinks we're logged
67 # in at the cvs server. we don't want to mess with ~/.cvspass. 137 # in at the cvs server. we don't want to mess with ~/.cvspass.
68 echo ":pserver:${ECVS_SERVER} A" > ${T}/cvspass 138 echo ":pserver:${ECVS_SERVER} A" > "${T}/cvspass"
69 export CVS_PASSFILE="${T}/cvspass" 139 export CVS_PASSFILE="${T}/cvspass"
70 140 chown $ECVS_RUNAS "${T}/cvspass"
71 cd $ECVS_TOP_DIR 141 #export CVSROOT=:pserver:${ECVS_USER}@${ECVS_SERVER}
72 142
143 # Note: cvs update and checkout commands are unified.
144 # we make sure a CVS/ dir exists in our module subdir with the right
145 # Root and Repository entries in it and cvs update.
146
147 [ "${ECVS_ANON}" == "yes" ] && \
148 newserver=":pserver:${ECVS_USER}@${ECVS_SERVER}" || \
149 newserver=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
150
151
152 # CVS/Repository files can't (I think) contain two concatenated slashes
73 if [ -z "$ECVS_SERVER" ]; then 153 if [ -n "$ECVS_SUBDIR" ]; then
74 # we're not required to fetch anything, the module already exists and shouldn't be updated 154 repository="${ECVS_MODULE}/${ECVS_SUBDIR}"
75 if [ -d "$ECVS_MODULE" ]; then 155 else
76 debug-print "$FUNCNAME: offline mode, exiting" 156 repository="${ECVS_MODULE}"
77 return 0 157 fi
78 else 158
79 einfo "ERROR: Offline mode specified, but module not found. Aborting." 159 debug-print "$FUNCNAME: Root<-$newserver, Repository<-$repository"
80 debug-print "$FUNCNAME: offline mode specified but module not found, exiting with error" 160 debug-print "$FUNCNAME: entering directory $DIR"
81 return 1 161 cd "/$DIR"
82 fi 162
163 if [ ! -d "CVS" ]; then
164 # create a new CVS/ directory (checkout)
165 debug-print "$FUNCNAME: creating new cvs directory"
166
167 mkdir CVS
168 echo $newserver > CVS/Root
169 echo $repository > CVS/Repository
170 touch CVS/Entries
171
172 # if we're checking out a subdirectory only, create a CVS/ dir
173 # in the module's top dir so that the user (and we) can cvs update
174 # from there to get the full module.
175 if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then
176 debug-print "$FUNCNAME: Copying CVS/ directory to module top-level dir"
177 cp -r CVS "$ECVS_TOP_DIR/$ECVS_MODULE/"
178 echo $ECVS_MODULE > "$ECVS_TOP_DIR/$ECVS_MODULE/CVS/Repository"
83 fi 179 fi
84 180
85 if [ -d "${ECVS_MODULE}" ]; then 181 else
86 #update existing module 182 #update existing module
87 183 debug-print "$FUNCNAME: updating existing module/subdir"
88 cd ${ECVS_MODULE} 184
89
90 # Switch servers if needed 185 # Switch servers if needed
91 # cvs keeps the server info in th CVS/Root file in every checked-out dir; 186 # cvs keeps the server info in the CVS/Root file in every checked-out dir;
92 # we can fix those files to point to the new server 187 # we can fix those files to point to the new server
93 newserver=":pserver:anonymous@${ECVS_SERVER}"
94 oldserver="`cat CVS/Root`" 188 oldserver="`cat CVS/Root`"
95 if [ "$newserver" != "$oldserver" ]; then 189 if [ "$newserver" != "$oldserver" ]; then
96 190
97 einfo "Changing CVS server from $oldserver to $newserver:" 191 einfo "Changing CVS server from $oldserver to $newserver:"
98 debug-print "$FUNCNAME: Changing CVS server from $oldserver to $newserver:" 192 debug-print "$FUNCNAME: Changing CVS server from $oldserver to $newserver:"
103 debug-print "$cvsdirs" 197 debug-print "$cvsdirs"
104 198
105 einfo "Modifying CVS dirs..." 199 einfo "Modifying CVS dirs..."
106 for x in $cvsdirs; do 200 for x in $cvsdirs; do
107 debug-print "In $x" 201 debug-print "In $x"
108 echo $newserver > $x/Root 202 echo $newserver > "$x/Root"
109 done 203 done
110 204
111 fi 205 fi
112 206
207 fi
208
209 # cvs auto-switches branches, how nice
210 # warning: if we do it this way we get multiple -rX options - harmless i think
211 [ -n "$ECVS_BRANCH" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -r$ECVS_BRANCH"
212
213 # Chowning the directory
214 if [ "${ECVS_RUNAS}" != "`whoami`" ]; then
215 chown -R "$ECVS_RUNAS" "/$DIR"
216 fi
217
218 # finally run the cvs update command
219 debug-print "$FUNCNAME: is in dir `/bin/pwd`"
113 debug-print "$FUNCNAME: running $ECVS_CVS_COMMAND update with $ECVS_SERVER for module $ECVS_MODULE" 220 debug-print "$FUNCNAME: running $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS with $ECVS_SERVER for module $ECVS_MODULE subdir $ECVS_SUBDIR"
114 einfo "Running $ECVS_CVS_COMMAND update with $ECVS_SERVER for module $ECVS_MODULE..." 221 einfo "Running $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS with $ECVS_SERVER for $ECVS_MODULE/$ECVS_SUBDIR..."
115 $ECVS_CVS_COMMAND update -dP || die "died running cvs update"
116 222
223 if [ "${ECVS_ANON}" == "no" ]; then
224
225 debug-print "$FUNCNAME: starting non-anonymous cvs login..."
226 # CVS Login - written in python :: the right way ;)
227 # Tilman Klar, <phoenix@gentoo.org>
228
229 export CVS_RSH="/usr/bin/ssh"
230
231############################## inline-python #####################################
232/usr/bin/env python << EndOfFile
233
234import pexpect,os
235
236mypasswd = "${ECVS_PASS}"
237myauth = "${ECVS_AUTH}"
238mytimeout = 10
239
240if "${ECVS_RUNAS}" == "`whoami`":
241 mycommand = "${ECVS_CVS_COMMAND} update ${ECVS_CVS_OPTIONS}"
242else:
243 mycommand = "su ${ECVS_RUNAS} -c \"${ECVS_CVS_COMMAND} update ${ECVS_CVS_OPTIONS}\""
244
245if myauth == "ext":
246 child = pexpect.spawn(mycommand)
247
248 index = child.expect(['continue connecting','word:'], mytimeout)
249 if index == 0:
250 child.sendline('yes')
251 ## Added server to ~/.ssh/known_hosts
252 child.expect('word:', mytimeout)
253 else:
254 ## Server already is in ~/.ssh/known_hosts
255 pass
256
257 child.sendline(mypasswd)
258 child.expect(pexpect.EOF)
259
260elif myauth == "pserver":
261 if "${ECVS_RUNAS}" == "`whoami`":
262 mycommand2 = "cvs login"
263 else:
264 mycommand2 = "su ${ECVS_RUNAS} -c \"cvs login\""
265 child = pexpect.spawn(mycommand2)
266 child.expect("CVS password:",mytimeout)
267 child.sendline(mypasswd)
268 child.expect(pexpect.EOF)
269
270 # Logged in - checking out
271 os.system(mycommand)
272
273EndOfFile
274########################### End of inline-python ##################################
117 else 275 else
118 # checkout module 276 debug-print "$FUNCNAME: using anonymous cvs login"
119 277 $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS || die "died running cvs update"
120 export CVSROOT=:pserver:${ECVS_USER}@${ECVS_SERVER}
121 debug-print "$FUNCNAME: running $ECVS_CVS_COMMAND checkout -P $ECVS_MODULE with $CVSROOT..."
122 einfo "Running $ECVS_CVS_COMMAND checkout -P $ECVS_MODULE with $CVSROOT..."
123 $ECVS_CVS_COMMAND checkout -P $ECVS_MODULE || die "died running cvs checkout"
124
125 fi 278 fi
126 279
280 # log out and restore ownership
281 if [ "$ECVS_RUNAS" == "`whoami`" ]; then
282 cvs logout &> /dev/null
283 else
284 su $ECVS_RUNAS -c "cvs logout" &> /dev/null
285 fi
286 chown `whoami` "${T}/cvspass"
127} 287}
128 288
129cvs_src_unpack() { 289cvs_src_unpack() {
130 290
131 debug-print-function $FUNCNAME $* 291 debug-print-function $FUNCNAME $*
132 cvs_fetch || die "died running cvs_fetch" 292 cvs_fetch || die "died running cvs_fetch"
133 293
134 einfo "Copying module $ECVS_MODULE from $ECVS_TOP_DIR..." 294 einfo "Copying $ECVS_MODULE/$ECVS_SUBDIR from $ECVS_TOP_DIR..."
135 debug-print "Copying module $ECVS_MODULE from $ECVS_TOP_DIR..." 295 debug-print "Copying module $ECVS_MODULE subdir $ECVS_SUBDIR local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR..."
136 # the reason this lives here and not in kde-source_src_unpack 296
137 # is that in the future after copying the sources we might need to 297 # probably redundant, but best to make sure
138 # delete them, so this has to be self-contained 298 mkdir -p "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR"
139 cp -Rf ${ECVS_TOP_DIR}/${ECVS_MODULE} $WORKDIR 299
140 300 if [ -n "$ECVS_SUBDIR" ]; then
141 # typically for kde cvs, the admin subdir lives in the kde-common module 301 if [ -n "$ECVS_LOCAL" ]; then
142 # which is also needed 302 cp -f "$ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR"/* "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR"
143 if [ ! -d "${WORKDIR}/${ECVS_MODULE}/admin" ]; then 303 else
144 ECVS_MODULE="kde-common" cvs_fetch 304 cp -Rf "$ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR" "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR/.."
145 einfo "Copying admin/ subdir from module kde-common, $ECVS_TOP_DIR..." 305 fi
146 debug-print "Copying admin/ subdir from module kde-common, $ECVS_TOP_DIR..." 306 else
307 if [ -n "$ECVS_LOCAL" ]; then
308 cp -f "$ECVS_TOP_DIR/$ECVS_MODULE"/* $WORKDIR/$ECVS_MODULE
309 else
147 cp -Rf ${ECVS_TOP_DIR}/${ECVS_MODULE} $WORKDIR 310 cp -Rf "$ECVS_TOP_DIR/$ECVS_MODULE" "$WORKDIR"
148 fi 311 fi
312 fi
149 313
314 # if the directory is empty, remove it; empty directories cannot exist in cvs.
315 # this happens when fex. kde-source requests module/doc/subdir which doesn't exist.
316 # still create the empty directory in workdir though.
317 if [ "`ls -A \"$DIR\"`" == "CVS" ]; then
318 debug-print "$FUNCNAME: removing cvs-empty directory $ECVS_MODULE/$ECVS_SUBDIR"
319 rm -rf "$DIR"
320 fi
321
322 # implement some of base_src_unpack's functionality;
323 # note however that base.eclass may not have been inherited!
324 if [ -n "$PATCHES" ]; then
325 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching"
326 cd "$S"
327 for x in $PATCHES; do
328 debug-print "patching from $x"
329 patch -p0 < "$x"
330 done
331 # make sure we don't try to apply patches more than once, since
332 # cvs_src_unpack is usually called several times from e.g. kde-source_src_unpack
333 export PATCHES=""
334 fi
335
150} 336}
151 337
152EXPORT_FUNCTIONS src_unpack 338EXPORT_FUNCTIONS src_unpack
153

Legend:
Removed from v.1.2  
changed lines
  Added in v.1.31

  ViewVC Help
Powered by ViewVC 1.1.20