Codebase list mozc / 0631a1d
Honor 'mac_sdk' GYP variable in build_breakpad.py This is a follow up CL to c19cc87a399bae0863b76daece950b8bb1be8175. With this CL, the target SDK used in build_breakpad.py will be automatically set based on 'mac_sdk' GYP variable rather then the version hard-coded in build_breakpad.py. BUG= TEST= REF_BUG=31891161 REF_CL=141003326 REF_TIME=2016-12-04T17:38:07-08:00 REF_TIME_RAW=1480901887 -0800 Yohei Yukawa 7 years ago
3 changed file(s) with 16 addition(s) and 13 deletion(s). Raw diff Collapse all Expand all
+3
-1
src/base/base.gyp less more
555555 ],
556556 'action': [
557557 'python', '../build_tools/build_breakpad.py',
558 '--pbdir', '<(pbdir)', '--outdir', '<(mac_breakpad_dir)',
558 '--pbdir', '<(pbdir)',
559 '--outdir', '<(mac_breakpad_dir)',
560 '--sdk', 'macosx<(mac_sdk)',
559561 ],
560562 }],
561563 'direct_dependent_settings': {
+12
-11
src/build_tools/build_breakpad.py less more
4343 parser = optparse.OptionParser()
4444 parser.add_option('--pbdir', default='./third_party/breakpad')
4545 parser.add_option('--outdir', default='./out_mac/Release/Breakpad')
46 parser.add_option('--sdk', default='macosx10.11')
4647
4748 (opts, _) = parser.parse_args()
4849 return opts
5758 print 'Done: %s' % ' '.join(command)
5859
5960
60 def Xcodebuild(projdir, target, arch, outdir):
61 def Xcodebuild(projdir, target, arch, sdk, outdir):
6162 ProcessCall([
6263 'xcodebuild', '-project', projdir, '-configuration', 'Release',
63 '-target', target, '-arch', arch, '-sdk', 'macosx10.11',
64 '-target', target, '-arch', arch, '-sdk', sdk,
6465 'GCC_VERSION=com.apple.compilers.llvm.clang.1_0',
6566 'CONFIGURATION_BUILD_DIR=%s' % outdir,
6667 ])
6768
6869
69 def BuildBreakpad(outdir):
70 def BuildBreakpad(outdir, sdk):
7071 projdir = os.path.join(outdir, 'src/client/mac/Breakpad.xcodeproj')
71 Xcodebuild(projdir, 'Breakpad', 'x86_64', outdir)
72 Xcodebuild(projdir, 'Breakpad', 'x86_64', sdk, outdir)
7273
7374
74 def BuildDumpSyms(outdir):
75 def BuildDumpSyms(outdir, sdk):
7576 projdir = os.path.join(outdir, 'src/tools/mac/dump_syms/dump_syms.xcodeproj')
76 Xcodebuild(projdir, 'dump_syms', 'x86_64', outdir)
77 Xcodebuild(projdir, 'dump_syms', 'x86_64', sdk, outdir)
7778
7879
79 def BuildSymupload(outdir):
80 def BuildSymupload(outdir, sdk):
8081 projdir = os.path.join(outdir, 'src/tools/mac/symupload/symupload.xcodeproj')
8182 # This build fails with Xcode8/i386.
82 Xcodebuild(projdir, 'symupload', 'x86_64', outdir)
83 Xcodebuild(projdir, 'symupload', 'x86_64', sdk, outdir)
8384
8485
8586 def CreateOutDir(pbdir, outdir):
9596 outdir = os.path.abspath(opts.outdir)
9697
9798 CreateOutDir(pbdir, outdir)
98 BuildBreakpad(outdir)
99 BuildDumpSyms(outdir)
100 BuildSymupload(outdir)
99 BuildBreakpad(outdir, opts.sdk)
100 BuildDumpSyms(outdir, opts.sdk)
101 BuildSymupload(outdir, opts.sdk)
101102
102103
103104 if __name__ == '__main__':
+1
-1
src/data/version/mozc_version_template.bzl less more
2929
3030 MAJOR=2
3131 MINOR=20
32 BUILD=2669
32 BUILD=2670
3333 REVISION=102
3434 # This version represents the version of Mozc IME engine (converter, predictor,
3535 # etc.). This version info is included both in the Mozc server and in the Mozc