From 4e510baa5dc2c926131faa1d3a352d099f067547 Mon Sep 17 00:00:00 2001 From: Emati Mitame Date: Thu, 3 Dec 2015 19:17:36 +0000 Subject: [PATCH 1/3] Change ssh git clone commands to HTTPs ones --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 176189daa2206..b9a74dfd29cc9 100644 --- a/README.md +++ b/README.md @@ -66,15 +66,15 @@ compiler for C++14 support and create a symlink: ### Getting Sources for Swift and Related Projects - git clone git@github.com:apple/swift.git swift - git clone git@github.com:apple/swift-llvm.git llvm - git clone git@github.com:apple/swift-clang.git clang - git clone git@github.com:apple/swift-lldb.git lldb - git clone git@github.com:apple/swift-cmark.git cmark - git clone git@github.com:apple/swift-llbuild.git llbuild - git clone git@github.com:apple/swift-package-manager.git swiftpm - git clone git@github.com:apple/swift-corelibs-xctest.git - git clone git@github.com:apple/swift-corelibs-foundation.git + git clone https://github.com/apple/swift.git swift + git clone https://github.com/apple/swift-llvm.git llvm + git clone https://github.com/apple/swift-clang.git clang + git clone https://github.com/apple/swift-lldb.git lldb + git clone https://github.com/apple/swift-cmark.git cmark + git clone https://github.com/apple/swift-llbuild.git llbuild + git clone https://github.com/apple/swift-package-manager.git swiftpm + git clone https://github.com/apple/swift-corelibs-xctest.git + git clone https://github.com/apple/swift-corelibs-foundation.git [CMake](http://cmake.org) is the core infrastructure used to configure builds of From 7c972d11cb4f35a344b193d5296d6c5829ee9dca Mon Sep 17 00:00:00 2001 From: Emati Mitame Date: Thu, 3 Dec 2015 19:19:43 +0000 Subject: [PATCH 2/3] Use `#!/usr/bin/env python2` instead of alternatives --- docs/scripts/ns-html2rst | 2 +- test/Driver/Dependencies/Inputs/fail.py | 2 +- test/Driver/Dependencies/Inputs/fake-build-for-bitcode.py | 2 +- test/Driver/Dependencies/Inputs/fake-build-whole-module.py | 2 +- test/Driver/Dependencies/Inputs/modify-non-primary-files.py | 2 +- test/Driver/Dependencies/Inputs/update-dependencies-bad.py | 2 +- test/Driver/Dependencies/Inputs/update-dependencies.py | 2 +- test/Inputs/getmtime.py | 2 +- test/Serialization/Inputs/binary_sub.py | 2 +- utils/apply-fixit-edits.py | 2 +- utils/benchmark/BST/bst.py | 2 +- utils/build-script | 2 +- utils/cmpcodesize | 2 +- utils/create-filecheck-test.py | 2 +- utils/demo-tool | 2 +- utils/gyb | 2 +- utils/gyb.py | 2 +- utils/line-directive | 2 +- utils/omit-needless-words.py | 2 +- utils/pass-pipeline/scripts/pipeline_generator.py | 2 +- utils/pass-pipeline/scripts/pipelines_build_script.py | 2 +- utils/pre-commit-benchmark | 2 +- utils/pygments/swift.py | 2 +- utils/recursive-lipo | 2 +- utils/resolve-crashes.py | 2 +- utils/sil-opt-verify-all-modules.py | 2 +- utils/split_file.py | 2 +- utils/submit-benchmark-results | 2 +- utils/swift-bench.py | 2 +- utils/update-checkout | 2 +- utils/viewcfg | 2 +- validation-test/stdlib/Slice/Inputs/GenerateSliceTests.py | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/docs/scripts/ns-html2rst b/docs/scripts/ns-html2rst index 004cf6f6d6a29..96e25e9eb691d 100755 --- a/docs/scripts/ns-html2rst +++ b/docs/scripts/ns-html2rst @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 import sys, re, subprocess def run(): diff --git a/test/Driver/Dependencies/Inputs/fail.py b/test/Driver/Dependencies/Inputs/fail.py index 95c72f8c19a10..4eb07f45fef30 100755 --- a/test/Driver/Dependencies/Inputs/fail.py +++ b/test/Driver/Dependencies/Inputs/fail.py @@ -1,3 +1,3 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 exit(1) diff --git a/test/Driver/Dependencies/Inputs/fake-build-for-bitcode.py b/test/Driver/Dependencies/Inputs/fake-build-for-bitcode.py index 24855b144601b..38e0a01336c8a 100755 --- a/test/Driver/Dependencies/Inputs/fake-build-for-bitcode.py +++ b/test/Driver/Dependencies/Inputs/fake-build-for-bitcode.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Emulates the frontend of an -embed-bitcode job. That means we have to handle # -emit-bc and -c actions. diff --git a/test/Driver/Dependencies/Inputs/fake-build-whole-module.py b/test/Driver/Dependencies/Inputs/fake-build-whole-module.py index 3b176a2846ee4..5484cb1455ed1 100755 --- a/test/Driver/Dependencies/Inputs/fake-build-whole-module.py +++ b/test/Driver/Dependencies/Inputs/fake-build-whole-module.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Emulates the frontend of a -whole-module-optimization compilation. diff --git a/test/Driver/Dependencies/Inputs/modify-non-primary-files.py b/test/Driver/Dependencies/Inputs/modify-non-primary-files.py index a131a72067f43..3553bebf0b971 100755 --- a/test/Driver/Dependencies/Inputs/modify-non-primary-files.py +++ b/test/Driver/Dependencies/Inputs/modify-non-primary-files.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # modify-non-primary-files.py simulates a build where the user is modifying the # source files during compilation. diff --git a/test/Driver/Dependencies/Inputs/update-dependencies-bad.py b/test/Driver/Dependencies/Inputs/update-dependencies-bad.py index 1c2c9f8d98f5e..e11e0856f74b3 100755 --- a/test/Driver/Dependencies/Inputs/update-dependencies-bad.py +++ b/test/Driver/Dependencies/Inputs/update-dependencies-bad.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Fails if the input file is named "bad.swift"; otherwise dispatches to # update-dependencies.py. diff --git a/test/Driver/Dependencies/Inputs/update-dependencies.py b/test/Driver/Dependencies/Inputs/update-dependencies.py index aac77698ff47c..504eaf5cb8d06 100755 --- a/test/Driver/Dependencies/Inputs/update-dependencies.py +++ b/test/Driver/Dependencies/Inputs/update-dependencies.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # update-dependencies.py simulates a Swift compilation for the purposes of # dependency analysis. That means it has two tasks: diff --git a/test/Inputs/getmtime.py b/test/Inputs/getmtime.py index 0a7a1397b6a8b..f0c27b444125d 100755 --- a/test/Inputs/getmtime.py +++ b/test/Inputs/getmtime.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 import os import sys diff --git a/test/Serialization/Inputs/binary_sub.py b/test/Serialization/Inputs/binary_sub.py index f3f84eb1c5ff4..79ba2d773c170 100755 --- a/test/Serialization/Inputs/binary_sub.py +++ b/test/Serialization/Inputs/binary_sub.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 import sys diff --git a/utils/apply-fixit-edits.py b/utils/apply-fixit-edits.py index 674ee7745c0e1..1d7289315acf4 100755 --- a/utils/apply-fixit-edits.py +++ b/utils/apply-fixit-edits.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 #===--- apply-fixit-edits.py - Tool for applying edits from .remap files ---===# # diff --git a/utils/benchmark/BST/bst.py b/utils/benchmark/BST/bst.py index 3427b26a57f70..34502586e7420 100644 --- a/utils/benchmark/BST/bst.py +++ b/utils/benchmark/BST/bst.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # # A binary search tree. class BST: diff --git a/utils/build-script b/utils/build-script index d75e2ef04a2d4..f4e66f2e0fe97 100755 --- a/utils/build-script +++ b/utils/build-script @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 #===--- build-script - The ultimate tool for building Swift ----------------===# # ## This source file is part of the Swift.org open source project diff --git a/utils/cmpcodesize b/utils/cmpcodesize index f197b184bc150..d068891561246 100755 --- a/utils/cmpcodesize +++ b/utils/cmpcodesize @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 import re import sys diff --git a/utils/create-filecheck-test.py b/utils/create-filecheck-test.py index d6cfc2c859144..f8df8a67db91d 100755 --- a/utils/create-filecheck-test.py +++ b/utils/create-filecheck-test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # The following script takes as input a SIL fragment and changes all # SSA variables into FileCheck variables. This significantly reduces diff --git a/utils/demo-tool b/utils/demo-tool index 31b553ba7553a..9b0100312980e 100755 --- a/utils/demo-tool +++ b/utils/demo-tool @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 import json import optparse diff --git a/utils/gyb b/utils/gyb index fcbceabf0024c..311005307cd0f 100755 --- a/utils/gyb +++ b/utils/gyb @@ -1,3 +1,3 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 import gyb gyb.main() diff --git a/utils/gyb.py b/utils/gyb.py index edf6d08ad12cc..851bb2b748564 100755 --- a/utils/gyb.py +++ b/utils/gyb.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # GYB: Generate Your Boilerplate (improved names welcome; at least # this one's short). See -h output for instructions diff --git a/utils/line-directive b/utils/line-directive index 2ba36820b2115..9c609db5d8111 100755 --- a/utils/line-directive +++ b/utils/line-directive @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 #convert line numbers in error messages according to "line directive" comments import os import sys diff --git a/utils/omit-needless-words.py b/utils/omit-needless-words.py index c6a38e7077942..e567533048db4 100755 --- a/utils/omit-needless-words.py +++ b/utils/omit-needless-words.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # This tool helps assess the impact of automatically applying # heuristics that omit 'needless' words from APIs imported from Clang diff --git a/utils/pass-pipeline/scripts/pipeline_generator.py b/utils/pass-pipeline/scripts/pipeline_generator.py index befbd3413f61f..b80faaa29c4fe 100755 --- a/utils/pass-pipeline/scripts/pipeline_generator.py +++ b/utils/pass-pipeline/scripts/pipeline_generator.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 import os import sys diff --git a/utils/pass-pipeline/scripts/pipelines_build_script.py b/utils/pass-pipeline/scripts/pipelines_build_script.py index 1adee8b7e59bb..2f8095d4bb48e 100755 --- a/utils/pass-pipeline/scripts/pipelines_build_script.py +++ b/utils/pass-pipeline/scripts/pipelines_build_script.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 import os import sys diff --git a/utils/pre-commit-benchmark b/utils/pre-commit-benchmark index b87df62362452..fd246434cb793 100755 --- a/utils/pre-commit-benchmark +++ b/utils/pre-commit-benchmark @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # Note: it doesn't matter what directory you invoke this in; it uses # your SWIFT_BUILD_ROOT and SWIFT_SOURCE_ROOT settings, just like diff --git a/utils/pygments/swift.py b/utils/pygments/swift.py index 93bf7aca33cf2..b20206a23bcb6 100644 --- a/utils/pygments/swift.py +++ b/utils/pygments/swift.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 import re diff --git a/utils/recursive-lipo b/utils/recursive-lipo index 7d1c84840e846..4183bfd7d42b0 100755 --- a/utils/recursive-lipo +++ b/utils/recursive-lipo @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 import argparse import os.path diff --git a/utils/resolve-crashes.py b/utils/resolve-crashes.py index 34c33da3b2022..77d61a8a5eef3 100755 --- a/utils/resolve-crashes.py +++ b/utils/resolve-crashes.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # A small utility to take the output of a Swift validation test run # where some compiler crashers have been fixed, and move them into the diff --git a/utils/sil-opt-verify-all-modules.py b/utils/sil-opt-verify-all-modules.py index 6588f198e8b8f..097b49ca7a0a5 100755 --- a/utils/sil-opt-verify-all-modules.py +++ b/utils/sil-opt-verify-all-modules.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 #===------------------------------------------------------------------------===# # # This source file is part of the Swift.org open source project diff --git a/utils/split_file.py b/utils/split_file.py index f0d499f78f49f..7ec99a23ce5a7 100755 --- a/utils/split_file.py +++ b/utils/split_file.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 """ split_file.py [-o ] diff --git a/utils/submit-benchmark-results b/utils/submit-benchmark-results index 45d7218907ab1..4cb07d05b26cc 100755 --- a/utils/submit-benchmark-results +++ b/utils/submit-benchmark-results @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 """ Utility script for submitting benchmark results to an LNT server. diff --git a/utils/swift-bench.py b/utils/swift-bench.py index 594e6353af1fe..8d4489567a941 100644 --- a/utils/swift-bench.py +++ b/utils/swift-bench.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 ##===--- swift-bench.py -------------------------------*- coding: utf-8 -*-===## ## ## This source file is part of the Swift.org open source project diff --git a/utils/update-checkout b/utils/update-checkout index 3dd11af9a027e..6d08b51e526d8 100755 --- a/utils/update-checkout +++ b/utils/update-checkout @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 #===--- update-checkout - Utility to update your local checkouts -----------===# # # This source file is part of the Swift.org open source project diff --git a/utils/viewcfg b/utils/viewcfg index 9935da52d900f..3356831fb8628 100755 --- a/utils/viewcfg +++ b/utils/viewcfg @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 # A script for viewing the CFG of SIL and llvm IR. diff --git a/validation-test/stdlib/Slice/Inputs/GenerateSliceTests.py b/validation-test/stdlib/Slice/Inputs/GenerateSliceTests.py index 4f05f56a9a54e..a06d6b8e5e67b 100644 --- a/validation-test/stdlib/Slice/Inputs/GenerateSliceTests.py +++ b/validation-test/stdlib/Slice/Inputs/GenerateSliceTests.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2 import itertools From 5aa75d61625b6b8466664b2a02ec3b7c1e9b60f1 Mon Sep 17 00:00:00 2001 From: Emati Mitame Date: Thu, 3 Dec 2015 19:22:07 +0000 Subject: [PATCH 3/3] Ignore temp CMake files --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index a2293f2c2cfd9..aa4bd5f7e2d78 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,9 @@ docs/_build # Finder metadata .DS_Store + +#==============================================================================# +# Ignore CMake files +#==============================================================================# +CMakeCache.txt +CMakeFiles