diff options
| author | Vadim Yanitskiy <axilirator@gmail.com> | 2018-07-02 20:28:55 +0700 |
|---|---|---|
| committer | Vadim Yanitskiy <axilirator@gmail.com> | 2018-07-02 20:30:31 +0700 |
| commit | 94c0031297abb0bb42a4ea23e68f944622f50469 (patch) | |
| tree | 5e2382f50bdb9b26ddc27e058c2c3dcd87cc2ab6 | |
| parent | bc568d0b9f216f8d3c26b888131f4a9a7e9d368d (diff) | |
Don't enforce Python 2 for utilities
The conv_gen.py utility was tested against both Python 2 and 3,
so there is no need to enforce Python 2. Also, having:
#!/usr/local/bin/python{2|3}
is a bad idea, because Python may be installed in a different location.
Change-Id: I6007d481047b584db13d6eda70fb99f11f9ddaa1
| -rw-r--r-- | include/Makefile.am | 2 | ||||
| -rw-r--r-- | src/gsm/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | utils/conv_codes_gsm.py | 3 | ||||
| -rw-r--r-- | utils/conv_gen.py | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 27a40908..38ba14cd 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -162,7 +162,7 @@ osmocom/core/crc%gen.h: osmocom/core/crcXXgen.h.tpl $(AM_V_GEN)sed -e's/XX/$*/g' $< > $@ osmocom/gsm/gsm0503.h: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py - $(AM_V_GEN)python2 $(top_srcdir)/utils/conv_gen.py gen_header gsm \ + $(AM_V_GEN)python $(top_srcdir)/utils/conv_gen.py gen_header gsm \ --target-path $(builddir)/osmocom/gsm CLEANFILES = osmocom/gsm/gsm0503.h diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index 0439ce62..5387e3ab 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -47,6 +47,6 @@ EXTRA_DIST = libosmogsm.map # Convolutional codes generation gsm0503_conv.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py - $(AM_V_GEN)python2 $(top_srcdir)/utils/conv_gen.py gen_codes gsm + $(AM_V_GEN)python $(top_srcdir)/utils/conv_gen.py gen_codes gsm CLEANFILES = gsm0503_conv.c diff --git a/tests/Makefile.am b/tests/Makefile.am index 70b5cb81..db4e5203 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -280,5 +280,5 @@ $(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4 mv $@.tmp $@ conv/gsm0503_test_vectors.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py - $(AM_V_GEN)python2 $(top_srcdir)/utils/conv_gen.py gen_vectors gsm \ + $(AM_V_GEN)python $(top_srcdir)/utils/conv_gen.py gen_vectors gsm \ --target-path $(builddir)/conv diff --git a/utils/conv_codes_gsm.py b/utils/conv_codes_gsm.py index eeed4fd0..ec776605 100644 --- a/utils/conv_codes_gsm.py +++ b/utils/conv_codes_gsm.py @@ -1,5 +1,6 @@ -#!/usr/bin/python2 +#!/usr/bin/env python # -*- coding: utf-8 -*- + from conv_gen import ConvolutionalCode from conv_gen import poly diff --git a/utils/conv_gen.py b/utils/conv_gen.py index 6b6b2677..06283d87 100644 --- a/utils/conv_gen.py +++ b/utils/conv_gen.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/env python mod_license = """ /* |