summaryrefslogtreecommitdiffstatshomepage
path: root/py
diff options
context:
space:
mode:
Diffstat (limited to 'py')
-rw-r--r--py/makeversionhdr.py91
-rw-r--r--py/modsys.c20
-rw-r--r--py/mpconfig.h32
3 files changed, 81 insertions, 62 deletions
diff --git a/py/makeversionhdr.py b/py/makeversionhdr.py
index e682a4e139..2030bb02c4 100644
--- a/py/makeversionhdr.py
+++ b/py/makeversionhdr.py
@@ -13,6 +13,14 @@ import datetime
import subprocess
+# The MicroPython repository tags a release commit as "vX.Y.Z", and the commit
+# immediately following as "vX.(Y+1).Z-preview".
+# This function will return:
+# "vX.Y.Z" -- building at the release commit
+# "vX.Y.Z-preview" -- building at the first commit in the next cycle
+# "vX.Y.Z-preview.N.gHASH" -- building at any subsequent commit in the cycle
+# "vX.Y.Z-preview.N.gHASH.dirty" -- building at any subsequent commit in the cycle
+# with local changes
def get_version_info_from_git(repo_path):
# Python 2.6 doesn't have check_output, so check for that
try:
@@ -29,47 +37,33 @@ def get_version_info_from_git(repo_path):
stderr=subprocess.STDOUT,
universal_newlines=True,
).strip()
- except subprocess.CalledProcessError as er:
- if er.returncode == 128:
- # git exit code of 128 means no repository found
- return None
- git_tag = ""
- except OSError:
- return None
- try:
- git_hash = subprocess.check_output(
- ["git", "rev-parse", "--short", "HEAD"],
- cwd=repo_path,
- stderr=subprocess.STDOUT,
- universal_newlines=True,
- ).strip()
+ # Turn git-describe's output into semver compatible (dot-separated
+ # identifiers inside the prerelease field).
+ git_tag = git_tag.split("-", 1)
+ if len(git_tag) == 1:
+ return git_tag[0]
+ else:
+ return git_tag[0] + "-" + git_tag[1].replace("-", ".")
except subprocess.CalledProcessError:
- git_hash = "unknown"
- except OSError:
return None
-
- try:
- # Check if there are any modified files.
- subprocess.check_call(
- ["git", "diff", "--no-ext-diff", "--quiet", "--exit-code"],
- cwd=repo_path,
- stderr=subprocess.STDOUT,
- )
- # Check if there are any staged files.
- subprocess.check_call(
- ["git", "diff-index", "--cached", "--quiet", "HEAD", "--"],
- cwd=repo_path,
- stderr=subprocess.STDOUT,
- )
- except subprocess.CalledProcessError:
- git_hash += "-dirty"
except OSError:
return None
- return git_tag, git_hash
-
+# When building from a source tarball (or any situation where the git repo
+# isn't available), this function will use the info in mpconfig.h as a
+# fallback. The release commit sets MICROPY_VERSION_PRERELEASE to 0, and the
+# commit immediately following increments MICROPY_VERSION_MINOR and sets
+# MICROPY_VERSION_PRERELEASE back to 1.
+# This function will return:
+# "vX.Y.Z" -- building at the release commit
+# "vX.Y.Z-preview" -- building at any other commit
def get_version_info_from_mpconfig(repo_path):
+ print(
+ "makeversionhdr.py: Warning: No git repo or tag info available, falling back to mpconfig.h version info.",
+ file=sys.stderr,
+ )
+
with open(os.path.join(repo_path, "py", "mpconfig.h")) as f:
for line in f:
if line.startswith("#define MICROPY_VERSION_MAJOR "):
@@ -78,21 +72,30 @@ def get_version_info_from_mpconfig(repo_path):
ver_minor = int(line.strip().split()[2])
elif line.startswith("#define MICROPY_VERSION_MICRO "):
ver_micro = int(line.strip().split()[2])
- git_tag = "v%d.%d.%d" % (ver_major, ver_minor, ver_micro)
- return git_tag, "<no hash>"
+ elif line.startswith("#define MICROPY_VERSION_PRERELEASE "):
+ ver_prerelease = int(line.strip().split()[2])
+ git_tag = "v%d.%d.%d%s" % (
+ ver_major,
+ ver_minor,
+ ver_micro,
+ "-preview" if ver_prerelease else "",
+ )
+ return git_tag
return None
def make_version_header(repo_path, filename):
- info = None
+ git_tag = None
if "MICROPY_GIT_TAG" in os.environ:
- info = [os.environ["MICROPY_GIT_TAG"], os.environ["MICROPY_GIT_HASH"]]
- if info is None:
- info = get_version_info_from_git(repo_path)
- if info is None:
- info = get_version_info_from_mpconfig(repo_path)
+ git_tag = os.environ["MICROPY_GIT_TAG"]
+ if git_tag is None:
+ git_tag = get_version_info_from_git(repo_path)
+ if git_tag is None:
+ git_tag = get_version_info_from_mpconfig(repo_path)
- git_tag, git_hash = info
+ if not git_tag:
+ print("makeversionhdr.py: Error: No version information available.")
+ sys.exit(1)
build_date = datetime.date.today()
if "SOURCE_DATE_EPOCH" in os.environ:
@@ -104,11 +107,9 @@ def make_version_header(repo_path, filename):
file_data = """\
// This file was generated by py/makeversionhdr.py
#define MICROPY_GIT_TAG "%s"
-#define MICROPY_GIT_HASH "%s"
#define MICROPY_BUILD_DATE "%s"
""" % (
git_tag,
- git_hash,
build_date.strftime("%Y-%m-%d"),
)
diff --git a/py/modsys.c b/py/modsys.c
index 38105ee218..e40542467b 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -59,16 +59,24 @@ const mp_print_t mp_sys_stdout_print = {&mp_sys_stdout_obj, mp_stream_write_adap
STATIC const MP_DEFINE_STR_OBJ(mp_sys_version_obj, "3.4.0; " MICROPY_BANNER_NAME_AND_VERSION);
// version_info - Python language version that this implementation conforms to, as a tuple of ints
-#define I(n) MP_OBJ_NEW_SMALL_INT(n)
-// TODO: CPython is now at 5-element array, but save 2 els so far...
-STATIC const mp_obj_tuple_t mp_sys_version_info_obj = {{&mp_type_tuple}, 3, {I(3), I(4), I(0)}};
+// TODO: CPython is now at 5-element array (major, minor, micro, releaselevel, serial), but save 2 els so far...
+STATIC const mp_rom_obj_tuple_t mp_sys_version_info_obj = {{&mp_type_tuple}, 3, {MP_ROM_INT(3), MP_ROM_INT(4), MP_ROM_INT(0)}};
// sys.implementation object
// this holds the MicroPython version
-STATIC const mp_obj_tuple_t mp_sys_implementation_version_info_obj = {
+STATIC const mp_rom_obj_tuple_t mp_sys_implementation_version_info_obj = {
{&mp_type_tuple},
- 3,
- { I(MICROPY_VERSION_MAJOR), I(MICROPY_VERSION_MINOR), I(MICROPY_VERSION_MICRO) }
+ 4,
+ {
+ MP_ROM_INT(MICROPY_VERSION_MAJOR),
+ MP_ROM_INT(MICROPY_VERSION_MINOR),
+ MP_ROM_INT(MICROPY_VERSION_MICRO),
+ #if MICROPY_VERSION_PRERELEASE
+ MP_ROM_QSTR(MP_QSTR_preview),
+ #else
+ MP_ROM_QSTR(MP_QSTR_),
+ #endif
+ }
};
STATIC const MP_DEFINE_STR_OBJ(mp_sys_implementation_machine_obj, MICROPY_BANNER_MACHINE);
#if MICROPY_PERSISTENT_CODE_LOAD
diff --git a/py/mpconfig.h b/py/mpconfig.h
index eb3a0eb736..a36f9658fb 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -26,22 +26,32 @@
#ifndef MICROPY_INCLUDED_PY_MPCONFIG_H
#define MICROPY_INCLUDED_PY_MPCONFIG_H
-// Current version of MicroPython
+// Current version of MicroPython. This is used by sys.implementation.version
+// as well as a fallback to generate MICROPY_GIT_TAG if the git repo or tags
+// are unavailable.
#define MICROPY_VERSION_MAJOR 1
-#define MICROPY_VERSION_MINOR 21
+#define MICROPY_VERSION_MINOR 22
#define MICROPY_VERSION_MICRO 0
-
-// Combined version as a 32-bit number for convenience
-#define MICROPY_VERSION ( \
- MICROPY_VERSION_MAJOR << 16 \
- | MICROPY_VERSION_MINOR << 8 \
- | MICROPY_VERSION_MICRO)
-
-// String version
-#define MICROPY_VERSION_STRING \
+#define MICROPY_VERSION_PRERELEASE 1
+
+// Combined version as a 32-bit number for convenience to allow version
+// comparison. Doesn't include prerelease state.
+// e.g. #if MICROPY_VERSION < MICROPY_MAKE_VERSION(1, 22, 0)
+#define MICROPY_MAKE_VERSION(major, minor, patch) (major << 16 | minor << 8 | patch)
+#define MICROPY_VERSION MICROPY_MAKE_VERSION(MICROPY_VERSION_MAJOR, MICROPY_VERSION_MINOR, MICROPY_VERSION_MICRO)
+
+// String version. This is only used directly for platform.platform and
+// os.uname().release. All other version info available in the firmware (e.g.
+// the REPL banner) comes from MICROPY_GIT_TAG.
+#define MICROPY_VERSION_STRING_BASE \
MP_STRINGIFY(MICROPY_VERSION_MAJOR) "." \
MP_STRINGIFY(MICROPY_VERSION_MINOR) "." \
MP_STRINGIFY(MICROPY_VERSION_MICRO)
+#if MICROPY_VERSION_PRERELEASE
+#define MICROPY_VERSION_STRING MICROPY_VERSION_STRING_BASE "-preview"
+#else
+#define MICROPY_VERSION_STRING MICROPY_VERSION_STRING_BASE
+#endif
// This file contains default configuration settings for MicroPython.
// You can override any of the options below using mpconfigport.h file
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-03 17:10:14 +0000