summaryrefslogtreecommitdiffstats
path: root/tools/scripts
diff options
context:
space:
mode:
authorZoltan Arvai <zarvai@inf.u-szeged.hu>2014-03-03 16:19:26 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-28 19:45:52 +0100
commit4261082975d7935e5f0f8334f9054cc71c9dba51 (patch)
tree82b21883f88feb9237e3e39fbca90f6370b3069a /tools/scripts
parent135655013ddf1d640faf83d2d28081a9d51676ec (diff)
Add Windows support to snapshot creation
Extend extra_os with Windows in git_submodule script. Update blacklist in take_snapshot script. This also updates take_snapshot.py for branch 1750. Change-Id: Ie8a1e58534e9f5c2635ed4103d0ae62f804dd5d0 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'tools/scripts')
-rw-r--r--tools/scripts/git_submodule.py2
-rwxr-xr-xtools/scripts/take_snapshot.py42
2 files changed, 36 insertions, 8 deletions
diff --git a/tools/scripts/git_submodule.py b/tools/scripts/git_submodule.py
index 41926379..ba08a4e2 100644
--- a/tools/scripts/git_submodule.py
+++ b/tools/scripts/git_submodule.py
@@ -45,7 +45,7 @@ import subprocess
import sys
import version_resolver as resolver
-extra_os = ['android', 'mac']
+extra_os = ['android', 'mac', 'win']
def subprocessCall(args):
print args
diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py
index 49da11f8..ec865605 100755
--- a/tools/scripts/take_snapshot.py
+++ b/tools/scripts/take_snapshot.py
@@ -80,17 +80,29 @@ def isInChromiumBlacklist(file_path):
not file_path.endswith('isolate') and
not '/webrtc/test/testsupport/' in file_path and
not file_path.startswith('net/test/') and
- not file_path.endswith('mock_chrome_application_mac.h'))
+ not file_path.endswith('mock_chrome_application_mac.h') and
+ not file_path.endswith('perftimer.h') and
+ not 'ozone' in file_path)
or file_path.endswith('.java')
or file_path.startswith('android_webview')
or file_path.startswith('apps/')
- or file_path.startswith('ash/')
or file_path.startswith('base/android/java')
or file_path.startswith('breakpad')
or file_path.startswith('build/android/')
or (file_path.startswith('chrome/') and
+ not file_path.startswith('chrome/VERSION') and
+ not '/app/theme/' in file_path and
+ not '/app/resources/' in file_path and
+ not '/browser/resources/' in file_path and
+ not '/renderer/resources/' in file_path and
not 'repack_locales' in file_path and
- not file_path.endswith('version.py'))
+ not 'third_party/chromevox' in file_path and
+ not file_path.endswith('.isolate') and
+ not file_path.endswith('cf_resources.rc') and
+ not file_path.endswith('version.py') and
+ not file_path.endswith('.grd') and
+ not file_path.endswith('.grdp') and
+ not file_path.endswith('.json'))
or file_path.startswith('chrome_frame')
or file_path.startswith('chromeos')
or file_path.startswith('cloud_print')
@@ -119,14 +131,18 @@ def isInChromiumBlacklist(file_path):
or file_path.startswith('third_party/aosp')
or file_path.startswith('third_party/apache-mime4j')
or file_path.startswith('third_party/apple_sample_code')
- or file_path.startswith('third_party/cacheinvalidation')
+ or file_path.startswith('third_party/bison')
+ or file_path.startswith('third_party/brotli')
or file_path.startswith('third_party/chromite')
or file_path.startswith('third_party/cld_2')
or file_path.startswith('third_party/codesighs')
or file_path.startswith('third_party/cros_dbus_cplusplus')
+ or file_path.startswith('third_party/cygwin')
or file_path.startswith('third_party/cros_system_api')
or file_path.startswith('third_party/eyesfree')
or file_path.startswith('third_party/findbugs')
+ or file_path.startswith('third_party/gperf')
+ or file_path.startswith('third_party/gnu_binutils')
or file_path.startswith('third_party/gtk+')
or file_path.startswith('third_party/guava/src')
or file_path.startswith('third_party/httpcomponents-client')
@@ -136,10 +152,20 @@ def isInChromiumBlacklist(file_path):
or file_path.startswith('third_party/jarjar')
or file_path.startswith('third_party/jsr-305/src')
or file_path.startswith('third_party/libphonenumber')
+ or file_path.startswith('third_party/libaddressinput')
+ or file_path.startswith('third_party/liblouis')
or file_path.startswith('third_party/lighttpd')
+ or file_path.startswith('third_party/mingw-w64')
+ or file_path.startswith('third_party/nacl_sdk_binaries')
or file_path.startswith('third_party/pdfsqueeze')
+ or file_path.startswith('third_party/pefile')
+ or file_path.startswith('third_party/perl')
+ or file_path.startswith('third_party/psyco_win32')
+ or file_path.startswith('third_party/python_26')
or file_path.startswith('third_party/scons-2.0.1')
+ or file_path.startswith('third_party/syzygy')
or file_path.startswith('third_party/swig')
+ or file_path.startswith('third_party/webgl')
or (file_path.startswith('third_party/trace-viewer') and
not file_path.endswith('.template') and
not file_path.endswith('.html') and
@@ -147,17 +173,19 @@ def isInChromiumBlacklist(file_path):
not file_path.endswith('.css') and
not file_path.endswith('.png') and
not '/build/' in file_path)
- or file_path.startswith('third_party/webgl_conformance')
+ or file_path.startswith('third_party/xulrunner-sdk')
or file_path.startswith('tools/android')
or file_path.startswith('tools/deep_memory_profiler')
or file_path.startswith('tools/gn')
or file_path.startswith('tools/page_cycler')
or file_path.startswith('tools/perf')
+ or file_path.startswith('tools/swarming_client')
or file_path.startswith('tools/swarm_client')
or file_path.startswith('tools/telemetry')
- or file_path.startswith('tools/win')
+ or (file_path.startswith('tools/win') and
+ not 'toolchain' in file_path)
or file_path.startswith('ui/android/java')
- or file_path.startswith('win8')
+
):
return True
return False