improve templates

A2va · Dec 1, 2022 · 0914303 · 0914303
1 parent 90613a3
commit 0914303
Show file tree

Hide file tree

Showing 22 changed files with 56 additions and 92 deletions.
diff --git a/xmake/templates/c++/shared/project/src/foo.cpp b/xmake/templates/c++/shared/project/src/foo.cpp
@@ -0,0 +1,5 @@
+#include "foo.h"
+
+int add(int a, int b) {
+    return a + b;
+}
diff --git a/...plates/c++/shared/project/src/interface.h → xmake/templates/c++/shared/project/src/foo.h b/...plates/c++/shared/project/src/interface.h → xmake/templates/c++/shared/project/src/foo.h
@@ -10,14 +10,7 @@ extern "C" {
 #   define __export
 #endif
 
-/*! calculate add(a, b)
- *
- * @param a     the first argument
- * @param b     the second argument
- *
- * @return      the result
- */
-__export int    add(int a, int b);
+__export int add(int a, int b);
 
 #ifdef __cplusplus
 }

diff --git a/xmake/templates/c++/shared/project/src/interface.cpp b/xmake/templates/c++/shared/project/src/interface.cpp
diff --git a/xmake/templates/c++/shared/project/src/main.cpp b/xmake/templates/c++/shared/project/src/main.cpp
@@ -1,10 +1,9 @@
-#include "interface.h"
+#include "foo.h"
 #include <iostream>
 
 using namespace std;
 
-int main(int argc, char** argv)
-{
+int main(int argc, char** argv) {
     cout << "add(1, 2) = " << add(1, 2) << endl;
     return 0;
 }
diff --git a/xmake/templates/c++/shared/project/xmake.lua b/xmake/templates/c++/shared/project/xmake.lua
@@ -1,12 +1,12 @@
 add_rules("mode.debug", "mode.release")
 
-target("${TARGETNAME}")
+target("foo")
     set_kind("shared")
-    add_files("src/interface.cpp")
+    add_files("src/foo.cpp")
 
-target("${TARGETNAME}_demo")
+target("${TARGETNAME}")
     set_kind("binary")
-    add_deps("${TARGETNAME}")
+    add_deps("foo")
     add_files("src/main.cpp")
 
 ${FAQ}
diff --git a/xmake/templates/c++/static/project/src/foo.cpp b/xmake/templates/c++/static/project/src/foo.cpp
@@ -0,0 +1,5 @@
+#include "foo.h"
+
+int add(int a, int b) {
+    return a + b;
+}
diff --git a/xmake/templates/c++/static/project/src/foo.h b/xmake/templates/c++/static/project/src/foo.h
@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int add(int a, int b);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/xmake/templates/c++/static/project/src/interface.cpp b/xmake/templates/c++/static/project/src/interface.cpp
diff --git a/xmake/templates/c++/static/project/src/interface.h b/xmake/templates/c++/static/project/src/interface.h
diff --git a/xmake/templates/c++/static/project/src/main.cpp b/xmake/templates/c++/static/project/src/main.cpp
@@ -1,10 +1,9 @@
-#include "interface.h"
+#include "foo.h"
 #include <iostream>
 
 using namespace std;
 
-int main(int argc, char** argv)
-{
+int main(int argc, char** argv) {
     cout << "add(1, 2) = " << add(1, 2) << endl;
     return 0;
 }
diff --git a/xmake/templates/c++/static/project/xmake.lua b/xmake/templates/c++/static/project/xmake.lua
@@ -1,12 +1,12 @@
 add_rules("mode.debug", "mode.release")
 
-target("${TARGETNAME}")
+target("foo")
     set_kind("static")
-    add_files("src/interface.cpp")
+    add_files("src/foo.cpp")
 
-target("${TARGETNAME}_demo")
+target("${TARGETNAME}")
     set_kind("binary")
-    add_deps("${TARGETNAME}")
+    add_deps("foo")
     add_files("src/main.cpp")
 
 ${FAQ}
diff --git a/xmake/templates/c/shared/project/src/foo.c b/xmake/templates/c/shared/project/src/foo.c
@@ -0,0 +1,5 @@
+#include "foo.h"
+
+int add(int a, int b) {
+    return a + b;
+}
diff --git a/...emplates/c/shared/project/src/interface.h → xmake/templates/c/shared/project/src/foo.h b/...emplates/c/shared/project/src/interface.h → xmake/templates/c/shared/project/src/foo.h
@@ -6,13 +6,6 @@
 #   define __export
 #endif
 
-/*! calculate add(a, b)
- *
- * @param a     the first argument
- * @param b     the second argument
- *
- * @return      the result
- */
-__export int    add(int a, int b);
+__export int add(int a, int b);
 
 
diff --git a/xmake/templates/c/shared/project/src/interface.c b/xmake/templates/c/shared/project/src/interface.c
diff --git a/xmake/templates/c/shared/project/src/main.c b/xmake/templates/c/shared/project/src/main.c
@@ -1,8 +1,7 @@
-#include "interface.h"
+#include "foo.h"
 #include <stdio.h>
 
-int main(int argc, char** argv)
-{
+int main(int argc, char** argv) {
     printf("add(1, 2) = %d\n", add(1, 2));
     return 0;
 }
diff --git a/xmake/templates/c/shared/project/xmake.lua b/xmake/templates/c/shared/project/xmake.lua
@@ -1,12 +1,12 @@
 add_rules("mode.debug", "mode.release")
 
-target("${TARGETNAME}")
+target("foo")
     set_kind("shared")
-    add_files("src/interface.c")
+    add_files("src/foo.c")
 
-target("${TARGETNAME}_demo")
+target("${TARGETNAME}")
     set_kind("binary")
-    add_deps("${TARGETNAME}")
+    add_deps("foo")
     add_files("src/main.c")
 
 ${FAQ}
diff --git a/xmake/templates/c/static/project/src/foo.c b/xmake/templates/c/static/project/src/foo.c
@@ -0,0 +1,5 @@
+#include "foo.h"
+
+int add(int a, int b) {
+    return a + b;
+}
diff --git a/xmake/templates/c/static/project/src/foo.h b/xmake/templates/c/static/project/src/foo.h
@@ -0,0 +1 @@
+int add(int a, int b);
diff --git a/xmake/templates/c/static/project/src/interface.c b/xmake/templates/c/static/project/src/interface.c
diff --git a/xmake/templates/c/static/project/src/interface.h b/xmake/templates/c/static/project/src/interface.h
diff --git a/xmake/templates/c/static/project/src/main.c b/xmake/templates/c/static/project/src/main.c
@@ -1,8 +1,7 @@
-#include "interface.h"
+#include "foo.h"
 #include <stdio.h>
 
-int main(int argc, char** argv)
-{
+int main(int argc, char** argv) {
     printf("add(1, 2) = %d\n", add(1, 2));
     return 0;
 }
diff --git a/xmake/templates/c/static/project/xmake.lua b/xmake/templates/c/static/project/xmake.lua
@@ -1,12 +1,12 @@
 add_rules("mode.debug", "mode.release")
 
-target("${TARGETNAME}")
+target("foo")
     set_kind("static")
-    add_files("src/interface.c")
+    add_files("src/foo.c")
 
-target("${TARGETNAME}_demo")
+target("${TARGETNAME}")
     set_kind("binary")
-    add_deps("${TARGETNAME}")
+    add_deps("foo")
     add_files("src/main.c")
 
 ${FAQ}