summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-21 01:43:11 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-21 01:43:11 +0000
commiteb4a2bcdc03599636b17fe199beb2b8357600a2b (patch)
tree1ba67e31bcc35ee0ef20dad82edcf7c7154bda2e /scripts
parent4b0c424136a25110054ba5691ea03350cdeaa303 (diff)
downloadtdesdk-eb4a2bcdc03599636b17fe199beb2b8357600a2b.tar.gz
tdesdk-eb4a2bcdc03599636b17fe199beb2b8357600a2b.zip
Convert remaining references to kde3 (e.g. in paths) to trinity
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/kdesvn-build6
-rwxr-xr-xscripts/svn2dist6
2 files changed, 6 insertions, 6 deletions
diff --git a/scripts/kdesvn-build b/scripts/kdesvn-build
index b0389d52..706c755a 100755
--- a/scripts/kdesvn-build
+++ b/scripts/kdesvn-build
@@ -1432,7 +1432,7 @@ sub setup_default_modules()
-dlopen-opengl),
'apply-qt-patches' => 'true',
-# See setup_kde35_hack() for why this option is here.
+# See setup_trinity5_hack() for why this option is here.
'module-base-path' => 'branches/qt/3.3',
'use-qt-builddir-hack' => 'true',
@@ -4170,7 +4170,7 @@ EOF
# This subroutine sets up or removes the default branch option for a few
# modules in order to build KDE 3.5 by default. branch options in the
# configuration file will still override these settings.
-sub setup_kde35_hack
+sub setup_trinity5_hack
{
my @branched_modules = qw/kde-common kdeaccessibility kdeaddons kdeadmin
kdeartwork kdebase kdebindings kdeedu kdegames kdegraphics kdelibs
@@ -4201,7 +4201,7 @@ eval
{
# Note to self: Quit changing the order around.
process_arguments(); # Process --help, --install, etc. first.
- setup_kde35_hack(); # Add 'branch' options as appropriate.
+ setup_trinity5_hack(); # Add 'branch' options as appropriate.
read_options(); # If we're still here, read the options
initialize_environment(); # Initialize global env vars.
diff --git a/scripts/svn2dist b/scripts/svn2dist
index 76f09b20..7680ec84 100755
--- a/scripts/svn2dist
+++ b/scripts/svn2dist
@@ -335,7 +335,7 @@ remove="$remove $modulename.lsm"
if [ $doi18n = "yes" ]; then
pushd $temp_dir
echo "Getting i18n subdirs" >> $log
- i18nlangs_tmp=`svn cat "$svnroot/l10n-kde3/subdirs"`
+ i18nlangs_tmp=`svn cat "$svnroot/l10n-trinity/subdirs"`
skiplist="`echo $noi18nlang | sed -e 's/,/ /g'`"
skiplist="$skiplist $always_skip_languages"
for lang in $i18nlangs_tmp; do
@@ -364,7 +364,7 @@ if [ -d $module/doc/$name ]; then
for lang in $i18nlangs; do
echo -n "Checking for $lang/$name... "
test -d $temp_dist/doc/$lang && rm -Rf $temp_dist/doc/$lang
- docdirname="l10n-kde3/$lang/docs/$i18nmodule/$name"
+ docdirname="l10n-trinity/$lang/docs/$i18nmodule/$name"
echo "svn export $svnroot/$docdirname $temp_dist/doc/$lang" >> $log
mkdir -p $temp_dist/doc
svn export "$svnroot/$docdirname" $temp_dist/doc/$lang >> $log 2>&1
@@ -404,7 +404,7 @@ if [ $doi18n = "yes" ]; then
echo "Getting translations for $pofile from i18n..."
for lang in $i18nlangs; do
- pofilename="l10n-kde3/$lang/messages/$i18nmodule/$pofile";
+ pofilename="l10n-trinity/$lang/messages/$i18nmodule/$pofile";
echo "Getting $pofilename" >> $log
svn cat "$svnroot/$pofilename" >$pofile 2>&1 || rm -f $pofile
if [ ! -f "$pofile" ]; then