Skip to content

Commit eb85f4d

Browse files
jimmojimmo
committed
examples/natmod: Rename umodule to module.
This work was funded through GitHub Sponsors. Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
1 parent 2eba98f commit eb85f4d

9 files changed

Lines changed: 17 additions & 17 deletions

File tree

examples/natmod/uzlib/Makefile renamed to examples/natmod/heapq/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Location of top-level MicroPython directory
22
MPY_DIR = ../../..
33

4-
# Name of module (different to built-in uzlib so it can coexist)
5-
MOD = uzlib_$(ARCH)
4+
# Name of module (different to built-in heapq so it can coexist)
5+
MOD = heapq_$(ARCH)
66

77
# Source files (.c or .py)
8-
SRC = uzlib.c
8+
SRC = heapq.c
99

1010
# Architecture to build for (x86, x64, armv7m, xtensa, xtensawin)
1111
ARCH = x64

examples/natmod/uheapq/uheapq.c renamed to examples/natmod/heapq/heapq.c

File renamed without changes.

examples/natmod/uheapq/Makefile renamed to examples/natmod/random/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Location of top-level MicroPython directory
22
MPY_DIR = ../../..
33

4-
# Name of module (different to built-in uheapq so it can coexist)
5-
MOD = uheapq_$(ARCH)
4+
# Name of module (different to built-in random so it can coexist)
5+
MOD = random_$(ARCH)
66

77
# Source files (.c or .py)
8-
SRC = uheapq.c
8+
SRC = random.c
99

1010
# Architecture to build for (x86, x64, armv7m, xtensa, xtensawin)
1111
ARCH = x64

examples/natmod/urandom/urandom.c renamed to examples/natmod/random/random.c

File renamed without changes.

examples/natmod/ure/Makefile renamed to examples/natmod/re/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Location of top-level MicroPython directory
22
MPY_DIR = ../../..
33

4-
# Name of module (different to built-in ure so it can coexist)
5-
MOD = ure_$(ARCH)
4+
# Name of module (different to built-in re so it can coexist)
5+
MOD = re_$(ARCH)
66

77
# Source files (.c or .py)
8-
SRC = ure.c
8+
SRC = re.c
99

1010
# Architecture to build for (x86, x64, armv7m, xtensa, xtensawin)
1111
ARCH = x64

examples/natmod/ure/ure.c renamed to examples/natmod/re/re.c

File renamed without changes.

examples/natmod/urandom/Makefile renamed to examples/natmod/zlib/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Location of top-level MicroPython directory
22
MPY_DIR = ../../..
33

4-
# Name of module (different to built-in urandom so it can coexist)
5-
MOD = urandom_$(ARCH)
4+
# Name of module (different to built-in zlib so it can coexist)
5+
MOD = zlib_$(ARCH)
66

77
# Source files (.c or .py)
8-
SRC = urandom.c
8+
SRC = zlib.c
99

1010
# Architecture to build for (x86, x64, armv7m, xtensa, xtensawin)
1111
ARCH = x64

examples/natmod/uzlib/uzlib.c renamed to examples/natmod/zlib/zlib.c

File renamed without changes.

‎tools/ci.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -454,10 +454,10 @@ function ci_native_mpy_modules_build {
454454
make -C examples/natmod/features3 ARCH=$arch
455455
make -C examples/natmod/btree ARCH=$arch
456456
make -C examples/natmod/framebuf ARCH=$arch
457-
make -C examples/natmod/uheapq ARCH=$arch
458-
make -C examples/natmod/urandom ARCH=$arch
459-
make -C examples/natmod/ure ARCH=$arch
460-
make -C examples/natmod/uzlib ARCH=$arch
457+
make -C examples/natmod/heapq ARCH=$arch
458+
make -C examples/natmod/random ARCH=$arch
459+
make -C examples/natmod/re ARCH=$arch
460+
make -C examples/natmod/zlib ARCH=$arch
461461
}
462462

463463
function ci_native_mpy_modules_32bit_build {
@@ -523,7 +523,7 @@ function ci_unix_coverage_run_mpy_merge_tests {
523523

524524
function ci_unix_coverage_run_native_mpy_tests {
525525
MICROPYPATH=examples/natmod/features2 ./ports/unix/build-coverage/micropython -m features2
526-
(cd tests && ./run-natmodtests.py "$@" extmod/{btree*,framebuf*,uheapq*,urandom*,ure*,uzlib*}.py)
526+
(cd tests && ./run-natmodtests.py "$@" extmod/{btree*,framebuf*,heapq*,random*,re*,zlib*}.py)
527527
}
528528

529529
function ci_unix_32bit_setup {

0 commit comments

Comments
 (0)