Skip to content

Commit b93c918

Browse files
committed
[omega] 1.23.0
2 parents 6f79783 + cf33f84 commit b93c918

File tree

248 files changed

+3565
-1892
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

248 files changed

+3565
-1892
lines changed

.github/workflows/ci-workflow.yml

+8
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@ jobs:
129129
submodules: 'recursive'
130130
- run: pacman -S --noconfirm mingw-w64-x86_64-gcc mingw-w64-x86_64-freetype mingw-w64-x86_64-pkg-config make mingw-w64-x86_64-python3 mingw-w64-x86_64-libjpeg-turbo mingw-w64-x86_64-libpng
131131
- run: make -j2 PLATFORM=simulator
132+
- run: make -j2 PLATFORM=simulator test.exe
133+
- run: cmd /c output\release\simulator\windows\test.exe --headless
132134
- uses: actions/upload-artifact@master
133135
with:
134136
name: epsilon-windows.exe
@@ -143,6 +145,8 @@ jobs:
143145
with:
144146
submodules: 'recursive'
145147
- run: make -j2 PLATFORM=simulator TARGET=web
148+
- run: make -j2 PLATFORM=simulator TARGET=web test.js
149+
- run: node output/release/simulator/web/test.js --headless
146150
- uses: actions/upload-artifact@master
147151
with:
148152
name: epsilon-web.zip
@@ -155,6 +159,8 @@ jobs:
155159
with:
156160
submodules: 'recursive'
157161
- run: make -j2 PLATFORM=simulator
162+
- run: make -j2 PLATFORM=simulator test.bin
163+
- run: output/release/simulator/linux/test.bin --headless
158164
- uses: actions/upload-artifact@master
159165
with:
160166
name: epsilon-linux.bin
@@ -168,6 +174,8 @@ jobs:
168174
with:
169175
submodules: 'recursive'
170176
- run: make -j2 PLATFORM=simulator
177+
- run: make -j2 PLATFORM=simulator ARCH=x86_64 test.bin
178+
- run: output/release/simulator/macos/x86_64/test.bin --headless
171179
- uses: actions/upload-artifact@master
172180
with:
173181
name: epsilon-macos.zip

.github/workflows/unit-workflow.yml

-14
This file was deleted.

.gitlab-ci.yml

-26
This file was deleted.

apps/Makefile

+3-4
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,6 @@ language_preferences = apps/language_preferences.csv
8585
SFLAGS += -I$(BUILD_DIR)
8686

8787
i18n_files += $(addprefix apps/language_,$(addsuffix .universal.i18n, $(EPSILON_I18N)))
88-
ifeq ($(EPSILON_GETOPT),1)
89-
i18n_files += $(addprefix apps/language_,$(addsuffix _iso6391.universal.i18n, $(EPSILON_I18N)))
90-
endif
9188

9289
i18n_files += $(call i18n_with_universal_for,shared)
9390
i18n_files += $(call i18n_with_universal_for,toolbox)
@@ -97,7 +94,7 @@ $(eval $(call rule_for, \
9794
I18N, \
9895
apps/i18n.cpp, \
9996
$(i18n_files), \
100-
$$(PYTHON) apps/i18n.py --codepoints $(code_points) --countrypreferences $(country_preferences) --languagepreferences $(language_preferences) --header $$(subst .cpp,.h,$$@) --implementation $$@ --locales $$(EPSILON_I18N) --countries $$(EPSILON_COUNTRIES) --files $$^ --generateISO6391locales $$(EPSILON_GETOPT), \
97+
$$(PYTHON) apps/i18n.py --codepoints $(code_points) --countrypreferences $(country_preferences) --languagepreferences $(language_preferences) --header $$(subst .cpp,.h,$$@) --implementation $$@ --locales $$(EPSILON_I18N) --countries $$(EPSILON_COUNTRIES) --files $$^, \
10198
global \
10299
))
103100

@@ -113,6 +110,8 @@ $(call object_for,$(apps_src) $(tests_src)): $(BUILD_DIR)/apps/i18n.h
113110
$(call object_for,$(apps_src) $(tests_src)): $(BUILD_DIR)/apps/home/apps_layout.h
114111
$(call object_for,$(apps_src) $(tests_src)): $(BUILD_DIR)/python/port/genhdr/qstrdefs.generated.h
115112

113+
$(call object_for,$(apps_src)): $(BUILD_DIR)/apps/home/apps_layout.h
114+
116115
apps_tests_src = $(app_calculation_test_src) $(app_code_test_src) $(app_graph_test_src) $(app_probability_test_src) $(app_regression_test_src) $(app_sequence_test_src) $(app_shared_test_src) $(app_statistics_test_src) $(app_settings_test_src) $(app_solver_test_src)
117116

118117
apps_tests_src += $(addprefix apps/,\

apps/code/Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ app_code_test_src = $(addprefix apps/code/,\
3030

3131
tests_src += $(addprefix apps/code/test/,\
3232
variable_box_controller.cpp\
33+
toolbox_ion_keys_dummy.cpp \
3334
)
3435

3536
app_code_src += $(app_code_test_src)

apps/code/app.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,6 @@ Toolbox * App::toolboxForInputEventHandler(InputEventHandler * textInput) {
124124
return &m_toolbox;
125125
}
126126

127-
Code::toolboxIonKeys * App::toolboxIonKeys() {
128-
return &m_toolboxIonKeys;
129-
}
130-
131127
VariableBoxController * App::variableBoxForInputEventHandler(InputEventHandler * textInput) {
132128
return &m_variableBoxController;
133129
}

apps/code/app.h

-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include "python_toolbox.h"
1111
#include "variable_box_controller.h"
1212
#include "../shared/shared_app.h"
13-
#include "toolbox_ion_keys.h"
1413

1514
namespace Code {
1615

@@ -78,8 +77,6 @@ class App : public Shared::InputEventHandlerDelegateApp {
7877

7978
static constexpr int k_pythonHeapSize = 100000;
8079

81-
Code::toolboxIonKeys * toolboxIonKeys();
82-
8380
private:
8481
/* Python delegate:
8582
* MicroPython requires a heap. To avoid dynamic allocation, we keep a working
@@ -96,7 +93,6 @@ class App : public Shared::InputEventHandlerDelegateApp {
9693
StackViewController m_codeStackViewController;
9794
PythonToolbox m_toolbox;
9895
VariableBoxController m_variableBoxController;
99-
Code::toolboxIonKeys m_toolboxIonKeys;
10096
};
10197

10298
}

apps/code/base.de.i18n

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
AddScript = "Skript hinzufügen"
22
AllowedCharactersaz09 = "Erlaubte Zeichen: a-z, 0-9, _"
33
Autocomplete = "Autovervollständigung"
4-
AutoImportScript = "Automatischer Import in Konsole"
5-
BuiltinsAndKeywords = "Native Funktionen und Schlüsselwörter"
4+
AutoImportScript = "Automatischer Import in die Konsole"
5+
BuiltinsAndKeywords = "Native Funktionen & Schlüsselwörter"
66
Console = "Interaktive Konsole"
77
DeleteScript = "Skript löschen"
88
DuplicateScript = "Skript duplizieren"
99
ExecuteScript = "Skript ausführen"
1010
FunctionsAndVariables = "Funktionen und Variablen"
1111
ImportedModulesAndScripts = "Importierte Module und Skripte"
12-
NoWordAvailableHere = "Kein Wort ist hier verfübar."
13-
ScriptInProgress = "Aktuelle Skript"
12+
NoWordAvailableHere = "Hier ist kein Wort verfügbar."
13+
ScriptInProgress = "Aktuelles Skript"
1414
ScriptOptions = "Skriptoptionen"
15-
ScriptSize = "Script size"
15+
ScriptSize = "Skriptgröße"

0 commit comments

Comments
 (0)