diff --git a/src/etc/check-summary.py b/src/etc/check-summary.py index dbff82d2b6b..c86e926003f 100755 --- a/src/etc/check-summary.py +++ b/src/etc/check-summary.py @@ -1,5 +1,12 @@ -#!/usr/bin/env python -# xfail-license +# Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT +# file at the top-level directory of this distribution and at +# http://rust-lang.org/COPYRIGHT. +# +# Licensed under the Apache License, Version 2.0 or the MIT license +# , at your +# option. This file may not be copied, modified, or distributed +# except according to those terms. import glob import sys diff --git a/src/etc/combine-tests.py b/src/etc/combine-tests.py index 457c0b683ac..f1ac3e89846 100755 --- a/src/etc/combine-tests.py +++ b/src/etc/combine-tests.py @@ -1,7 +1,14 @@ -#!/usr/bin/env python -# xfail-license +# Copyright 2011-2013 The Rust Project Developers. See the COPYRIGHT +# file at the top-level directory of this distribution and at +# http://rust-lang.org/COPYRIGHT. +# +# Licensed under the Apache License, Version 2.0 or the MIT license +# , at your +# option. This file may not be copied, modified, or distributed +# except according to those terms. -# this combines all the working run-pass tests into a single large crate so we +# This combines all the working run-pass tests into a single large crate so we # can run it "fast": spawning zillions of windows processes is our major build # bottleneck (and it doesn't hurt to run faster on other platforms as well). diff --git a/src/etc/copy-runtime-deps.py b/src/etc/copy-runtime-deps.py index 4f4949e3c88..8aab3f18bda 100644 --- a/src/etc/copy-runtime-deps.py +++ b/src/etc/copy-runtime-deps.py @@ -1,7 +1,14 @@ -#!/usr/bin/env python -# xfail-license +# Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT +# file at the top-level directory of this distribution and at +# http://rust-lang.org/COPYRIGHT. +# +# Licensed under the Apache License, Version 2.0 or the MIT license +# , at your +# option. This file may not be copied, modified, or distributed +# except according to those terms. -# Copies Rust runtime dependencies to the specified directory +# Copies Rust runtime dependencies to the specified directory. import snapshot, sys, os, shutil diff --git a/src/etc/extract-tests.py b/src/etc/extract-tests.py index bbc57b7eb73..06cdf66a918 100644 --- a/src/etc/extract-tests.py +++ b/src/etc/extract-tests.py @@ -1,5 +1,13 @@ -# xfail-license -# -*- coding: utf-8 -*- +# Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT +# file at the top-level directory of this distribution and at +# http://rust-lang.org/COPYRIGHT. +# +# Licensed under the Apache License, Version 2.0 or the MIT license +# , at your +# option. This file may not be copied, modified, or distributed +# except according to those terms. + """ Script for extracting compilable fragments from markdown documentation. See prep.js for a description of the format recognized by this tool. Expects diff --git a/src/etc/extract_grammar.py b/src/etc/extract_grammar.py index 61aabf1d881..4e0fbe94498 100755 --- a/src/etc/extract_grammar.py +++ b/src/etc/extract_grammar.py @@ -1,5 +1,12 @@ -#!/usr/bin/env python -# xfail-license +# Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT +# file at the top-level directory of this distribution and at +# http://rust-lang.org/COPYRIGHT. +# +# Licensed under the Apache License, Version 2.0 or the MIT license +# , at your +# option. This file may not be copied, modified, or distributed +# except according to those terms. # This script is for extracting the grammar from the rust docs. diff --git a/src/etc/generate-deriving-span-tests.py b/src/etc/generate-deriving-span-tests.py index f00168a52c6..a3f057c04b0 100755 --- a/src/etc/generate-deriving-span-tests.py +++ b/src/etc/generate-deriving-span-tests.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# xfail-license +# # Copyright 2013 The Rust Project Developers. See the COPYRIGHT # file at the top-level directory of this distribution and at # http://rust-lang.org/COPYRIGHT. diff --git a/src/etc/generate-keyword-tests.py b/src/etc/generate-keyword-tests.py index 5b827552e83..de148f3cfab 100755 --- a/src/etc/generate-keyword-tests.py +++ b/src/etc/generate-keyword-tests.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# xfail-license +# # Copyright 2013 The Rust Project Developers. See the COPYRIGHT # file at the top-level directory of this distribution and at # http://rust-lang.org/COPYRIGHT. diff --git a/src/etc/get-snapshot.py b/src/etc/get-snapshot.py index fb14deabf24..fd97affd9ad 100755 --- a/src/etc/get-snapshot.py +++ b/src/etc/get-snapshot.py @@ -1,5 +1,12 @@ -#!/usr/bin/env python -# xfail-license +# Copyright 2011-2013 The Rust Project Developers. See the COPYRIGHT +# file at the top-level directory of this distribution and at +# http://rust-lang.org/COPYRIGHT. +# +# Licensed under the Apache License, Version 2.0 or the MIT license +# , at your +# option. This file may not be copied, modified, or distributed +# except according to those terms. import os, tarfile, re, shutil, sys from snapshot import * diff --git a/src/etc/latest-unix-snaps.py b/src/etc/latest-unix-snaps.py index 7cecf837161..32e9691f815 100755 --- a/src/etc/latest-unix-snaps.py +++ b/src/etc/latest-unix-snaps.py @@ -1,5 +1,14 @@ #!/usr/bin/env python -# xfail-license +# +# Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT +# file at the top-level directory of this distribution and at +# http://rust-lang.org/COPYRIGHT. +# +# Licensed under the Apache License, Version 2.0 or the MIT license +# , at your +# option. This file may not be copied, modified, or distributed +# except according to those terms. import os, tarfile, hashlib, re, shutil, sys from snapshot import * diff --git a/src/etc/make-snapshot.py b/src/etc/make-snapshot.py index a60d26673d8..fec78fc1aaf 100755 --- a/src/etc/make-snapshot.py +++ b/src/etc/make-snapshot.py @@ -1,5 +1,12 @@ -#!/usr/bin/env python -# xfail-license +# Copyright 2011-2013 The Rust Project Developers. See the COPYRIGHT +# file at the top-level directory of this distribution and at +# http://rust-lang.org/COPYRIGHT. +# +# Licensed under the Apache License, Version 2.0 or the MIT license +# , at your +# option. This file may not be copied, modified, or distributed +# except according to those terms. import snapshot, sys diff --git a/src/etc/maketest.py b/src/etc/maketest.py index 91de7fba758..fb886f30bd6 100644 --- a/src/etc/maketest.py +++ b/src/etc/maketest.py @@ -1,4 +1,12 @@ -# xfail-license +# Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT +# file at the top-level directory of this distribution and at +# http://rust-lang.org/COPYRIGHT. +# +# Licensed under the Apache License, Version 2.0 or the MIT license +# , at your +# option. This file may not be copied, modified, or distributed +# except according to those terms. import subprocess import os diff --git a/src/etc/mirror-all-snapshots.py b/src/etc/mirror-all-snapshots.py index 3b5f66c4117..3934c235e8c 100644 --- a/src/etc/mirror-all-snapshots.py +++ b/src/etc/mirror-all-snapshots.py @@ -1,5 +1,14 @@ #!/usr/bin/env python -# xfail-license +# +# Copyright 2011-2013 The Rust Project Developers. See the COPYRIGHT +# file at the top-level directory of this distribution and at +# http://rust-lang.org/COPYRIGHT. +# +# Licensed under the Apache License, Version 2.0 or the MIT license +# , at your +# option. This file may not be copied, modified, or distributed +# except according to those terms. import os, tarfile, hashlib, re, shutil from snapshot import * diff --git a/src/etc/mklldeps.py b/src/etc/mklldeps.py index 2abe3230c2c..0fdeb23d2e3 100644 --- a/src/etc/mklldeps.py +++ b/src/etc/mklldeps.py @@ -1,4 +1,12 @@ -# xfail-license +# Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT +# file at the top-level directory of this distribution and at +# http://rust-lang.org/COPYRIGHT. +# +# Licensed under the Apache License, Version 2.0 or the MIT license +# , at your +# option. This file may not be copied, modified, or distributed +# except according to those terms. import os import sys diff --git a/src/etc/snapshot.py b/src/etc/snapshot.py index 036bfd2cf08..ba193db1eda 100644 --- a/src/etc/snapshot.py +++ b/src/etc/snapshot.py @@ -1,23 +1,31 @@ -# xfail-license +# Copyright 2011-2014 The Rust Project Developers. See the COPYRIGHT +# file at the top-level directory of this distribution and at +# http://rust-lang.org/COPYRIGHT. +# +# Licensed under the Apache License, Version 2.0 or the MIT license +# , at your +# option. This file may not be copied, modified, or distributed +# except according to those terms. import re, os, sys, glob, tarfile, shutil, subprocess, tempfile, distutils.spawn try: - import hashlib - sha_func = hashlib.sha1 + import hashlib + sha_func = hashlib.sha1 except ImportError: - import sha - sha_func = sha.new + import sha + sha_func = sha.new def scrub(b): - if sys.version_info >= (3,) and type(b) == bytes: - return b.decode('ascii') - else: - return b + if sys.version_info >= (3,) and type(b) == bytes: + return b.decode('ascii') + else: + return b src_dir = scrub(os.getenv("CFG_SRC_DIR")) if not src_dir: - raise Exception("missing env var CFG_SRC_DIR") + raise Exception("missing env var CFG_SRC_DIR") snapshotfile = os.path.join(src_dir, "src", "snapshots.txt") download_url_base = "http://static.rust-lang.org/stage0-snapshots" @@ -31,37 +39,36 @@ snapshot_files = { "freebsd": ["bin/rustc"], } -winnt_runtime_deps = ["libgcc_s_dw2-1.dll", - "libstdc++-6.dll"] +winnt_runtime_deps = ["libgcc_s_dw2-1.dll", "libstdc++-6.dll"] def parse_line(n, line): - global snapshotfile + global snapshotfile - if re.match(r"\s*$", line): return None + if re.match(r"\s*$", line): return None - if re.match(r"^T\s*$", line): return None + if re.match(r"^T\s*$", line): return None - match = re.match(r"\s+([\w_-]+) ([a-fA-F\d]{40})\s*$", line) - if match: - return { "type": "file", - "platform": match.group(1), - "hash": match.group(2).lower() } + match = re.match(r"\s+([\w_-]+) ([a-fA-F\d]{40})\s*$", line) + if match: + return { "type": "file", + "platform": match.group(1), + "hash": match.group(2).lower() } - match = re.match(r"([ST]) (\d{4}-\d{2}-\d{2}) ([a-fA-F\d]+)\s*$", line); - if (not match): - raise Exception("%s:%d:E syntax error: " % (snapshotfile, n)) - return {"type": "snapshot", - "date": match.group(2), - "rev": match.group(3)} + match = re.match(r"([ST]) (\d{4}-\d{2}-\d{2}) ([a-fA-F\d]+)\s*$", line); + if not match: + raise Exception("%s:%d:E syntax error: " % (snapshotfile, n)) + return { "type": "snapshot", + "date": match.group(2), + "rev": match.group(3) } def partial_snapshot_name(date, rev, platform): - return ("rust-stage0-%s-%s-%s.tar.bz2" - % (date, rev, platform)) + return ("rust-stage0-%s-%s-%s.tar.bz2" + % (date, rev, platform)) def full_snapshot_name(date, rev, platform, hsh): - return ("rust-stage0-%s-%s-%s-%s.tar.bz2" - % (date, rev, platform, hsh)) + return ("rust-stage0-%s-%s-%s-%s.tar.bz2" + % (date, rev, platform, hsh)) def get_kernel(triple): @@ -78,23 +85,22 @@ def get_kernel(triple): def get_cpu(triple): arch = triple.split('-')[0] if arch == "i686": - return "i386" + return "i386" return arch def get_platform(triple): - return "%s-%s" % (get_kernel(triple), get_cpu(triple)) + return "%s-%s" % (get_kernel(triple), get_cpu(triple)) def cmd_out(cmdline): - p = subprocess.Popen(cmdline, - stdout=subprocess.PIPE) + p = subprocess.Popen(cmdline, stdout=subprocess.PIPE) return scrub(p.communicate()[0].strip()) def local_rev_info(field): return cmd_out(["git", "--git-dir=" + os.path.join(src_dir, ".git"), - "log", "-n", "1", - "--format=%%%s" % field, "HEAD"]) + "log", "-n", "1", + "--format=%%%s" % field, "HEAD"]) def local_rev_full_sha(): @@ -127,10 +133,10 @@ def get_url_to_file(u,f): os.rename(tmpf, f) def snap_filename_hash_part(snap): - match = re.match(r".*([a-fA-F\d]{40}).tar.bz2$", snap) - if not match: - raise Exception("unable to find hash in filename: " + snap) - return match.group(1) + match = re.match(r".*([a-fA-F\d]{40}).tar.bz2$", snap) + if not match: + raise Exception("unable to find hash in filename: " + snap) + return match.group(1) def hash_file(x): h = sha_func() @@ -142,13 +148,13 @@ def get_winnt_runtime_deps(): runtime_deps = [] path_dirs = os.environ["PATH"].split(';') for name in winnt_runtime_deps: - for dir in path_dirs: - matches = glob.glob(os.path.join(dir, name)) - if matches: - runtime_deps.append(matches[0]) - break - else: - raise Exception("Could not find runtime dependency: %s" % name) + for dir in path_dirs: + matches = glob.glob(os.path.join(dir, name)) + if matches: + runtime_deps.append(matches[0]) + break + else: + raise Exception("Could not find runtime dependency: %s" % name) return runtime_deps def make_snapshot(stage, triple): @@ -160,31 +166,31 @@ def make_snapshot(stage, triple): file0 = partial_snapshot_name(date, rev, platform) def in_tar_name(fn): - cs = re.split(r"[\\/]", fn) - if len(cs) >= 2: - return os.sep.join(cs[-2:]) + cs = re.split(r"[\\/]", fn) + if len(cs) >= 2: + return os.sep.join(cs[-2:]) tar = tarfile.open(file0, "w:bz2") for name in snapshot_files[kernel]: - dir = stage - if stage == "stage1" and re.match(r"^lib/(lib)?std.*", name): - dir = "stage0" - fn_glob = os.path.join(triple, dir, name) - matches = glob.glob(fn_glob) - if not matches: - raise Exception("Not found file with name like " + fn_glob) - if len(matches) == 1: - tar.add(matches[0], "rust-stage0/" + in_tar_name(matches[0])) - else: - raise Exception("Found stale files: \n %s\n" - "Please make a clean build." % "\n ".join(matches)) + dir = stage + if stage == "stage1" and re.match(r"^lib/(lib)?std.*", name): + dir = "stage0" + fn_glob = os.path.join(triple, dir, name) + matches = glob.glob(fn_glob) + if not matches: + raise Exception("Not found file with name like " + fn_glob) + if len(matches) == 1: + tar.add(matches[0], "rust-stage0/" + in_tar_name(matches[0])) + else: + raise Exception("Found stale files: \n %s\n" + "Please make a clean build." % "\n ".join(matches)) if kernel=="winnt": - for path in get_winnt_runtime_deps(): - tar.add(path, "rust-stage0/bin/" + os.path.basename(path)) - tar.add(os.path.join(os.path.dirname(__file__), "third-party"), - "rust-stage0/bin/third-party") + for path in get_winnt_runtime_deps(): + tar.add(path, "rust-stage0/bin/" + os.path.basename(path)) + tar.add(os.path.join(os.path.dirname(__file__), "third-party"), + "rust-stage0/bin/third-party") tar.close() @@ -196,59 +202,59 @@ def make_snapshot(stage, triple): return file1 def curr_snapshot_rev(): - i = 0 - found_snap = False - date = None - rev = None + i = 0 + found_snap = False + date = None + rev = None - f = open(snapshotfile) - for line in f.readlines(): - i += 1 - parsed = parse_line(i, line) - if (not parsed): continue + f = open(snapshotfile) + for line in f.readlines(): + i += 1 + parsed = parse_line(i, line) + if (not parsed): continue - if parsed["type"] == "snapshot": - date = parsed["date"] - rev = parsed["rev"] - found_snap = True - break + if parsed["type"] == "snapshot": + date = parsed["date"] + rev = parsed["rev"] + found_snap = True + break - if not found_snap: - raise Exception("no snapshot entries in file") + if not found_snap: + raise Exception("no snapshot entries in file") - return (date, rev) + return (date, rev) def determine_curr_snapshot(triple): - i = 0 - platform = get_platform(triple) + i = 0 + platform = get_platform(triple) - found_file = False - found_snap = False - hsh = None - date = None - rev = None + found_file = False + found_snap = False + hsh = None + date = None + rev = None - f = open(snapshotfile) - for line in f.readlines(): - i += 1 - parsed = parse_line(i, line) - if (not parsed): continue + f = open(snapshotfile) + for line in f.readlines(): + i += 1 + parsed = parse_line(i, line) + if (not parsed): continue - if found_snap and parsed["type"] == "file": - if parsed["platform"] == platform: - hsh = parsed["hash"] - found_file = True - break; - elif parsed["type"] == "snapshot": - date = parsed["date"] - rev = parsed["rev"] - found_snap = True + if found_snap and parsed["type"] == "file": + if parsed["platform"] == platform: + hsh = parsed["hash"] + found_file = True + break; + elif parsed["type"] == "snapshot": + date = parsed["date"] + rev = parsed["rev"] + found_snap = True - if not found_snap: - raise Exception("no snapshot entries in file") + if not found_snap: + raise Exception("no snapshot entries in file") - if not found_file: - raise Exception("no snapshot file found for platform %s, rev %s" % - (platform, rev)) + if not found_file: + raise Exception("no snapshot file found for platform %s, rev %s" % + (platform, rev)) - return full_snapshot_name(date, rev, platform, hsh) + return full_snapshot_name(date, rev, platform, hsh) diff --git a/src/etc/sugarise-doc-comments.py b/src/etc/sugarise-doc-comments.py index 7bd4175fbf0..7d4ad749fe3 100755 --- a/src/etc/sugarise-doc-comments.py +++ b/src/etc/sugarise-doc-comments.py @@ -1,5 +1,14 @@ #!/usr/bin/env python -# xfail-license +# +# Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT +# file at the top-level directory of this distribution and at +# http://rust-lang.org/COPYRIGHT. +# +# Licensed under the Apache License, Version 2.0 or the MIT license +# , at your +# option. This file may not be copied, modified, or distributed +# except according to those terms. # # this script attempts to turn doc comment attributes (#[doc = "..."]) diff --git a/src/etc/tidy.py b/src/etc/tidy.py index bd6448d156e..b342b9602ae 100644 --- a/src/etc/tidy.py +++ b/src/etc/tidy.py @@ -1,5 +1,12 @@ -#!/usr/bin/env python -# xfail-license +# Copyright 2010-2014 The Rust Project Developers. See the COPYRIGHT +# file at the top-level directory of this distribution and at +# http://rust-lang.org/COPYRIGHT. +# +# Licensed under the Apache License, Version 2.0 or the MIT license +# , at your +# option. This file may not be copied, modified, or distributed +# except according to those terms. import sys, fileinput, subprocess, re from licenseck import * @@ -59,7 +66,7 @@ try: hsh = match.group(1) date, rev = snapshot.curr_snapshot_rev() if not hsh.startswith(rev): - report_err("snapshot out of date (" + date + report_err("snapshot out of date (" + date + "): " + line) else: if "SNAP" in line: diff --git a/src/etc/unicode.py b/src/etc/unicode.py index d35263c100f..71c5c8f8a95 100755 --- a/src/etc/unicode.py +++ b/src/etc/unicode.py @@ -1,5 +1,14 @@ #!/usr/bin/env python -# xfail-license +# +# Copyright 2011-2013 The Rust Project Developers. See the COPYRIGHT +# file at the top-level directory of this distribution and at +# http://rust-lang.org/COPYRIGHT. +# +# Licensed under the Apache License, Version 2.0 or the MIT license +# , at your +# option. This file may not be copied, modified, or distributed +# except according to those terms. # This digests UnicodeData.txt and DerivedCoreProperties.txt and emits rust # code covering the core properties. Since this is a pretty rare event we diff --git a/src/etc/ziggurat_tables.py b/src/etc/ziggurat_tables.py index 263c76a88dd..d1980cec2ed 100755 --- a/src/etc/ziggurat_tables.py +++ b/src/etc/ziggurat_tables.py @@ -1,5 +1,14 @@ #!/usr/bin/env python -# xfail-license +# +# Copyright 2013 The Rust Project Developers. See the COPYRIGHT +# file at the top-level directory of this distribution and at +# http://rust-lang.org/COPYRIGHT. +# +# Licensed under the Apache License, Version 2.0 or the MIT license +# , at your +# option. This file may not be copied, modified, or distributed +# except according to those terms. # This creates the tables used for distributions implemented using the # ziggurat algorithm in `std::rand::distributions;`. They are