Commit 80871e54 authored by owsla's avatar owsla

Allow rdiff-backup to be built into a single executable on Windows using

py2exe ("setup.py py2exe --single-file"). (Patch from Josh Nisly)


git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup@910 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
parent 8739633b
New in v1.1.17 (????/??/??) 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 Properly handle uid/gid comparison when the metadata about a destination
file has become corrupt. Closes Debian bug #410586. (Andrew Ferguson) file has become corrupt. Closes Debian bug #410586. (Andrew Ferguson)
......
...@@ -13,6 +13,7 @@ if sys.version_info[:2] < (2,2): ...@@ -13,6 +13,7 @@ if sys.version_info[:2] < (2,2):
lflags_arg = [] lflags_arg = []
libname = ['rsync'] libname = ['rsync']
incdir_list = libdir_list = None incdir_list = libdir_list = None
extra_options = {}
if os.name == 'posix' or os.name == 'nt': if os.name == 'posix' or os.name == 'nt':
LIBRSYNC_DIR = os.environ.get('LIBRSYNC_DIR', '') LIBRSYNC_DIR = os.environ.get('LIBRSYNC_DIR', '')
...@@ -40,6 +41,21 @@ if os.name == 'posix' or os.name == 'nt': ...@@ -40,6 +41,21 @@ if os.name == 'posix' or os.name == 'nt':
libdir_list = [os.path.join(LIBRSYNC_DIR, 'lib')] libdir_list = [os.path.join(LIBRSYNC_DIR, 'lib')]
if '-lrsync' in LIBS: if '-lrsync' in LIBS:
libname = [] 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", setup(name="rdiff-backup",
version=version_string, version=version_string,
...@@ -59,5 +75,6 @@ setup(name="rdiff-backup", ...@@ -59,5 +75,6 @@ setup(name="rdiff-backup",
data_files = [('share/man/man1', ['rdiff-backup.1', data_files = [('share/man/man1', ['rdiff-backup.1',
'rdiff-backup-statistics.1']), 'rdiff-backup-statistics.1']),
('share/doc/rdiff-backup-%s' % (version_string,), ('share/doc/rdiff-backup-%s' % (version_string,),
['CHANGELOG', 'COPYING', 'README', 'FAQ.html'])]) ['CHANGELOG', 'COPYING', 'README', 'FAQ.html'])],
**extra_options)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment