djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mpy-cross: Add --version command line option to print version info.

Browse Source 
Prints something like:

MicroPython v1.10-304-g8031b7a25 on 2019-05-02; mpy-cross emitting mpy v4
This commit is contained in:
Damien George 2019-05-02 09:59:21 +10:00
parent 6323cbda4f
commit 7e90e22ea5
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mpy-cross/main.c
View File

@ -34,6 +34,7 @@
#include "py/runtime.h" #include "py/runtime.h"
#include "py/gc.h" #include "py/gc.h"
#include "py/stackctrl.h" #include "py/stackctrl.h"
#include "genhdr/mpversion.h"
#ifdef _WIN32 #ifdef _WIN32
#include "ports/windows/fmode.h" #include "ports/windows/fmode.h"
#endif #endif
@ -98,6 +99,7 @@ STATIC int usage(char **argv) {
printf( printf(
"usage: %s [<opts>] [-X <implopt>] <input filename>\n" "usage: %s [<opts>] [-X <implopt>] <input filename>\n"
"Options:\n" "Options:\n"
"--version : show version information\n"
"-o : output file for compiled bytecode (defaults to input with .mpy extension)\n" "-o : output file for compiled bytecode (defaults to input with .mpy extension)\n"
"-s : source filename to embed in the compiled bytecode (defaults to input file)\n" "-s : source filename to embed in the compiled bytecode (defaults to input file)\n"
"-v : verbose (trace various operations); can be multiple\n" "-v : verbose (trace various operations); can be multiple\n"
@ -211,6 +213,10 @@ MP_NOINLINE int main_(int argc, char **argv) {
if (argv[a][0] == '-') { if (argv[a][0] == '-') {
if (strcmp(argv[a], "-X") == 0) { if (strcmp(argv[a], "-X") == 0) {
a += 1; a += 1;
} else if (strcmp(argv[a], "--version") == 0) {
printf("MicroPython " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE
"; mpy-cross emitting mpy v" MP_STRINGIFY(MPY_VERSION) "\n");
return 0;
} else if (strcmp(argv[a], "-v") == 0) { } else if (strcmp(argv[a], "-v") == 0) {
mp_verbose_flag++; mp_verbose_flag++;
} else if (strncmp(argv[a], "-O", 2) == 0) { } else if (strncmp(argv[a], "-O", 2) == 0) {

3
py/persistentcode.c
View File

@ -40,9 +40,6 @@
#define QSTR_LAST_STATIC MP_QSTR_zip #define QSTR_LAST_STATIC MP_QSTR_zip
// The current version of .mpy files
#define MPY_VERSION (4)
// Macros to encode/decode flags to/from the feature byte // Macros to encode/decode flags to/from the feature byte
#define MPY_FEATURE_ENCODE_FLAGS(flags) (flags) #define MPY_FEATURE_ENCODE_FLAGS(flags) (flags)
#define MPY_FEATURE_DECODE_FLAGS(feat) ((feat) & 3) #define MPY_FEATURE_DECODE_FLAGS(feat) ((feat) & 3)

3
py/persistentcode.h
View File

@ -30,6 +30,9 @@
#include "py/reader.h" #include "py/reader.h"
#include "py/emitglue.h" #include "py/emitglue.h"
// The current version of .mpy files
#define MPY_VERSION 4
enum { enum {
MP_NATIVE_ARCH_NONE = 0, MP_NATIVE_ARCH_NONE = 0,
MP_NATIVE_ARCH_X86, MP_NATIVE_ARCH_X86,