Skip to content

build: refactor configure, add --verbose #22450

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.

Sign up for GitHub

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

Merged
refack merged 3 commits into from
Sep 7, 2018
Merged

build: refactor configure, add --verbose #22450

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1c5d18
build: rename configure to configure.py
refack Aug 21, 2018
cc9dd0f
build: move meta-shebang back to `configure`
refack Aug 21, 2018
62a3f9b
build: add `--verbose` to `./configure`
refack Aug 22, 2018
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
Prev Previous commit
Next Next commit
build: move meta-shebang back to configure 
PR-URL: #22450
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
  • Loading branch information
@refack
refack committed Sep 7, 2018
commit cc9dd0f36596df9ae27b47ee6864c7d3b08ac04b
28 changes: 28 additions & 0 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#!/bin/sh

# Locate python2 interpreter and re-execute the script. Note that the
# mix of single and double quotes is intentional, as is the fact that
# the ] goes on a new line.
_=[ 'exec' '/bin/sh' '-c' '''
which python2.7 >/dev/null && exec python2.7 "$0" "$@"
which python2 >/dev/null && exec python2 "$0" "$@"
exec python "$0" "$@"
''' "$0" "$@"
]
del _

import sys
from distutils.spawn import find_executable as which
if sys.version_info[0] != 2 or sys.version_info[1] not in (6, 7):
sys.stderr.write('Please use either Python 2.6 or 2.7')

python2 = which('python2') or which('python2.6') or which('python2.7')

if python2:
sys.stderr.write(':\n\n')
sys.stderr.write(' ' + python2 + ' ' + ' '.join(sys.argv))

sys.stderr.write('\n')
sys.exit(1)

import configure
Copy link
Copy Markdown
Member

@joyeecheung joyeecheung Aug 30, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm..can we use another name for the configure.py to avoid confusion? Or maybe a comment here?

27 changes: 1 addition & 26 deletions configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,4 @@
#!/bin/sh

# Locate python2 interpreter and re-execute the script. Note that the
# mix of single and double quotes is intentional, as is the fact that
# the ] goes on a new line.
_=[ 'exec' '/bin/sh' '-c' '''
which python2.7 >/dev/null && exec python2.7 "$0" "$@"
which python2 >/dev/null && exec python2 "$0" "$@"
exec python "$0" "$@"
''' "$0" "$@"
]
del _

import sys
from distutils.spawn import find_executable as which
if sys.version_info[0] != 2 or sys.version_info[1] not in (6, 7):
sys.stderr.write('Please use either Python 2.6 or 2.7')

python2 = which('python2') or which('python2.6') or which('python2.7')

if python2:
sys.stderr.write(':\n\n')
sys.stderr.write(' ' + python2 + ' ' + ' '.join(sys.argv))

sys.stderr.write('\n')
sys.exit(1)

import errno
import optparse
import os
Expand All @@ -35,6 +9,7 @@
import subprocess
import shutil
import string
from distutils.spawn import find_executable as which

# If not run from node/, cd to node/.
os.chdir(os.path.dirname(__file__) or '.')
Expand Down