From 39a0d09358a8cae4a3d65ed13b81a810355571e5 Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Thu, 12 Dec 2013 15:54:10 +0100 Subject: Update take_snapshot.py Add additional conditions to the blacklist function so that we include files needed for Boot2Qt-Android but exclude other files not needed for the build. Change-Id: I7cda448a943dc776ad6d29c872048cf256da599e Reviewed-by: Jocelyn Turcotte --- tools/scripts/git_submodule.py | 2 +- tools/scripts/take_snapshot.py | 87 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 73 insertions(+), 16 deletions(-) (limited to 'tools') diff --git a/tools/scripts/git_submodule.py b/tools/scripts/git_submodule.py index f45f08cae..697232828 100644 --- a/tools/scripts/git_submodule.py +++ b/tools/scripts/git_submodule.py @@ -191,7 +191,7 @@ class Submodule: print '-- skipping ' + self.path + ' for this operating system. --' def listFiles(self): - if self.matchesOS(): + if self.matchesOS() and os.path.isdir(self.path): currentDir = os.getcwd() os.chdir(self.path) files = subprocessCheckOutput(['git', 'ls-files']).splitlines() diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py index 2a91923ca..8233a947d 100755 --- a/tools/scripts/take_snapshot.py +++ b/tools/scripts/take_snapshot.py @@ -51,7 +51,7 @@ import shutil import git_submodule as GitSubmodule -qtwebengine_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..')) +qtwebengine_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..')) os.chdir(qtwebengine_root) def isInGitBlacklist(file_path): @@ -70,32 +70,80 @@ def isInChromiumBlacklist(file_path): # We do need all the gyp files. if file_path.endswith('.gyp') or file_path.endswith('.gypi'): return False - if ( '/tests/' in file_path + if ( '_jni' in file_path + or 'jni_' in file_path + or 'testdata/' in file_path + or (file_path.startswith('third_party/android_tools') and + not 'android/cpufeatures' in file_path) + or '/tests/' in file_path or ('/test/' in file_path and + 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')) - or file_path.startswith('third_party/WebKit/LayoutTests') - or file_path.startswith('third_party/WebKit/PerformanceTests') - or file_path.startswith('third_party/WebKit/ManualTests') + or file_path.endswith('.java') + or file_path.startswith('android_webview') 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 'repack_locales' in file_path and not file_path.endswith('version.py')) or file_path.startswith('chrome_frame') or file_path.startswith('chromeos') - or file_path.startswith('breakpad') - or file_path.startswith('third_party/GTM') - or file_path.startswith('third_party/chromite') - or file_path.startswith('third_party/webgl_conformance') - or file_path.startswith('third_party/hunspell_dictionaries') or file_path.startswith('cloud_print') - or file_path.startswith('ios') - or file_path.startswith('google_update') + or file_path.startswith('cloud_print') + or file_path.startswith('content/public/android/java') + or file_path.startswith('content/shell/android/java') or file_path.startswith('courgette') + or file_path.startswith('extensions') + or file_path.startswith('google_update') + or file_path.startswith('ios') + or file_path.startswith('media/base/android/java') + or file_path.startswith('mojo') or file_path.startswith('native_client') + or file_path.startswith('net/android/java') + or file_path.startswith('remoting') + or file_path.startswith('rlz') + or file_path.startswith('sync/android') + or file_path.startswith('testing/android') + or file_path.startswith('third_party/accessibility-developer-tools') + or file_path.startswith('third_party/GTM') + or file_path.startswith('third_party/GTM') + or file_path.startswith('third_party/WebKit/LayoutTests') + or file_path.startswith('third_party/WebKit/ManualTests') + or file_path.startswith('third_party/WebKit/PerformanceTests') + or file_path.startswith('third_party/active_doc') + or file_path.startswith('third_party/android_platform') + or file_path.startswith('third_party/android_testrunner') + 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/chromite') + 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/cros_system_api') + or file_path.startswith('third_party/eyesfree') + or file_path.startswith('third_party/findbugs') + or file_path.startswith('third_party/gtk+') + or file_path.startswith('third_party/guava/src') + or file_path.startswith('third_party/httpcomponents-client') + or file_path.startswith('third_party/httpcomponents-core') + or file_path.startswith('third_party/hunspell') + or file_path.startswith('third_party/hunspell_dictionaries') + 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/lighttpd') + or file_path.startswith('third_party/pdfsqueeze') + or file_path.startswith('third_party/scons-2.0.1') + or file_path.startswith('third_party/swig') or (file_path.startswith('third_party/trace-viewer') and not file_path.endswith('.template') and not file_path.endswith('.html') and @@ -103,8 +151,18 @@ 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('remoting') - or file_path.startswith('win8') ): + or file_path.startswith('third_party/webgl_conformance') + 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/swarm_client') + or file_path.startswith('tools/telemetry') + or file_path.startswith('tools/win') + or file_path.startswith('ui/android/java') + or file_path.startswith('win8') + ): return True return False @@ -179,7 +237,6 @@ def exportChromium(): if not isInChromiumBlacklist(f) and not isInGitBlacklist(f): createHardLinkForFile(f, os.path.join(third_party_chromium, f)) - clearDirectory(third_party) exportNinja() -- cgit v1.2.3