[r21538]Win32:Apply \\ escape to all const paths
svn: r21541
This commit is contained in:
11
setup.py
11
setup.py
@@ -244,8 +244,9 @@ def write_const_py(command):
|
|||||||
image_dir = os.path.join(share_dir, 'gramps', 'icons', 'hicolor')
|
image_dir = os.path.join(share_dir, 'gramps', 'icons', 'hicolor')
|
||||||
doc_dir = os.path.join(share_dir, 'doc', 'gramps')
|
doc_dir = os.path.join(share_dir, 'doc', 'gramps')
|
||||||
if sys.platform == 'win32':
|
if sys.platform == 'win32':
|
||||||
locale_dir= locale_dir.replace('\\', '\\\\')
|
(share_dir, locale_dir, data_dir, image_dir, doc_dir) = \
|
||||||
|
[path.replace('\\', '\\\\') for path in
|
||||||
|
(share_dir, locale_dir, data_dir, image_dir, doc_dir)]
|
||||||
else:
|
else:
|
||||||
#in build
|
#in build
|
||||||
if 'install' in command.distribution.command_obj:
|
if 'install' in command.distribution.command_obj:
|
||||||
@@ -257,8 +258,10 @@ def write_const_py(command):
|
|||||||
image_dir = os.path.join(base_dir, 'images')
|
image_dir = os.path.join(base_dir, 'images')
|
||||||
doc_dir = base_dir
|
doc_dir = base_dir
|
||||||
if sys.platform == 'win32':
|
if sys.platform == 'win32':
|
||||||
locale_dir= locale_dir.replace('\\', '\\\\')
|
(locale_dir, data_dir, image_dir, doc_dir) = \
|
||||||
|
[path.replace('\\', '\\\\') for path in
|
||||||
|
(locale_dir, data_dir, image_dir, doc_dir)]
|
||||||
|
|
||||||
subst_vars = (('@VERSIONSTRING@', VERSION),
|
subst_vars = (('@VERSIONSTRING@', VERSION),
|
||||||
('@LOCALE_DIR@', locale_dir),
|
('@LOCALE_DIR@', locale_dir),
|
||||||
('@DATA_DIR@', data_dir),
|
('@DATA_DIR@', data_dir),
|
||||||
|
|||||||
Reference in New Issue
Block a user