Merge branch 'release-2.1.x' to fix common last bug

# Conflicts: # VERSION.txt # aseba/launcher/src/tdmsupervisor.cpp # azure-pipelines.yml # osx/launcher.entitlements
Mobsya · Mar 15, 2021 · ce2defe · ce2defe
2 parents 6a55742 + b9c5fde
commit ce2defe
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 9 deletions.
diff --git a/aseba/clients/studio/NodeTab.cpp b/aseba/clients/studio/NodeTab.cpp
@@ -334,7 +334,7 @@ void NodeTab::updateMemoryUsage(const mobsya::CompilationResult& res) {
         const QString bytecodeText =
             tr("bytecode: %1/%2 (%3 %)")
                 .arg(res.bytecode_size())
-                .arg(res.variables_total_size())
+                .arg(res.bytecode_total_size())
                 .arg((double)res.bytecode_size() * 100. / res.bytecode_total_size(), 0, 'f', 1);
         memoryUsageText->setText(trUtf8("<b>Memory usage</b> : %1, %2").arg(variableText).arg(bytecodeText));
     }
@@ -1110,4 +1110,4 @@ void NodeTab::showEvent(QShowEvent*) {
 }
 
 
-}  // namespace Aseba
+}  // namespace Aseba
diff --git a/aseba/launcher/src/tdmsupervisor.cpp b/aseba/launcher/src/tdmsupervisor.cpp
@@ -6,7 +6,11 @@
 
 namespace mobsya {
 
+#ifdef Q_OS_OSX
 static const auto tdm_program_name = QByteArrayLiteral("../Helpers/thymio-device-manager");
+#else
+static const auto tdm_program_name = QByteArrayLiteral("../Helpers/thymio-device-manager");
+#endif
 static const auto max_launch_count = 10;
 
 TDMSupervisor::TDMSupervisor(const Launcher& launcher, QObject* parent)

diff --git a/aseba/thymio-device-manager/aseba_node_registery.cpp b/aseba/thymio-device-manager/aseba_node_registery.cpp
@@ -138,10 +138,9 @@ void aseba_node_registery::on_update_discovery_complete(const boost::system::err
         mLogError("Discovery : {}", ec.message());
 		m_discovery_needs_update = true;
     } else {
-        mLogTrace("Discovery : update complete");
-		m_updating_discovery = false;
+        mLogTrace("Discovery : update complete");		
     }
-
+	m_updating_discovery = false;
     if(m_discovery_needs_update) {
         boost::asio::post(boost::asio::get_associated_executor(this),
                           boost::bind(&aseba_node_registery::update_discovery, this));

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -251,7 +251,6 @@ jobs:
       pathtoPublish: '$(Build.ArtifactStagingDirectory)'
       artifactName: 'ThymioSuite.dmg'
 
-
 - job: BuildForIOs
   pool:
     vmImage: 'macOS-10.14'

diff --git a/flatpak/org.mobsya.ThymioSuite.json b/flatpak/org.mobsya.ThymioSuite.json
@@ -94,7 +94,7 @@
                 {
                     "type": "archive",
                     "url": "https://github.com/Mobsya/ci-data/releases/download/data/vpl3-thymio-suite.tar.gz",
-                    "sha256": "aa00de26b873c604eeb077ff492dfc3a8a6cfe3eb6b9f26e785fa09fae4bda04",
+                    "sha256": "6cba8188b3f87927f5026646b80506566cdcaa49ae36080ce0ae404ed40b77de",
                     "strip-components": 0
                 }
             ],

diff --git a/osx/device-manager.entitlements b/osx/device-manager.entitlements
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>com.apple.security.app-sandbox</key>
+        <true/>
+        <key>com.apple.security.device.serial</key>
+        <true/>
+        <key>com.apple.security.network.client</key>
+        <true/>
+        <key>com.apple.security.network.server</key>
+        <true/>
+		<key>com.apple.security.files.user-selected.read-write</key>
+        <true/>
+    </dict>
+</plist>
diff --git a/osx/launcher.entitlements b/osx/launcher.entitlements
@@ -9,6 +9,8 @@
         <key>com.apple.security.network.client</key>
         <true/>
         <key>com.apple.security.network.server</key>
+        <true/>
+		<key>com.apple.security.files.user-selected.read-write</key>
         <true/>
 		<key>com.apple.security.cs.allow-dyld-environment-variables</key>
 		<true/>

diff --git a/windows/NSIS.template.in b/windows/NSIS.template.in
@@ -241,10 +241,10 @@ Section "-Install the driver" InstDriver	; Hidden section -> always executed
 
 	${If} ${RunningX64}
 		DetailPrint $(STR_Drv_64bits)
-		ExecWait '"$INSTDIR\drivers\dpinst64.exe" /c /sa /lm /sw /PATH "$INSTDIR\drivers"' $0
+		ExecWait '"$INSTDIR\drivers\dpinst64.exe" /c /sa /lm /s /PATH "$INSTDIR\drivers"' $0
 	${Else}
 		DetailPrint $(STR_Drv_32bits)
-		ExecWait '"$INSTDIR\drivers\dpinst32.exe" /c /sa /lm /sw /PATH "$INSTDIR\drivers"' $0
+		ExecWait '"$INSTDIR\drivers\dpinst32.exe" /c /sa /lm /s /PATH "$INSTDIR\drivers"' $0
 	${EndIf}
 	DetailPrint "$(STR_Drv_Return_Code) $0"
 	IntCmpU $0 0x80000000 drv_error no_error drv_error

diff --git a/windows/thymio-drivers/dpinst32.exe b/windows/thymio-drivers/dpinst32.exe
diff --git a/windows/thymio-drivers/dpinst64.exe b/windows/thymio-drivers/dpinst64.exe
diff --git a/windows/thymio-drivers/drivers/win_8/mchpcdc.cat b/windows/thymio-drivers/drivers/win_8/mchpcdc.cat
diff --git a/windows/thymio-drivers/drivers/win_8/mchpcdcw.cat b/windows/thymio-drivers/drivers/win_8/mchpcdcw.cat