8000 unix: Rename unix binaries to micropython-variant (not _variant). · projectgus/micropython@977b532 · GitHub
[go: up one dir, main page]
Skip to content

Commit 977b532

Browse files
jimmodpgeorge
jimmo
authored and
dpgeorge
committed
unix: Rename unix binaries to micropython-variant (not _variant).
For consistency with mpy-cross, and other unix tools in general.
1 parent 7319d54 commit 977b532

File tree

9 files changed

+24
-29
lines changed

9 files changed

+24
-29
lines changed

‎.travis.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,13 @@ jobs:
7575
- make ${MAKEOPTS} -C ports/unix deplibs
7676
- make ${MAKEOPTS} -C ports/unix VARIANT=coverage
7777
# run the main test suite
78-
- (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests)
79-
- (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -d thread)
80-
- (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --emit native)
81-
- (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --via-mpy -d basics float micropython)
82-
- (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --via-mpy --emit native -d basics float micropython)
78+
- (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests)
79+
- (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests -d thread)
80+
- (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests --emit native)
81+
- (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests --via-mpy -d basics float micropython)
82+
- (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests --via-mpy --emit native -d basics float micropython)
8383
# test when input script comes from stdin
84-
- cat tests/basics/0prelim.py | ports/unix/micropython_coverage | grep -q 'abc'
84+
- cat tests/basics/0prelim.py | ports/unix/micropython-coverage | grep -q 'abc'
8585
# test building native mpy modules
8686
- make -C examples/natmod/features1 ARCH=x64
8787
- make -C examples/natmod/features2 ARCH=x64
@@ -92,7 +92,7 @@ jobs:
9292
- make -C examples/natmod/ure ARCH=x64
9393
- make -C examples/natmod/uzlib ARCH=x64
9494
# test importing .mpy generated by mpy_ld.py
95-
- MICROPYPATH=examples/natmod/features2 ./ports/unix/micropython_coverage -m features2
95+
- MICROPYPATH=examples/natmod/features2 ./ports/unix/micropython-coverage -m features2
9696
- (cd tests && ./run-natmodtests.py extmod/{btree*,framebuf*,uheapq*,ure*,uzlib*}.py)
9797
# run coveralls coverage analysis (try to, even if some builds/tests failed)
9898
- (cd ports/unix && coveralls --root ../.. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod)
@@ -115,13 +115,13 @@ jobs:
115115
- make ${MAKEOPTS} -C ports/unix MICROPY_FORCE_32BIT=1 deplibs
116116
- make ${MAKEOPTS} -C ports/unix MICROPY_FORCE_32BIT=1 coverage
117117
# run the main test suite
118-
- (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests)
119-
- (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -d thread)
120-
- (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --emit native)
121-
- (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --via-mpy --mpy-cross-flags='-mcache-lookup-bc -march=x86' -d basics float micropython)
122-
- (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --via-mpy --emit native --mpy-cross-flags='-mcache-lookup-bc -march=x86' -d basics float micropython)
118+
- (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests)
119+
- (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests -d thread)
120+
- (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests --emit native)
121+
- (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests --via-mpy --mpy-cross-flags='-mcache-lookup-bc -march=x86' -d basics float micropython)
122+
- (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests --via-mpy --emit native --mpy-cross-flags='-mcache-lookup-bc -march=x86' -d basics float micropython)
123123
# test when input script comes from stdin
124-
- cat tests/basics/0prelim.py | ports/unix/micropython_coverage | grep -q 'abc'
124+
- cat tests/basics/0prelim.py | ports/unix/micropython-coverage | grep -q 'abc'
125125
# test building native mpy modules
126126
- make -C examples/natmod/features1 ARCH=x86
127127
- make -C examples/natmod/features2 ARCH=x86
@@ -132,7 +132,7 @@ jobs:
132132
- make -C examples/natmod/ure ARCH=x86
133133
- make -C examples/natmod/uzlib ARCH=x86
134134
# test importing .mpy generated by mpy_ld.py
135-
- MICROPYPATH=examples/natmod/features2 ./ports/unix/micropython_coverage -m features2
135+
- MICROPYPATH=examples/natmod/features2 ./ports/unix/micropython-coverage -m features2
136136
- (cd tests && ./run-natmodtests.py --arch x86 extmod/{btree*,framebuf*,uheapq*,ure*,uzlib*}.py)
137137
after_failure:
138138
- (cd tests && for exp in *.exp; do testbase=$(basename $exp .exp); echo -e "\nFAILURE $testbase"; diff -u $testbase.exp $testbase.out; done)
@@ -158,7 +158,7 @@ jobs:
158158
- make ${MAKEOPTS} -C ports/unix submodules
159159
- make ${MAKEOPTS} -C ports/unix PYTHON=python2 deplibs
160160
- make ${MAKEOPTS} -C ports/unix PYTHON=python2 VARIANT=nanbox
161-
- (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_nanbox ./run-tests)
161+
- (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-nanbox ./run-tests)
162162

163163
# unix stackless
164164
- stage: test
@@ -187,7 +187,7 @@ jobs:
187187
env: NAME="minimal unix port build and tests"
188188
script:
189189
- make ${MAKEOPTS} -C ports/unix minimal
190-
- (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_minimal ./run-tests -e exception_chain -e self_type_check -e subclass_native_init -d basics)
190+
- (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-minimal ./run-tests -e exception_chain -e self_type_check -e subclass_native_init -d basics)
191191

192192
# windows port via mingw
193193
- stage: test

‎ports/unix/.gitignore

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
micropython
2-
micropython_dev
3-
micropython_fast
4-
micropython_minimal
5-
micropython_coverage
6-
micropython_nanbox
7-
micropython_freedos*
2+
micropython-*
83
*.py
94
*.gcov

‎ports/unix/variants/coverage/mpconfigvariant.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
PROG ?= micropython_coverage
1+
PROG ?= micropython-coverage
22

33
COPT = -O0
44

‎ports/unix/variants/dev/mpconfigvariant.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
PROG ?= micropython_dev
1+
PROG ?= micropython-dev

‎ports/unix/variants/fast/mpconfigvariant.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
COPT = "-O2 -DNDEBUG -fno-crossjumping"
44

5-
PROG = micropython_fast
5+
PROG = micropython-fast
66

77
FROZEN_MANIFEST =

‎ports/unix/variants/freedos/mpconfigvariant.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ CFLAGS_EXTRA = \
1010
-DMICROPY_EMIT_X86=0 \
1111
-DMICROPY_NO_ALLOCA=1 \
1212

13-
PROG = micropython_freedos
13+
PROG = micropython-freedos
1414

1515
MICROPY_PY_SOCKET = 0
1616
MICROPY_PY_FFI = 0

‎ports/unix/variants/minimal/mpconfigvariant.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# build a minimal interpreter
22
COPT = -Os -DNDEBUG
33

4-
PROG = micropython_minimal
4+
PROG = micropython-minimal
55

66
FROZEN_MANIFEST =
77

‎ports/unix/variants/nanbox/mpconfigvariant.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# build interpreter with nan-boxing as object model (object repr D)
2-
PROG = micropython_nanbox
2+
PROG = micropython-nanbox
33

44
MICROPY_FORCE_32BIT = 1

‎tests/run-natmodtests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
# Paths for host executables
1616
CPYTHON3 = os.getenv('MICROPY_CPYTHON3', 'python3')
17-
MICROPYTHON = os.getenv('MICROPY_MICROPYTHON', '../ports/unix/micropython_coverage')
17+
MICROPYTHON = os.getenv('MICROPY_MICROPYTHON', '../ports/unix/micropython-coverage')
1818

1919
NATMOD_EXAMPLE_DIR = '../examples/natmod/'
2020

0 commit comments

Comments
 (0)
0