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

Diff of /eclass/cvs.eclass

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

Revision 1.5 Revision 1.16
1# Copyright 1999-2000 Gentoo Technologies, Inc. 1# Copyright 1999-2000 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 or later
3# Author Dan Armak <danarmak@gentoo.org> 3# Author Dan Armak <danarmak@gentoo.org>
4# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.5 2002/07/19 09:54:05 danarmak Exp $ 4# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.16 2002/09/08 21:23:03 azarah Exp $
5# This eclass provides the generic cvs fetching functions. 5# This eclass provides the generic cvs fetching functions.
6 6
7ECLASS=cvs 7ECLASS=cvs
8INHERITED="$INHERITED $ECLASS" 8INHERITED="$INHERITED $ECLASS"
9 9
16# cvs command to run. you can set fex. "cvs -t" for extensive debug information 16# 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 17# 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. 18# the ~/.cvsrc config file and to use maximum compression.
19[ -z "$ECVS_CVS_COMMAND" ] && ECVS_CVS_COMMAND="cvs -q -f -z4" 19[ -z "$ECVS_CVS_COMMAND" ] && ECVS_CVS_COMMAND="cvs -q -f -z4"
20 20
21# cvs options given after the command (i.e. cvs update foo)
22# don't remove -dP or things won't work
23[ -z "$ECVS_CVS_OPTIONS" ] && ECVS_CVS_OPTIONS="-dP"
24
25# set this for the module/subdir to be fetched non-recursively
26#[ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l"
27
21# Where the cvs modules are stored/accessed 28# Where the cvs modules are stored/accessed
22[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="/usr/src" 29[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${DISTDIR}/cvs-src"
23 30
24# Name of cvs server, set to "" to disable fetching 31# 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). 32# (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 33# Format is server:/dir e.g. "anoncvs.kde.org:/home/kde". remove the other
27# parts of the full CVSROOT (which looks like 34# parts of the full CVSROOT (which looks like
28# ":pserver:anonymous@anoncvs.kde.org:/home/kde"); these are added from 35# ":pserver:anonymous@anoncvs.kde.org:/home/kde"); these are added from
29# other settings 36# other settings
30[ -z "$ECVS_SERVER" ] && ECVS_SERVER="" 37[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline"
31 38
32# Username to use 39# Username to use
33[ -z "$ECVS_USER" ] && ECVS_USER="anonymous" 40[ -z "$ECVS_USER" ] && ECVS_USER="anonymous"
34 41
35# Password to use (NOT (YET) SUPPORTED, because cvs doesn't store passwords in plaintext in .cvspass) 42# Password to use (NOT (YET) SUPPORTED, because cvs doesn't store passwords in plaintext in .cvspass)
36[ -z "$ECVS_PASS" ] && ECVS_PASS="" 43[ -z "$ECVS_PASS" ] && ECVS_PASS=""
37 44
38# Module to be fetched, must be set explicitly - 45# Module to be fetched, must be set explicitly -
39# I don't like the former ="$NP" default setting 46# I don't like the former ="$PN" default setting
40[ -z "$ECVS_MODULE" ] && die "$ECLASS: error: ECVS_MODULE not set, cannot continue" 47[ -z "$ECVS_MODULE" ] && debug-print "$ECLASS: error: ECVS_MODULE not set, cannot continue"
41 48
49# Branch/tag to use, default is HEAD
50# uncomment the following line to enable the reset-branch-to-HEAD behaviour
51[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD"
52
42# Subdirectory in module to be fetched, default is root "/" = whole module (NOT YET IMPLEMENTED) 53# Subdirectory in module to be fetched, default is not defined = whole module
54# DO NOT set default to "", if it's defined at all code will break!
55# don't uncomment following line!
43[ -z "$ECVS_MODULE_SUBDIR" ] && ECVS_MODULE_SUBDIR="/" 56#[ -z "$ECVS_MODULE_SUBDIR" ] && ECVS_MODULE_SUBDIR=""
44 57
45# --- end ebuild-configurable settings --- 58# --- end ebuild-configurable settings ---
46 59
47debug-print "$ECLASS: init: ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND 60# add cvs to deps
61DEPEND="$DEPEND dev-util/cvs"
62
63# since we now longer have src_fetch as a redefinable ebuild function,
64# we are forced to call this function from cvs_src_unpack
65cvs_fetch() {
66
67 debug-print-function $FUNCNAME $*
68
69 debug-print "$FUNCNAME: init:
70ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND
71ECVS_CVS_OPTIONS=$ECVS_CVS_OPTIONS
48ECVS_TOP_DIR=$ECVS_TOP_DIR 72ECVS_TOP_DIR=$ECVS_TOP_DIR
49ECVS_SERVER=$ECVS_SERVER 73ECVS_SERVER=$ECVS_SERVER
50ECVS_USER=$ECVS_USER 74ECVS_USER=$ECVS_USER
51ECVS_PASS=$ECVS_PASS 75ECVS_PASS=$ECVS_PASS
52ECS_MODULE=$ECVS_MODULE 76ECS_MODULE=$ECVS_MODULE
53ECVS_MODULE_SUBDIR=$ECVS_MODULE_SUBDIR" 77ECVS_MODULE_SUBDIR=$ECVS_SUBDIR
78ECVS_LOCAL=$ECVS_LOCAL
79DIR=$DIR"
54 80
55# since we now longer have src_fetch as a redefinable ebuild function, 81 # if ECVS_TOP_DIR is a symlink to a dir, get the real dir's path,
56# we are forced to call this function from cvs_src_unpack 82 # otherwise addwrite() doesn't work
57cvs_fetch() { 83 if [ -n "$ECVS_TOP_DIR" ]; then
84 # create $ECVS_TOP_DIR if missing
85 addwrite $ECVS_TOP_DIR
86 [ ! -d $ECVS_TOP_DIR -a ! -L $ECVS_TOP_DIR ] && mkdir -p $ECVS_TOP_DIR
87 cd -P $ECVS_TOP_DIR
88 ECVS_TOP_DIR="`pwd`"
89 cd $OLDPWD
90 fi
91
92 # a shorthand
93 [ -n "$ECVS_SUBDIR" ] && DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}" || \
94 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}"
58 95
59 debug-print-function $FUNCNAME $* 96 [ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l"
97
98 addread $DIR
99
100 if [ "$ECVS_SERVER" == "offline" ]; then
101 # we're not required to fetch anything, the module already exists and shouldn't be updated
102 if [ -d "$DIR" ]; then
103 debug-print "$FUNCNAME: offline mode, exiting"
104 return 0
105 else
106 einfo "ERROR: Offline mode specified, but module/subdir not found. Aborting."
107 debug-print "$FUNCNAME: offline mode specified but module/subdir not found, exiting with error"
108 return 1
109 fi
110 fi
60 111
61 # disable the sandbox for this dir 112 # disable the sandbox for this dir
113 # not just $DIR because we want to create moduletopdir/CVS too
114 addwrite $ECVS_TOP_DIR/$ECVS_MODULE
115
62 if [ ! -d "$ECVS_TOP_DIR" ]; then 116 if [ ! -d "$DIR" ]; then
63 addwrite $ECVS_TOP_DIR/.. 117 debug-print "$FUNCNAME: creating cvs directory $DIR"
64 mkdir -p $ECVS_TOP_DIR 118 einfo "Creating directory $DIR"
65 adddeny $ECVS_TOP_DIR/.. 119 export SANDBOX_WRITE="$SANDBOX_WRITE:/foo:/"
120 mkdir -p /$DIR
121 export SANDBOX_WRITE=${SANDBOX_WRITE//:\/foo:\/}
66 fi 122 fi
67 addread ${ECVS_TOP_DIR}
68 addwrite ${ECVS_TOP_DIR}
69 123
70 # prepare a cvspass file just for this session so that cvs thinks we're logged 124 # prepare a cvspass file just for this session so that cvs thinks we're logged
71 # in at the cvs server. we don't want to mess with ~/.cvspass. 125 # in at the cvs server. we don't want to mess with ~/.cvspass.
72 echo ":pserver:${ECVS_SERVER} A" > ${T}/cvspass 126 echo ":pserver:${ECVS_SERVER} A" > ${T}/cvspass
73 export CVS_PASSFILE="${T}/cvspass" 127 export CVS_PASSFILE="${T}/cvspass"
74 128 #export CVSROOT=:pserver:${ECVS_USER}@${ECVS_SERVER}
75 cd $ECVS_TOP_DIR 129
76 130 # Note: cvs update and checkout commands are unified.
131 # we make sure a CVS/ dir exists in our module subdir with the right
132 # Root and Repository entries in it and cvs update.
133
134 newserver=":pserver:${ECVS_USER}@${ECVS_SERVER}"
135
136 # CVS/Repository files can't (I think) contain two concatenated slashes
77 if [ -z "$ECVS_SERVER" ]; then 137 if [ -n "$ECVS_SUBDIR" ]; then
78 # we're not required to fetch anything, the module already exists and shouldn't be updated 138 repository="${ECVS_MODULE}/${ECVS_SUBDIR}"
79 if [ -d "$ECVS_MODULE" ]; then 139 else
80 debug-print "$FUNCNAME: offline mode, exiting" 140 repository="${ECVS_MODULE}"
81 return 0 141 fi
82 else 142
83 einfo "ERROR: Offline mode specified, but module not found. Aborting." 143 debug-print "$FUNCNAME: Root<-$newserver, Repository<-$repository"
84 debug-print "$FUNCNAME: offline mode specified but module not found, exiting with error" 144
85 return 1 145 cd $DIR
86 fi 146 if [ ! -d "$DIR/CVS" ]; then
147 # create a new CVS/ directory (checkout)
148 debug-print "$FUNCNAME: creating new cvs directory"
149
150 mkdir CVS
151 echo $newserver > CVS/Root
152 echo $repository > CVS/Repository
153 touch CVS/Entries
154
155 # if we're checking out a subdirectory only, create a CVS/ dir
156 # in the module's top dir so that the user (and we) can cvs update
157 # from there to get the full module.
158 if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then
159 debug-print "$FUNCNAME: Copying CVS/ directory to module top-level dir"
160 cp -r CVS $ECVS_TOP_DIR/$ECVS_MODULE/
161 echo $ECVS_MODULE > $ECVS_TOP_DIR/$ECVS_MODULE/CVS/Repository
87 fi 162 fi
88 163
89 if [ -d "${ECVS_MODULE}" ]; then 164 else
90 #update existing module 165 #update existing module
91 166 debug-print "$FUNCNAME: updating existing module/subdir"
92 cd ${ECVS_MODULE} 167
93
94 # Switch servers if needed 168 # Switch servers if needed
95 # cvs keeps the server info in th CVS/Root file in every checked-out dir; 169 # cvs keeps the server info in the CVS/Root file in every checked-out dir;
96 # we can fix those files to point to the new server 170 # we can fix those files to point to the new server
97 newserver=":pserver:anonymous@${ECVS_SERVER}"
98 oldserver="`cat CVS/Root`" 171 oldserver="`cat CVS/Root`"
99 if [ "$newserver" != "$oldserver" ]; then 172 if [ "$newserver" != "$oldserver" ]; then
100 173
101 einfo "Changing CVS server from $oldserver to $newserver:" 174 einfo "Changing CVS server from $oldserver to $newserver:"
102 debug-print "$FUNCNAME: Changing CVS server from $oldserver to $newserver:" 175 debug-print "$FUNCNAME: Changing CVS server from $oldserver to $newserver:"
112 echo $newserver > $x/Root 185 echo $newserver > $x/Root
113 done 186 done
114 187
115 fi 188 fi
116 189
190 fi
191
192 # cvs auto-switches branches, how nice
193 # warning: if we do it this way we get multiple -rX options - harmless i think
194 [ -n "$ECVS_BRANCH" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -r$ECVS_BRANCH"
195
196 # finally run the cvs update command
117 debug-print "$FUNCNAME: running $ECVS_CVS_COMMAND update with $ECVS_SERVER for module $ECVS_MODULE" 197 debug-print "$FUNCNAME: running $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS with $ECVS_SERVER for module $ECVS_MODULE subdir $ECVS_SUBDIR"
118 einfo "Running $ECVS_CVS_COMMAND update with $ECVS_SERVER for module $ECVS_MODULE..." 198 einfo "Running $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS with $ECVS_SERVER for $ECVS_MODULE/$ECVS_SUBDIR..."
119 $ECVS_CVS_COMMAND update -dP || die "died running cvs update" 199 $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS || die "died running cvs update"
120
121 else
122 # checkout module
123
124 export CVSROOT=:pserver:${ECVS_USER}@${ECVS_SERVER}
125 debug-print "$FUNCNAME: running $ECVS_CVS_COMMAND checkout -P $ECVS_MODULE with $CVSROOT..."
126 einfo "Running $ECVS_CVS_COMMAND checkout -P $ECVS_MODULE with $CVSROOT..."
127 $ECVS_CVS_COMMAND checkout -P $ECVS_MODULE || die "died running cvs checkout"
128
129 fi
130 200
131} 201}
132 202
133cvs_src_unpack() { 203cvs_src_unpack() {
134 204
135 debug-print-function $FUNCNAME $* 205 debug-print-function $FUNCNAME $*
136 cvs_fetch || die "died running cvs_fetch" 206 cvs_fetch || die "died running cvs_fetch"
137 207
138 einfo "Copying module $ECVS_MODULE from $ECVS_TOP_DIR..." 208 einfo "Copying module $ECVS_MODULE from $ECVS_TOP_DIR..."
139 debug-print "Copying module $ECVS_MODULE from $ECVS_TOP_DIR..." 209 debug-print "Copying module $ECVS_MODULE from $ECVS_TOP_DIR..."
140 # the reason this lives here and not in kde-source_src_unpack 210
141 # is that in the future after copying the sources we might need to 211 if [ -n "$ECVS_SUBDIR" ]; then
142 # delete them, so this has to be self-contained 212 mkdir -p $WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR
213 cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR/* $WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR/
214 else
215 if [ -n "$ECVS_LOCAL" ]; then
216 cp -f $ECVS_TOP_DIR/$ECVS_MODULE/* $WORKDIR/$ECVS_MODULE
217 else
143 cp -Rf ${ECVS_TOP_DIR}/${ECVS_MODULE} $WORKDIR 218 cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE $WORKDIR
144 219 fi
220 fi
221
222 # if the directory is empty, remove it; empty directories cannot exist in cvs.
223 # this happens when fex. kde-source requests module/doc/subdir which doesn't exist.
224 # still create the empty directory in workdir though.
225 if [ "`ls -A $DIR`" == "CVS" ]; then
226 debug-print "$FUNCNAME: removing cvs-empty directory $ECVS_MODULE/$ECVS_SUBDIR"
227 rm -rf $DIR
228 fi
229
145 # implement some of base_src_unpack's functionality; 230 # implement some of base_src_unpack's functionality;
146 # note however that base.eclass may not have been inherited! 231 # note however that base.eclass may not have been inherited!
147 if [ -n "$PATCHES" ]; then 232 if [ -n "$PATCHES" ]; then
148 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching" 233 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching"
149 cd $S 234 cd $S
150 for x in $PATCHES; do 235 for x in $PATCHES; do
151 debug-print "patching from $x" 236 debug-print "patching from $x"
152 patch -p0 < $x 237 patch -p0 < $x
153 done 238 done
239 # make sure we don't try to apply patches more than once, since
240 # cvs_src_unpack is usually called several times from e.g. kde-source_src_unpack
241 export PATCHES=""
154 fi 242 fi
155 243
156} 244}
157 245
158EXPORT_FUNCTIONS src_unpack 246EXPORT_FUNCTIONS src_unpack

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.16

  ViewVC Help
Powered by ViewVC 1.1.20