summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorruki <[email protected]>2016-02-14 21:32:36 +0800
committerruki <[email protected]>2016-02-15 19:10:27 +0800
commit00db421c6d1fcb4604015e30fbc3ce80e9c00b41 (patch)
tree156038808d71a3bbdd66959604293ebc7aa31f94 /tests
parent52c273079851f2b83b9c632aec8e37b7482f6a83 (diff)
rename add_target and add_option to def_xxx
Diffstat (limited to 'tests')
-rw-r--r--tests/console/src/demo/xmake.lua10
-rw-r--r--tests/console/xmake.lua18
-rw-r--r--tests/interpreter/scope.lua4
3 files changed, 16 insertions, 16 deletions
diff --git a/tests/console/src/demo/xmake.lua b/tests/console/src/demo/xmake.lua
index f304aa255..6585054be 100644
--- a/tests/console/src/demo/xmake.lua
+++ b/tests/console/src/demo/xmake.lua
@@ -1,5 +1,5 @@
-add_target("demo_c")
+def_target("demo_c")
set_kind("binary")
add_deps("hello1")
add_files("*.c")
@@ -14,7 +14,7 @@ add_target("demo_c")
if options("option3") then add_defines("OPTION3") end
if options("option4") then add_defines("OPTION4") end
-add_target("demo_cpp")
+def_target("demo_cpp")
set_kind("binary")
add_deps("hello2")
add_files("*.cpp")
@@ -31,7 +31,7 @@ add_target("demo_cpp")
if plats("macosx", "ios") then
- add_target("demo_objc")
+ def_target("demo_objc")
set_kind("binary")
add_deps("hello3")
add_files("*.m")
@@ -40,7 +40,7 @@ add_target("demo_cpp")
add_includedirs("$(buildir)/inc")
add_mflags("-DHELLO3", "-DPLAT=\"macosx\"", "-DARCH='armv7, arm64'")
- add_target("demo_objcpp")
+ def_target("demo_objcpp")
set_kind("binary")
add_deps("hello3")
add_files("*.mm")
@@ -52,6 +52,6 @@ add_target("demo_cpp")
end
end
-add_target("demo_swift")
+def_target("demo_swift")
set_kind("binary")
add_files("*.swift")
diff --git a/tests/console/xmake.lua b/tests/console/xmake.lua
index 01406f127..b4cf57d58 100644
--- a/tests/console/xmake.lua
+++ b/tests/console/xmake.lua
@@ -27,13 +27,13 @@ if archs("x86", "x64") then
add_defines("ARCH=\"$(arch)\"", "PLAT=$(plat)", "MODE=$(mode)", "HOST=$(host)")
end
-add_option("option1")
+def_option("option1")
set_option_enable(true)
set_option_showmenu(true)
add_option_defines_h_if_ok("OPTION1_ENABLE")
set_option_description("The option for definition and need not check.")
-add_option("option2")
+def_option("option2")
set_option_enable(false)
set_option_showmenu(true)
add_option_defines_h_if_ok("OPTION2_ENABLE")
@@ -41,7 +41,7 @@ add_option("option2")
add_option_includedirs("src/hello1")
set_option_description("The option for finding includes.")
-add_option("option3")
+def_option("option3")
set_option_enable(false)
set_option_showmenu(true)
add_option_defines_h_if_ok("OPTION3_ENABLE")
@@ -49,7 +49,7 @@ add_option("option3")
add_option_linkdirs("$(buildir)")
set_option_description("The option for finding links.")
-add_option("option4")
+def_option("option4")
set_option_enable(false)
set_option_showmenu(true)
add_option_defines_h_if_ok("OPTION4_ENABLE")
@@ -60,15 +60,15 @@ add_option("option4")
add_option_cincludes("stdio.h", "sqlite3.h")
end
-add_target("hello1")
+def_target("hello1")
set_kind("static")
add_files("src/hello1/*.c")
-add_target("hello2")
+def_target("hello2")
set_kind("shared")
add_files("$(projectdir)/src/hello2/*.c")
-add_target("hello3")
+def_target("hello3")
set_kind("static")
add_files("src/hello3/*.c")
add_headers("src/(hello3/*.h)")
@@ -76,13 +76,13 @@ add_target("hello3")
set_targetdir("$(buildir)/lib")
set_objectdir("$(buildir)/obj")
-add_target("hello4")
+def_target("hello4")
set_kind("static")
add_deps("hello1", "hello2")
add_files("$(buildir)/.objs/hello1/**.o")
add_files("$(buildir)/.objs/hello2/**.obj")
-add_target("hello5")
+def_target("hello5")
set_kind("static")
add_deps("hello4", "hello1")
add_files("$(buildir)/hello1.lib")
diff --git a/tests/interpreter/scope.lua b/tests/interpreter/scope.lua
index 2893dfeaf..dbc532587 100644
--- a/tests/interpreter/scope.lua
+++ b/tests/interpreter/scope.lua
@@ -2,12 +2,12 @@
set_kind("static")
add_files("root.c")
-add_target("target1")
+def_target("target1")
set_kind("static")
add_files("*.c", "hello.c")
add_files("$(projectdir)/test.c")
-add_option("option1")
+def_option("option1")
add_option_links("pthread", "z")