From 5aca68e50cf97db7b976867daed9c46ba3adc080 Mon Sep 17 00:00:00 2001
From: Jan Pochyla <jpochyla@gmail.com>
Date: Tue, 17 Dec 2019 19:24:08 +0100
Subject: [PATCH] core: generate moduledefs.h for micropython

---
 core/SConscript.firmware | 28 +++++++++++++++++++---------
 core/SConscript.unix     | 28 +++++++++++++++++++---------
 2 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/core/SConscript.firmware b/core/SConscript.firmware
index a58aa9af6..ae928546e 100644
--- a/core/SConscript.firmware
+++ b/core/SConscript.firmware
@@ -401,15 +401,6 @@ env.Replace(
     MPY_CROSS='vendor/micropython/mpy-cross/mpy-cross -O' + PYOPT
 )
 
-#
-# Micropython version
-#
-
-hdr_version = env.Command(
-    target='genhdr/mpversion.h',
-    source='',
-    action='$MAKEVERSIONHDR $TARGET', )
-
 #
 # Qstrings
 #
@@ -428,6 +419,25 @@ qstr_generated = env.GenerateQstrDefs(
 
 env.Ignore(qstr_collected, qstr_generated)
 
+#
+# Micropython version and modules
+#
+
+hdr_version = env.Command(
+    target='genhdr/mpversion.h',
+    source='',
+    action='$MAKEVERSIONHDR $TARGET', )
+
+hdr_moduledefs = env.Command(
+    target='genhdr/moduledefs.h',
+    source=SOURCE_QSTR,
+    action='$MAKEMODULEDEFS --vpath="." $SOURCES > $TARGET', )
+
+env.Ignore(hdr_moduledefs, hdr_moduledefs)
+env.Ignore(hdr_moduledefs, qstr_collected)
+env.Ignore(hdr_moduledefs, qstr_preprocessed)
+env.Ignore(hdr_moduledefs, qstr_generated)
+
 #
 # Frozen modules
 #
diff --git a/core/SConscript.unix b/core/SConscript.unix
index f3d86722a..a9286a61d 100644
--- a/core/SConscript.unix
+++ b/core/SConscript.unix
@@ -364,15 +364,6 @@ env.Replace(
     MPY_CROSS='vendor/micropython/mpy-cross/mpy-cross -O' + PYOPT
 )
 
-#
-# Micropython version
-#
-
-hdr_version = env.Command(
-    target='genhdr/mpversion.h',
-    source='',
-    action='$MAKEVERSIONHDR $TARGET', )
-
 #
 # Qstrings
 #
@@ -391,6 +382,25 @@ qstr_generated = env.GenerateQstrDefs(
 
 env.Ignore(qstr_collected, qstr_generated)
 
+#
+# Micropython version and modules
+#
+
+hdr_version = env.Command(
+    target='genhdr/mpversion.h',
+    source='',
+    action='$MAKEVERSIONHDR $TARGET', )
+
+hdr_moduledefs = env.Command(
+    target='genhdr/moduledefs.h',
+    source=SOURCE_QSTR,
+    action='$MAKEMODULEDEFS --vpath="." $SOURCES > $TARGET', )
+
+env.Ignore(hdr_moduledefs, hdr_moduledefs)
+env.Ignore(hdr_moduledefs, qstr_collected)
+env.Ignore(hdr_moduledefs, qstr_preprocessed)
+env.Ignore(hdr_moduledefs, qstr_generated)
+
 #
 # Frozen modules
 #