diff options
| author | ruki <[email protected]> | 2020-06-12 00:53:14 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-06-11 23:19:29 +0800 |
| commit | 2daaee9087bf3a503831d8dfb141baa328cbac43 (patch) | |
| tree | 38b6c14f320af0ccbdb0e39c70c1237a2ed556f7 | |
| parent | 162747cfe0a2f8c6df420cbe6655b0d9dcca5771 (diff) | |
fix theme
| -rw-r--r-- | tests/projects/c/protobuf/src/main.c | 1 | ||||
| -rw-r--r-- | tests/projects/c/protobuf/src/subdir/test2.proto | 8 | ||||
| -rw-r--r-- | tests/projects/c/protobuf/src/test.proto | 1 | ||||
| -rw-r--r-- | xmake/themes/dark/xmake.lua | 2 | ||||
| -rw-r--r-- | xmake/themes/default/xmake.lua | 2 | ||||
| -rw-r--r-- | xmake/themes/ninja/xmake.lua | 2 |
6 files changed, 13 insertions, 3 deletions
diff --git a/tests/projects/c/protobuf/src/main.c b/tests/projects/c/protobuf/src/main.c index 1f0458b66..7e08deb99 100644 --- a/tests/projects/c/protobuf/src/main.c +++ b/tests/projects/c/protobuf/src/main.c @@ -1,5 +1,6 @@ #include <stdio.h> #include "test.pb-c.h" +#include "subdir/test2.pb-c.h" int main(int argc, char** argv) { diff --git a/tests/projects/c/protobuf/src/subdir/test2.proto b/tests/projects/c/protobuf/src/subdir/test2.proto new file mode 100644 index 000000000..31fa665e2 --- /dev/null +++ b/tests/projects/c/protobuf/src/subdir/test2.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; +package test2; +message TestCase2 { + string name = 4; +} +message Test2 { + repeated TestCase2 case = 1; +} diff --git a/tests/projects/c/protobuf/src/test.proto b/tests/projects/c/protobuf/src/test.proto index 0f129ea13..f22385950 100644 --- a/tests/projects/c/protobuf/src/test.proto +++ b/tests/projects/c/protobuf/src/test.proto @@ -1,4 +1,5 @@ syntax = "proto3"; +import subdir/test2.proto package test; message TestCase { string name = 4; diff --git a/xmake/themes/dark/xmake.lua b/xmake/themes/dark/xmake.lua index a72a1aa8b..49ae5a51c 100644 --- a/xmake/themes/dark/xmake.lua +++ b/xmake/themes/dark/xmake.lua @@ -53,7 +53,7 @@ theme("dark") set_color("build.target", "magenta") -- the spinner chars - if not os.subhost("msys", "cygwin") then + if not is_subhost("msys", "cygwin") then set_text("spinner.chars", '⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏') else set_text("spinner.chars", '\\', '-', '/', '|') diff --git a/xmake/themes/default/xmake.lua b/xmake/themes/default/xmake.lua index a1d8651b4..3d272c5da 100644 --- a/xmake/themes/default/xmake.lua +++ b/xmake/themes/default/xmake.lua @@ -53,7 +53,7 @@ theme("default") set_color("build.target", "magenta bright") -- the spinner chars - if not os.subhost("msys", "cygwin") then + if not is_subhost("msys", "cygwin") then set_text("spinner.chars", '⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏') else set_text("spinner.chars", '\\', '-', '/', '|') diff --git a/xmake/themes/ninja/xmake.lua b/xmake/themes/ninja/xmake.lua index aaccfbd9d..786f6943e 100644 --- a/xmake/themes/ninja/xmake.lua +++ b/xmake/themes/ninja/xmake.lua @@ -53,7 +53,7 @@ theme("ninja") set_color("build.target", "magenta bright") -- the spinner chars - if not os.subhost("msys", "cygwin") then + if not is_subhost("msys", "cygwin") then set_text("spinner.chars", '⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏') else set_text("spinner.chars", '\\', '-', '/', '|') |