- Spell out repository when using git instead of using the alias. Using an alias was

required for one of the ways I was doing git updates when prototyping the feature but
  doesn't appear required the way I'm doing it now.
- Remove -no-exceptions from default qt-copy args and correct spelling of the -dbus
  option based on feedback on kde-buildsystem

svn path=/trunk/KDE/kdesdk/scripts/kdesvn-build; revision=1049778
wilder
Michael Pyne 17 years ago
parent 57d224bc49
commit ba311dfb6d
  1. 10
      kdesvn-build
  2. 2
      kdesvn-buildrc-sample

@ -1980,14 +1980,14 @@ sub git_update_module
}
# Download updated objects
if (0 != log_command($module, 'git-fetch', ['git', 'fetch', '__kdesvn-build-remote'])) {
if (0 != log_command($module, 'git-fetch', ['git', 'fetch', $cur_repo])) {
return 0;
}
# If the user doesn't already have this branch, check it out.
if (not git_has_branch($branch)) {
$result = log_command($module, 'git-checkout-branch',
['git', 'checkout', '-b', $branch, "__kdesvn-build-remote/$branch"]);
['git', 'checkout', '-b', $branch, "$cur_repo/$branch"]);
}
else {
$result = log_command($module, 'git-checkout-update',
@ -2717,9 +2717,9 @@ sub default_module_options
if ($module eq 'qt-copy') {
# Setup default options for qt-copy
my %qtcopy_opts = (
'configure-flags' => '-qt-gif -phonon -qdbus -nomake demos -nomake examples -fast',
'repository' => 'git://gitorious.org/qt/qt.git',
'branch' => 'master',
'configure-flags' => '-qt-gif -phonon -dbus -nomake demos -nomake examples -fast',
'repository' => 'git://gitorious.org/+kde-developers/qt/kde-qt.git',
'branch' => '4.6-stable-patched',
);
# Merge (uses Perl hash slice)

@ -126,7 +126,7 @@ module qt-copy
# Configure flags. If you compile phonon separately make sure to pass
# -no-phonon. Alternatively, if you use Qt's phonon, ensure kdesupport is
# built without Phonon.
configure-flags -qt-gif -no-exceptions -fast -qdbus \
configure-flags -qt-gif -fast -dbus \
-nomake examples -nomake demos \
-phonon # Phonon built as part of Qt now

Loading…
Cancel
Save