Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

snapcraft packaging #1241

Merged
merged 1 commit into from
Aug 29, 2024
Merged

snapcraft packaging #1241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/gui/src/cpp/QtTerminal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions modules/terminal/src/cpp/WindowsConsole.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions snap/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion snap/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading