From c37b04e80aafc8437d458ced2366f825749ae2d7 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Tue, 19 Apr 2016 11:04:01 -0700 Subject: Move build/ to build_gyp/. This CL moves the build/ files to build_gyp/ in anticipation of pulling in Chromiums build/ directory. The gyp_pdfium files have been duplicated into both places. Once the bots are updated we'll remove the build/ versions. BUG=pdfium:106 Review URL: https://codereview.chromium.org/1900913003 --- .gitignore | 4 +- DEPS | 4 +- README.md | 12 +- build/all.gyp | 17 -- build/gyp_pdfium | 6 +- build/mac_find_sdk.py | 93 ------ build/set_clang_warning_flags.gypi | 58 ---- build/standalone.gypi | 507 --------------------------------- build_gyp/all.gyp | 17 ++ build_gyp/gyp_pdfium | 52 ++++ build_gyp/gyp_pdfium.py | 8 + build_gyp/mac_find_sdk.py | 93 ++++++ build_gyp/set_clang_warning_flags.gypi | 58 ++++ build_gyp/standalone.gypi | 507 +++++++++++++++++++++++++++++++++ 14 files changed, 747 insertions(+), 689 deletions(-) delete mode 100644 build/all.gyp delete mode 100644 build/mac_find_sdk.py delete mode 100644 build/set_clang_warning_flags.gypi delete mode 100644 build/standalone.gypi create mode 100644 build_gyp/all.gyp create mode 100755 build_gyp/gyp_pdfium create mode 100644 build_gyp/gyp_pdfium.py create mode 100644 build_gyp/mac_find_sdk.py create mode 100644 build_gyp/set_clang_warning_flags.gypi create mode 100644 build_gyp/standalone.gypi diff --git a/.gitignore b/.gitignore index 45bcec530e..ae54040af9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ -/build/Debug -/build/Release -/build/gyp +/build_gyp/gyp /buildtools /out /testing/corpus diff --git a/DEPS b/DEPS index 265f452089..d846d20906 100644 --- a/DEPS +++ b/DEPS @@ -18,7 +18,7 @@ vars = { } deps = { - "build/gyp": + "build_gyp/gyp": Var('chromium_git') + "/external/gyp", "buildtools": @@ -68,7 +68,7 @@ hooks = [ # A change to a .gyp, .gypi, or to GYP itself should run the generator. 'name': 'gyp', 'pattern': '.', - 'action': ['python', 'pdfium/build/gyp_pdfium'], + 'action': ['python', 'pdfium/build_gyp/gyp_pdfium'], }, # Pull GN binaries. This needs to be before running GYP below. { diff --git a/README.md b/README.md index 24fc1f3d7b..53e1b4b8f5 100644 --- a/README.md +++ b/README.md @@ -38,8 +38,8 @@ Previously, the second option (platform-specific build files) was the default. Most PDFium developers use Ninja, as does our [continuous build system] (http://build.chromium.org/p/client.pdfium/). - * On Windows: `build\gyp_pdfium` - * For all other platforms: `build/gyp_pdfium` + * On Windows: `build_gyp\gyp_pdfium` + * For all other platforms: `build_gyp/gyp_pdfium` The second option is to generate platform-specific build files, i.e. Makefiles on Linux, sln files on Windows, and xcodeproj files on Mac. To do so, set the @@ -56,7 +56,7 @@ To build without XFA, set `pdf_enable_xfa=0` before running `gyp_pdfium`. To build without JavaScript, set `pdf_enable_v8=0 pdf_enable_xfa=0` before running `gyp_pdfium`. For example ``` -GYP_DEFINES='pdf_enable_v8=0 pdf_enable_xfa=0' build/gyp_pdfium +GYP_DEFINES='pdf_enable_v8=0 pdf_enable_xfa=0' build_gyp/gyp_pdfium ``` gives the smallest possible build configuration. @@ -67,7 +67,7 @@ you installed goma in a non-standard location, you will also need to set `gomadir`. e.g. ``` -build/gyp_pdfium -D use_goma=1 -D gomadir=path/to/goma +build_gyp/gyp_pdfium -D use_goma=1 -D gomadir=path/to/goma ``` ## Building the code @@ -79,8 +79,8 @@ tests) by: `ninja -C out/Debug`. If you're not using Ninja, then building is platform-specific. * On Linux: `make pdfium_test` - * On Mac: `open build/all.xcodeproj` - * On Windows: open build\all.sln + * On Mac: `open build_gyp/all.xcodeproj` + * On Windows: open build_gyp\all.sln ## Running the sample program diff --git a/build/all.gyp b/build/all.gyp deleted file mode 100644 index 47097e39b4..0000000000 --- a/build/all.gyp +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2014 PDFium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'targets': [ - { - 'target_name': 'All', - 'type': 'none', - 'dependencies': [ - '../pdfium.gyp:*', - '../samples/samples.gyp:*', - '../testing/libfuzzer/fuzzers.gyp:*', - ], - } - ] -} diff --git a/build/gyp_pdfium b/build/gyp_pdfium index fca2ca39b6..3dbbbeea75 100755 --- a/build/gyp_pdfium +++ b/build/gyp_pdfium @@ -14,7 +14,7 @@ import sys script_dir = os.path.dirname(os.path.realpath(__file__)) pdfium_root = os.path.abspath(os.path.join(script_dir, os.pardir)) -sys.path.insert(0, os.path.join(pdfium_root, 'build', 'gyp', 'pylib')) +sys.path.insert(0, os.path.join(pdfium_root, 'build_gyp', 'gyp', 'pylib')) import gyp @@ -27,10 +27,10 @@ def run_gyp(args): def main(): args = sys.argv[1:] - args.append(os.path.join(script_dir, 'all.gyp')) + args.append(os.path.join(pdfium_root, 'build_gyp', 'all.gyp')) args.append('-I') - args.append(os.path.join(pdfium_root, 'build', 'standalone.gypi')) + args.append(os.path.join(pdfium_root, 'build_gyp', 'standalone.gypi')) args.extend(['-D', 'gyp_output_dir=out']) diff --git a/build/mac_find_sdk.py b/build/mac_find_sdk.py deleted file mode 100644 index 230c2fd52e..0000000000 --- a/build/mac_find_sdk.py +++ /dev/null @@ -1,93 +0,0 @@ -#!/usr/bin/env python -# Copyright 2016 PDFium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -"""Prints the lowest locally available SDK version greater than or equal to a -given minimum sdk version to standard output. - -Usage: - python mac_find_sdk.py 10.6 # Ignores SDKs < 10.6 -""" - -import os -import re -import subprocess -import sys - - -from optparse import OptionParser - - -def parse_version(version_str): - """'10.6' => [10, 6]""" - return map(int, re.findall(r'(\d+)', version_str)) - - -def main(): - parser = OptionParser() - parser.add_option("--verify", - action="store_true", dest="verify", default=False, - help="return the sdk argument and warn if it doesn't exist") - parser.add_option("--sdk_path", - action="store", type="string", dest="sdk_path", default="", - help="user-specified SDK path; bypasses verification") - parser.add_option("--print_sdk_path", - action="store_true", dest="print_sdk_path", default=False, - help="Additionaly print the path the SDK (appears first).") - options, args = parser.parse_args() - if len(args) != 1: - parser.error('Please specify a minimum SDK version') - min_sdk_version = args[0] - - job = subprocess.Popen(['xcode-select', '-print-path'], - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT) - out, err = job.communicate() - if job.returncode != 0: - print >> sys.stderr, out - print >> sys.stderr, err - raise Exception(('Error %d running xcode-select, you might have to run ' - '|sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer| ' - 'if you are using Xcode 4.') % job.returncode) - # The Developer folder moved in Xcode 4.3. - xcode43_sdk_path = os.path.join( - out.rstrip(), 'Platforms/MacOSX.platform/Developer/SDKs') - if os.path.isdir(xcode43_sdk_path): - sdk_dir = xcode43_sdk_path - else: - sdk_dir = os.path.join(out.rstrip(), 'SDKs') - sdks = [re.findall('^MacOSX(10\.\d+)\.sdk$', s) for s in os.listdir(sdk_dir)] - sdks = [s[0] for s in sdks if s] # [['10.5'], ['10.6']] => ['10.5', '10.6'] - sdks = [s for s in sdks # ['10.5', '10.6'] => ['10.6'] - if parse_version(s) >= parse_version(min_sdk_version)] - if not sdks: - raise Exception('No %s+ SDK found' % min_sdk_version) - best_sdk = sorted(sdks, key=parse_version)[0] - - if options.verify and best_sdk != min_sdk_version and not options.sdk_path: - print >> sys.stderr, '' - print >> sys.stderr, ' vvvvvvv' - print >> sys.stderr, '' - print >> sys.stderr, \ - 'This build requires the %s SDK, but it was not found on your system.' \ - % min_sdk_version - print >> sys.stderr, \ - 'Either install it, or explicitly set mac_sdk in your GYP_DEFINES.' - print >> sys.stderr, '' - print >> sys.stderr, ' ^^^^^^^' - print >> sys.stderr, '' - return min_sdk_version - - if options.print_sdk_path: - print subprocess.check_output(['xcodebuild', '-version', '-sdk', - 'macosx' + best_sdk, 'Path']).strip() - - return best_sdk - - -if __name__ == '__main__': - if sys.platform != 'darwin': - raise Exception("This script only runs on Mac") - print main() - sys.exit(0) diff --git a/build/set_clang_warning_flags.gypi b/build/set_clang_warning_flags.gypi deleted file mode 100644 index f6d7aea700..0000000000 --- a/build/set_clang_warning_flags.gypi +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright (c) 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# This file is meant to be included to set clang-specific compiler flags. -# To use this the following variable can be defined: -# clang_warning_flags: list: Compiler flags to pass to clang. -# clang_warning_flags_unset: list: Compiler flags to not pass to clang. -# -# Only use this in third-party code. In chromium_code, fix your code to not -# warn instead! -# -# Note that the gypi file is included in target_defaults, so it does not need -# to be explicitly included. -# -# Warning flags set by this will be used on all platforms. If you want to set -# warning flags on only some platforms, you have to do so manually. -# -# To use this, create a gyp target with the following form: -# { -# 'target_name': 'my_target', -# 'variables': { -# 'clang_warning_flags': ['-Wno-awesome-warning'], -# 'clang_warning_flags_unset': ['-Wpreviously-set-flag'], -# } -# } - -{ - 'variables': { - 'clang_warning_flags_unset%': [], # Provide a default value. - }, - 'conditions': [ - ['clang==1', { - # This uses >@ instead of @< to also see clang_warning_flags set in - # targets directly, not just the clang_warning_flags in target_defaults. - 'cflags': [ '>@(clang_warning_flags)' ], - 'cflags!': [ '>@(clang_warning_flags_unset)' ], - 'xcode_settings': { - 'WARNING_CFLAGS': ['>@(clang_warning_flags)'], - 'WARNING_CFLAGS!': ['>@(clang_warning_flags_unset)'], - }, - 'msvs_settings': { - 'VCCLCompilerTool': { - 'AdditionalOptions': [ '>@(clang_warning_flags)' ], - 'AdditionalOptions!': [ '>@(clang_warning_flags_unset)' ], - }, - }, - }], - ['clang==0 and host_clang==1', { - 'target_conditions': [ - ['_toolset=="host"', { - 'cflags': [ '>@(clang_warning_flags)' ], - 'cflags!': [ '>@(clang_warning_flags_unset)' ], - }], - ], - }], - ], -} diff --git a/build/standalone.gypi b/build/standalone.gypi deleted file mode 100644 index 925326b794..0000000000 --- a/build/standalone.gypi +++ /dev/null @@ -1,507 +0,0 @@ -# Copyright 2014 PDFium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# Definitions to be used when building stand-alone PDFium binaries. - -{ - 'variables': { - 'component%': 'static_library', - 'clang%': 0, - 'asan%': 0, - 'sanitizer_coverage%': 0, - 'use_goma%': 0, - 'gomadir%': '', - 'msvs_multi_core_compile%': '1', - 'pdf_enable_xfa%': 1, - 'variables': { - 'variables': { - 'variables': { - 'conditions': [ - ['OS=="linux" or OS=="mac"', { - # This handles the Unix platforms we generally deal with. - # Anything else gets passed through, which probably won't work - # very well; such hosts should pass an explicit target_arch - # to gyp. - 'host_arch%': - ' [10, 6]""" + return map(int, re.findall(r'(\d+)', version_str)) + + +def main(): + parser = OptionParser() + parser.add_option("--verify", + action="store_true", dest="verify", default=False, + help="return the sdk argument and warn if it doesn't exist") + parser.add_option("--sdk_path", + action="store", type="string", dest="sdk_path", default="", + help="user-specified SDK path; bypasses verification") + parser.add_option("--print_sdk_path", + action="store_true", dest="print_sdk_path", default=False, + help="Additionaly print the path the SDK (appears first).") + options, args = parser.parse_args() + if len(args) != 1: + parser.error('Please specify a minimum SDK version') + min_sdk_version = args[0] + + job = subprocess.Popen(['xcode-select', '-print-path'], + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT) + out, err = job.communicate() + if job.returncode != 0: + print >> sys.stderr, out + print >> sys.stderr, err + raise Exception(('Error %d running xcode-select, you might have to run ' + '|sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer| ' + 'if you are using Xcode 4.') % job.returncode) + # The Developer folder moved in Xcode 4.3. + xcode43_sdk_path = os.path.join( + out.rstrip(), 'Platforms/MacOSX.platform/Developer/SDKs') + if os.path.isdir(xcode43_sdk_path): + sdk_dir = xcode43_sdk_path + else: + sdk_dir = os.path.join(out.rstrip(), 'SDKs') + sdks = [re.findall('^MacOSX(10\.\d+)\.sdk$', s) for s in os.listdir(sdk_dir)] + sdks = [s[0] for s in sdks if s] # [['10.5'], ['10.6']] => ['10.5', '10.6'] + sdks = [s for s in sdks # ['10.5', '10.6'] => ['10.6'] + if parse_version(s) >= parse_version(min_sdk_version)] + if not sdks: + raise Exception('No %s+ SDK found' % min_sdk_version) + best_sdk = sorted(sdks, key=parse_version)[0] + + if options.verify and best_sdk != min_sdk_version and not options.sdk_path: + print >> sys.stderr, '' + print >> sys.stderr, ' vvvvvvv' + print >> sys.stderr, '' + print >> sys.stderr, \ + 'This build requires the %s SDK, but it was not found on your system.' \ + % min_sdk_version + print >> sys.stderr, \ + 'Either install it, or explicitly set mac_sdk in your GYP_DEFINES.' + print >> sys.stderr, '' + print >> sys.stderr, ' ^^^^^^^' + print >> sys.stderr, '' + return min_sdk_version + + if options.print_sdk_path: + print subprocess.check_output(['xcodebuild', '-version', '-sdk', + 'macosx' + best_sdk, 'Path']).strip() + + return best_sdk + + +if __name__ == '__main__': + if sys.platform != 'darwin': + raise Exception("This script only runs on Mac") + print main() + sys.exit(0) diff --git a/build_gyp/set_clang_warning_flags.gypi b/build_gyp/set_clang_warning_flags.gypi new file mode 100644 index 0000000000..f6d7aea700 --- /dev/null +++ b/build_gyp/set_clang_warning_flags.gypi @@ -0,0 +1,58 @@ +# Copyright (c) 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# This file is meant to be included to set clang-specific compiler flags. +# To use this the following variable can be defined: +# clang_warning_flags: list: Compiler flags to pass to clang. +# clang_warning_flags_unset: list: Compiler flags to not pass to clang. +# +# Only use this in third-party code. In chromium_code, fix your code to not +# warn instead! +# +# Note that the gypi file is included in target_defaults, so it does not need +# to be explicitly included. +# +# Warning flags set by this will be used on all platforms. If you want to set +# warning flags on only some platforms, you have to do so manually. +# +# To use this, create a gyp target with the following form: +# { +# 'target_name': 'my_target', +# 'variables': { +# 'clang_warning_flags': ['-Wno-awesome-warning'], +# 'clang_warning_flags_unset': ['-Wpreviously-set-flag'], +# } +# } + +{ + 'variables': { + 'clang_warning_flags_unset%': [], # Provide a default value. + }, + 'conditions': [ + ['clang==1', { + # This uses >@ instead of @< to also see clang_warning_flags set in + # targets directly, not just the clang_warning_flags in target_defaults. + 'cflags': [ '>@(clang_warning_flags)' ], + 'cflags!': [ '>@(clang_warning_flags_unset)' ], + 'xcode_settings': { + 'WARNING_CFLAGS': ['>@(clang_warning_flags)'], + 'WARNING_CFLAGS!': ['>@(clang_warning_flags_unset)'], + }, + 'msvs_settings': { + 'VCCLCompilerTool': { + 'AdditionalOptions': [ '>@(clang_warning_flags)' ], + 'AdditionalOptions!': [ '>@(clang_warning_flags_unset)' ], + }, + }, + }], + ['clang==0 and host_clang==1', { + 'target_conditions': [ + ['_toolset=="host"', { + 'cflags': [ '>@(clang_warning_flags)' ], + 'cflags!': [ '>@(clang_warning_flags_unset)' ], + }], + ], + }], + ], +} diff --git a/build_gyp/standalone.gypi b/build_gyp/standalone.gypi new file mode 100644 index 0000000000..7292947226 --- /dev/null +++ b/build_gyp/standalone.gypi @@ -0,0 +1,507 @@ +# Copyright 2014 PDFium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# Definitions to be used when building stand-alone PDFium binaries. + +{ + 'variables': { + 'component%': 'static_library', + 'clang%': 0, + 'asan%': 0, + 'sanitizer_coverage%': 0, + 'use_goma%': 0, + 'gomadir%': '', + 'msvs_multi_core_compile%': '1', + 'pdf_enable_xfa%': 1, + 'variables': { + 'variables': { + 'variables': { + 'conditions': [ + ['OS=="linux" or OS=="mac"', { + # This handles the Unix platforms we generally deal with. + # Anything else gets passed through, which probably won't work + # very well; such hosts should pass an explicit target_arch + # to gyp. + 'host_arch%': + '