Author: rhuijben
Date: Sat Jul 20 10:58:54 2013
New Revision: 1505123
URL: http://svn.apache.org/r1505123
Log:
When localization is not enabled in the build, don't generate a 'locale'
project in the Windows project generator.
* build/generator/gen_win.py
(WinGeneratorBase.__init__):
Don't generate build_locale.bat if there is nothing to build.
(WinGeneratorBase.get_install_targets):
(get_install_targets): Remove the 'locale' project from the install
list if there is no locale support to build.
Modified:
subversion/trunk/build/generator/gen_win.py
Modified: subversion/trunk/build/generator/gen_win.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win.py?rev=1505123&r1=1505122&r2=1505123&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Sat Jul 20 10:58:54 2013
@@ -115,16 +115,16 @@ class WinGeneratorBase(gen_win_dependenc
self.write_with_template(bat, 'templates/build_zlib.ezt', data)
# Generate the build_locale.bat file
- pofiles = []
if self.enable_nls:
+ pofiles = []
for po in os.listdir(os.path.join('subversion', 'po')):
if fnmatch.fnmatch(po, '*.po'):
pofiles.append(POFile(po[:-3]))
- data = {'pofiles': pofiles}
- self.write_with_template(os.path.join(self.projfilesdir,
- 'build_locale.bat'),
- 'templates/build_locale.ezt', data)
+ data = {'pofiles': pofiles}
+ self.write_with_template(os.path.join(self.projfilesdir,
+ 'build_locale.bat'),
+ 'templates/build_locale.ezt', data)
#Here we can add additional platforms to compile for
self.platforms = ['Win32']
@@ -193,6 +193,9 @@ class WinGeneratorBase(gen_win_dependenc
# Don't create projects for scripts
install_targets = [x for x in install_targets if not isinstance(x,
gen_base.TargetScript)]
+ if not self.enable_nls:
+ install_targets = [x for x in install_targets if x.name != 'locale']
+
# Drop the libsvn_fs_base target and tests if we don't have BDB
if 'db' not in self._libraries:
install_targets = [x for x in install_targets if x.name !=
'libsvn_fs_base']
