This repository has been archived by the owner on Nov 3, 2021. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #14876 from KevinGrandon/revert_bug_945553
Revert "Bug 945553 - Rewrite install-gaia.py to install-gaia.js"
- Loading branch information
Showing
5 changed files
with
243 additions
and
212 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,188 @@ | ||
| """Usage: python %prog [ADB_PATH] [REMOTE_PATH] [PROFILE_FOLDER] | ||
| ADB_PATH is the path to the |adb| executable we should run. | ||
| REMOTE_PATH is the path to push the gaia webapps directory to. | ||
| PROFILE_FOLDER is the name of the profile folder. defaults to `profile` | ||
| Used by |make install-gaia| to push files to a device. You shouldn't run | ||
| this file directly. | ||
| """ | ||
|
|
||
| import sys | ||
| import os | ||
| import hashlib | ||
| import subprocess | ||
| from tempfile import mkstemp | ||
|
|
||
| def compute_local_hash(filename, hashes): | ||
| h = hashlib.sha1() | ||
| with open(filename,'rb') as f: | ||
| for chunk in iter(lambda: f.read(256 * h.block_size), b''): | ||
| h.update(chunk) | ||
| hashes[filename] = h.hexdigest() | ||
|
|
||
| def compute_local_hashes_in_dir(dir, hashes): | ||
| def visit(arg, dirname, names): | ||
| for filename in [os.path.join(dirname, name) for name in names]: | ||
| if not os.path.isfile(filename): | ||
| continue | ||
| compute_local_hash(filename, hashes) | ||
|
|
||
| os.path.walk(dir, visit, None) | ||
|
|
||
| def compute_local_hashes(): | ||
| hashes = {} | ||
| compute_local_hashes_in_dir('webapps', hashes) | ||
| compute_local_hash('user.js', hashes) | ||
| return hashes | ||
|
|
||
| def adb_push(local, remote): | ||
| global adb_cmd | ||
| subprocess.check_call([adb_cmd, 'push', local, remote]) | ||
|
|
||
| def adb_shell(cmd, ignore_error=False): | ||
| global adb_cmd | ||
|
|
||
| # Output the return code so we can check whether the command executed | ||
| # successfully. | ||
| new_cmd = cmd + '; echo "RETURN CODE: $?"' | ||
|
|
||
| # universal_newlines=True because adb shell returns CRLF separators. | ||
| proc = subprocess.Popen([adb_cmd, 'shell', new_cmd], | ||
| stdout=subprocess.PIPE, | ||
| stderr=subprocess.PIPE, | ||
| universal_newlines=True) | ||
| (stdout, stderr) = proc.communicate() | ||
| if stderr.strip(): | ||
| raise Exception('adb shell "%s" returned the following unexpected error: "%s"' % | ||
| (cmd, stderr.strip())) | ||
| if proc.returncode != 0: | ||
| raise Exception('adb shell "%s" exited with error %d' % (cmd, proc.returncode)) | ||
|
|
||
| split = [line for line in stdout.split('\n') if line.strip()] | ||
| if not ignore_error and not split[-1].startswith('RETURN CODE: 0'): | ||
| raise Exception('adb shell "%s" did not complete successfully. Output:\n%s' % (cmd, stdout)) | ||
|
|
||
| # Don't return the "RETURN CODE: 0" line! | ||
| return split[0:-1] | ||
|
|
||
|
|
||
| def compute_remote_hashes(): | ||
| hashes = {} | ||
| adb_out = adb_shell('cd /data/local && find . -type f | xargs sha1sum') | ||
| for (hash, filename) in [line.split() for line in adb_out]: | ||
| # Strip off './' from the filename. | ||
| if filename.startswith('./'): | ||
| filename = filename[2:] | ||
| else: | ||
| raise Exception('Unexpected filename %s' % filename) | ||
|
|
||
| hashes[filename] = hash | ||
| return hashes | ||
|
|
||
| INDEXED_DB_FOLDER = 'indexedDB/' | ||
|
|
||
| def remove_from_remote(local_hashes, remote_hashes): | ||
| """Remove any files from the remote device which don't appear in | ||
| local_hashes. | ||
| """ | ||
|
|
||
| # Keep indexedDB content | ||
| to_keep = set() | ||
| for path in remote_hashes: | ||
| if path[:len(INDEXED_DB_FOLDER)] == INDEXED_DB_FOLDER: | ||
| to_keep.add(path) | ||
|
|
||
| to_remove = list(set(remote_hashes.keys()) - set(local_hashes.keys()) - to_keep) | ||
|
|
||
| if not to_remove: | ||
| return | ||
|
|
||
| print 'Removing from device:\n%s\n' % '\n'.join(to_remove) | ||
| # Chunk to_remove into 25 files at a time so we don't send too much over | ||
| # adb_shell at once. | ||
| for files in [to_remove[pos:pos + 25] for pos in xrange(0, len(to_remove), 25)]: | ||
| adb_shell('cd /data/local && rm -f %s' % ' '.join(files)) | ||
|
|
||
| def push_to_remote(local_hashes, remote_hashes): | ||
| global adb_cmd | ||
|
|
||
| to_push = set() | ||
| for (k, v) in local_hashes.items(): | ||
| if k not in remote_hashes or remote_hashes[k] != local_hashes[k]: | ||
| to_push.add(k) | ||
|
|
||
| if not to_push: | ||
| return | ||
|
|
||
| print 'Pushing to device:\n%s' % '\n'.join(list(to_push)) | ||
|
|
||
| tmpfile, tmpfilename = mkstemp() | ||
| try: | ||
| subprocess.check_call(['tar', '-czf', tmpfilename] + list(to_push)) | ||
| adb_push(tmpfilename, '/data/local') | ||
| basename = os.path.basename(tmpfilename) | ||
| adb_shell('cd /data/local && tar -xzf %s && rm %s' % (basename, basename)) | ||
| finally: | ||
| os.remove(tmpfilename) | ||
|
|
||
| def install_gaia_fast(): | ||
| global profile_folder | ||
| os.chdir(profile_folder) | ||
| try: | ||
| local_hashes = compute_local_hashes() | ||
| remote_hashes = compute_remote_hashes() | ||
| remove_from_remote(local_hashes, remote_hashes) | ||
| push_to_remote(local_hashes, remote_hashes) | ||
| finally: | ||
| os.chdir('..') | ||
|
|
||
| def install_gaia_slow(): | ||
| global adb_cmd, remote_path, profile_folder | ||
| webapps_path = remote_path + '/webapps' | ||
| adb_shell("rm -r " + webapps_path, ignore_error=True) | ||
| adb_shell("rm /data/local/user.js", ignore_error=True) | ||
| adb_push(profile_folder + '/webapps', webapps_path) | ||
| adb_push(profile_folder + '/user.js', '/data/local/user.js') | ||
|
|
||
| def install_preload_data(): | ||
| global profile_folder | ||
| db_path = profile_folder + '/indexedDB/' | ||
| if os.path.exists(db_path): | ||
| adb_push(db_path, '/data/local/indexedDB') | ||
|
|
||
| def install_gaia(): | ||
| global remote_path | ||
| try: | ||
| if remote_path == "/system/b2g": | ||
| # XXX Force slow method until we fix the fast one to support | ||
| # files in both /system/b2g and /data/local | ||
| # install_gaia_fast() | ||
| install_gaia_slow() | ||
| else: | ||
| install_gaia_fast() | ||
| except: | ||
| # If anything goes wrong, fall back to the slow method. | ||
| install_gaia_slow() | ||
| install_preload_data() | ||
|
|
||
| if __name__ == '__main__': | ||
| if len(sys.argv) > 4: | ||
| print >>sys.stderr, 'Too many arguments!\n' | ||
| print >>sys.stderr, \ | ||
| 'Usage: python %s [ADB_PATH] [REMOTE_PATH] [PROFILE_FOLDER]\n' % __FILE__ | ||
| sys.exit(1) | ||
|
|
||
| adb_cmd = 'adb' | ||
| remote_path = '/data/local/webapps' | ||
| profile_folder = 'profile' | ||
| if len(sys.argv) >= 2: | ||
| adb_cmd = sys.argv[1] | ||
| if len(sys.argv) >= 3: | ||
| remote_path = sys.argv[2] | ||
| if len(sys.argv) >= 4: | ||
| profile_folder = sys.argv[3] | ||
|
|
||
| install_gaia() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| #!/bin/sh | ||
|
|
||
| # This shell script installs busybox on the device. | ||
| # This lets us take the fast path in install-gaia.py. | ||
|
|
||
| # Remount file system with read/write permissions | ||
| adb shell "mount -o rw,remount -t rootfs /" | ||
| adb shell "mkdir -p /system/vendor/bin" | ||
| adb push busybox-armv6l /vendor/bin/busybox | ||
| adb shell "chmod 555 /vendor/bin/busybox" | ||
|
|
||
| # Perform the symbolic links | ||
| adb shell "for x in \`busybox --list\`; do ln -s /vendor/bin/busybox /vendor/bin/\$x; done" | ||
|
|
||
| # Remount file system with read-only permissions | ||
| adb shell "mount -o ro,remount -t rootfs /" | ||
|
|
Oops, something went wrong.