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

List:       kde-commits
Subject:    KDE/kdesdk/scripts
From:       Michael Pyne <mpyne () purinchu ! net>
Date:       2009-06-04 15:05:06
Message-ID: 1244127906.735007.1491.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 977531 by mpyne:

Adapt kdesvn-build to changes in the qt-copy configure script.  On the one hand the auto-
license-accept hack no longer works.  On the other hand there's a way to do it without
hacking the script, which is better.


 M  +4 -36     kdesvn-build  


--- trunk/KDE/kdesdk/scripts/kdesvn-build #977530:977531
@@ -4656,6 +4656,9 @@
         }
 
         push @commands, "-prefix", $prefix;
+
+        # Auto-accept the license (only works in very recent versions of qt-copy though
+        push @commands, '-confirm-license', '-opensource';
     }
 
     # We're special casing these modules because we're using the lndir
@@ -4665,51 +4668,16 @@
         $script = get_fullpath($module, 'build') . "/configure";
     }
 
-    # We use a special script for qt-copy to auto-accept the license, it is created
-    # just before running it (see below).
-    my $qtdir = get_fullpath('qt-copy', 'source');
-    my $builddir = get_fullpath($module, 'build');
-
-    $script = "$qtdir/configure.new" if $module eq 'qt-copy';
     unshift @commands, $script;
 
     my $old_flags = get_persistent_option($module, 'last-configure-flags') || '';
+    my $builddir = get_fullpath($module, 'build');
 
     if((get_list_digest(@commands) ne $old_flags) or
        (get_option($module, 'reconfigure')) or
        (not -e "$builddir/Makefile")
       )
     {
-        # Create specialized configure script for qt-copy.
-        if ($module eq 'qt-copy')
-        {
-            debug "Creating g[$qtdir/configure.new] from g[$script]";
-
-            if(not pretending)
-            {
-                # Copy the configure script to accept the GPL license.
-
-                # $script should point to $srcdir/qt-copy/configure for both Qt
-                # 3 and 4.
-
-                open CONFIG, "<$qtdir/configure";
-                open NEWCONFIG, ">$qtdir/configure.new";
-
-                while(<CONFIG>)
-                {
-                    s/read acceptance/acceptance=yes/;
-                    print NEWCONFIG $_;
-                }
-
-                close NEWCONFIG;
-                close CONFIG;
-
-                chmod 0755, "$qtdir/configure.new";
-            }
-
-            note "\tb[r[GPL license selected for Qt].  See $srcdir/LICENSE.GPL";
-        }
-
         info "\tRunning g[configure]...";
 
         set_persistent_option($module, 'last-configure-flags', get_list_digest(@commands));
[prev in list] [next in list] [prev in thread] [next in thread]