diff options
Diffstat (limited to 'inputmethod/mozc-server/patches/patch-build__mozc.py')
| -rw-r--r-- | inputmethod/mozc-server/patches/patch-build__mozc.py | 77 |
1 files changed, 26 insertions, 51 deletions
diff --git a/inputmethod/mozc-server/patches/patch-build__mozc.py b/inputmethod/mozc-server/patches/patch-build__mozc.py index ce10f9507f3..1d1b017ac26 100644 --- a/inputmethod/mozc-server/patches/patch-build__mozc.py +++ b/inputmethod/mozc-server/patches/patch-build__mozc.py @@ -1,6 +1,6 @@ -$NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $ +$NetBSD: patch-build__mozc.py,v 1.5 2014/07/19 09:03:04 ryoon Exp $ ---- build_mozc.py.orig 2014-01-06 07:10:26.000000000 +0000 +--- build_mozc.py.orig 2014-07-14 10:14:21.000000000 +0000 +++ build_mozc.py @@ -60,6 +60,7 @@ from build_tools.util import FindFileFro from build_tools.util import GetNumberOfProcessors @@ -10,7 +10,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $ from build_tools.util import IsMac from build_tools.util import IsWindows from build_tools.util import PrintErrorAndExit -@@ -120,6 +121,8 @@ def GetBuildBaseName(options, target_pla +@@ -121,6 +122,8 @@ def GetBuildShortBaseName(options, targe build_base = 'out_mac' elif target_platform == 'Linux': build_base = 'out_linux' @@ -19,7 +19,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $ elif target_platform == 'Android': build_base = 'out_android' elif target_platform == 'NaCl': -@@ -214,6 +217,14 @@ def GetGypFileNames(options): +@@ -220,6 +223,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) @@ -34,7 +34,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $ elif options.target_platform == 'NaCl': # Add chrome NaCl Mozc gyp scripts. gyp_file_names.append('%s/chrome/nacl/nacl_extension.gyp' % SRC_DIR) -@@ -309,6 +320,8 @@ def AddTargetPlatformOption(parser): +@@ -315,6 +326,8 @@ def AddTargetPlatformOption(parser): # If you want Android build, specify "Android". if IsLinux(): default_target = 'Linux' @@ -43,7 +43,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $ elif IsWindows(): default_target = 'Windows' elif IsMac(): -@@ -506,6 +519,14 @@ def ExpandMetaTarget(options, meta_targe +@@ -512,6 +525,14 @@ 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') @@ -58,7 +58,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $ elif target_platform == 'Mac': targets = [SRC_DIR + '/mac/mac.gyp:DiskImage'] elif target_platform == 'Windows': -@@ -531,7 +552,7 @@ def ParseBuildOptions(args=None, values= +@@ -537,7 +558,7 @@ def ParseBuildOptions(args=None, values= """Parses command line options for the build command.""" parser = optparse.OptionParser(usage='Usage: %prog build [options]') AddCommonOptions(parser) @@ -67,7 +67,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $ default_build_concurrency = GetNumberOfProcessors() * 2 parser.add_option('--jobs', '-j', dest='jobs', default=('%d' % default_build_concurrency), -@@ -551,7 +572,7 @@ def ParseRunTestsOptions(args=None, valu +@@ -566,7 +587,7 @@ def ParseRunTestsOptions(args=None, valu parser = optparse.OptionParser( usage='Usage: %prog runtests [options] [test_targets] [-- build options]') AddCommonOptions(parser) @@ -76,7 +76,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $ default_build_concurrency = GetNumberOfProcessors() * 2 parser.add_option('--jobs', '-j', dest='jobs', default=('%d' % default_build_concurrency), -@@ -777,7 +798,8 @@ def GypMain(options, unused_args, _): +@@ -787,7 +808,8 @@ def GypMain(options, unused_args, _): gyp_options.extend(['-D', 'channel_dev=1']) def SetCommandLineForFeature(option_name, windows=False, mac=False, @@ -86,7 +86,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 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 -@@ -799,6 +821,8 @@ def GypMain(options, unused_args, _): +@@ -809,6 +831,8 @@ def GypMain(options, unused_args, _): option on Android platform. nacl: A boolean which replesents the default value of the target option on NaCl. @@ -95,7 +95,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $ Raises: ValueError: An error occurred when 'option_name' is empty. -@@ -811,6 +835,7 @@ def GypMain(options, unused_args, _): +@@ -821,6 +845,7 @@ def GypMain(options, unused_args, _): 'Mac': mac, 'Linux': linux, 'Android': android, @@ -103,7 +103,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $ 'NaCl': nacl}[options.target_platform] enable_option_name = 'enable_%s' % option_name enabled = options.ensure_value(enable_option_name, default_enabled) -@@ -822,10 +847,12 @@ def GypMain(options, unused_args, _): +@@ -832,10 +857,12 @@ def GypMain(options, unused_args, _): SetCommandLineForFeature(option_name='cloud_handwriting', linux=is_official_dev, @@ -116,7 +116,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $ windows=is_official, mac=is_official, android=is_official, -@@ -863,7 +890,8 @@ def GypMain(options, unused_args, _): +@@ -873,7 +900,8 @@ def GypMain(options, unused_args, _): else: gyp_options.extend(['-D', 'use_zinnia=NO']) @@ -126,7 +126,7 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $ '%s/unix/ibus/ibus.gyp' % SRC_DIR in gyp_file_names): gyp_options.extend(['-D', 'use_libibus=1']) -@@ -896,7 +924,7 @@ def GypMain(options, unused_args, _): +@@ -906,7 +934,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,49 +135,33 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $ gyp_options.extend(['-D', 'pkg_config_command=%s' % GetPkgConfigCommand()]) else: gyp_options.extend(['-D', 'pkg_config_command=']) -@@ -1049,6 +1077,41 @@ def BuildOnMac(options, targets, origina +@@ -1050,6 +1078,25 @@ def BuildOnMac(options, targets, origina '-parallelizeTargets', 'BUILD_WITH_GYP=1']) +def BuildOnBSD(options, targets, unused_original_directory_name): -+ """Build the targets on *BSD.""" ++ """Build the targets on BSD.""" + target_names = [] + for target in targets: + (unused_gyp_file_name, target_name) = ( + CanonicalTargetToGypFileAndTargetName(target)) + target_names.append(target_name) + -+ make_command = os.getenv('BUILD_COMMAND', 'make') -+ -+ envvars = [ -+ 'CFLAGS', -+ 'CXXFLAGS', -+ 'CXX', -+ 'CC', -+ 'AR', -+ 'AS', -+ 'RANLIB', -+ 'LD', -+ ] -+ for envvar in envvars: -+ if envvar in os.environ: -+ os.environ[envvar] = os.getenv(envvar) -+ -+ # set output directory -+ os.environ['builddir_name'] = 'out_bsd' -+ -+ build_args = ['-j%s' % options.jobs, -+ 'MAKE_JOBS=%s' % options.jobs, -+ 'BUILDTYPE=%s' % options.configuration] -+ build_args.append('builddir_name=%s' % -+ GetBuildBaseName(options, -+ GetMozcVersion().GetTargetPlatform())) ++ 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.""" -@@ -1076,6 +1139,8 @@ def BuildMain(options, targets, original +@@ -1077,6 +1124,8 @@ def BuildMain(options, targets, original BuildOnMac(options, targets, original_directory_name) elif IsLinux(): BuildOnLinux(options, targets, original_directory_name) @@ -186,12 +170,3 @@ $NetBSD: patch-build__mozc.py,v 1.4 2014/01/19 01:18:50 ryoon Exp $ elif IsWindows(): BuildOnWindows(targets) else: -@@ -1341,7 +1406,7 @@ def CleanBuildFilesAndDirectories(option - elif IsMac(): - directory_names.extend(glob.glob(os.path.join(gyp_directory_name, - '*.xcodeproj'))) -- elif IsLinux(): -+ elif IsLinux() or IsNetBSD(): - file_names.extend(glob.glob(os.path.join(gyp_directory_name, - '*.target.mk'))) - file_names.extend(glob.glob(os.path.join(gyp_directory_name, |