From 3c0ca6951a382344343e4e25a75abe9250e4d6a1 Mon Sep 17 00:00:00 2001 From: David Faure Date: Tue, 6 Jan 2009 20:48:06 +0000 Subject: [PATCH] Document how to check out kde-4.2 with kdesvn-build. "module-base-path branches/KDE/4.2" for all kde modules, "tag kdesupport-for-4.2" for kdesupport (because I used a kdesupport subdir in there), but unfortunately there's no nice solution for qt-copy, it's in branches/qt/4.4 (but without a qt-copy subdir), so the "branch" or "module-base-path" solution doesn't work, only override-url does (which is really not as nice). Michael, could there be a way to set some "base path where the module name is NOT appended" somehow? I can only think of a new (per-module) option like "svn-path branches/qt/4.4"... CCMAIL: Michael Pyne svn path=/trunk/KDE/kdesdk/scripts/kdesvn-buildrc-sample; revision=906770 --- kdesvn-buildrc-sample | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/kdesvn-buildrc-sample b/kdesvn-buildrc-sample index 232b538..686b31d 100644 --- a/kdesvn-buildrc-sample +++ b/kdesvn-buildrc-sample @@ -16,12 +16,16 @@ global # override-url option yourself. # # If you set this option to false, or leave it unset, kdesvn-build will build -# /trunk, which corresponds right now with KDE 4.0. If you set this option to -# true, you should also comment out or remove the branch option which is set -# in the "module kdelibs" section below. +# /trunk. If you set this option to true, you should also comment out or remove +# the branch option which is set in the "module kdelibs" section below. # # use-stable-kde false +# By default (if the above is commented out), you are getting trunk. +# If instead you want to check out another branch, like 4.2, use +# +# module-base-path branches/KDE/4.2 + # binpath controls the value of the PATH environment variable during # compilation. If you have unusual tools that need to be in the path to build # KDE, add them here. KDE's and Qt's programs are automatically added. @@ -165,6 +169,10 @@ module qt-copy apply-qt-patches true # Works with Qt 3 and 4, recommended as well. # make-options -j2 + +# To get the correct Qt for KDE-4.2, use something like this: (depending on your protocol for svn) +# override-url svn+ssh://svn.kde.org/home/kde/branches/qt/4.4 + end module # arts is the KDE sound library. It is not expected to be used by the time @@ -178,6 +186,8 @@ end module # kdesupport is also the bearer of automoc and all that is good and right with # CMake, install it before all KDE modules. module kdesupport + # To get the necessary kdesupport stuff for KDE-4.2, use: + # tag kdesupport-for-4.2 end module # Phonon is the multimedia interface for KDE 4. It is developed in kdesupport @@ -210,7 +220,6 @@ end module # kdebase contains useful general-purpose programs, normally people would # expect a usable desktop to have these. module kdebase - #configure-flags --with-pam --with-shadow end module # kdemultimedia contains JuK, noatun, Kaboodle, and other KDE multimedia @@ -222,14 +231,10 @@ end module module kdegames end module -## Note: The following modules may not have been ported to KDE 4 yet, and may -# have changed significantly from their KDE 3 counterparts as well. Because -# of this, they are commented out, uncomment it if you want to build it. - # kdesdk is a useful module for software developers. It is where kdesvn-build # is developed. -#module kdesdk -#end module +module kdesdk +end module # kdenetwork has Kopete and other useful applications for the Internet and # other networks.