Skip to content

Commit 9db96ae

Browse files
committed
remove KeyboarLayoutBase from web generator
1 parent 6015f0d commit 9db96ae

3 files changed

Lines changed: 16 additions & 10 deletions

File tree

generator-web/js/drive.png

-20.6 KB
Loading

generator-web/make_zip_bundle.php

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
ob_start();
77
$ERRORS = [];
8+
$LAYOUT_BASE = false;
89

910
$source_url = "";
1011
$platform = "win";
@@ -90,13 +91,15 @@
9091

9192
$keycodes = preg_replace("/".preg_quote($VERSION0)."/", $VERSION, $keycodes);
9293

93-
if( !file_exists("src/keyboard_layout6.mpy") ) {
94-
exec("mpy-cross/mpy-cross.static-amd64-linux-6 src/keyboard_layout.py");
95-
rename("src/keyboard_layout.mpy", "src/keyboard_layout6.mpy");
96-
}
97-
if( !file_exists("src/keyboard_layout7.mpy") ) {
98-
exec("mpy-cross/mpy-cross.static-amd64-linux-7 src/keyboard_layout.py");
99-
rename("src/keyboard_layout.mpy", "src/keyboard_layout7.mpy");
94+
if($LAYOUT_BASE) {
95+
if( !file_exists("src/keyboard_layout6.mpy") ) {
96+
exec("mpy-cross/mpy-cross.static-amd64-linux-6 src/keyboard_layout.py");
97+
rename("src/keyboard_layout.mpy", "src/keyboard_layout6.mpy");
98+
}
99+
if( !file_exists("src/keyboard_layout7.mpy") ) {
100+
exec("mpy-cross/mpy-cross.static-amd64-linux-7 src/keyboard_layout.py");
101+
rename("src/keyboard_layout.mpy", "src/keyboard_layout7.mpy");
102+
}
100103
}
101104

102105
function make_zip($layout, $keycodes, $cpversion, $platform, $lang) {
@@ -142,11 +145,15 @@ function make_zip($layout, $keycodes, $cpversion, $platform, $lang) {
142145
$deletes[] = $tempfile;
143146
$deletes[] = $mpyfile;
144147
# layout base
145-
$zip->addFile("src/keyboard_layout".$cpversion.".mpy", "keyboard_layout.mpy");
148+
if($LAYOUT_BASE) {
149+
$zip->addFile("src/keyboard_layout".$cpversion.".mpy", "keyboard_layout.mpy");
150+
}
146151
} else {
147152
$zip->addFromString($layout_file, $layout);
148153
$zip->addFromString($keycodes_file, $keycodes);
149-
$zip->addFile("src/keyboard_layout.py", "keyboard_layout.py");
154+
if($LAYOUT_BASE) {
155+
$zip->addFile("src/keyboard_layout.py", "keyboard_layout.py");
156+
}
150157
}
151158

152159
$data = file_get_contents("src/sample_code_template.py");

generator-web/src/keyboard_layout.py

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)