david: doc/kde-client/svn-instructions checkout_kde_i18n_proko2.sh, 1.2, 1.3 checkout_proko2.sh, 1.17, 1.18
cvs at intevation.de
cvs at intevation.de
Mon May 15 20:09:46 CEST 2006
Author: david
Update of /kolabrepository/doc/kde-client/svn-instructions
In directory doto:/tmp/cvs-serv25375
Modified Files:
checkout_kde_i18n_proko2.sh checkout_proko2.sh
Log Message:
Updated the script for the new branching mechanism - the scripts are not necessary anymore.
Index: checkout_kde_i18n_proko2.sh
===================================================================
RCS file: /kolabrepository/doc/kde-client/svn-instructions/checkout_kde_i18n_proko2.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- checkout_kde_i18n_proko2.sh 11 May 2006 19:44:59 -0000 1.2
+++ checkout_kde_i18n_proko2.sh 15 May 2006 18:09:44 -0000 1.3
@@ -35,21 +35,3 @@
cd kde-i18n
svn up
-
-# This was the old idea, partial 3.3-branch with proko2 updates on top.
-# But it's much simpler to just have a standalone proko2 branch.
-#svn up -N templates
-#svn up templates/kdepim
-#svn up -N templates/docs
-#svn up templates/docs/kdepim
-#svn up -N de
-#svn up -N de/messages
-#svn up -N de/docs
-#svn up de/messages/kdepim
-#svn up de/docs/kdepim
-#svn up -N de/messages/docs
-#svn up de/messages/docs/kdepim
-#svn up de/messages/docs/language
-#echo de > subdirs
-# to get the admin dir
-#svn up
Index: checkout_proko2.sh
===================================================================
RCS file: /kolabrepository/doc/kde-client/svn-instructions/checkout_proko2.sh,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- checkout_proko2.sh 15 May 2006 06:59:32 -0000 1.17
+++ checkout_proko2.sh 15 May 2006 18:09:44 -0000 1.18
@@ -1,111 +1,2 @@
-# Run this script from the *PARENT* directory of kdepim
-# The script can even check out kdepim for you if needed.
-# David Faure <faure at kde.org>, LGPL v2.
-
-# Edit those lines or set the env vars out of the script.
-# SVNSERVER can be svn.kde.org or anonsvn.kde.org
-# SVNPROTOCOL can be either svn+ssh or https.
-# SVNPROTOCOL and SVNUSER only need to be set for svn.kde.org, not for anonymous checkout.
-#
-SVNSERVER=svn.kde.org
-SVNPROTOCOL=svn+ssh
-SVNUSER=tilladam
-
-if test -z "$SVNSERVER"; then
- echo "You must set SVNSERVER!"
- exit 1
-fi
-
-if test "$SVNSERVER" = "svn.kde.org"; then
- if test -z "$SVNUSER"; then
- echo "You must set SVNUSER when using svn.kde.org!"
- exit 1
- fi
- if test -z "$SVNPROTOCOL"; then
- echo "You must set SVNPROTOCOL when using svn.kde.org!"
- exit 1
- fi
- SVNUSERAT=$SVNUSER@
- USERNAMEOPT="--username $SVNUSER"
-else
- SVNPROTOCOL=svn
- SVNUSER=
- SVNUSERAT=
- USERNAMEOPT=
-fi
-
-SVN=svn
-CDPATH=
-
-if ! test -d kdepim; then
- echo "kdepim not found. Press ENTER to check it out from SVN."
- read && \
- $SVN $USERNAMEOPT checkout $SVNPROTOCOL://$SVNUSERAT$SVNSERVER/home/kde/branches/KDE/3.3/kdepim || exit 1
-fi
-
-cd kdepim
-
-function switch_dir() {
- echo "switching $1..."
- ( cd $1 && $SVN $USERNAMEOPT switch "$SVNPROTOCOL://$SVNUSERAT$SVNSERVER/home/kde/branches/kdepim/proko2/kdepim/$1" )
-}
-
-function switch_file() {
- echo "switching $1..."
- file=`basename $1`
- dir=`dirname $1`
- ( cd $dir && $SVN $USERNAMEOPT switch "$SVNPROTOCOL://$SVNUSERAT$SVNSERVER/home/kde/branches/kdepim/proko2/kdepim/$dir/$file" $file )
-}
-
-function checkout_dir() {
- echo "checking out $1 ..."
- file=`basename $1`
- dir=`dirname $1`
- ( cd $dir && $SVN $USERNAMEOPT checkout "$SVNPROTOCOL://$SVNUSERAT$SVNSERVER/home/kde/branches/kdepim/proko2/kdepim/$dir/$file" $file )
-}
-
-switch_dir certmanager/lib
-switch_dir kmail
-switch_dir korganizer
-switch_dir kontact
-switch_dir kpilot
-switch_dir kioslaves/imap4
-switch_dir doc/kmail
-switch_dir doc/korganizer
-switch_dir doc/kaddressbook
-switch_dir doc/kleopatra
-switch_dir libkdepim
-switch_dir mimelib
-switch_dir libkcal
-switch_dir kresources
-switch_dir plugins
-
-for f in \
- ReleaseNotes \
- Makefile.am.in \
- kaddressbook/{kabcore.cpp,kabcore.h,kaddressbook_part.rc} \
- kaddressbook/{searchmanager.{cpp,h},extensionmanager.{cpp,h}} \
- kaddressbook/kaddressbookui.rc \
- kaddressbook/interfaces/{core.h,extensionwidget.h} \
- kaddressbook/features/distributionlistwidget.{cpp,h} \
- kaddressbook/features/resourceselection.{cpp,h} \
- certmanager/{aboutdata.cpp,certificatewizard{.ui,impl.cpp},lib/backends/qgpgme/qgpgmejob.cpp} \
- libkdenetwork/Makefile.am \
- wizards/{Makefile.am,kolabwizard.cpp,kolabwizard.h,kmailchanges.cpp,kolab.kcfg} \
- kioslaves/Makefile.am
- do
- switch_file $f
-done
-
-for f in \
- kioslaves/ldap \
- libpimldaptools
- do
- checkout_dir $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://$SVNUSERAT$SVNSERVER/home/kde/branches/KDE/3.3/kdepim/$subdir/$f . ; done )
+echo "This script doesn't exist anymore. proko2 is now a simple branch, simply check it out with"
+echo "svn co your_url_to_the_kde_svn/branches/kdepim/proko2/kdepim"
More information about the commits
mailing list