[Rdiff-backup-commits] rdiff-backup CHANGELOG dist/setup.py

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 08/07/11 16:40:59

Modified files:
        .              : CHANGELOG 
        dist           : setup.py 

Log message:
        Allow rdiff-backup to be built into a single executable on Windows using
        py2exe ("setup.py py2exe --single-file"). (Patch from Josh Nisly)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.287&r2=1.288
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/dist/setup.py?cvsroot=rdiff-backup&r1=1.11&r2=1.12

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -b -r1.287 -r1.288
--- CHANGELOG   5 Jul 2008 19:04:44 -0000       1.287
+++ CHANGELOG   11 Jul 2008 16:40:59 -0000      1.288
@@ -1,6 +1,9 @@
 New in v1.1.17 (????/??/??)
 ---------------------------
 
+Allow rdiff-backup to be built into a single executable on Windows using
+py2exe ("setup.py py2exe --single-file"). (Patch from Josh Nisly)
+
 Properly handle uid/gid comparison when the metadata about a destination
 file has become corrupt. Closes Debian bug #410586. (Andrew Ferguson)
 

Index: dist/setup.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/dist/setup.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- dist/setup.py       8 Apr 2008 15:46:02 -0000       1.11
+++ dist/setup.py       11 Jul 2008 16:40:59 -0000      1.12
@@ -13,6 +13,7 @@
 lflags_arg = []
 libname = ['rsync']
 incdir_list = libdir_list = None
+extra_options = {}
 
 if os.name == 'posix' or os.name == 'nt':
        LIBRSYNC_DIR = os.environ.get('LIBRSYNC_DIR', '')
@@ -40,6 +41,21 @@
                        libdir_list = [os.path.join(LIBRSYNC_DIR, 'lib')]
                if '-lrsync' in LIBS:
                        libname = []
+               if os.name == 'nt':
+                       try:
+                               import py2exe
+                       except ImportError:
+                               pass
+                       else:
+                               extra_options = {
+                                       'console': ['rdiff-backup'],
+                               }
+                               if '--single-file' in sys.argv[1:]:
+                                       sys.argv.remove('--single-file')
+                                       extra_options.update({
+                                               'options': {'py2exe': 
{'bundle_files': 1}},
+                                               'zipfile': None
+                                       })
 
 setup(name="rdiff-backup",
          version=version_string,
@@ -59,5 +75,6 @@
          data_files = [('share/man/man1', ['rdiff-backup.1',
                                                                                
'rdiff-backup-statistics.1']),
                                        ('share/doc/rdiff-backup-%s' % 
(version_string,),
-                                        ['CHANGELOG', 'COPYING', 'README', 
'FAQ.html'])])
+                                        ['CHANGELOG', 'COPYING', 'README', 
'FAQ.html'])],
+                                       **extra_options)