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

Diff of /eclass/cvs.eclass

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

Revision 1.6 Revision 1.36
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.36 2003/04/19 11:52:50 danarmak 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.6 2002/08/01 19:16:31 danarmak Exp $ 6#
5# This eclass provides the generic cvs fetching functions. 7# This eclass provides the generic cvs fetching functions.
8# to use from an ebuild, set the 'ebuild-configurable settings' below in your ebuild before inheriting.
9# then either leave the default src_unpack or extend over cvs_src_unpack.
10# if you find that you need to call the cvs_* functions directly, i'd be interested to hear about it.
6 11
7ECLASS=cvs 12ECLASS=cvs
8INHERITED="$INHERITED $ECLASS" 13INHERITED="$INHERITED $ECLASS"
9 14
10# You shouldn't change these settings yourself! The ebuild/eclass inheriting this eclass 15# You shouldn't change these settings yourself! The ebuild/eclass inheriting this eclass
14# --- begin ebuild-configurable settings 19# --- begin ebuild-configurable settings
15 20
16# cvs command to run. you can set fex. "cvs -t" for extensive debug information 21# 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 22# 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. 23# the ~/.cvsrc config file and to use maximum compression.
19[ -z "$ECVS_CVS_COMMAND" ] && ECVS_CVS_COMMAND="cvs -f -z4" 24[ -z "$ECVS_CVS_COMMAND" ] && ECVS_CVS_COMMAND="cvs -q -f -z4"
25
26# cvs options given after the cvs command (update or checkout)
27# don't remove -dP from update or things won't work
28[ -z "$ECVS_UP_OPTS" ] && ECVS_UP_OPTS="-dP"
29[ -z "$ECVS_CO_OPTS" ] && ECVS_CO_OPTS=""
30
31# set this to some value for the module/subdir to be fetched non-recursively: ECVS_LOCAL
20 32
21# Where the cvs modules are stored/accessed 33# Where the cvs modules are stored/accessed
22[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="/usr/src" 34[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${DISTDIR}/cvs-src"
23 35
24# Name of cvs server, set to "" to disable fetching 36# 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). 37# (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 38# Format is server:/dir e.g. "anoncvs.kde.org:/home/kde". remove the other
27# parts of the full CVSROOT (which looks like 39# parts of the full CVSROOT (which looks like
28# ":pserver:anonymous@anoncvs.kde.org:/home/kde"); these are added from 40# ":pserver:anonymous@anoncvs.kde.org:/home/kde"); these are added from
29# other settings 41# other settings
42# the special value 'offline' disables fetching, assumes sources are alread in ECVS_TOP_DIR
30[ -z "$ECVS_SERVER" ] && ECVS_SERVER="" 43[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline"
31 44
32# Username to use 45# Authentication method to use - possible values are "pserver" and "ext"
46# WARNING ext is NOT supported! (never was, despite what earlier version of this file said)
47[ -z "$ECVS_AUTH" ] && ECVS_AUTH="pserver"
48[ "$ECVS_AUTH" == ext ] && die "ERROR: ext auth not supported. If you want it, please contact danarmak@gentoo.org."
49
50# Use su to run cvs as user
51# Currently b0rked and wouldn't work with portage userpriv anyway without special magic
52# [ -z "$ECVS_RUNAS" ] && ECVS_RUNAS="`whoami`"
53
54# Username to give to the server
33[ -z "$ECVS_USER" ] && ECVS_USER="anonymous" 55[ -z "$ECVS_USER" ] && ECVS_USER="anonymous"
34 56
35# Password to use (NOT (YET) SUPPORTED, because cvs doesn't store passwords in plaintext in .cvspass) 57# Password to use
36[ -z "$ECVS_PASS" ] && ECVS_PASS="" 58[ -z "$ECVS_PASS" ] && ECVS_PASS=""
37 59
38# Module to be fetched, must be set explicitly - 60# Module to be fetched, must be set when kde_src_unpack is called
39# I don't like the former ="$NP" default setting 61# can include several directory levels, ie foo/bar/baz
40[ -z "$ECVS_MODULE" ] && die "$ECLASS: error: ECVS_MODULE not set, cannot continue" 62#[ -z "$ECVS_MODULE" ] && die "$ECLASS: error: ECVS_MODULE not set, cannot continue"
41 63
42# Subdirectory in module to be fetched, default is not defined = whole module 64# Branch/tag to use, default is HEAD
43# DO NOT set default to "", if it's defined at all code will break! 65# the following default _will_ reset your branch checkout to head if used
44# don't uncomment following line! 66#[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD"
45#[ -z "$ECVS_MODULE_SUBDIR" ] && ECVS_MODULE_SUBDIR="" 67
68# deprecated - do not use
69[ -n "$ECVS_SUBDIR" ] && die "ERROR: deprecated ECVS_SUBDIR defined. Please fix this ebuild."
46 70
47# --- end ebuild-configurable settings --- 71# --- end ebuild-configurable settings ---
48 72
49# add cvs to deps 73# add cvs to deps
74# ssh is used for ext auth
75# sudo is used to run as a specified user
50DEPEND="$DEPEND dev-util/cvs" 76DEPEND="$DEPEND dev-util/cvs app-admin/sudo"
77#[ "$ECVS_AUTH" == "ext" ] && DEPEND="$DEPEND net-misc/openssh"
51 78
52# since we now longer have src_fetch as a redefinable ebuild function, 79# calls cvs_contorl, is called from cvs_src_unpack
53# we are forced to call this function from cvs_src_unpack
54cvs_fetch() { 80cvs_fetch() {
81
82 debug-print-function $FUNCNAME $*
83
84 # parameters modifying other parameters that should be effective every time cvs_prep is called, and not
85 # just every time cvs.eclas is inherited
86 # 1. parameter for local (non-recursive) fetching
87 if [ -n "$ECVS_LOCAL" ]; then
88 ECVS_UP_OPTS="$ECVS_UP_OPTS -l"
89 ECVS_CO_OPTS="$ECVS_CO_OPTS -l"
90 fi
91 # 2. cvs auto-switches branches, we just have to pass the correct -rBRANCH option to it when updating.
92 # doing it this way we get multiple -rX options - harmless afaik
93 if [ -n "$ECVS_BRANCH" ]; then
94 ECVS_UP_OPTS="$ECVS_UP_OPTS -r$ECVS_BRANCH"
95 ECVS_CO_OPTS="$ECVS_CO_OPTS -r$ECVS_BRANCH"
96 fi
97
98 # it's easiest to always be in "run-as mode", logic-wise
99 # or would be if sudo didn't ask for a password even when sudo'ing to `whoami`
100 if [ -z "$ECVS_RUNAS" ]; then
101 run=""
102 else
103 run="sudo -u $ECVS_RUNAS"
104 fi
105
106 # create the top dir if needed
107 if [ ! -d "$ECVS_TOP_DIR" ]; then
108 # note that the addwrite statements in this block are only there to allow creating ECVS_TOP_DIR;
109 # we've already allowed writing inside it
110 # this is because it's simpler than trying to find out the parent path of the directory, which
111 # would need to be the real path and not a symlink for things to work (so we can't just remove
112 # the last path element in the string)
113 debug-print "$FUNCNAME: checkout mode. creating cvs directory"
114 addwrite /foobar
115 addwrite /
116 $run mkdir -p "/$ECVS_TOP_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
125 # determine checkout or update mode
126 if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then
127 mode=checkout
128 else
129 mode=update
130 fi
131
132 # disable the sandbox for this dir
133 addwrite "$ECVS_TOP_DIR"
134
135 # chowning the directory and all contents
136 if [ -n "$ECVS_RUNAS" ]; then
137 $run chown -R "$ECVS_RUNAS" "/$ECVS_TOP_DIR"
138 fi
139
140 # our server string (aka CVSHOST), without the password so it can be put in Root
141 server=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
142
143 # switch servers automagically if needed
144 if [ "$mode" == "update" ]; then
145 cd /$ECVS_TOP_DIR/$ECVS_MODULE
146 oldserver="`$run cat CVS/Root`"
147 if [ "$server" != "$oldserver" ]; then
148
149 einfo "Changing CVS server from $oldserver to $server:"
150 debug-print "$FUNCNAME: Changing CVS server from $oldserver to $server:"
151
152 einfo "Searching for CVS dirs..."
153 cvsdirs="`$run find . -iname CVS -print`"
154 debug-print "$FUNCNAME: CVS dirs found:"
155 debug-print "$cvsdirs"
156
157 einfo "Modifying CVS dirs..."
158 for x in $cvsdirs; do
159 debug-print "In $x"
160 $run echo "$server" > "$x/Root"
161 done
162
163 fi
164 fi
165
166 # the server string with the password in it
167 # needed for mode=update too as we may not be inside ECVS_MODULE but only inside ECVS_TOP_DIR
168 # however putting the password in in update mode can break (?)
169 if [ "$mode" == "checkout" ]; then
170 export CVSROOT=":${ECVS_AUTH}:${ECVS_USER}:${ECVS_PASS}@${ECVS_SERVER}"
171 else
172 export CVSROOT=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
173 fi
174
175 # prepare a cvspass file just for this session, we don't want to mess with ~/.cvspass
176 touch "${T}/cvspass"
177 export CVS_PASSFILE="${T}/cvspass"
178 if [ -n "$ECVS_RUNAS" ]; then
179 chown "$ECVS_RUNAS" "${T}/cvspass"
180 fi
181
182 # commands to run
183 cmdupdate="${run} ${ECVS_CVS_COMMAND} update ${ECVS_UP_OPTS} ${ECVS_MODULE}"
184 cmdcheckout="${run} ${ECVS_CVS_COMMAND} checkout ${ECVS_CO_OPTS} ${ECVS_MODULE}"
185
186 cd "${ECVS_TOP_DIR}"
187 if [ "${ECVS_AUTH}" == "pserver" ]; then
188 if [ "${mode}" == "update" ]; then
189 $cmdupdate
190 elif [ "${mode}" == "checkout" ]; then
191 $cmdcheckout
192 fi
193# elif [ "${ECVS_AUTH}" == "ext" ]; then
194# # for ext there's also a possible ssh prompt, code not yet written
195# echo "${ECVS_DELAY} continue connecting&yes" >> "$instruct"
196# echo "${ECVS_DELAY} CVS password:&${ECVS_PASS}" >> "$instruct"
197# if [ "$mode" == "update" ]; then
198# expect "$cvsout" "$instruct" | $cmdupdate > "$cvsout"
199# elif [ "$mode" == "checkout" ]; then
200# expect "$cvsout" "$instruct" | $cmdcheckout > "$cvsout"
201# fi
202 fi
203
204 # restore ownership. not sure why this is needed, but someone added it in the orig ECVS_RUNAS stuff.
205 if [ -n "$ECVS_RUNAS" ]; then
206 chown `whoami` "${T}/cvspass"
207 fi
208
209}
210
211
212cvs_src_unpack() {
55 213
56 debug-print-function $FUNCNAME $* 214 debug-print-function $FUNCNAME $*
57 215
58 debug-print "$FUNCNAME: init: 216 debug-print "$FUNCNAME: init:
59ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND 217ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND
218ECVS_UP_OPTS=$ECVS_UP_OPTS
219ECVS_CO_OPTS=$ECVS_CO_OPTS
60ECVS_TOP_DIR=$ECVS_TOP_DIR 220ECVS_TOP_DIR=$ECVS_TOP_DIR
61ECVS_SERVER=$ECVS_SERVER 221ECVS_SERVER=$ECVS_SERVER
62ECVS_USER=$ECVS_USER 222ECVS_USER=$ECVS_USER
63ECVS_PASS=$ECVS_PASS 223ECVS_PASS=$ECVS_PASS
64ECS_MODULE=$ECVS_MODULE 224ECS_MODULE=$ECVS_MODULE
65ECVS_MODULE_SUBDIR=$ECVS_SUBDIR 225ECVS_LOCAL=$ECVS_LOCAL
66DIR=$DIR" 226ECVS_RUNAS=$ECVS_RUNAS"
67 227
68 # a shorthand 228 [ -z "$ECVS_MODULE" ] && die "ERROR: CVS module not set, cannot continue."
69 [ -n "$ECVS_SUBDIR" ] && DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}" || \ 229
70 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}"
71
72 addread $DIR
73
74 if [ -z "$ECVS_SERVER" ]; then 230 if [ "$ECVS_SERVER" == "offline" ]; then
75 # we're not required to fetch anything, the module already exists and shouldn't be updated 231 # we're not required to fetch anything, the module already exists and shouldn't be updated
76 if [ -d "$DIR" ]; then 232 if [ -d "${ECVS_TOP_DIR}/${ECVS_MODULE}" ]; then
77 debug-print "$FUNCNAME: offline mode, exiting" 233 debug-print "$FUNCNAME: offline mode, exiting"
78 return 0 234 return 0
79 else 235 else
80 einfo "ERROR: Offline mode specified, but module/subdir not found. Aborting."
81 debug-print "$FUNCNAME: offline mode specified but module/subdir not found, exiting with error" 236 debug-print "$FUNCNAME: offline mode specified but module/subdir not found, exiting with error"
82 return 1 237 die "ERROR: Offline mode specified, but module/subdir checkout not found. Aborting."
83 fi
84 fi
85
86 # disable the sandbox for this dir
87
88 # not just $DIR because we want to create moduletopdir/CVS too
89 addwrite $ECVS_TOP_DIR/$ECVS_MODULE
90
91 if [ ! -d "$DIR" ]; then
92 debug-print "$FUNCNAME: creating cvs directory $DIR"
93 einfo "Creating directory $DIR"
94 mkdir -p /$DIR
95 fi
96
97 # prepare a cvspass file just for this session so that cvs thinks we're logged
98 # in at the cvs server. we don't want to mess with ~/.cvspass.
99 echo ":pserver:${ECVS_SERVER} A" > ${T}/cvspass
100 export CVS_PASSFILE="${T}/cvspass"
101 #export CVSROOT=:pserver:${ECVS_USER}@${ECVS_SERVER}
102
103 # Note: cvs update and checkout commands are unified.
104 # we make sure a CVS/ dir exists in our module subdir with the right
105 # Root and Repository entries in it and cvs update.
106
107 newserver=":pserver:anonymous@${ECVS_SERVER}"
108
109 # CVS/Repository files can't (I think) contain two concatenated slashes
110 if [ -n "$ECVS_SUBDIR" ]; then
111 repository="${ECVS_MODULE}/${ECVS_SUBDIR}"
112 else
113 repository="${ECVS_MODULE}"
114 fi
115
116 debug-print "$FUNCNAME: Root<-$newserver, Repository<-$repository"
117
118 cd $DIR
119 if [ ! -d "$DIR/CVS" ]; then
120 # create a new CVS/ directory (checkout)
121 debug-print "$FUNCNAME: creating new cvs directory"
122
123 mkdir CVS
124 echo $newserver > CVS/Root
125 echo $repository > CVS/Repository
126 touch CVS/Entries
127
128 # if we're checking out a subdirectory only, create a CVS/ dir
129 # in the module's top dir so that the user (and we) can cvs update
130 # from there to get the full module.
131 if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then
132 debug-print "$FUNCNAME: Copying CVS/ directory to module top-level dir"
133 cp -r CVS $ECVS_TOP_DIR/$ECVS_MODULE/
134 echo $ECVS_MODULE > $ECVS_TOP_DIR/$ECVS_MODULE/CVS/Repository
135 fi 238 fi
136 239 elif [ -n "$ECVS_SERVER" ]; then # ECVS_SERVER!=offline --> real fetching mode
137 else 240 einfo "Fetching cvs module $ECVS_MODULE into $ECVS_TOP_DIR..."
138 #update existing module 241 cvs_fetch
139 debug-print "$FUNCNAME: updating existing module/subdir" 242 else # ECVS_SERVER not set
140 243 die "ERROR: CVS server not set, cannot continue."
141 # Switch servers if needed 244 fi
142 # cvs keeps the server info in the CVS/Root file in every checked-out dir;
143 # we can fix those files to point to the new server
144 oldserver="`cat CVS/Root`"
145 if [ "$newserver" != "$oldserver" ]; then
146 245
147 einfo "Changing CVS server from $oldserver to $newserver:" 246 einfo "Copying $ECVS_MODULE from $ECVS_TOP_DIR..."
148 debug-print "$FUNCNAME: Changing CVS server from $oldserver to $newserver:" 247 debug-print "Copying module $ECVS_MODULElocal_mode=$ECVS_LOCAL from $ECVS_TOP_DIR..."
149 248
150 einfo "Searching for CVS dirs..." 249 # probably redundant, but best to make sure
151 cvsdirs="`find . -iname CVS -print`" 250 mkdir -p "$WORKDIR/$ECVS_MODULE"
152 debug-print "$FUNCNAME: CVS dirs found:"
153 debug-print "$cvsdirs"
154 251
155 einfo "Modifying CVS dirs..." 252 if [ -n "$ECVS_LOCAL" ]; then
156 for x in $cvsdirs; do 253 mkdir -p "$WORKDIR/$ECVS_MODULE"
254 cp -f "$ECVS_TOP_DIR/$ECVS_MODULE"/* "$WORKDIR/$ECVS_MODULE"
255 else
256 cp -Rf "$ECVS_TOP_DIR/$ECVS_MODULE" "$WORKDIR/$ECVS_MODULE/.."
257 fi
258
259 # if the directory is empty, remove it; empty directories cannot exist in cvs.
260 # this happens when fex. kde-source requests module/doc/subdir which doesn't exist.
261 # still create the empty directory in workdir though.
262 if [ "`ls -A \"${ECVS_TOP_DIR}/${ECVS_MODULE}\"`" == "CVS" ]; then
263 debug-print "$FUNCNAME: removing cvs-empty directory $ECVS_MODULE"
264 rm -rf "${ECVS_TOP_DIR}/${ECVS_MODULE}"
265 fi
266
267 # implement some of base_src_unpack's functionality;
268 # note however that base.eclass may not have been inherited!
269 if [ -n "$PATCHES" ]; then
270 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching"
271 cd "$S"
272 for x in $PATCHES; do
157 debug-print "In $x" 273 debug-print "patching from $x"
158 echo $newserver > $x/Root 274 patch -p0 < "$x"
159 done 275 done
160 276 # make sure we don't try to apply patches more than once, since
277 # cvs_src_unpack is usually called several times from e.g. kde-source_src_unpack
278 export PATCHES=""
161 fi 279 fi
162
163 fi
164
165 # finally run the cvs update command
166 debug-print "$FUNCNAME: running $ECVS_CVS_COMMAND update with $ECVS_SERVER for module $ECVS_MODULE subdir $ECVS_SUBDIR"
167 einfo "Running $ECVS_CVS_COMMAND update with $ECVS_SERVER for $ECVS_MODULE/$ECVS_SUBDIR..."
168 $ECVS_CVS_COMMAND update -dP || die "died running cvs update"
169 280
170} 281}
171 282
172cvs_src_unpack() {
173
174 debug-print-function $FUNCNAME $*
175 cvs_fetch || die "died running cvs_fetch"
176
177 einfo "Copying module $ECVS_MODULE from $ECVS_TOP_DIR..."
178 debug-print "Copying module $ECVS_MODULE from $ECVS_TOP_DIR..."
179 # the reason this lives here and not in kde-source_src_unpack
180 # is that in the future after copying the sources we might need to
181 # delete them, so this has to be self-contained
182 [ -n "$ECVS_SUBDIR" ] && cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR $WORKDIR \
183 || cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE $WORKDIR
184
185 # implement some of base_src_unpack's functionality;
186 # note however that base.eclass may not have been inherited!
187 if [ -n "$PATCHES" ]; then
188 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching"
189 cd $S
190 for x in $PATCHES; do
191 debug-print "patching from $x"
192 patch -p0 < $x
193 done
194 fi
195
196}
197
198EXPORT_FUNCTIONS src_unpack 283EXPORT_FUNCTIONS src_unpack
199
200

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.36

  ViewVC Help
Powered by ViewVC 1.1.20