more v2 reports fixes

[SVN r23681]

tools/regression/xsl_reports/merger/merge_logs.py

@@ -15,7 +15,7 @@ def download_test_runs( destination, tag, user ):
     utils.log( 'Downloading test runs for tag "%s" [connecting as %s]...' % ( tag, user ) )
 
     utils.sourceforge.download( 
-          'regression-logs/incoming/%s/*' % tag
+          'regression-logs/incoming/%s/' % tag
         , os.path.join( destination, tag )
         , user
         )

tools/regression/xsl_reports/report.py

@@ -228,7 +228,7 @@ def build_xsl_reports(
         utils.log( 'Uploading v2 results into "%s" [connecting as %s]...' % ( upload_dir, user ) )
         
         utils.sourceforge.upload( 
-              os.path.join( results_dir, result_file_prefix, '*' )
+              os.path.join( results_dir, result_file_prefix )
             , upload_dir
             , user
             )

tools/regression/xsl_reports/utils/sourceforge.py

@@ -1,5 +1,7 @@
 
 import utils.checked_system
+import os
+import sys
 
 site_dir = '/home/groups/b/bo/boost/htdocs'
 
@@ -10,7 +12,10 @@ def download( source, destination, user ):
         ] )
 
 def upload( source, destination, user ):
+    if sys.platform == 'win32':
+        source = os.popen( 'cygpath "%s"' % source ).read().splitlines()[0]
+        
     utils.checked_system( [ 
-          'rsync -v -r -z --progress localhost:/%(source)s %(user)s@shell.sourceforge.net:%(site_dir)s/%(dest)s'
+          'rsync -v -r -z --progress %(source)s %(user)s@shell.sourceforge.net:%(site_dir)s/%(dest)s'
                 % { 'user': user, 'site_dir': site_dir, 'source': source, 'dest': destination }
         ] )