diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.pro | 61 | ||||
| -rwxr-xr-x | build/gyp_qtwebengine | 167 | ||||
| -rw-r--r-- | build/qmake/mkspecs/features/default_pre.prf | 29 | ||||
| -rw-r--r-- | build/qmake/mkspecs/features/functions.prf | 109 | ||||
| -rw-r--r-- | build/qmake/mkspecs/features/gyp_generator.prf | 208 | ||||
| -rw-r--r-- | build/qmake/mkspecs/features/mac/default_post.prf | 2 | ||||
| -rw-r--r-- | build/qmake_extras/host/host.pro | 16 | ||||
| -rw-r--r-- | build/qmake_extras/qmake_extras.pro | 6 | ||||
| -rw-r--r-- | build/qmake_extras/target/target.pro | 36 | ||||
| -rw-r--r-- | build/qtwebengine_extras.gypi | 51 | ||||
| -rwxr-xr-x | build/scripts/build_resources.py | 103 | ||||
| -rwxr-xr-x | build/scripts/find-included-moc-files | 13 | ||||
| -rwxr-xr-x | build/scripts/find-mocables | 26 |
13 files changed, 0 insertions, 827 deletions
diff --git a/build/build.pro b/build/build.pro deleted file mode 100644 index e0c8b4af1..000000000 --- a/build/build.pro +++ /dev/null @@ -1,61 +0,0 @@ -# This .pro file serves a dual purpose: -# 1) invoking gyp through the gyp_qtwebengine script, which in turn makes use of the generated gypi include files -# 2) produce a Makefile that will run ninja, and take care of actually building everything. - -TEMPLATE = aux - -GYP_ARGS = "-D qt_cross_compile=0" -cross_compile { - GYP_ARGS = "-D qt_cross_compile=1 -D os_posix=1" - TOOLCHAIN_SYSROOT = $$[QT_SYSROOT] - !isEmpty(TOOLCHAIN_SYSROOT): GYP_ARGS += "-D sysroot=\"$${TOOLCHAIN_SYSROOT}\"" - - contains(QT_ARCH, "arm") { - GYP_ARGS += "-D target_arch=arm" - - # Extract ARM specific compiler options that we have to pass to gyp, - # but let gyp figure out a default if an option is not present. - MARCH = $$extractCFlag("-march=.*") - !isEmpty(MARCH): GYP_ARGS += "-D arm_arch=\"$$MARCH\"" - - MFPU = $$extractCFlag("-mfpu=.*") - !isEmpty(MFPU) { - GYP_ARGS += "-D arm_fpu=\"$$MFPU\"" - contains(MFPU, "neon"): GYP_ARGS += "-D arm_neon=\"$$NEON\"" - } - - MTUNE = $$extractCFlag("-mtune=.*") - !isEmpty(MTUNE): GYP_ARGS += "-D arm_tune=\"$$MTUNE\"" - - MFLOAT = $$extractCFlag("-mfloat-abi=.*") - !isEmpty(MFLOAT): GYP_ARGS += "-D arm_float_abi=\"$$MFLOAT\"" - - MARMV = $$replace(MARCH, "armv",) - !isEmpty(MARMV) { - MARMV = $$split(MARMV,) - MARMV = $$member(MARMV, 0) - GYP_ARGS += "-D arm_version=\"$$MARMV\"" - } - - contains(QMAKE_CFLAGS, "-mthumb"): GYP_ARGS += "-D arm_thumb=1" - } - - # Needed for v8, see chromium/v8/build/toolchain.gypi - GYP_ARGS += "-D CXX=\"$$which($$QMAKE_CXX)\"" -} - -!build_pass { - message(Running gyp_qtwebengine $${GYP_ARGS}...) - !system("python ./gyp_qtwebengine $${GYP_ARGS}"): error("-- running gyp_qtwebengine failed --") -} - -ninja.target = invoke_ninja -ninja.commands = $$findOrBuildNinja() $$(NINJAFLAGS) -C $$getOutDir()/$$getConfigDir() -ninja.depends: qmake -QMAKE_EXTRA_TARGETS += ninja - -build_pass:build_all:default_target.target = all -else: default_target.target = first -default_target.depends = ninja - -QMAKE_EXTRA_TARGETS += default_target diff --git a/build/gyp_qtwebengine b/build/gyp_qtwebengine deleted file mode 100755 index e715cb821..000000000 --- a/build/gyp_qtwebengine +++ /dev/null @@ -1,167 +0,0 @@ -#!/usr/bin/env python - -import glob -import os -import subprocess -import sys - -print 'using python: ' + sys.executable + ' version: ' + sys.version - -qtwebengine_src = os.path.abspath(os.path.join(os.path.dirname(__file__), '..')) -chrome_src = subprocess.check_output("git config qtwebengine.chromiumsrcdir || true", shell=True).strip() -if chrome_src: - chrome_src = os.path.join(qtwebengine_src, chrome_src) -if not chrome_src or not os.path.isdir(chrome_src): - chrome_src = os.path.join(qtwebengine_src, '3rdparty/chromium') - print 'CHROMIUM_SRC_DIR not set, falling back to ' + chrome_src - -script_dir = os.path.abspath(os.path.join(chrome_src, 'build')) -if not os.path.isdir(script_dir): - print script_dir + " is not a valid directory" - sys.exit(1) -root_dir = os.path.abspath(os.path.join(os.getcwd(), os.pardir)) - -sys.path.insert(0, script_dir) -import gyp_helper -sys.path.insert(0, os.path.join(chrome_src, 'tools', 'gyp', 'pylib')) -import gyp - -# Add paths so that pymod_do_main(...) can import files. -sys.path.insert(1, os.path.join(chrome_src, 'tools', 'grit')) -sys.path.insert(1, os.path.join(chrome_src, 'tools', 'generate_shim_headers')) - -sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit', - 'Source', 'core', 'core.gyp', 'scripts')) -# Remove the above and keep the line below once we require a newer specific -# Chromium revision. -sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit', - 'Source', 'core', 'scripts')) - -sys.path.insert(1, os.path.join(chrome_src, 'chrome', 'tools', 'build')) - -import repack_locales - -def additional_include_files(args=[]): - """ - Returns a list of additional (.gypi) files to include, without - duplicating ones that are already specified on the command line. - """ - # Determine the include files specified on the command line. - # This doesn't cover all the different option formats you can use, - # but it's mainly intended to avoid duplicating flags on the automatic - # makefile regeneration which only uses this format. - specified_includes = set() - for arg in args: - if arg.startswith('-I') and len(arg) > 2: - specified_includes.add(os.path.realpath(arg[2:])) - - result = [] - def AddInclude(path): - if os.path.realpath(path) not in specified_includes: - result.append(path) - - # Always include common.gypi. - AddInclude(os.path.join(script_dir, 'common.gypi')) - - # Used for additional build tweaks such as file exclusions - AddInclude(os.path.join(qtwebengine_src, 'build', 'qtwebengine_extras.gypi')) - - # Common stuff we generate and extract from qmake - AddInclude(os.path.join(qtwebengine_src, 'build', 'qmake_extras.gypi')) - - # Optionally add supplemental .gypi files if present. - supplements = glob.glob(os.path.join(chrome_src, '*', 'supplement.gypi')) - for supplement in supplements: - AddInclude(supplement) - - return result - -# TODO: later we probably want to hook that up with qmake to allow shadow builds. (Might not play nice with the rest of chromium though) -def get_output_dir(): - outdir = os.path.join(root_dir, "out") # Hardcode for now - if not os.path.isdir(outdir): - os.mkdir(outdir) - - return outdir - -if __name__ == '__main__': - args = sys.argv[1:] - - # On Mac we want to override CXX and CC that is provided with - # the Chromium GYP environment. - if sys.platform.startswith('darwin') and not 'GYP_CROSSCOMPILE' in os.environ: - os.environ['CXX'] = 'clang++' - os.environ['CC'] = 'clang' - - gyp_helper.apply_chromium_gyp_env() - - # This could give false positives since it doesn't actually do real option - # parsing. Oh well. - gyp_file_specified = False - for arg in args: - if arg.endswith('.gyp'): - gyp_file_specified = True - break - - if not gyp_file_specified: - args.append(os.path.join(root_dir, 'qtwebengine.gyp')) - - args.extend(['-I' + i for i in additional_include_files(args)]) - - # On Mac we want to build in x64 mode. And we want to use libc++. - # Even though we are not on linux, it seems we specifically have to disable linux_use_tcmalloc. - if sys.platform in ('darwin',) and not 'GYP_CROSSCOMPILE' in os.environ: - args.extend(['-D', 'host_arch=x64', '-D', 'use_libcpp=1', '-D', 'linux_use_tcmalloc=0']) - - # There shouldn't be a circular dependency relationship between .gyp files, - # but in Chromium's .gyp files, on non-Mac platforms, circular relationships - # currently exist. The check for circular dependencies is currently - # bypassed on other platforms, but is left enabled on the Mac, where a - # violation of the rule causes Xcode to misbehave badly. - # TODO(mark): Find and kill remaining circular dependencies, and remove this - # option. http://crbug.com/35878. - # TODO(tc): Fix circular dependencies in ChromiumOS then add linux2 to the - # list. - if sys.platform not in ('darwin',): - args.append('--no-circular-check') - - args.extend(['-D', 'webkit_src_dir=' + chrome_src + '/third_party/WebKit']) - # the top_level source directory is the first common ancestor of our module and the chromium source tree for the build to be sane. - # commonprefix works on a character basis, so it might return a phony common prefix (not the common parent directory we expect), - toplevel= os.path.commonprefix([root_dir, chrome_src]) - if not os.path.exists(toplevel): - toplevel = os.path.join(toplevel, os.pardir) - args.extend(["--toplevel-dir=" + toplevel]) - # Chromium specific Hack: for Chromium to build, the depth has to be set to the chromium src dir. - args.extend(["--depth=" + chrome_src]) - args.extend(['-D', 'qtwebengine_src_dir=' + qtwebengine_src]) - args.extend(['-D', 'chromium_src_dir=' + chrome_src]) - - if 'qt_cross_compile=1' in sys.argv: - os.environ['GYP_CROSSCOMPILE'] = '1' - - # linux_use_gold_binary currently relies on a hardcoded relative path from chromium/src/out/(Release|Debug) - # Disable it along with the -Wl,--threads flag just in case gold isn't installed on the system. - args.extend(['-D', 'linux_use_gold_binary=0']) - args.extend(['-D', 'linux_use_gold_flags=0']) - # Trigger Qt-specific build conditions. - args.extend(['-D', 'use_qt=1']) - # Tweak the output location and format (hardcode ninja for now if not set) - args.extend(['--generator-output', os.path.abspath(get_output_dir())]) - args.extend(['-Goutput_dir='+ os.path.abspath(get_output_dir())]) - if not os.environ.get('GYP_GENERATORS'): - args.extend(['--format=ninja']) - if "QTWEBENGINE_GYP_DEBUG" in os.environ: - args.append("--check") - args.append("-d all") - print args - ret_code = gyp.main(args) - sys.exit(ret_code) - - ################################### - - print 'Updating projects from gyp files...' - #sys.stdout.flush() - - # Off we go... - sys.exit(gyp.main(args)) diff --git a/build/qmake/mkspecs/features/default_pre.prf b/build/qmake/mkspecs/features/default_pre.prf deleted file mode 100644 index 1e751b740..000000000 --- a/build/qmake/mkspecs/features/default_pre.prf +++ /dev/null @@ -1,29 +0,0 @@ -# Resolve root directories for sources -QTWEBENGINE_ROOT = $$replace(PWD, /build/qmake/mkspecs/features$,) - -QTWEBENGINEPROCESS_NAME = QtWebEngineProcess - -git_chromium_src_dir = $$system("git config qtwebengine.chromiumsrcdir") - -# Fall back to the snapshot path if git does not know about chromium sources (i.e. init-repository.py has not been used) -isEmpty(git_chromium_src_dir): git_chromium_src_dir = "3rdparty/chromium" - -CHROMIUM_SRC_DIR = $$absolute_path("$$QTWEBENGINE_ROOT/$$git_chromium_src_dir") - -INCLUDEPATH += $$CHROMIUM_SRC_DIR - -# Tweaks that shouldn't affect our examples -!contains(_PRO_FILE_PWD_, $$QTWEBENGINE_ROOT/examples) { - # Used for our export macros - DEFINES += BUILDING_CHROMIUM - # We have to disable RTTI for now since that's how chromium builds on linux - unix:QMAKE_CXXFLAGS += -fno-rtti -} -# Location of sync.profile -MODULE_BASE_DIR = $$QTWEBENGINE_ROOT - - -load(functions) - -# Call the original default_pre. -load(default_pre) diff --git a/build/qmake/mkspecs/features/functions.prf b/build/qmake/mkspecs/features/functions.prf deleted file mode 100644 index 9d90d67bd..000000000 --- a/build/qmake/mkspecs/features/functions.prf +++ /dev/null @@ -1,109 +0,0 @@ -# Map to the correct target type for gyp -defineReplace(toGypTargetType) { - equals(TEMPLATE, "app"):return("executable") - equals(TEMPLATE, "lib") { - CONFIG(static): return("static_library") - return("shared_library") - } - return("none") -} - -defineReplace(getOutDir) { - # FIXME: rely on env variable in here and in the gyp_qtwebengine script, à la WEBKITOUTPUTDIR - return("$$QTWEBENGINE_ROOT/out") -} - -defineReplace(getConfigDir) { - CONFIG(release, debug|release):return("Release") - return("Debug") -} - -defineReplace(extractCFlag) { - OPTION = $$find(QMAKE_CFLAGS, $$1) - OPTION = $$split(OPTION, =) - return ($$member(OPTION, 1)) -} - -defineReplace(findMocables) { - input = $$1 - for (file, input): \ - infiles += $$absolute_path($$file, $$_PRO_FILE_PWD_) - mocables = $$system("python $$QTWEBENGINE_ROOT/build/scripts/find-mocables $$infiles") - mocables = $$replace(mocables, $$_PRO_FILE_PWD_$${QMAKE_DIR_SEP}, '') - return($$mocables) -} - -defineReplace(findIncludedMocFiles) { - input = $$1 - for (file, input): \ - infiles += $$absolute_path($$file, $$_PRO_FILE_PWD_) - return($$system("python $$QTWEBENGINE_ROOT/build/scripts/find-included-moc-files $$infiles")) -} - -defineReplace(mocOutput) { - out = $$1 - # The order is important, since the output of the second replace would end up accidentaly transformed by the first one - out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|)), $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) - out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|)), $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) - return($$out) -} - -defineReplace(rccOutput) { - out = $$1 - out = $$replace(out, .qrc, .cpp) - out = $$join(out, qrc_, qrc_) - return($$out) -} - -defineReplace(rccExternFunc) { - out = $$1 - out = $$replace(out, .qrc, ) - return($$out) -} - -defineReplace(which) { - out = $$1 - win32 { - command = $$split(out, " ") - executable = $$first(command) - # Return the first match only - out = $$system("((for /f \"usebackq delims=\" %i in (`where $$executable 2^> NUL`) do @if not defined _endwhich (@echo %i & set _endwhich=true)) & set _endwhich=)") - isEmpty(out) { - message($$executable not found) - out = $$executable - } - for(arg, command): !equals(arg, $$executable): out += $$arg - } else:unix { - command = $$split(out, " ") - executable = $$first(command) - out = $$system("which $$executable 2>/dev/null") - isEmpty(out) { - message($$executable not found) - out = $$executable - } - for(arg, command): !equals(arg, $$executable): out += $$arg - } - return($$out) -} - -defineReplace(findOrBuildNinja) { - !isEmpty(CACHED_NINJA_EXECUTABLE):exists($$CACHED_NINJA_EXECUTABLE): return($$CACHED_NINJA_EXECUTABLE) - out = $$which(ninja) - # Try to be smart about it if we know where the chromium sources are located - !exists($$out) { - git_chromium_src_dir = $$system("git config qtwebengine.chromiumsrcdir") - # Fall back to the snapshot path if git does not know about chromium sources (i.e. init-repository.py has not been used) - isEmpty(git_chromium_src_dir): git_chromium_src_dir = "3rdparty/chromium" - win32: out = $$system_path($$absolute_path("$$QTWEBENGINE_ROOT/$$git_chromium_src_dir/../ninja/ninja.exe")) - else: out = $$absolute_path("$$QTWEBENGINE_ROOT/$$git_chromium_src_dir/../ninja/ninja") - # If we still did not find ninja, then we bootstrap it. - !exists($$out) { - message("bootstrapping ninja...") - ninjadir = $$dirname(out) - system("python $$ninjadir/bootstrap.py") - } - } - message("using $$out") - cache(CACHED_NINJA_EXECUTABLE, set, out) - return($$out) -} diff --git a/build/qmake/mkspecs/features/gyp_generator.prf b/build/qmake/mkspecs/features/gyp_generator.prf deleted file mode 100644 index d15b864c9..000000000 --- a/build/qmake/mkspecs/features/gyp_generator.prf +++ /dev/null @@ -1,208 +0,0 @@ -# This file is loaded after the dummy .pro and all the default_post ran. -# This is the right point to extract the variables we're interested in and generate -# the .gyp file that we'll use later on when running gyp - -load(functions) -load(moc) -load(resources) - -defineReplace(mocAction) { - INPUT_FILE = $$1 - OUTPUT_NAME = $$mocOutput($$INPUT_FILE) - DEFINES_LIST = $$join(DEFINES, " -D", -D) - INCPATH = $$join(INCLUDEPATH, " -I", -I) - MOC_COMMAND = $$mocCmdBase() - MOC_COMMAND = $$replace(MOC_COMMAND, $$re_escape("$(DEFINES)"), $$DEFINES_LIST) - MOC_COMMAND = $$replace(MOC_COMMAND, $$re_escape("$(INCPATH)"), $$INCPATH) - MOC_COMMAND = $$split(MOC_COMMAND, " ") - OUTPUT_FILE = $$absolute_path($$MOC_DIR, $$OUT_PWD)$${QMAKE_DIR_SEP}$${OUTPUT_NAME} - contents = " {" \ - " 'action_name':'$$OUTPUT_NAME'," \ - " 'inputs': ['$$INPUT_FILE',]," \ - " 'outputs': ['$$OUTPUT_FILE',]," \ - " 'action': [" - for(token, MOC_COMMAND): contents += " '$$token'," - contents += " '$$INPUT_FILE'," \ - " '-o'," \ - " '$$OUTPUT_FILE'," \ - " ]," \ - " }," - - return($$contents) -} - -defineReplace(rccAction) { - win32-*: QMAKE_RCC ~= s,\\\\,/,g - INPUT_FILE = $$1 - OUTPUT_NAME = $$rccOutput($$INPUT_FILE) - EXTERN_FUNC = $$rccExternFunc($$INPUT_FILE) - OUTPUT_FILE = $$absolute_path($$RCC_DIR, $$OUT_PWD)$${QMAKE_DIR_SEP}$${OUTPUT_NAME} - contents = " {" \ - " 'action_name':'$$OUTPUT_NAME'," \ - " 'inputs': ['$$INPUT_FILE',]," \ - " 'outputs': ['$$OUTPUT_FILE',]," \ - " 'action': [" \ - " '$$QMAKE_RCC'," - for(resource_flag, $$QMAKE_RESOURCE_FLAGS): contents += " '$$resource_flag'," - contents += " '-name'," \ - " '$$EXTERN_FUNC'," \ - " '$$INPUT_FILE'," \ - " '-o'," \ - " '$$OUTPUT_FILE'," - contents += " ]," \ - " }," - - return($$contents) -} - -GYPI_FILE = $$replace(_PRO_FILE_, .pro$, .gyp) - -TARGET_TYPE = $$toGypTargetType() -MOCABLE_HEADERS = $$findMocables($$HEADERS) -INCLUDED_MOC_FILES = $$findIncludedMocFiles($$SOURCES) - -GYP_CONTENTS = "{" \ - " 'targets': [" \ - " {" \ - " 'target_name': '$$TARGET'," \ - " 'type': '$$TARGET_TYPE'," -!isEmpty(GYPINCLUDES) { -GYP_CONTENTS += " 'includes': [" -for (incl, GYPINCLUDES): GYP_CONTENTS += " '$$incl'," -GYP_CONTENTS += " ]," -} - -# Split LIBS into linker flags and actual libraries, and add them to the -# appropriate section (ldflags vs link_settings: libraries) in the gyp file. -LIBRARIES = $$find(LIBS, "-l") -LIBRARIES = $$unique(LIBRARIES) -for (library, LIBRARIES): LIBS -= "$$library" - -GYP_CONTENTS += " 'ldflags': [" -for (lib, LIBS): GYP_CONTENTS += " '$$lib'," -for (rpath, QMAKE_RPATHDIR): GYP_CONTENTS += " '$$QMAKE_RPATH$$rpath'," -GYP_CONTENTS += " ]," - -!isEmpty(QMAKE_CFLAGS) { - GYP_CONTENTS += " 'cflags': [" - for(flag, QMAKE_CFLAGS): GYP_CONTENTS += " '$$flag'," - GYP_CONTENTS += " ]," -} -!isEmpty(QMAKE_CXXFLAGS) { - GYP_CONTENTS += " 'cflags_cc': [" - for(flag, QMAKE_CXXFLAGS): GYP_CONTENTS += " '$$flag'," - GYP_CONTENTS += " ]," -} -GYP_CONTENTS += " 'link_settings': {" \ - " 'libraries': [" -for (library, LIBRARIES): GYP_CONTENTS += " '$$library'," -macx { - FRAMEWORKS = $$find(LIBS, "Q*") - FRAMEWORKS = $$unique(FRAMEWORKS) - FRAMEWORKS ~= s/-.*/ - FRAMEWORKS -= "-framework" - for (framework, FRAMEWORKS): { - framework_name = $$join(framework, "", "", ".framework") - GYP_CONTENTS += " '$$framework_name'," - } - - FRAMEWORK_PATHS = $$find(LIBS, "-F*") - FRAMEWORK_PATHS = $$unique(FRAMEWORK_PATHS) - FRAMEWORK_PATHS -= "-framework" - for (framework_path, FRAMEWORK_PATHS): GYP_CONTENTS += " '$$framework_path'," - !isEmpty(QMAKE_FRAMEWORKPATH): GYP_CONTENTS += " '-F$$QMAKE_FRAMEWORKPATH'," -} -GYP_CONTENTS += " ]," \ - " }," - -!isEmpty(GYPDEPENDENCIES) { - GYP_CONTENTS += " 'dependencies': [" - for (dep, GYPDEPENDENCIES): GYP_CONTENTS += " '$$dep'," - GYP_CONTENTS += " ]," -} -!isEmpty(DEFINES) { - GYP_CONTENTS += " 'defines': [" - for (define, DEFINES): GYP_CONTENTS += " '$$define'," - GYP_CONTENTS += " ]," -} -!isEmpty(PER_CONFIG_DEFINES) { - GYP_CONTENTS += " 'configurations': {"\ - " 'Release': {" \ - " 'defines': [" - for (define, PER_CONFIG_DEFINES): GYP_CONTENTS += " '$$replace(define,%config,Release)'," - GYP_CONTENTS += " ]," \ - " }," \ - " 'Debug': {" \ - " 'defines': [" - for (define, PER_CONFIG_DEFINES): GYP_CONTENTS += " '$$replace(define,%config,Debug)'," - GYP_CONTENTS += " ]," \ - " }," \ - " }," -} -!isEmpty(GYP_DYLIB_INSTALL_NAME_BASE) { - GYP_CONTENTS += " 'xcode_settings': {" \ - " 'DYLIB_INSTALL_NAME_BASE': '$$GYP_DYLIB_INSTALL_NAME_BASE'," \ - " }," -} - -# Source files to compile -GYP_CONTENTS += " 'sources': [" -for (sourcefile, SOURCES): GYP_CONTENTS += " '$$sourcefile'," -for (headerfile, HEADERS): GYP_CONTENTS += " '$$headerfile'," - -# Add Sources generated by rcc from qrc files. -for (resourcefile, RESOURCES) { - RCC_CPP = $$replace(resourcefile, .qrc, .cpp) - RCC_CPP = $$join(RCC_CPP, "qrc_", qrc_) - RCC_CPP = $$absolute_path($$RCC_DIR, $$OUT_PWD)$${QMAKE_DIR_SEP}$${RCC_CPP} - GYP_CONTENTS += " '$$RCC_CPP'," -} - -# Add moc output files to compile that aren't included at the end of any other source -MOC_OUT_PATH = $$absolute_path($$MOC_DIR, $$OUT_PWD)$${QMAKE_DIR_SEP} -for (mocable_header, MOCABLE_HEADERS) { - !contains(INCLUDED_MOC_FILES, $$mocOutput($$mocable_header)) { - GYP_CONTENTS += " '$$MOC_OUT_PATH$$mocOutput($$mocable_header)'," - } -} - -GYP_CONTENTS += " ]," -!isEmpty(INCLUDEPATH) { - GYP_CONTENTS += " 'include_dirs': [" - for (path, INCLUDEPATH): GYP_CONTENTS += " '$$path'," - GYP_CONTENTS += " ]," -} - -# Some needed files (like devtools_resources.pak) are both _generated_ as part of the build process and are _needed_ as part of the build process. -!isEmpty(COPY_FILES) { - GYP_CONTENTS += " 'copies': [" - for (index, 0..$$size(COPY_FILES)) { - copyFile = $$member(COPY_FILES, $$index) - !isEmpty(copyFile) { - copyDestination = $$member(COPY_DESTINATIONS, $$index) - GYP_CONTENTS += " {'destination': '$$copyDestination', 'files': ['$$copyFile']}," - } - } - GYP_CONTENTS += " ]," -} - -# Generate the actions for moc, copy -GYP_CONTENTS += " 'actions': [" -for(resourcefile, RESOURCES): GYP_CONTENTS += $$rccAction($$resourcefile) -for(header, MOCABLE_HEADERS): GYP_CONTENTS += $$mocAction($$header) -GYP_CONTENTS += " ]," \ - " }," - -GYP_CONTENTS += " ]," \ - "}" - -!build_pass: write_file($$GYPI_FILE, GYP_CONTENTS) - -# Overwriting the generated gyp file seems like a good reason to re-gyp -unix: phony_variable_name_for_qmake_to_be_happy=$$system("touch $$QTWEBENGINE_ROOT/build/build.pro") - -# The generated Makefile shouldn't build anything by itself, just re-run qmake if necessary -TEMPLATE = aux -SOURCES = -HEADERS = -RESOURCES = diff --git a/build/qmake/mkspecs/features/mac/default_post.prf b/build/qmake/mkspecs/features/mac/default_post.prf deleted file mode 100644 index 2b9fed81b..000000000 --- a/build/qmake/mkspecs/features/mac/default_post.prf +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG -= build_all -load(default_post) diff --git a/build/qmake_extras/host/host.pro b/build/qmake_extras/host/host.pro deleted file mode 100644 index e99d1e7c5..000000000 --- a/build/qmake_extras/host/host.pro +++ /dev/null @@ -1,16 +0,0 @@ -# Prevent generating a makefile that attempts to create a lib -TEMPLATE = aux - -# Pick up the host toolchain -option(host_build) - -GYPI_CONTENTS = "{" \ - " 'make_global_settings': [" \ - " ['CC.host', '$$which($$QMAKE_CC)']," \ - " ['CXX.host', '$$which($$QMAKE_CXX)']," \ - " ['LD.host', '$$which($$QMAKE_LINK)']," - -GYPI_FILE = $$absolute_path('build/qmake_extras.gypi', $$QTWEBENGINE_ROOT) -!build_pass { - write_file($$GYPI_FILE, GYPI_CONTENTS) -} diff --git a/build/qmake_extras/qmake_extras.pro b/build/qmake_extras/qmake_extras.pro deleted file mode 100644 index 409993128..000000000 --- a/build/qmake_extras/qmake_extras.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = subdirs - -CONFIG += ordered - -SUBDIRS = host \ - target diff --git a/build/qmake_extras/target/target.pro b/build/qmake_extras/target/target.pro deleted file mode 100644 index 6d9f414c3..000000000 --- a/build/qmake_extras/target/target.pro +++ /dev/null @@ -1,36 +0,0 @@ -# Prevent generating a makefile that attempts to create a lib -TEMPLATE = aux - -TOOLCHAIN_INCLUDES = $${QMAKE_INCDIR_EGL} $${INCLUDEPATH} $${QMAKE_INCDIR} - -GYPI_CONTENTS += " ['CC', '$$which($$QMAKE_CC)']," \ - " ['CXX', '$$which($$QMAKE_CXX)']," \ - " ['LD', '$$which($$QMAKE_LINK)']," -GYPI_CONTENTS += " ]," \ - " 'target_defaults': {" \ - " 'target_conditions': [" \ - " ['_toolset==\"target\"', {" \ - " 'include_dirs': [" -for(includes, TOOLCHAIN_INCLUDES) { - GYPI_CONTENTS += " '$$includes'," -} -GYPI_CONTENTS += " ]," \ - " 'cflags': [" -for(cflag, QT_CFLAGS_DBUS) { - GYPI_CONTENTS += " '$$cflag'," -} -GYPI_CONTENTS += " ]," \ - " }]," \ - " ]," \ - " }," - -GYPI_CONTENTS += "}" - -GYPI_FILE = $$absolute_path('build/qmake_extras.gypi', $$QTWEBENGINE_ROOT) - -!exists($$GYPI_FILE): error("-- $$GYPI not found --") - -# Append to the file already containing the host settings. -!build_pass { - write_file($$GYPI_FILE, GYPI_CONTENTS, append) -} diff --git a/build/qtwebengine_extras.gypi b/build/qtwebengine_extras.gypi deleted file mode 100644 index 2937ee423..000000000 --- a/build/qtwebengine_extras.gypi +++ /dev/null @@ -1,51 +0,0 @@ -{ - 'target_defaults': { - # patterns used to exclude chromium files from the build when we have a drop-in replacement - 'sources/': [ - ['exclude', 'base/resource/resource_bundle_gtk.cc$'], - ['exclude', 'base/resource/resource_bundle_mac.mm$'], - ['exclude', 'base/resource/resource_bundle_win.cc$'], - ['exclude', 'browser/web_contents/web_contents_view_gtk\\.(cc|h)$'], - ['exclude', 'browser/web_contents/web_contents_view_mac\\.(mm|h)$'], - ['exclude', 'browser/web_contents/web_contents_view_win\\.(cc|h)$'], - ['exclude', 'browser/renderer_host/gtk_im_context_wrapper\\.cc$'], - ['exclude', 'browser/renderer_host/render_widget_host_view_gtk\\.(cc|h)$'], - ['exclude', 'browser/renderer_host/render_widget_host_view_mac\\.(mm|h)$'], - ['exclude', 'browser/renderer_host/render_widget_host_view_win\\.(cc|h)$'], - - # QNX-specific excludes - ['exclude', 'base/resource/resource_bundle_qnx.cc$'], - ['exclude', 'browser/qnx/'], - ['exclude', 'browser/renderer_host/render_widget_host_view_qnx\\.(cc|h)$'], - ['exclude', 'browser/web_contents/web_contents_view_qnx\\.(cc|h)$'], - ], - }, - 'conditions': [ - [ 'OS=="linux" and qt_cross_compile==1', { - 'target_defaults': { - 'defines': [ - 'TOOLKIT_QT', - ], - 'target_conditions': [ - ['_toolset=="target"', { - 'ldflags!': ['-L/usr/lib'], # garbage added by icu-config - 'conditions': [ - [ '_target_name=="gl"', { - 'defines': [ - 'GL_GLEXT_PROTOTYPES', - 'EGL_EGLEXT_PROTOTYPES', - ], - }], - ['_type=="shared_library"', { - 'ldflags': [ - # Tell the linker to prefer symbols within the library before looking outside - '-Wl,-shared,-Bsymbolic', - ], - }], - ], - }], - ], - }, - }], - ], -} diff --git a/build/scripts/build_resources.py b/build/scripts/build_resources.py deleted file mode 100755 index 7b20aa9ad..000000000 --- a/build/scripts/build_resources.py +++ /dev/null @@ -1,103 +0,0 @@ -#!/usr/bin/env python - -############################################################################# -# -# Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -# Contact: http://www.qt-project.org/legal -# -# This file is part of the QtWebEngine module of the Qt Toolkit. -# -# $QT_BEGIN_LICENSE:LGPL$ -# Commercial License Usage -# Licensees holding valid commercial Qt licenses may use this file in -# accordance with the commercial license agreement provided with the -# Software or, alternatively, in accordance with the terms contained in -# a written agreement between you and Digia. For licensing terms and -# conditions see http://qt.digia.com/licensing. For further information -# use the contact form at http://qt.digia.com/contact-us. -# -# GNU Lesser General Public License Usage -# Alternatively, this file may be used under the terms of the GNU Lesser -# General Public License version 2.1 as published by the Free Software -# Foundation and appearing in the file LICENSE.LGPL included in the -# packaging of this file. Please review the following information to -# ensure the GNU Lesser General Public License version 2.1 requirements -# will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -# -# In addition, as a special exception, Digia gives you certain additional -# rights. These rights are described in the Digia Qt LGPL Exception -# version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -# -# GNU General Public License Usage -# Alternatively, this file may be used under the terms of the GNU -# General Public License version 3.0 as published by the Free Software -# Foundation and appearing in the file LICENSE.GPL included in the -# packaging of this file. Please review the following information to -# ensure the GNU General Public License version 3.0 requirements will be -# met: http://www.gnu.org/copyleft/gpl.html. -# -# -# $QT_END_LICENSE$ -# -############################################################################# - -import glob -import os -import subprocess -import sys -import string -import time - -qtwebengine_src = os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")) - - -chrome_src = subprocess.check_output("git config qtwebengine.chromiumsrcdir || true", shell=True).strip() -if chrome_src: - chrome_src = os.path.join(qtwebengine_src, chrome_src) -if not chrome_src or not os.path.isdir(chrome_src): - chrome_src = os.path.join(qtwebengine_src, '3rdparty/chromium') - print 'CHROMIUM_SRC_DIR not set, falling back to ' + chrome_src - -grit_tool = os.path.join(chrome_src, 'tools/grit/grit.py') -resources_subdir = os.path.join(qtwebengine_src, 'resources') - -def checkNeedForRebuild(grd_file): - grit_files = subprocess.check_output(['python', grit_tool, '-i', grd_file, 'buildinfo']).splitlines() - - dependencies = [grd_file] - data_packages = [] - for line in grit_files: - if line.startswith('input|'): - dependencies.append(line.split('|')[1]) - if line.startswith('data_package|'): - data_packages.append(line.split('|')[1]) - - target_timestamp = 0 - for data_package in data_packages: - data_package_file = os.path.join(resources_subdir, data_package) - if not os.path.isfile(data_package_file): - return True - - data_package_timestamp = os.path.getmtime(data_package_file) - if data_package_timestamp < target_timestamp or target_timestamp == 0: - target_timestamp = data_package_timestamp - - for dependency in dependencies: - dependency_timestamp = os.path.getmtime(dependency) - if (dependency_timestamp > target_timestamp): - return True - return False - -def rebuildPakFile(grd_file): - print 'Rebuilding resource file for:' + grd_file - resource_ids_file = os.path.join(chrome_src, 'tools/gritsettings/resource_ids') - subprocess.call(['python', grit_tool, '-i', grd_file, 'build', '-f', resource_ids_file, '-o', resources_subdir]) - -def rebuildIfNeeded(grd_file): - grd_file = os.path.join(chrome_src, grd_file) - if checkNeedForRebuild(grd_file): - rebuildPakFile(grd_file) - - -# The grd_file is specified relative to the chromium source directory. -rebuildIfNeeded('net/base/net_resources.grd') diff --git a/build/scripts/find-included-moc-files b/build/scripts/find-included-moc-files deleted file mode 100755 index e55f3824c..000000000 --- a/build/scripts/find-included-moc-files +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env python - -import re, sys, os - -includedMocs = set() -for f in filter(os.path.isfile, sys.argv[1:]): - inBlockComment = False - for line in open(f).readlines(): - m = re.search('#include "(moc_\w+.cpp)"', line) - if m: - includedMocs.add(m.group(1)) -for moc in includedMocs: - print moc diff --git a/build/scripts/find-mocables b/build/scripts/find-mocables deleted file mode 100755 index 7c383cfec..000000000 --- a/build/scripts/find-mocables +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python - -import re, sys, os - -mocables = set() -for f in filter(os.path.isfile, sys.argv[1:]): - inBlockComment = False - for line in open(f).readlines(): - # Block comments handling - if "/*" in line: - inBlockComment = True - if inBlockComment and "*/" in line: - inBlockComment = False - if line.find("*/") != len(line) - 3: - line = line[line.find("*/")+2:] - else: - continue - if inBlockComment: - continue - #simple comments handling - if "//" in line: - line = line.partition("//")[0] - if re.match(".*Q_OBJECT", line): - mocables.add(f) -for mocable in mocables: - print mocable |