diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmake/mkspecs/features/functions.prf | 8 | ||||
| -rwxr-xr-x | tools/scripts/take_snapshot.py | 21 |
2 files changed, 23 insertions, 6 deletions
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf index 4c2547d57..338a9ec27 100644 --- a/tools/qmake/mkspecs/features/functions.prf +++ b/tools/qmake/mkspecs/features/functions.prf @@ -73,7 +73,7 @@ defineReplace(findMocables) { for (file, input): \ infiles += $$absolute_path($$file, $$_PRO_FILE_PWD_) mocables = $$system("python $$QTWEBENGINE_ROOT/tools/buildscripts/find-mocables $$infiles") - mocables = $$replace(mocables, $$_PRO_FILE_PWD_/, '') + mocables = $$replace(mocables, $$re_escape($${_PRO_FILE_PWD_}/), '') return($$mocables) } @@ -87,8 +87,10 @@ defineReplace(findIncludedMocFiles) { 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)}) + for(ext, $$list($${QMAKE_EXT_CPP})): \ + out = $$replace(out, ^(.*)($$re_escape($${ext})), $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) + for(ext, $$list($${QMAKE_EXT_H})): \ + out = $$replace(out, ^(.*)($$re_escape($${ext})), $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)}) return($$out) } diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py index 3696b9a7a..3db3bac6c 100755 --- a/tools/scripts/take_snapshot.py +++ b/tools/scripts/take_snapshot.py @@ -61,6 +61,7 @@ def isInGitBlacklist(file_path): False if ( '.gitignore' in file_path or '.gitmodules' in file_path + or '.gitattributes' in file_path or '.DEPS' in file_path ): return True @@ -108,13 +109,17 @@ def isInChromiumBlacklist(file_path): not file_path.endswith('version.py') and not file_path.endswith('.grd') and not file_path.endswith('.grdp') and - not file_path.endswith('.json')) + not file_path.endswith('.json') and + not file_path.endswith('chrome_version.rc.version')) or file_path.startswith('chrome_frame') or file_path.startswith('chromeos') or file_path.startswith('cloud_print') or (file_path.startswith('components') and not file_path.startswith('components/tracing') and - not file_path.startswith('components/visitedlink')) + not file_path.startswith('components/visitedlink') and + not file_path.startswith('components/error_page') and + not file_path.endswith('.grdp') and + not 'components_strings' in file_path) or file_path.startswith('content/public/android/java') or file_path.startswith('content/shell') or file_path.startswith('courgette') @@ -157,9 +162,11 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('third_party/cros_dbus_cplusplus') or file_path.startswith('third_party/cros_system_api') or file_path.startswith('third_party/cygwin') + or file_path.startswith('third_party/cython') or file_path.startswith('third_party/elfutils') or file_path.startswith('third_party/eyesfree') or file_path.startswith('third_party/findbugs') + or file_path.startswith('third_party/google_input_tools') or file_path.startswith('third_party/gperf') or file_path.startswith('third_party/gnu_binutils') or file_path.startswith('third_party/gtk+') @@ -173,6 +180,7 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('third_party/instrumented_libraries') or file_path.startswith('third_party/jarjar') or file_path.startswith('third_party/jsr-305/src') + or file_path.startswith('third_party/junit') or file_path.startswith('third_party/libphonenumber') or file_path.startswith('third_party/libaddressinput') or file_path.startswith('third_party/libc++') @@ -182,6 +190,7 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('third_party/markdown') or file_path.startswith('third_party/mingw-w64') or file_path.startswith('third_party/nacl_sdk_binaries') + or file_path.startswith('third_party/polymer') or file_path.startswith('third_party/pdfsqueeze') or file_path.startswith('third_party/pefile') or file_path.startswith('third_party/perl') @@ -248,7 +257,7 @@ def clearDirectory(directory): os.chdir(directory) print 'clearing the directory:' + directory for direntry in os.listdir(directory): - if not direntry == '.git': + if not direntry == '.git' and os.path.isdir(direntry): print 'clearing:' + direntry shutil.rmtree(direntry) os.chdir(currentDir) @@ -304,6 +313,12 @@ if not commandNotFound: if commandNotFound or dos2unixVersion < StrictVersion('6.0.6'): raise Exception("You need dos2unix version 6.0.6 minimum.") +os.chdir(third_party) +ignore_case_setting = subprocess.Popen(['git', 'config', '--get', 'core.ignorecase'], stdout=subprocess.PIPE).communicate()[0] +if 'true' in ignore_case_setting: + raise Exception("Your 3rdparty repository is configured to ignore case. " + "A snapshot created with these settings would cause problems on case sensitive file systems.") + clearDirectory(third_party) exportNinja() |