david: doc/kde-client/svn-instructions checkout_proko2.sh,1.2,1.3

[cvs at intevation.de]

Author: david

Update of /kolabrepository/doc/kde-client/svn-instructions
In directory doto:/tmp/cvs-serv6234/svn-instructions

Modified Files:
	checkout_proko2.sh 
Log Message:
Branched kresources completely, for less hacks here.
proko2 should be fine now.


Index: checkout_proko2.sh
===================================================================
RCS file: /kolabrepository/doc/kde-client/svn-instructions/checkout_proko2.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- checkout_proko2.sh	9 May 2005 20:19:29 -0000	1.2
+++ checkout_proko2.sh	9 May 2005 21:02:21 -0000	1.3
@@ -19,6 +19,7 @@
 fi
 
 SVN=svn
+CDPATH=
 
 if ! test -d kdepim; then
     echo "kdepim not found. Press ENTER to check it out from SVN."
@@ -29,15 +30,12 @@
 cd kdepim
 
 function switch_dir() {
+  echo "switching $1..."
   ( cd $1 && $SVN --username $SVNUSER switch "$SVNPROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/kdepim/proko2/kdepim/$1" )
 }
 
-function update() {
-  file=`basename $1`
-  dir=`dirname $1`
-  ( cd $dir && $SVN --username $SVNUSER checkout "$SVNPROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/kdepim/proko2/kdepim/$dir/$file" )
-}
 function switch_file() {
+  echo "switching $1..."
   file=`basename $1`
   dir=`dirname $1`
   ( cd $dir && $SVN --username $SVNUSER switch "$SVNPROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/kdepim/proko2/kdepim/$dir/$file" $file )
@@ -46,7 +44,6 @@
 switch_dir certmanager/lib
 switch_dir kmail
 switch_dir kontact/plugins/summary
-switch_dir kresources/imap
 switch_dir kpilot
 switch_dir kioslaves/imap4
 switch_dir doc/kmail
@@ -55,14 +52,7 @@
 switch_dir libkdepim
 switch_dir libkcal
 switch_dir kontact/src
-
-# The downside of checking out a subdir is that "svn up" won't update it...
-# Hence the major hack: replacing imap with kolab in .svn/entries
-( cd kresources &&
-  $SVN --username $SVNUSER checkout "$SVNPROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/kdepim/proko2/kdepim/kresources/kolab" &&
-  perl -pi -e 's/imap/kolab/' .svn/entries &&
-  rm -rf imap
-)
+switch_dir kresources
 
 for f in \
      kaddressbook/{kabcore.cpp,kabcore.h,kaddressbook_part.rc} \
@@ -77,13 +67,13 @@
      korganizer/{kodialogmanager.cpp,koagenda.cpp} \
      korganizer/{kogroupware.{cpp,h},calendarview.{cpp,h}} \
      korganizer/{koeventeditor.{cpp,h},koeditordetails.{cpp,h}} \
-     kresources/Makefile.am \
      libkdenetwork/Makefile.am \
      plugins/kmail/bodypartformatter/text_calendar.cpp \
      wizards/{Makefile.am,kolabwizard.cpp,kolabwizard.h,kmailchanges.cpp,kolab.kcfg} \
 ; do switch_file $f ; done
 
 ### How to finish the branching of a dir where some files were branched:
+### (use with care, check each intermediate step...)
 # ( cd pure-proko2/kdepim/$subdir && ls -1 > /tmp/alreadythere )
 # ( cd kdepim-proko2/kdepim/$subdir && ls -1 | while read a; do if grep -q ^$a$ /tmp/alreadythere; then : ; else echo $a ; fi ; done  > /tmp/tocp )
-# ( cd pure-proko2/kdepim/$subdir && cat /tmp/tocp | while read f ; do svn cp $SVNPROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/KDE/3.3/kdepim/$subdir/$f . ; done
+# ( cd pure-proko2/kdepim/$subdir && cat /tmp/tocp | while read f ; do svn cp $SVNPROTOCOL://$SVNUSER@svn.kde.org/home/kde/branches/KDE/3.3/kdepim/$subdir/$f . ; done )