releng r944 - in trunk/tools: . smoketesting

[ovitters svn gnome org]

Author: ovitters
Date: Mon Feb 25 10:20:38 2008
New Revision: 944
URL: http://svn.gnome.org/viewvc/releng?rev=944&view=rev

Log:
	* smoketesting/convert-to-tarballs.py: Limit GDM to 2.20. Use
	java-gnome for Java bindings (4.0 version).
	* smoketesting/tarball-conversion.config: Add option to set the config
	file. Limit tarballs to files with a valid name (not the 'rc1' stuff
	used in java-gnome).



Modified:
   trunk/tools/ChangeLog
   trunk/tools/smoketesting/convert-to-tarballs.py
   trunk/tools/smoketesting/tarball-conversion.config

Modified: trunk/tools/smoketesting/convert-to-tarballs.py
==============================================================================
--- trunk/tools/smoketesting/convert-to-tarballs.py	(original)
+++ trunk/tools/smoketesting/convert-to-tarballs.py	Mon Feb 25 10:20:38 2008
@@ -556,14 +556,12 @@
         # Only include tarballs for the given module
         tarballs = [tarball for tarball in tarballs if modulename in tarball]
 
+        re_tarball = r'^.*[_-](([0-9]+[\.\-])*[0-9]+)(\.orig)?\.tar.*$'
         ## Don't include -beta -installer -stub-installer and all kinds of
         ## other stupid inane tarballs
-        #def valid_tarball(x): return re.search(r'([0-9]+\.)*[0-9]+\.tar', x)
-        #tarballs = filter(valid_tarball, tarballs)
+        tarballs = filter(lambda t: re.search(re_tarball, t), tarballs)
 
-        def getversion(x):
-            return re.sub(r'^.*[_-](([0-9]+[\.\-])*[0-9]+)(\.orig)?\.tar.*$', r'\1', x)
-        versions = map(getversion, tarballs)
+        versions = map(lambda t: re.sub(re_tarball, r'\1', t), tarballs)
 
         if not len(versions):
             raise IOError('No versions found')
@@ -886,6 +884,8 @@
                       help="GNOME version to build")
     parser.add_option("-f", "--force", action="store_true", dest="force",
                       default=False, help="overwrite existing versions and *.modules files")
+    parser.add_option("-c", "--config", dest="config",
+                      help="tarball-conversion config file", metavar="FILE")
 
     if os.path.exists(os.path.join(os.getcwd(), 'tarballs')):
         parser.set_defaults(tarballdir=os.path.join(os.getcwd(), 'tarballs'))
@@ -908,6 +908,8 @@
     else:
         conversion = Options(os.path.join(program_dir, 'tarball-conversion.config'))
         jhbuildrc = os.path.join(program_dir, 'sample-tarball.jhbuildrc')
+    if options.config:
+        conversion = Options(os.path.join(program_dir, options.config))
 
     jhbuild_dir = get_path('jhbuild.in', (os.path.expanduser('~/src/jhbuild'), '/cvs/jhbuild'))
 

Modified: trunk/tools/smoketesting/tarball-conversion.config
==============================================================================
--- trunk/tools/smoketesting/tarball-conversion.config	(original)
+++ trunk/tools/smoketesting/tarball-conversion.config	Mon Feb 25 10:20:38 2008
@@ -186,7 +186,7 @@
     <package name="file-roller"             set="desktop"/>
     <package name="gcalctool"               set="desktop"/>
     <package name="gconf-editor"            set="desktop"/>
-    <package name="gdm"                     set="desktop"/>
+    <package name="gdm"                     set="desktop"   max_version="2.21"/>
     <package name="gedit"                   set="desktop"/>
     <package name="gnome-applets"           set="desktop"/>
     <package name="gnome-backgrounds"       set="desktop"/>
@@ -278,11 +278,7 @@
     <package name="libxml++"           subdir="c++"    set="bindings"/>
     <package name="libsigc++"          subdir="c++"    set="bindings"/>
     # Java
-    <package name="libgtk-java"        subdir="java"   set="bindings"/>
-    <package name="libgnome-java"      subdir="java"   set="bindings"/>
-    <package name="libgconf-java"      subdir="java"   set="bindings"/>
-    <package name="libglade-java"      subdir="java"   set="bindings"/>
-    <package name="glib-java"          subdir="java"   set="bindings"/>
+    <package name="java-gnome"         subdir="java"   set="bindings"/>
     # Perl
     <package name="Glib"               subdir="perl"   set="bindings"/>
     <package name="Gnome2"             subdir="perl"   set="bindings"/>