summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJianpeng Peng <[email protected]>2022-10-19 15:00:37 +0800
committerJianpeng Peng <[email protected]>2022-10-19 15:00:37 +0800
commitfa425b0c71e333276f94fa11f216b23a2de5a23b (patch)
tree6130d1b0e8783d8188ee732eb324dc7d912d9d34
parentf6a1811657d2a2abc5ca6026bb340cb68942db0a (diff)
Format the code and follow the coding conventions.
-rw-r--r--tests/projects/embed/gnu-rm/hello/.xmake/windows/x64/xmake.conf19
-rw-r--r--tests/projects/embed/gnu-rm/hello/src/foo/foo.c2
-rw-r--r--tests/projects/embed/gnu-rm/hello/src/main.c2
-rw-r--r--tests/projects/embed/gnu-rm/hello/xmake.lua3
-rw-r--r--xmake/rules/gnu-rm/xmake.lua2
5 files changed, 4 insertions, 24 deletions
diff --git a/tests/projects/embed/gnu-rm/hello/.xmake/windows/x64/xmake.conf b/tests/projects/embed/gnu-rm/hello/.xmake/windows/x64/xmake.conf
deleted file mode 100644
index ab6e72ce9..000000000
--- a/tests/projects/embed/gnu-rm/hello/.xmake/windows/x64/xmake.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- __toolchains_cross_arm = {
- "envs",
- "cross"
- },
- arch = "arm",
- bin = [[C:\NXP\S32DS.3.5\S32DS\build_tools\gcc_v10.2\gcc-10.2-arm32-eabi]],
- buildir = "build",
- ccache = true,
- cross = "arm-none-eabi-",
- host = "windows",
- kind = "binary",
- menu = true,
- mode = "debug",
- ndk_stdcxx = false,
- plat = "cross",
- sdk = [[C:\NXP\S32DS.3.5\S32DS\build_tools\gcc_v10.2\gcc-10.2-arm32-eabi]],
- target_os = "none"
-} \ No newline at end of file
diff --git a/tests/projects/embed/gnu-rm/hello/src/foo/foo.c b/tests/projects/embed/gnu-rm/hello/src/foo/foo.c
index a962f560c..e652e68d0 100644
--- a/tests/projects/embed/gnu-rm/hello/src/foo/foo.c
+++ b/tests/projects/embed/gnu-rm/hello/src/foo/foo.c
@@ -1,4 +1,4 @@
int foo(int x)
{
- return x;
+ return x;
}
diff --git a/tests/projects/embed/gnu-rm/hello/src/main.c b/tests/projects/embed/gnu-rm/hello/src/main.c
index 76b1c316f..fd2fade43 100644
--- a/tests/projects/embed/gnu-rm/hello/src/main.c
+++ b/tests/projects/embed/gnu-rm/hello/src/main.c
@@ -2,5 +2,5 @@ int foo(int x);
int main()
{
- return foo(1);
+ return foo(1);
}
diff --git a/tests/projects/embed/gnu-rm/hello/xmake.lua b/tests/projects/embed/gnu-rm/hello/xmake.lua
index f5049db07..92c4b0144 100644
--- a/tests/projects/embed/gnu-rm/hello/xmake.lua
+++ b/tests/projects/embed/gnu-rm/hello/xmake.lua
@@ -1,5 +1,4 @@
--- Configure xmake.conf with the actual environment variables.
-set_toolchains("envs", "gnu-rm")
+set_toolchains("gnu-rm")
add_rules("mode.debug", "mode.release")
diff --git a/xmake/rules/gnu-rm/xmake.lua b/xmake/rules/gnu-rm/xmake.lua
index 07ca6dc86..d69ab5050 100644
--- a/xmake/rules/gnu-rm/xmake.lua
+++ b/xmake/rules/gnu-rm/xmake.lua
@@ -15,7 +15,7 @@
-- Copyright (C) 2015-present, TBOOX Open Source Group.
--
-- @author Jacob
--- @file rule.lua
+-- @file xmake.lua
--
rule("gnu-rm.binary")