summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRefael Ackermann <refack@gmail.com>2018-08-21 19:28:53 -0400
committerRefael Ackermann <refack@gmail.com>2018-09-07 10:17:52 -0400
commitcc9dd0f36596df9ae27b47ee6864c7d3b08ac04b (patch)
tree8b3fdd298e0aa7abec182f63fbb486189a6c2f00
parentd1c5d18ff6fd209e87ad18ea9c8c6fd35989ba82 (diff)
downloadandroid-node-v8-cc9dd0f36596df9ae27b47ee6864c7d3b08ac04b.tar.gz
android-node-v8-cc9dd0f36596df9ae27b47ee6864c7d3b08ac04b.tar.bz2
android-node-v8-cc9dd0f36596df9ae27b47ee6864c7d3b08ac04b.zip
build: move meta-shebang back to `configure`
PR-URL: https://github.com/nodejs/node/pull/22450 Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
-rwxr-xr-xconfigure28
-rwxr-xr-xconfigure.py27
2 files changed, 29 insertions, 26 deletions
diff --git a/configure b/configure
new file mode 100755
index 0000000000..495d0e8848
--- /dev/null
+++ b/configure
@@ -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
diff --git a/configure.py b/configure.py
index c04118e983..ac1137a341 100755
--- a/configure.py
+++ b/configure.py
@@ -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
@@ -35,6 +9,7 @@ import shlex
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 '.')