diff options
Diffstat (limited to 'scripts/kdesvn-build')
| -rwxr-xr-x | scripts/kdesvn-build | 230 |
1 files changed, 115 insertions, 115 deletions
diff --git a/scripts/kdesvn-build b/scripts/kdesvn-build index cd1d9cd9..fb81ac67 100755 --- a/scripts/kdesvn-build +++ b/scripts/kdesvn-build @@ -6,7 +6,7 @@ =over -=item B<kdesvn-build> - automate the kde svn build process +=item B<tdesvn-build> - automate the kde svn build process =back @@ -14,45 +14,45 @@ =over -=item B<kdesvn-build> I<[options]...> I<[modules]...> +=item B<tdesvn-build> I<[options]...> I<[modules]...> =back =head1 DESCRIPTION -The B<kdesvn-build> script is used to automate the download, build, +The B<tdesvn-build> script is used to automate the download, build, and install process for KDE (using Subversion). -It is recommended that you first setup a F<.kdesvn-buildrc> file -in your home directory. Please refer to B<kdesvn-build> help file -in KDE help for information on how to write F<.kdesvn-buildrc>, +It is recommended that you first setup a F<.tdesvn-buildrc> file +in your home directory. Please refer to B<tdesvn-build> help file +in KDE help for information on how to write F<.tdesvn-buildrc>, or consult the sample file which should have been included -with this program. If you don't setup a F<.kdesvn-buildrc>, a +with this program. If you don't setup a F<.tdesvn-buildrc>, a default set of options will be used, and a few modules will be built by default. -After setting up F<.kdesvn-buildrc>, you can run this program from +After setting up F<.tdesvn-buildrc>, you can run this program from either the command-line or from cron. It will automatically download the modules from Subversion, create the build system, and configure and make the modules you tell it to. You can use this program to install KDE as well, -if you are building KDE for a single user. Note that B<kdesvn-build> +if you are building KDE for a single user. Note that B<tdesvn-build> will try to install the modules by default. If you DO specify a package name, then your settings will still be read, but the script will try to build / install the package -regardless of F<.kdesvn-buildrc> +regardless of F<.tdesvn-buildrc> -kdesvn-build reads options in the following order: +tdesvn-build reads options in the following order: =over =item 1. From the command line. -=item 2. From the file F<kdesvn-buildrc> in the current directory. Note that +=item 2. From the file F<tdesvn-buildrc> in the current directory. Note that the file is not a hidden file. -=item 3. From the file F<~/.kdesvn-buildrc>. +=item 3. From the file F<~/.tdesvn-buildrc>. =item 4. From a set of internal options. @@ -66,7 +66,7 @@ This utility is part of the KDE Software Development Kit. =item B<--quiet>, B<-q> -With this switch kdesvn-build will only output a general overview of the build +With this switch tdesvn-build will only output a general overview of the build process. Progress output is still displayed if available. =item B<--really-quiet> @@ -75,7 +75,7 @@ With this switch only warnings and errors will be output. =item B<--verbose>, B<-v> -Be very detailed in what is going on, and what actions kdesvn-build is taking. +Be very detailed in what is going on, and what actions tdesvn-build is taking. Only B<--debug> is more detailed. =item B<--no-svn> @@ -163,7 +163,7 @@ directory is not deleted. =item B<--no-rebuild-on-fail> Do not try to rebuild a module from scratch if it failed building. Normally -kdesvn-build will try progressively harder to build the module before giving +tdesvn-build will try progressively harder to build the module before giving up. =item B<--build-system-only> @@ -173,7 +173,7 @@ Create the build infrastructure, but don't actually perform the build. =item B<--install> Try to install the packages passed on the command line, or all packages in -F<~/.kdesvn-buildrc> that don't have manual-build set. Building and +F<~/.tdesvn-buildrc> that don't have manual-build set. Building and Subversion updates are not performed. =item B<--E<lt>optionE<gt>=> @@ -182,15 +182,15 @@ Any unrecognized options are added to the global configuration, overriding any value that may exist. For example, B<--svn-server=http://path.to.svn.server/> would change the -setting of the global B<svn-server> option for this instance of kdesvn-build. +setting of the global B<svn-server> option for this instance of tdesvn-build. =item B<--E<lt>moduleE<gt>,E<lt>optionE<gt>=> Likewise, allow you to override any module specific option from the command line. -Example: B<--kdelibs,use-unsermake=false> would disable unsermake for the -kdelibs module. +Example: B<--tdelibs,use-unsermake=false> would disable unsermake for the +tdelibs module. =item B<--help> @@ -210,18 +210,18 @@ Output the program version. =over -=item B<kdesvn-build> +=item B<tdesvn-build> -=item B<kdesvn-build> I<--no-svn kdelibs> +=item B<tdesvn-build> I<--no-svn tdelibs> -=item B<kdesvn-bulid> I<--refresh-build> I<kdebase> +=item B<tdesvn-bulid> I<--refresh-build> I<tdebase> =back =head1 BUGS -Since kdesvn-build doesn't generally save information related to the build and -prior settings, you may need to manually re-run kdesvn-build with a flag like +Since tdesvn-build doesn't generally save information related to the build and +prior settings, you may need to manually re-run tdesvn-build with a flag like B<--recreate-configure> if you change some options, including B<use-unsermake>. Please use KDE bugzilla at http://bugs.kde.org for information and @@ -229,9 +229,9 @@ reporting bugs. =head1 SEE ALSO -You can find additional information at B<kdesvn-build> home page, -F<http://kdesvn-build.kde.org/>, or using kdesvn-build -docbook documentation, using the help kioslave, F<help:/kdesvn-build>. +You can find additional information at B<tdesvn-build> home page, +F<http://tdesvn-build.kde.org/>, or using tdesvn-build +docbook documentation, using the help kioslave, F<help:/tdesvn-build>. =head1 AUTHOR @@ -243,13 +243,13 @@ Carlos Leonhard Woelz <carlos.woelz@kdemail.net> =cut # Script to handle building KDE from Subversion. All of the configuration is -# stored in the file ~/.kdesvn-buildrc. +# stored in the file ~/.tdesvn-buildrc. # # Please also see the documentation that should be included with this program, # in doc.html # # Copyright (c) 2003, 2004, 2005 Michael Pyne. <michael.pyne@kdemail.net> -# Home page: http://kdesvn-build.kde.org/ +# Home page: http://tdesvn-build.kde.org/ # # You may use, alter, and redistribute this software under the terms # of the GNU General Public License, v2 (or any later version). @@ -314,14 +314,14 @@ my %package_opts = ( "override-url" => "", "prefix" => "", # Override installation prefix. "pretend" => "", - "qtdir" => "$ENV{HOME}/kdesvn/build/qt-copy", + "qtdir" => "$ENV{HOME}/tdesvn/build/qt-copy", "reconfigure" => "", "recreate-configure" => "", "refresh-build" => "", "remove-after-install"=> "none", # { none, builddir, all } "revision" => 0, "set-env" => { }, # Hash of environment vars to set - "source-dir" => "$ENV{HOME}/kdesvn", + "source-dir" => "$ENV{HOME}/tdesvn", "stop-on-failure" => "", "svn-server" => "svn://anonsvn.kde.org/home/kde", "tag" => "", @@ -355,7 +355,7 @@ my %fail_lists = ( my $install_flag; # True if we're in install mode. my $BUILD_ID; # Used by logging subsystem to create a unique log dir. my $LOG_DATE; # Used by logging subsystem to create logs in same dir. -my @rcfiles = ("./kdesvn-buildrc", "$ENV{HOME}/.kdesvn-buildrc"); +my @rcfiles = ("./tdesvn-buildrc", "$ENV{HOME}/.tdesvn-buildrc"); my $rcfile; # the file that was used; set by read_options # Colors @@ -525,9 +525,9 @@ sub get_subdir_path } else { - # Relative directory, tack it on to the end of $kdesvn. - my $kdesvndir = get_kdesvn_dir(); - $dir = "$kdesvndir/$dir"; + # Relative directory, tack it on to the end of $tdesvn. + my $tdesvndir = get_tdesvn_dir(); + $dir = "$tdesvndir/$dir"; } return $dir; @@ -550,7 +550,7 @@ sub get_dest_dir } # Convienience subroutine to get the source root dir. -sub get_kdesvn_dir +sub get_tdesvn_dir { return get_option ('global', 'source-dir'); } @@ -572,8 +572,8 @@ sub list_has(\@$) # The second parameter should be 'branches' if we're dealing with a branch or # 'tags' if we're dealing with a tag. # -# Ex: 'kdelibs' => 'branches/KDE' -# 'kdevelop' => 'branches/kdevelop' +# Ex: 'tdelibs' => 'branches/KDE' +# 'tdevelop' => 'branches/tdevelop' sub branch_prefix { my $module = shift; @@ -583,10 +583,10 @@ sub branch_prefix my @tag_components = qw/arts koffice amarok kst qt taglib/; # The map call adds the kde prefix to the module names because I don't feel - # like typing them all in. kdevelop and konstruct are special cases. + # like typing them all in. tdevelop and konstruct are special cases. my @kde_module_list = ((map {'kde' . $_} qw/-i18n -common accessibility addons admin artwork base bindings edu games graphics libs - multimedia network nonbeta pim sdk toys utils webdev/), 'kdevelop', + multimedia network nonbeta pim sdk toys utils webdev/), 'tdevelop', 'konstruct'); # KDE proper modules seem to use this pattern. @@ -623,7 +623,7 @@ sub handle_branch_tag_option } # Subroutine to return the appropriate SVN URL for a given module, based on -# the user settings. For example, 'kdelibs' -> https://svn.kde.org/home/kde/trunk/KDE/kdelibs +# the user settings. For example, 'tdelibs' -> https://svn.kde.org/home/kde/trunk/KDE/tdelibs sub svn_module_url { my $module = shift; @@ -631,7 +631,7 @@ sub svn_module_url my $branch = get_option($module, 'module-base-path'); # Allow user to override normal processing of the module in a few ways, - # to make it easier to still be able to use kdesvn-build even when I + # to make it easier to still be able to use tdesvn-build even when I # can't be there to manually update every little special case. if(get_option($module, 'override-url')) { @@ -681,7 +681,7 @@ sub get_build_dir my $module = shift; # It is the responsibility of the caller to append $module! - return get_kdesvn_dir() if ($module eq 'qt-copy') and not get_option('qt-copy', 'use-qt-builddir-hack'); + return get_tdesvn_dir() if ($module eq 'qt-copy') and not get_option('qt-copy', 'use-qt-builddir-hack'); return get_subdir_path($module, 'build-dir'); } @@ -766,7 +766,7 @@ sub blacklisted my ($module, $option) = @_; # Known to not work. - my @unsermake_ban_list = qw/valgrind kde-common qt-copy kdebindings/; + my @unsermake_ban_list = qw/valgrind kde-common qt-copy tdebindings/; return list_has(@unsermake_ban_list, $module) if ($option eq 'use-unsermake'); return 0; @@ -876,18 +876,18 @@ sub has_base_module # NOTE: The return value is a hash. The key 'module' will return the final # module name, the key 'path' will return the full path to the module. The # key 'fullpath' will return their concatenation. -# For example, with $module == 'KDE/kdelibs', and no change in the dest-dir +# For example, with $module == 'KDE/tdelibs', and no change in the dest-dir # option, you'd get something like: # { -# 'path' => '/home/user/kdesvn/KDE', -# 'module' => 'kdelibs', -# 'fullpath' => '/home/user/kdesvn/KDE/kdelibs' +# 'path' => '/home/user/tdesvn/KDE', +# 'module' => 'tdelibs', +# 'fullpath' => '/home/user/tdesvn/KDE/tdelibs' # } # If dest-dir were changed to e.g. extragear-multimedia, you'd get: # { -# 'path' => '/home/user/kdesvn', +# 'path' => '/home/user/tdesvn', # 'module' => 'extragear-multimedia', -# 'fullpath' => '/home/user/kdesvn/extragear-multimedia' +# 'fullpath' => '/home/user/tdesvn/extragear-multimedia' # } # First parameter is the module. # Second parameter is either source or build. @@ -896,7 +896,7 @@ sub get_module_path_dir my $module = shift; my $type = shift; my $destdir = get_dest_dir($module); - my $srcbase = get_kdesvn_dir(); + my $srcbase = get_tdesvn_dir(); $srcbase = get_build_dir($module) if $type eq 'build'; my $combined = "$srcbase/$destdir"; @@ -1031,10 +1031,10 @@ sub log_command my $result = $?; set_error_logfile($module, "$filename.log") if $result; - # If we are using the alias to a kdesvn-build function, it should have + # If we are using the alias to a tdesvn-build function, it should have # already printed the error message, so clear out errno (but still # return failure status). - if ($command[0] eq 'kdesvn-build') + if ($command[0] eq 'tdesvn-build') { $! = 0; } @@ -1074,7 +1074,7 @@ sub log_command open (STDERR, ">&STDOUT") unless $command[0] eq 'svn'; # Call internal function, name given by $command[1] - if($command[0] eq 'kdesvn-build') + if($command[0] eq 'tdesvn-build') { debug "Calling $command[1]"; @@ -1097,7 +1097,7 @@ sub log_command r[b[Unable to execute "$cmd_string"]! $! -Please check your binpath setting (it controls the PATH used by kdesvn-build). +Please check your binpath setting (it controls the PATH used by tdesvn-build). Currently it is set to g[$ENV{PATH}]. EOF # Don't use return, this is the child still! @@ -1222,7 +1222,7 @@ sub run_make_command r[b[Unable to execute "$cmd_string"]! $! -Please check your binpath setting (it controls the PATH used by kdesvn-build). +Please check your binpath setting (it controls the PATH used by tdesvn-build). Currently it is set to g[$ENV{PATH}]. EOF # Don't return, we're still in the child! @@ -1233,13 +1233,13 @@ EOF # Subroutine to determine if the given subdirectory of a module can actually be # built or not. For instance, /admin can never be built, and the /kalyptus subdir -# of kdebindings can't either. +# of tdebindings can't either. sub is_subdir_buildable { my ($module, $dir) = @_; return 0 if $dir eq 'admin'; - return 0 if $dir eq 'kalyptus' and $module eq 'kdebindings'; + return 0 if $dir eq 'kalyptus' and $module eq 'tdebindings'; return 1; } @@ -1385,25 +1385,25 @@ sub setenv } # Display a message to the user regarding their relative lack of -# ~/.kdesvn-buildrc, and point them to some help. We will continue using a +# ~/.tdesvn-buildrc, and point them to some help. We will continue using a # default set of options. sub no_config_whine { my $searched = join("\n ", @rcfiles); - my $homepage = "http://kdesvn-build.kde.org/"; + my $homepage = "http://tdesvn-build.kde.org/"; note <<"HOME"; Unable to open configuration file! We looked for: $searched -kdesvn-build will continue using a default set of options. These options may -not apply to you, so feel free to visit the kdesvn-build homepage +tdesvn-build will continue using a default set of options. These options may +not apply to you, so feel free to visit the tdesvn-build homepage b[g[$homepage] and use the configuration file generator to guide you through the process of -creating a config file to customize your kdesvn-build process. +creating a config file to customize your tdesvn-build process. HOME } @@ -1412,9 +1412,9 @@ HOME # update and build lists to build a default set of modules. sub setup_default_modules() { - @update_list = qw(qt-copy arts tdesupport kdelibs kdebase kdeartwork - kdemultimedia tdepim kdeutils kdegraphics tdegames - kdetoys kdeedu kdeaddons); + @update_list = qw(qt-copy arts tdesupport tdelibs tdebase tdeartwork + tdemultimedia tdepim tdeutils tdegraphics tdegames + tdetoys tdeedu tdeaddons); @build_list = @update_list; for my $i (@update_list) { @@ -1562,7 +1562,7 @@ EOM s/#.*$//; # Remove comments next if (/^\s*$/); # Skip blank lines - # First command in .kdesvn-buildrc should be a global + # First command in .tdesvn-buildrc should be a global # options declaration, even if none are defined. if (not /^global\s*$/) { @@ -1635,13 +1635,13 @@ EOM } # Subroutine to check if the given module needs special treatment to support -# srcdir != builddir. If this function returns true kdesvn-build will use a +# srcdir != builddir. If this function returns true tdesvn-build will use a # few hacks to simulate it, and will update e.g. configure paths appropriately # as well. sub module_needs_builddir_help { my $module = shift; - my @module_help_list = qw/qt-copy kdebindings valgrind/; + my @module_help_list = qw/qt-copy tdebindings valgrind/; # qt-copy special case to support use-qt-builddir-hack. if ($module eq 'qt-copy' and not get_option('qt-copy', 'use-qt-builddir-hack')) @@ -1856,7 +1856,7 @@ sub set_option sub process_arguments { my $arg; - my $version = "kdesvn-build 0.97.6 (KDE 3.5 Edition)"; + my $version = "tdesvn-build 0.97.6 (KDE 3.5 Edition)"; my $author = <<DONE; $version was written (mostly) by: Michael Pyne <michael.pyne\@kdemail.net> @@ -1880,27 +1880,27 @@ $version This script automates the download, build, and install process for KDE (using Subversion). -It is recommended that you first setup a .kdesvn-buildrc file in your home -directory. Please visit http://kdesvn-build.kde.org/ for +It is recommended that you first setup a .tdesvn-buildrc file in your home +directory. Please visit http://tdesvn-build.kde.org/ for information on how to write the file, or consult the sample file which should -have been included with this program. If you don't setup a .kdesvn-buildrc, +have been included with this program. If you don't setup a .tdesvn-buildrc, a default set of options will be used, which a few modules to be built by default. -After setting up .kdesvn-buildrc, you can run this program from either the +After setting up .tdesvn-buildrc, you can run this program from either the command-line or from cron. It will automatically download the modules from Subversion, create the build system, and configure and make the modules you tell it to. If you\'d like, you can use this program to install KDE as well, -if you\'re building KDE for a single user. Note that kdesvn-build will try +if you\'re building KDE for a single user. Note that tdesvn-build will try by default to install the modules. -Basic synopsis, after setting up .kdesvn-buildrc: -\$ kdesvn-build [package names] (Download, build, and install KDE) +Basic synopsis, after setting up .tdesvn-buildrc: +\$ tdesvn-build [package names] (Download, build, and install KDE) If you don\'t specify any particular package names, then your settings -in .kdesvn-buildrc will be used. If you DO specify a package name, then +in .tdesvn-buildrc will be used. If you DO specify a package name, then your settings will still be read, but the script will try to build/install -the package regardless of .kdesvn-buildrc +the package regardless of .tdesvn-buildrc Copyright (c) 2003, 2004, 2005 $author The script is distributed under the terms of the GNU General Public License @@ -1919,7 +1919,7 @@ Options: or create/delete files and directories. Instead, output what the script would have done. --quiet (or -q) Be less descriptive of the build process, without - printing each little substep kdesvn-build is + printing each little substep tdesvn-build is performing. --really-quiet Only warnings and errors will be displayed. --verbose (or -v) Be *very* descriptive of the build process. Only @@ -1953,7 +1953,7 @@ Options: --build-system-only Create the build infrastructure, but don't actually perform the build. --install Try to install the packages passed on the command - line, or all packages in ~/.kdesvn-buildrc that don't + line, or all packages in ~/.tdesvn-buildrc that don't have manual-build set. Building and Subversion updates are not performed. @@ -1967,7 +1967,7 @@ Options: --version Output the program version. You can get more help by reading the included HTML documentation, or going -online to http://kdesvn-build.kde.org/ +online to http://tdesvn-build.kde.org/ DONE # We haven't done any locking... no need to finish() # Avoids log-dir errors due to having not performed. @@ -2230,7 +2230,7 @@ DONE # handling separate tasks. sub get_lock { - my $lockfile = "$ENV{HOME}/.kdesvn-lock"; + my $lockfile = "$ENV{HOME}/.tdesvn-lock"; sysopen LOCKFILE, $lockfile, O_WRONLY | O_CREAT | O_EXCL; my $errorCode = $!; # Save for later testing. @@ -2263,15 +2263,15 @@ sub get_lock if($pid) { - # Recent kdesvn-build; we wrote a PID in there. + # Recent tdesvn-build; we wrote a PID in there. chomp $pid; # See if something's running with this PID. if (kill(0, $pid) == 1) { - # Something *is* running, likely kdesvn-build. Don't use error, + # Something *is* running, likely tdesvn-build. Don't use error, # it'll scan for $! - print clr " r[*y[*r[*] kdesvn-build appears to be running. Do you want to:\n"; + print clr " r[*y[*r[*] tdesvn-build appears to be running. Do you want to:\n"; print clr " (b[Q])uit, (b[P])roceed anyways?: "; my $choice = <STDIN>; @@ -2279,13 +2279,13 @@ sub get_lock if(lc $choice ne 'p') { - print clr " y[*] kdesvn-build run canceled.\n"; + print clr " y[*] tdesvn-build run canceled.\n"; exit 1; } # We still can't grab the lockfile, let's just hope things # work out. - print clr " y[*] kdesvn-build run in progress by user request.\n"; + print clr " y[*] tdesvn-build run in progress by user request.\n"; return 1; } @@ -2296,7 +2296,7 @@ sub get_lock # No pid found, optimistically assume the user isn't running # twice. - warning " y[WARNING]: stale kdesvn-build lockfile found, deleting."; + warning " y[WARNING]: stale tdesvn-build lockfile found, deleting."; unlink $lockfile; sysopen LOCKFILE, $lockfile, O_WRONLY | O_CREAT | O_EXCL and do { @@ -2311,14 +2311,14 @@ sub get_lock # Even if we fail it's generally better to allow the script to proceed # without being a jerk about things, especially as more non-CLI-skilled - # users start using kdesvn-build to build KDE. + # users start using tdesvn-build to build KDE. return 1; } # Subroutine to free the lock allocated by get_lock() sub close_lock { - my $lockfile = "$ENV{HOME}/.kdesvn-lock"; + my $lockfile = "$ENV{HOME}/.tdesvn-lock"; close LOCKFILE; unlink $lockfile; @@ -2677,7 +2677,7 @@ EOF if ($result) # Run this code for both death-by-signal and nonzero return { print "\nUnable to add SSH identity, aborting.\n"; - print "If you don't want kdesvn-build to check in the future,\n"; + print "If you don't want tdesvn-build to check in the future,\n"; print clr "Set the g[disable-agent-check] option to g[true] in your $rcfile.\n\n"; return 0; @@ -2696,7 +2696,7 @@ EOF sub handle_updates { my $update_ref = shift; - my $kdesvn = get_kdesvn_dir(); + my $tdesvn = get_tdesvn_dir(); my $svnroot = get_option ('global', 'svn-server'); my $result = 0; my $module; @@ -2710,12 +2710,12 @@ sub handle_updates note "<<< Updating Subversion Directories >>>"; info " "; # Add newline for aesthetics unless in quiet mode. - if (not -e $kdesvn) + if (not -e $tdesvn) { whisper "KDE Subversion download directory doesn't exist, creating.\n"; - if (not super_mkdir ($kdesvn)) + if (not super_mkdir ($tdesvn)) { - error "Unable to make directory r[$kdesvn]!"; + error "Unable to make directory r[$tdesvn]!"; @build_list = (); # Clear out the build list, since we can't build. $install_flag = 0; # Can't install either. return 1; @@ -3024,18 +3024,18 @@ sub prepare_fake_builddir my $builddir = get_fullpath($module, 'build'); my $srcdir = get_fullpath($module, 'source'); - # List reference, not a real list. The initial kdesvn-build does *NOT* - # fork another kdesvn-build using exec, see sub log_command() for more + # List reference, not a real list. The initial tdesvn-build does *NOT* + # fork another tdesvn-build using exec, see sub log_command() for more # info. - my $args = [ 'kdesvn-build', 'safe_lndir', $srcdir, $builddir ]; + my $args = [ 'tdesvn-build', 'safe_lndir', $srcdir, $builddir ]; # Skip modules that don't need special treatment. return 1 unless module_needs_builddir_help($module); # Backwards compatibility hack. - # kdesvn-build 0.97 and earlier would physically copy the Qt source - # directory to the build directory. kdesvn-build versions after that use - # the lndir program that is used for kdebindings and valgrind for + # tdesvn-build 0.97 and earlier would physically copy the Qt source + # directory to the build directory. tdesvn-build versions after that use + # the lndir program that is used for tdebindings and valgrind for # portability reasons. This will break for users who have a real copy of # Qt, so check here if the qt-copy configure script file is a real file # (not a symlink), and if so, use the old method (since presumably it @@ -3673,7 +3673,7 @@ EOF # If the packages are not already checked-out and/or updated, this # subroutine WILL NOT do so for you. # -# This subroutine assumes that the $kdesvn directory has already been +# This subroutine assumes that the $tdesvn directory has already been # set up. It will create $builddir if it doesn't already exist. # # If $builddir/$module/.refresh-me exists, the subroutine will @@ -3684,7 +3684,7 @@ sub handle_build { my @build_done; my $build_ref = shift; - my $kdesvn = get_kdesvn_dir(); + my $tdesvn = get_tdesvn_dir(); my $svnroot = get_option ('global', 'svn-server'); my $module; my @modules = grep (!/^(KDE\/)?kde-common$/, @{$build_ref}); @@ -3770,7 +3770,7 @@ EOF if (not pretending) { # Print out results, and output to a file - open BUILT_LIST, ">$kdesvn/successfully-built"; + open BUILT_LIST, ">$tdesvn/successfully-built"; foreach $module (@build_done) { info "$module"; @@ -3837,7 +3837,7 @@ sub check_module_validity y[!!] g[$module] seems to be checked out from somewhere other than expected. y[!!] -kdesvn-build expects: y[$module_expected_url] +tdesvn-build expects: y[$module_expected_url] The module is actually from: y[$module_actual_url] If the module location is incorrect, you can fix it by either deleting the @@ -4123,7 +4123,7 @@ sub email_error_report # Initial e-mail header. my $email_body = <<EOF; -The following errors were detected in the kdesvn-build run just completed. +The following errors were detected in the tdesvn-build run just completed. EOF @@ -4172,10 +4172,10 @@ EOF # configuration file will still override these settings. sub setup_trinity5_hack { - my @branched_modules = qw/kde-common kdeaccessibility kdeaddons kdeadmin - kdeartwork kdebase kdebindings kdeedu tdegames kdegraphics kdelibs - kdemultimedia kdenetwork tdepim kdesdk kdetoys kdeutils kdevelop - kdewebdev/; + my @branched_modules = qw/kde-common tdeaccessibility tdeaddons tdeadmin + tdeartwork tdebase tdebindings tdeedu tdegames tdegraphics tdelibs + tdemultimedia tdenetwork tdepim tdesdk tdetoys tdeutils tdevelop + tdewebdev/; # arts uses a different versioning scheme. set_option('arts', 'branch', '1.5'); @@ -4215,7 +4215,7 @@ if ($@) # We encountered an error. print "Encountered an error in the execution of the script.\n"; print "The error reported was $@\n"; - print "Please submit a bug against kdesvn-build on http://bugs.kde.org/\n"; + print "Please submit a bug against tdesvn-build on http://bugs.kde.org/\n"; # Don't finish, because we haven't attained the lock yet. exit 99; @@ -4242,7 +4242,7 @@ eval # Do some necessary adjusting. Right now this is used for supporting # the command-line option shortcut to where you can enter e.g. - # kdelibs/khtml, and the script will only try to update that part of + # tdelibs/khtml, and the script will only try to update that part of # the module. munge_lists(); @@ -4276,7 +4276,7 @@ if ($@) # We encountered an error. print "Encountered an error in the execution of the script.\n"; print "The error reported was $@\n"; - print "Please submit a bug against kdesvn-build on http://bugs.kde.org/\n"; + print "Please submit a bug against tdesvn-build on http://bugs.kde.org/\n"; $result = 99; } |