Make things work on systems defaulting to python3

svaarala · Apr 13, 2016 · 6715fa1 · 6715fa1
1 parent 29b728f
commit 6715fa1
Show file tree

Hide file tree

Showing 46 changed files with 77 additions and 76 deletions.
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -28,6 +28,7 @@ and agreed to irrevocably license their contributions under the Duktape
 * Bruce Pascoe <fatcerberus1@gmail.com>
 * René Hollander <rene@rene8888.at>
 * Julien Hamaide (https://github.com/crazyjul)
+* Sebastian Götte (https://github.com/jaseg)
 
 Other contributions
 ===================

diff --git a/Makefile b/Makefile
@@ -44,7 +44,7 @@ NODE:=$(shell which nodejs node | head -1)
 WGET:=$(shell which wget)
 JAVA:=$(shell which java)
 VALGRIND:=$(shell which valgrind)
-PYTHON:=$(shell which python)
+PYTHON:=$(shell which python2 python|head -1)
 
 # Scrape version from the public header; convert from e.g. 10203 -> '1.2.3'
 DUK_VERSION:=$(shell cat src/duk_api_public.h.in | grep define | grep DUK_VERSION | tr -s ' ' ' ' | cut -d ' ' -f 3 | tr -d 'L')
@@ -551,16 +551,16 @@ endif
 
 .PHONY: matrix10
 matrix10: dist
-	cd dist; python ../util/matrix_compile.py --count=10
+	cd dist; $(PYTHON) ../util/matrix_compile.py --count=10
 .PHONY: matrix100
 matrix100: dist
-	cd dist; python ../util/matrix_compile.py --count=100
+	cd dist; $(PYTHON) ../util/matrix_compile.py --count=100
 .PHONY: matrix1000
 matrix1000: dist
-	cd dist; python ../util/matrix_compile.py --count=1000
+	cd dist; $(PYTHON) ../util/matrix_compile.py --count=1000
 .PHONY: matrix10000
 matrix10000: dist
-	cd dist; python ../util/matrix_compile.py --count=10000
+	cd dist; $(PYTHON) ../util/matrix_compile.py --count=10000
 
 regfuzz-0.1.tar.gz:
 	# https://code.google.com/p/regfuzz/
@@ -1044,7 +1044,7 @@ cloc:	dist cloc-1.60.pl
 # XXX: make prints a harmless warning related to the sub-make.
 dist:
 	@make codepolicycheck
-	if [ -f compiler.jar ]; then python util/make_dist.py --minify closure --create-spdx; else python util/make_dist.py --minify none; fi
+	if [ -f compiler.jar ]; then $(PYTHON) util/make_dist.py --minify closure --create-spdx; else $(PYTHON) util/make_dist.py --minify none; fi
 
 .PHONY:	dist-src
 dist-src:	dist
@@ -1108,7 +1108,7 @@ endif
 .PHONY: codepolicycheck
 codepolicycheck:
 	@echo Code policy check
-	@python util/check_code_policy.py \
+	@$(PYTHON) util/check_code_policy.py \
 		$(CODEPOLICYOPTS) \
 		--check-debug-log-calls \
 		--check-carriage-returns \
@@ -1122,7 +1122,7 @@ codepolicycheck:
 		--check-cpp-comment \
 		--dump-vim-commands \
 		src/*.c src/*.h src/*.h.in tests/api/*.c
-	@python util/check_code_policy.py \
+	@$(PYTHON) util/check_code_policy.py \
 		$(CODEPOLICYOPTS) \
 		--check-debug-log-calls \
 		--check-carriage-returns \
@@ -1133,7 +1133,7 @@ codepolicycheck:
 		--check-nonleading-tab \
 		--dump-vim-commands \
 		tests/ecmascript/*.js
-	@python util/check_code_policy.py \
+	@$(PYTHON) util/check_code_policy.py \
 		$(CODEPOLICYOPTS) \
 		--check-carriage-returns \
 		--check-fixme \
@@ -1158,7 +1158,7 @@ codepolicycheck:
 		config/examples/* config/header-snippets/* config/helper-snippets/* \
 		config/*.yaml
 	# XXX: not yet FIXME pure
-	@python util/check_code_policy.py \
+	@$(PYTHON) util/check_code_policy.py \
 		$(CODEPOLICYOPTS) \
 		--check-carriage-returns \
 		--check-non-ascii \
@@ -1167,7 +1167,7 @@ codepolicycheck:
 		--check-nonleading-tab \
 		--dump-vim-commands \
 		config/config-options/*.yaml config/other-defines/*.yaml
-	@python util/check_code_policy.py \
+	@$(PYTHON) util/check_code_policy.py \
 		$(CODEPOLICYOPTS) \
 		--check-carriage-returns \
 		--check-fixme \
@@ -1177,7 +1177,7 @@ codepolicycheck:
 		--check-nonleading-tab \
 		--dump-vim-commands \
 		debugger/*.yaml
-	@python util/check_code_policy.py \
+	@$(PYTHON) util/check_code_policy.py \
 		$(CODEPOLICYOPTS) \
 		--check-carriage-returns \
 		--check-fixme \
@@ -1190,7 +1190,7 @@ codepolicycheck:
 
 .PHONY: codepolicycheckvim
 codepolicycheckvim:
-	-python util/check_code_policy.py --dump-vim-commands src/*.c src/*.h src/*.h.in tests/api/*.c
+	-$(PYTHON) util/check_code_policy.py --dump-vim-commands src/*.c src/*.h src/*.h.in tests/api/*.c
 
 .PHONY: big-git-files
 big-git-files:
@@ -1233,9 +1233,9 @@ massif-arcfour: massif-test-dev-arcfour
 # - Node.js (V8) is JITed
 # - Luajit is JITed
 
-#TIME=python util/time_multi.py --count 1 --sleep 0 --sleep-factor 0.8 --mode min # Take minimum time of N
-#TIME=python util/time_multi.py --count 3 --sleep 0 --sleep-factor 0.8 --mode min # Take minimum time of N
-TIME=python util/time_multi.py --count 5 --sleep 0 --sleep-factor 0.8 --mode min # Take minimum time of N
+#TIME=$(PYTHON) util/time_multi.py --count 1 --sleep 0 --sleep-factor 0.8 --mode min # Take minimum time of N
+#TIME=$(PYTHON) util/time_multi.py --count 3 --sleep 0 --sleep-factor 0.8 --mode min # Take minimum time of N
+TIME=$(PYTHON) util/time_multi.py --count 5 --sleep 0 --sleep-factor 0.8 --mode min # Take minimum time of N
 
 # Blocks: optimization variants, previous versions, other interpreting engines,
 # other JIT engines.
@@ -1254,7 +1254,7 @@ perftest: duk duk.O2 duk.O3 duk.O4
 		printf ' |'; \
 		printf ' mujs %5s' "`$(TIME) mujs $$i`"; \
 		printf ' lua %5s' "`$(TIME) lua $${i%%.js}.lua`"; \
-		printf ' python %5s' "`$(TIME) python $${i%%.js}.py`"; \
+		printf ' python %5s' "`$(TIME) $(PYTHON) $${i%%.js}.py`"; \
 		printf ' perl %5s' "`$(TIME) perl $${i%%.js}.pl`"; \
 		printf ' ruby %5s' "`$(TIME) ruby $${i%%.js}.rb`"; \
 		printf ' |'; \

diff --git a/config/extract_unique_options.py b/config/extract_unique_options.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Extract unique DUK_USE_xxx flags from current code base:
 #

diff --git a/config/genconfig.py b/config/genconfig.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Process Duktape option metadata and produce various useful outputs:
 #

diff --git a/debugger/merge_debug_meta.py b/debugger/merge_debug_meta.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Merge debugger YAML metadata files and output a merged JSON metadata file.
 #

diff --git a/debugger/util/heapjson_convert.py b/debugger/util/heapjson_convert.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Convert a HeapDump JSON file into a more useful format.
 #

diff --git a/examples/alloc-logging/log2gnuplot.py b/examples/alloc-logging/log2gnuplot.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Analyze allocator logs and write total-bytes-in-use after every
 #  operation to stdout.  The output can be gnuplotted as:

diff --git a/examples/alloc-logging/pool_simulator.py b/examples/alloc-logging/pool_simulator.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Simulate pool allocator behavior against a memory allocation log written
 #  by duk_alloc_logging.c or in matching format.  Provide commands to provide

diff --git a/misc/c_overflow_test.py b/misc/c_overflow_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 
 import math
 

diff --git a/misc/chaos.py b/misc/chaos.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  $ ./duk test-dev-chaos.js | python chaos.py > chaos.raw
 #  $ sox -r 8k -e unsigned -b 8 -c 1 chaos.raw chaos.wav

diff --git a/src/dukutil.py b/src/dukutil.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Python utilities shared by the build scripts.
 #

diff --git a/src/extract_caseconv.py b/src/extract_caseconv.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Extract rules for Unicode case conversion, specifically the behavior
 #  required by Ecmascript E5 in Sections 15.5.4.16 to 15.5.4.19.  The

diff --git a/src/extract_chars.py b/src/extract_chars.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Select a set of Unicode characters (based on included/excluded categories
 #  etc) and write out a compact bitstream for matching a character against

diff --git a/src/genbuildparams.py b/src/genbuildparams.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Generate build parameter files based on build information.
 #  A C header is generated for C code, and a JSON file for

diff --git a/src/genbuiltins.py b/src/genbuiltins.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Generate initialization data for built-in strings and objects.
 #

diff --git a/src/gendoubleconsts.py b/src/gendoubleconsts.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 
 # Double constants, see http://en.wikipedia.org/wiki/Double-precision_floating-point_format.
 # Some double constants have been created with 'python-mpmath'.  The constants are in binary

diff --git a/src/genequivyear.py b/src/genequivyear.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Generate equivalent year table needed by duk_bi_date.c.  Based on:
 #

diff --git a/src/genexesizereport.py b/src/genexesizereport.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Generate a size report from a Duktape library / executable.
 #  Write out useful information about function sizes in a variety

diff --git a/src/genhashsizes.py b/src/genhashsizes.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Find a sequence of duk_hobject hash sizes which have a desired 'ratio'
 #  and are primes.  Prime hash sizes ensure that all probe sequence values

diff --git a/src/gennumdigits.py b/src/gennumdigits.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Generate a table indicating how many digits should be considered
 #  significant for each radix (2 to 36) when doing string-to-number

diff --git a/src/genobjsizereport.py b/src/genobjsizereport.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Size report of (stripped) object and source files.
 #

diff --git a/src/prepare_unicode_data.py b/src/prepare_unicode_data.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  UnicodeData.txt may contain ranges in addition to individual characters.
 #  Unpack the ranges into individual characters for the other scripts to use.

diff --git a/src/scan_used_stridx_bidx.py b/src/scan_used_stridx_bidx.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Scan Duktape code base for references to built-in strings and built-in
 #  objects, i.e. for:

diff --git a/util/autofix_debuglog_calls.py b/util/autofix_debuglog_calls.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Automatically fix one-line broken debug log calls.  Adds a missing
 #  wrapper for such lines, e.g. changes:

diff --git a/util/check_code_policy.py b/util/check_code_policy.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Check various C source code policy rules and issue warnings for offenders
 #

diff --git a/util/combine_src.py b/util/combine_src.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Combine all source and header files in source directory into
 #  a single C file.

diff --git a/util/create_spdx_license.py b/util/create_spdx_license.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Helper to create an SPDX license file (http://spdx.org)
 #

diff --git a/util/ditz_hack.py b/util/ditz_hack.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Throwaway utility to dump Ditz issues for grooming.
 #

diff --git a/util/duk_meta_to_strarray.py b/util/duk_meta_to_strarray.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Create an array of C strings with Duktape built-in strings.
 #  Useful when using external strings.

diff --git a/util/dump_bytecode.py b/util/dump_bytecode.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Utility to dump bytecode into a human readable form.
 #

diff --git a/util/fastint_reps.py b/util/fastint_reps.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Print out a few IEEE double representations related to the Duktape fastint
 #  number model.

diff --git a/util/filter_test262_log.py b/util/filter_test262_log.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 
 import os
 import sys

diff --git a/util/find_func_calls.py b/util/find_func_calls.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Extract function call names from source C/H files.
 #

diff --git a/util/find_non_ascii.py b/util/find_non_ascii.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Example:
 #

diff --git a/util/fix_emscripten.py b/util/fix_emscripten.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Fix a few errors from Emscripten output (stopgap until emscripten mainline
 #  is updated).

diff --git a/util/format_perftest.py b/util/format_perftest.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Format a perftest text dump into a HTML table.
 

diff --git a/util/make_ascii.py b/util/make_ascii.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
 #
 #  Paranoia escape input file to be printable ASCII.
 #