[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdesdk/scripts
From:       Michael Pyne <michael.pyne () kdemail ! net>
Date:       2005-07-28 0:29:19
Message-ID: 1122510559.336050.13282.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 439383 by mpyne:

Fix bug with module-base-path handling for non-trunk modules.
Add qt-copy to the list of modules to default to a branch (non-trunk) download.


 M  +17 -6     kdesvn-build  


--- branches/KDE/3.5/kdesdk/scripts/kdesvn-build #439382:439383
@@ -646,10 +646,6 @@
         return handle_branch_tag_option($module, 'branches');
     }
     
-    $branch = 'trunk/KDE' unless $branch;
-    $branch =~ s/^\/*//; # Eliminate / at beginning of string.
-    $branch =~ s/\/*$//; # Likewise at the end.
-    
     # The following modules are in /trunk, not /trunk/KDE.  There are others,
     # but there are the important ones.  The hash is associated with the value
     # 1 so that we can do a boolean test by looking up the module name.
@@ -659,8 +655,15 @@
     my $module_root = $module;
     $module_root =~ s/\/.*//; # Remove everything after the first slash
 
-    $branch = 'trunk' if list_has(@non_trunk_modules, $module_root);
+    if (not $branch)
+    {
+        $branch = 'trunk/KDE';
+        $branch = 'trunk' if list_has(@non_trunk_modules, $module_root);
+    }
 
+    $branch =~ s/^\/*//; # Eliminate / at beginning of string.
+    $branch =~ s/\/*$//; # Likewise at the end.
+    
     # Remove trailing slashes.
     $svn_server =~ s/\/*$//;
 
@@ -1385,6 +1388,10 @@
                           -plugin-imgfmt-mng -thread -no-exceptions -debug
                           -dlopen-opengl),
         'apply-qt-patches' => 'true',
+
+# See setup_kde35_hack() for why this option is here.
+        'module-base-path' => 'branches/qt/3.3',
+
         'use-qt-builddir-hack' => 'true',
         'use-unsermake' => 0,
         'set-env' => { },
@@ -1785,7 +1792,7 @@
 sub process_arguments
 {
     my $arg;
-    my $version = "kdesvn-build 0.97.1 (KDE 3.5 Edition)";
+    my $version = "kdesvn-build 0.97.2 (KDE 3.5 Edition)";
     my $author = <<DONE;
 $version was written (mostly) by:
   Michael Pyne <michael.pyne\@kdemail.net>
@@ -3976,6 +3983,10 @@
     # arts uses a different versioning scheme.
     set_option('arts', 'branch', '1.5');
 
+    # qt-copy is in branches/qt/3.3.  Due to the default option handling the
+    # handling is done in setup_default_modules().
+    # set_option('qt-copy', 'module-base-path', 'branches/qt/3.3');
+
     for my $module (@branched_modules)
     {
         # Default to downloading from KDE 3.5 instead of KDE 4.
[prev in list] [next in list] [prev in thread] [next in thread]