diff options
Diffstat (limited to 'inputmethod/mozc-server/patches/patch-build__mozc.py')
| -rw-r--r-- | inputmethod/mozc-server/patches/patch-build__mozc.py | 129 |
1 files changed, 38 insertions, 91 deletions
diff --git a/inputmethod/mozc-server/patches/patch-build__mozc.py b/inputmethod/mozc-server/patches/patch-build__mozc.py index d6d0540f656..56835bf99ce 100644 --- a/inputmethod/mozc-server/patches/patch-build__mozc.py +++ b/inputmethod/mozc-server/patches/patch-build__mozc.py @@ -1,16 +1,16 @@ -$NetBSD: patch-build__mozc.py,v 1.7 2015/01/06 10:30:54 ryoon Exp $ +$NetBSD: patch-build__mozc.py,v 1.8 2016/05/16 11:51:49 ryoon Exp $ ---- build_mozc.py.orig 2014-11-03 05:13:03.000000000 +0000 +--- build_mozc.py.orig 2016-05-15 08:11:10.000000000 +0000 +++ build_mozc.py -@@ -60,6 +60,7 @@ from build_tools.util import FindFileFro - from build_tools.util import GetNumberOfProcessors +@@ -58,6 +58,7 @@ from build_tools.util import GetNumberOf from build_tools.util import GetRelPath from build_tools.util import IsLinux -+from build_tools.util import IsNetBSD from build_tools.util import IsMac ++from build_tools.util import IsNetBSD from build_tools.util import IsWindows from build_tools.util import PrintErrorAndExit -@@ -121,6 +122,8 @@ def GetBuildShortBaseName(options, targe + from build_tools.util import RemoveDirectoryRecursively +@@ -123,6 +124,8 @@ def GetBuildShortBaseName(options, targe build_base = 'out_mac' elif target_platform == 'Linux': build_base = 'out_linux' @@ -19,31 +19,29 @@ $NetBSD: patch-build__mozc.py,v 1.7 2015/01/06 10:30:54 ryoon Exp $ elif target_platform == 'Android': build_base = 'out_android' elif target_platform == 'NaCl': -@@ -219,6 +222,14 @@ def GetGypFileNames(options): - if not PkgExists('ibus-1.0 >= 1.4.1'): - logging.info('removing ibus.gyp.') - gyp_file_names.remove('%s/unix/ibus/ibus.gyp' % SRC_DIR) +@@ -223,6 +226,12 @@ def GetGypFileNames(options): + elif options.target_platform == 'Android': + # Add Android Mozc gyp scripts. + gyp_file_names.extend(glob.glob('%s/android/*/*.gyp' % SRC_DIR)) + elif options.target_platform == 'NetBSD': + gyp_file_names.extend(glob.glob('%s/unix/*/*.gyp' % SRC_DIR)) + # Add ibus.gyp if ibus version is >=1.4.1. + if not PkgExists('ibus-1.0 >= 1.4.1'): + logging.info('removing ibus.gyp.') + gyp_file_names.remove('%s/unix/ibus/ibus.gyp' % SRC_DIR) -+ elif options.target_platform == 'ChromeOS': -+ gyp_file_names.extend(glob.glob('%s/unix/ibus/*.gyp' % SRC_DIR)) - elif options.target_platform == 'NaCl': - # Add chrome NaCl Mozc gyp scripts. - gyp_file_names.append('%s/chrome/nacl/nacl_extension.gyp' % SRC_DIR) -@@ -314,6 +325,8 @@ def AddTargetPlatformOption(parser): + gyp_file_names.sort() + return gyp_file_names + +@@ -318,6 +327,8 @@ def AddTargetPlatformOption(parser): # If you want Android build, specify "Android". if IsLinux(): default_target = 'Linux' -+ elif IsNetBSD(): ++ if IsNetBSD(): + default_target = 'NetBSD' elif IsWindows(): default_target = 'Windows' elif IsMac(): -@@ -511,6 +524,14 @@ def ExpandMetaTarget(options, meta_targe +@@ -497,6 +508,12 @@ def ExpandMetaTarget(options, meta_targe SRC_DIR + '/gui/gui.gyp:mozc_tool'] if PkgExists('ibus-1.0 >= 1.4.1'): targets.append(SRC_DIR + '/unix/ibus/ibus.gyp:ibus_mozc') @@ -53,30 +51,10 @@ $NetBSD: patch-build__mozc.py,v 1.7 2015/01/06 10:30:54 ryoon Exp $ + SRC_DIR + '/gui/gui.gyp:mozc_tool'] + if PkgExists('ibus-1.0 >= 1.4.1'): + targets.append(SRC_DIR + '/unix/ibus/ibus.gyp:ibus_mozc') -+ elif target_platform == 'ChromeOS': -+ targets.append(SRC_DIR + '/unix/ibus/ibus.gyp:ibus_mozc') elif target_platform == 'Mac': targets = [SRC_DIR + '/mac/mac.gyp:DiskImage'] elif target_platform == 'Windows': -@@ -536,7 +557,7 @@ def ParseBuildOptions(args=None, values= - """Parses command line options for the build command.""" - parser = optparse.OptionParser(usage='Usage: %prog build [options]') - AddCommonOptions(parser) -- if IsLinux(): -+ if IsLinux() or IsNetBSD(): - default_build_concurrency = GetNumberOfProcessors() * 2 - parser.add_option('--jobs', '-j', dest='jobs', - default=('%d' % default_build_concurrency), -@@ -565,7 +586,7 @@ def ParseRunTestsOptions(args=None, valu - parser = optparse.OptionParser( - usage='Usage: %prog runtests [options] [test_targets] [-- build options]') - AddCommonOptions(parser) -- if IsLinux(): -+ if IsLinux() or IsNetBSD(): - default_build_concurrency = GetNumberOfProcessors() * 2 - parser.add_option('--jobs', '-j', dest='jobs', - default=('%d' % default_build_concurrency), -@@ -788,7 +809,8 @@ def GypMain(options, unused_args, _): +@@ -753,7 +770,8 @@ def GypMain(options, unused_args, _): gyp_options.extend(['-D', 'channel_dev=1']) def SetCommandLineForFeature(option_name, windows=False, mac=False, @@ -86,39 +64,34 @@ $NetBSD: patch-build__mozc.py,v 1.7 2015/01/06 10:30:54 ryoon Exp $ """Updates an option like '--enable_foober' and add a -D argument for gyp. This function ensures an option like '--enable_foober' exists and it has a -@@ -810,6 +832,8 @@ def GypMain(options, unused_args, _): +@@ -775,6 +793,8 @@ def GypMain(options, unused_args, _): option on Android platform. nacl: A boolean which replesents the default value of the target option on NaCl. -+ netbsd: boolean which replesents the default value of the target option -+ on NetBSD platform. ++ netbsd: A boolean which replesents the default value of the target option ++ on NetBSD platform. Raises: ValueError: An error occurred when 'option_name' is empty. -@@ -822,6 +846,7 @@ def GypMain(options, unused_args, _): +@@ -786,6 +806,7 @@ def GypMain(options, unused_args, _): + default_enabled = {'Windows': windows, 'Mac': mac, 'Linux': linux, ++ 'NetBSD': netbsd, 'Android': android, -+ 'NetBSD' : netbsd, 'NaCl': nacl}[options.target_platform] enable_option_name = 'enable_%s' % option_name - enabled = options.ensure_value(enable_option_name, default_enabled) -@@ -833,10 +858,12 @@ def GypMain(options, unused_args, _): +@@ -798,6 +819,7 @@ def GypMain(options, unused_args, _): SetCommandLineForFeature(option_name='cloud_handwriting', linux=is_official_dev, -+ netbsd=is_official_dev, ++ netbsd=is_official_dev, windows=is_official_dev, mac=is_official_dev) - SetCommandLineForFeature(option_name='http_client', - linux=is_official, -+ netbsd=is_official, - windows=is_official, - mac=is_official, - android=is_official, -@@ -874,7 +901,8 @@ def GypMain(options, unused_args, _): + +@@ -825,7 +847,8 @@ def GypMain(options, unused_args, _): else: - gyp_options.extend(['-D', 'use_zinnia=NO']) + gyp_options.extend(['-D', 'use_dynamically_linked_qt=0']) - if (options.target_platform == 'Linux' and + if ((options.target_platform == 'Linux' or @@ -126,7 +99,7 @@ $NetBSD: patch-build__mozc.py,v 1.7 2015/01/06 10:30:54 ryoon Exp $ '%s/unix/ibus/ibus.gyp' % SRC_DIR in gyp_file_names): gyp_options.extend(['-D', 'use_libibus=1']) -@@ -907,7 +935,7 @@ def GypMain(options, unused_args, _): +@@ -857,7 +880,7 @@ def GypMain(options, unused_args, _): # command for pkg-config. Here we catch the environment variable # and use the specified command instead of actual pkg-config # command. @@ -135,38 +108,12 @@ $NetBSD: patch-build__mozc.py,v 1.7 2015/01/06 10:30:54 ryoon Exp $ gyp_options.extend(['-D', 'pkg_config_command=%s' % GetPkgConfigCommand()]) else: gyp_options.extend(['-D', 'pkg_config_command=']) -@@ -1045,6 +1073,25 @@ def BuildOnMac(options, targets, origina - '-parallelizeTargets', - 'BUILD_WITH_GYP=1']) - -+def BuildOnBSD(options, targets, unused_original_directory_name): -+ """Build the targets on BSD.""" -+ target_names = [] -+ for target in targets: -+ (unused_gyp_file_name, target_name) = ( -+ CanonicalTargetToGypFileAndTargetName(target)) -+ target_names.append(target_name) -+ -+ ninja = 'ninja' -+ if hasattr(options, 'android_device'): -+ # Only for android testing. -+ os.environ['ANDROID_DEVICES'] = options.android_device -+ -+ short_basename = GetBuildShortBaseName(options, -+ GetMozcVersion().GetTargetPlatform()) -+ make_command = ninja -+ build_args = ['-j %s' % options.jobs, -+ '-C', '%s/%s' % (short_basename, options.configuration)] -+ RunOrDie([make_command] + build_args + target_names) - - def BuildOnWindows(targets): - """Build the target on Windows.""" -@@ -1072,6 +1119,8 @@ def BuildMain(options, targets, original - BuildOnMac(options, targets, original_directory_name) - elif IsLinux(): - BuildOnLinux(options, targets, original_directory_name) -+ elif IsNetBSD(): -+ BuildOnBSD(options, targets, original_directory_name) - elif IsWindows(): - BuildOnWindows(targets) - else: +@@ -1282,7 +1305,7 @@ def CleanBuildFilesAndDirectories(option + GetMozcVersion().GetTargetPlatform()) + if target_platform: + directory_names.append(target_platform) +- if IsLinux(): ++ if IsLinux() or IsNetBSD(): + # Remove auto-generated files. + file_names.append(os.path.join(SRC_DIR, 'android', 'AndroidManifest.xml')) + file_names.append(os.path.join( |