Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some general fixes to make it more system compatable and easier to use #79

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,9 @@ docs/_build

# Finder metadata
.DS_Store

#==============================================================================#
# Ignore CMake files
#==============================================================================#
CMakeCache.txt
CMakeFiles
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/scripts/ns-html2rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python2
import sys, re, subprocess

def run():
Expand Down
2 changes: 1 addition & 1 deletion test/Driver/Dependencies/Inputs/fail.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env python
#!/usr/bin/env python2

exit(1)
2 changes: 1 addition & 1 deletion test/Driver/Dependencies/Inputs/fake-build-for-bitcode.py
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion test/Driver/Dependencies/Inputs/fake-build-whole-module.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python2

# Emulates the frontend of a -whole-module-optimization compilation.

Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion test/Driver/Dependencies/Inputs/update-dependencies-bad.py
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion test/Driver/Dependencies/Inputs/update-dependencies.py
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion test/Inputs/getmtime.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python2

import os
import sys
Expand Down
2 changes: 1 addition & 1 deletion test/Serialization/Inputs/binary_sub.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python2

import sys

Expand Down
2 changes: 1 addition & 1 deletion utils/apply-fixit-edits.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python2

#===--- apply-fixit-edits.py - Tool for applying edits from .remap files ---===#
#
Expand Down
2 changes: 1 addition & 1 deletion utils/benchmark/BST/bst.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python2
#
# A binary search tree.
class BST:
Expand Down
2 changes: 1 addition & 1 deletion utils/build-script
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion utils/cmpcodesize
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python2

import re
import sys
Expand Down
2 changes: 1 addition & 1 deletion utils/create-filecheck-test.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion utils/demo-tool
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python2

import json
import optparse
Expand Down
2 changes: 1 addition & 1 deletion utils/gyb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env python
#!/usr/bin/env python2
import gyb
gyb.main()
2 changes: 1 addition & 1 deletion utils/gyb.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion utils/line-directive
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion utils/omit-needless-words.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion utils/pass-pipeline/scripts/pipeline_generator.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python2

import os
import sys
Expand Down
2 changes: 1 addition & 1 deletion utils/pass-pipeline/scripts/pipelines_build_script.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python2

import os
import sys
Expand Down
2 changes: 1 addition & 1 deletion utils/pre-commit-benchmark
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion utils/pygments/swift.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python2

import re

Expand Down
2 changes: 1 addition & 1 deletion utils/recursive-lipo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python2

import argparse
import os.path
Expand Down
2 changes: 1 addition & 1 deletion utils/resolve-crashes.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion utils/sil-opt-verify-all-modules.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python2
#===------------------------------------------------------------------------===#
#
# This source file is part of the Swift.org open source project
Expand Down
2 changes: 1 addition & 1 deletion utils/split_file.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python2

"""
split_file.py [-o <dir>] <path>
Expand Down
2 changes: 1 addition & 1 deletion utils/submit-benchmark-results
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python2

"""
Utility script for submitting benchmark results to an LNT server.
Expand Down
2 changes: 1 addition & 1 deletion utils/swift-bench.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion utils/update-checkout
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion utils/viewcfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python2

# A script for viewing the CFG of SIL and llvm IR.

Expand Down
2 changes: 1 addition & 1 deletion validation-test/stdlib/Slice/Inputs/GenerateSliceTests.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python2

import itertools

Expand Down