snapcraft packaging (#1241)

nelson-lang · Aug 29, 2024 · 15d54e6 · 15d54e6
1 parent e60c97b
commit 15d54e6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/modules/gui/src/cpp/QtTerminal.cpp b/modules/gui/src/cpp/QtTerminal.cpp
@@ -261,7 +261,7 @@ QtTerminal::getLine(const std::wstring& prompt)
         return L"\n";
     }
     eval->commandQueue.clear();
-    CallbackQueue::getInstance()->clear();
+    Nelson::CallbackQueue::getInstance()->clear();
 
     bool wasInterruptedByAction = false;
 
@@ -275,7 +275,7 @@ QtTerminal::getLine(const std::wstring& prompt)
             break;
         }
 
-        if (!eval->commandQueue.isEmpty() || !CallbackQueue::getInstance()->isEmpty()) {
+        if (!eval->commandQueue.isEmpty() || !Nelson::CallbackQueue::getInstance()->isEmpty()) {
             wasInterruptedByAction = true;
             break;
         }

diff --git a/modules/terminal/src/cpp/WindowsConsole.cpp b/modules/terminal/src/cpp/WindowsConsole.cpp
@@ -441,7 +441,7 @@ WindowsConsole::getCharacter(bool& bIsAction)
         void* veval = NelsonConfiguration::getInstance()->getMainEvaluator();
         Nelson::Evaluator* eval = (Nelson::Evaluator*)veval;
         eval->commandQueue.clear();
-        CallbackQueue::getInstance()->clear();
+        Nelson::CallbackQueue::getInstance()->clear();
         while (TRUE) {
             ::WaitForSingleObject(Win32InputStream, 30);
             DWORD nbEventsAvailable = 0;
@@ -457,7 +457,7 @@ WindowsConsole::getCharacter(bool& bIsAction)
                     bInterruptGetChar = true;
                 }
             }
-            if (!eval->commandQueue.isEmpty() || !CallbackQueue::getInstance()->isEmpty()
+            if (!eval->commandQueue.isEmpty() || !Nelson::CallbackQueue::getInstance()->isEmpty()
                 || bInterruptGetChar) {
                 bIsAction = true;
                 bInterruptGetChar = false;

diff --git a/snap/readme.md b/snap/readme.md
@@ -15,7 +15,7 @@ sudo snapcraft --destructive-mode  --verbose
 # Test locally
 
 ```
-sudo snap install nelson_1.6.0.0_amd64.snap --dangerous
+sudo snap install nelson_1.7.0.0_amd64.snap --dangerous
 ```
 
 Debug:
@@ -27,7 +27,7 @@ snap run --shell nelson.nelson
 # Push
 
 ```
-snapcraft upload nelson_1.6.0.0_amd64.snap
+snapcraft upload nelson_1.7.0.0_amd64.snap
 ```
 
 # Connection

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -74,7 +74,7 @@ parts:
       DESTDIR=$CRAFT_PART_INSTALL cmake --build . -- install
 
       craftctl set grade=stable
-      craftctl set version=1.6.0.0
+      craftctl set version=1.7.0.0
       rm -rf $CRAFT_PART_INSTALL/usr/share/perl5/XML/
       rm -rf $CRAFT_PART_INSTALL/usr/share/texmf