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

List:       kde-commits
Subject:    playground/utils/createtarball
From:       Tom Albers <tomalbers () kde ! nl>
Date:       2009-02-04 18:11:57
Message-ID: 1233771117.365579.15122.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 921293 by toma:

Fix bug when using the name together with a folder parameter, honor the docs setting \
and silent the rm error message.


 M  +15 -5     config.ini  
 M  +3 -3      create_tarball.rb  


--- trunk/playground/utils/createtarball/config.ini #921292:921293
@@ -3,6 +3,15 @@
 # doc translations, etc.
 #
 
+[konq-plugins]
+mainmodule   = playground
+name         = playground-konq-plugins
+submodule    = base
+folder       = konq-plugins
+kde_release  = no
+version      = 0.0.3
+docs         = no 
+
 [rsibreak]
 mainmodule   = extragear
 submodule    = utils
@@ -13,15 +22,16 @@
 docs         = yes
 
 [akonadi]
-mainmodule  = kdesupport
-submodule   = akonadi
+mainmodule  = akonadi 
+submodule   = 1.1
+name        = akonadi
 wholeModule = yes
-version     = 1.0.80
+version     = 1.1.1
 translations= no
 remove      = makechangelog
 
 [mailody]
-name        = mailody4
+name        = kde4-mailody
 mainmodule  = extragear
 submodule   = pim
 version     = 1.5.0beta1
@@ -109,7 +119,7 @@
 docs        = yes
 custompo = policykit-kde,polkit-kde-authorization
 
-[konq-plugins]
+[1konq-plugins]
 mainmodule  = extragear
 submodule   = base
 kde_release = yes
--- trunk/playground/utils/createtarball/create_tarball.rb #921292:921293
@@ -182,7 +182,7 @@
         appdata = appdata.merge(temp)
     end
 
-    if !appdata["folder"]
+    if !appdata["folder"] || appdata["name"]
         temp = { "folder" => appdata["name"] + "-" + appdata["version"] }
     else
         temp = { "folder" => appdata["folder"] + "-" + appdata["version"] }
@@ -225,7 +225,7 @@
     Dir.chdir( ".." )
 
     `find -name ".svn" | xargs rm -rf`
-    `rmdir #{app}-tmp`
+    `rm -rf #{app}-tmp`
 
     if appdata["translations"] != "no"
         puts "-> Fetching l10n docs for #{appdata["submodule"]}/#{app}..."
@@ -254,7 +254,7 @@
                 dg.chomp!
                 `rm -rf #{dg}`
                 docdirname = \
                "l10n-kde4/#{lang}/docs/#{appdata["mainmodule"]}-#{appdata["submodule"]}/#{dg}"
                
-                if ( appdata["docs"] )
+                if ( appdata["docs"] != "no" )
                     puts "  -> Checking if #{lang} has translated \
documentation...\n"  `svn co -q #{svnroot}/#{docdirname} > /dev/null 2>&1`
                 end


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