clean up git ignore; fix test xmake.lua

32 files changed, 153 insertions, 645 deletions

diff --git a/.gitignore b/.gitignore
index cd7ecbe72..11fe9ea9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,44 +1,15 @@
-*.a
-*.b
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-*.ilk
-*.stackdump
-*.manifest
-.ccache
-.demo
-.svn
-.DS_Store
-.xmake
-*.deb
-*.zip
-*.gch
-*.gch.d
-*.sys
-cscope.*
-gmon.out
-tags
-doc
+.DS_Store/
+.xmake/
+build/
+winenv/
+xmake-ppa/
+.vscode/
+/*.exe
+/*.zip
+/xmake/*.exe
+/xmake/*.zip
+/scripts/*.exe
+/scripts/*.zip
 install.log
-build
-core/bin
-core/pre
-core/tool/msys
-core/xmake.config.h
-core/.config.mak
-winenv
-xmake-ppa
-!xmake/actions/build
-.vscode/
\ No newline at end of file
+
+!/xmake/actions/build/
\ No newline at end of file
diff --git a/tests/projects/cuda/shared/.gitignore b/tests/projects/cuda/shared/.gitignore
deleted file mode 100644
index 173fb6eaf..000000000
--- a/tests/projects/cuda/shared/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.xmake
-build
diff --git a/tests/projects/cuda/shared/xmake.lua b/tests/projects/cuda/shared/xmake.lua
index 268f16dcd..e96999a13 100644
--- a/tests/projects/cuda/shared/xmake.lua
+++ b/tests/projects/cuda/shared/xmake.lua
@@ -2,8 +2,6 @@
 -- add modes: debug and release
 add_rules("mode.debug", "mode.release")
 
-add_includedirs("inc")
-
 -- generate PTX code for the virtual architecture to guarantee compatibility
 add_cugencodes("compute_30")
 
@@ -16,6 +14,8 @@ target("lib")
     -- add files
     add_files("src/lib.cu")
 
+    add_includedirs("inc", {public = true})
+
 target("bin")
     add_deps("lib")
     set_kind("binary")
diff --git a/tests/projects/cuda/static/.gitignore b/tests/projects/cuda/static/.gitignore
deleted file mode 100644
index 173fb6eaf..000000000
--- a/tests/projects/cuda/static/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.xmake
-build
diff --git a/tests/projects/cuda/static/xmake.lua b/tests/projects/cuda/static/xmake.lua
index fd2143bfb..55e1e5fd9 100644
--- a/tests/projects/cuda/static/xmake.lua
+++ b/tests/projects/cuda/static/xmake.lua
@@ -2,8 +2,6 @@
 -- add modes: debug and release
 add_rules("mode.debug", "mode.release")
 
-add_includedirs("inc")
-
 -- generate PTX code for the virtual architecture to guarantee compatibility
 add_cugencodes("compute_30")
 
@@ -15,6 +13,8 @@ target("lib")
 
     add_cuflags("-rdc=true")
 
+    add_includedirs("inc", {public = true})
+
     -- add files
     add_files("src/lib.cu")
 
diff --git a/xmake/scripts/gitignore b/xmake/scripts/gitignore
index 08ffbbd04..e4ede4aa6 100644
--- a/xmake/scripts/gitignore
+++ b/xmake/scripts/gitignore
@@ -1,22 +1,5 @@
-*.a
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-.svn
-.DS_Store
-.xmake
-*.gch
-*.gch.d
-gmon.out
-build
+# xmake temp files
+.xmake/
+# build result files
+build/
+
diff --git a/xmake/templates/c++/console/project/.gitignore b/xmake/templates/c++/console/project/.gitignore
index 08ffbbd04..e4ede4aa6 100644
--- a/xmake/templates/c++/console/project/.gitignore
+++ b/xmake/templates/c++/console/project/.gitignore
@@ -1,22 +1,5 @@
-*.a
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-.svn
-.DS_Store
-.xmake
-*.gch
-*.gch.d
-gmon.out
-build
+# xmake temp files
+.xmake/
+# build result files
+build/
+
diff --git a/xmake/templates/c++/console_qt/project/.gitignore b/xmake/templates/c++/console_qt/project/.gitignore
index 08ffbbd04..e4ede4aa6 100644
--- a/xmake/templates/c++/console_qt/project/.gitignore
+++ b/xmake/templates/c++/console_qt/project/.gitignore
@@ -1,22 +1,5 @@
-*.a
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-.svn
-.DS_Store
-.xmake
-*.gch
-*.gch.d
-gmon.out
-build
+# xmake temp files
+.xmake/
+# build result files
+build/
+
diff --git a/xmake/templates/c++/console_tbox/project/.gitignore b/xmake/templates/c++/console_tbox/project/.gitignore
index 08ffbbd04..e4ede4aa6 100644
--- a/xmake/templates/c++/console_tbox/project/.gitignore
+++ b/xmake/templates/c++/console_tbox/project/.gitignore
@@ -1,22 +1,5 @@
-*.a
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-.svn
-.DS_Store
-.xmake
-*.gch
-*.gch.d
-gmon.out
-build
+# xmake temp files
+.xmake/
+# build result files
+build/
+
diff --git a/xmake/templates/c++/shared_library/project/.gitignore b/xmake/templates/c++/shared_library/project/.gitignore
index 08ffbbd04..e4ede4aa6 100644
--- a/xmake/templates/c++/shared_library/project/.gitignore
+++ b/xmake/templates/c++/shared_library/project/.gitignore
@@ -1,22 +1,5 @@
-*.a
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-.svn
-.DS_Store
-.xmake
-*.gch
-*.gch.d
-gmon.out
-build
+# xmake temp files
+.xmake/
+# build result files
+build/
+
diff --git a/xmake/templates/c++/shared_library_qt/project/.gitignore b/xmake/templates/c++/shared_library_qt/project/.gitignore
index 08ffbbd04..e4ede4aa6 100644
--- a/xmake/templates/c++/shared_library_qt/project/.gitignore
+++ b/xmake/templates/c++/shared_library_qt/project/.gitignore
@@ -1,22 +1,5 @@
-*.a
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-.svn
-.DS_Store
-.xmake
-*.gch
-*.gch.d
-gmon.out
-build
+# xmake temp files
+.xmake/
+# build result files
+build/
+
diff --git a/xmake/templates/c++/shared_library_tbox/project/.gitignore b/xmake/templates/c++/shared_library_tbox/project/.gitignore
index 08ffbbd04..e4ede4aa6 100644
--- a/xmake/templates/c++/shared_library_tbox/project/.gitignore
+++ b/xmake/templates/c++/shared_library_tbox/project/.gitignore
@@ -1,22 +1,5 @@
-*.a
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-.svn
-.DS_Store
-.xmake
-*.gch
-*.gch.d
-gmon.out
-build
+# xmake temp files
+.xmake/
+# build result files
+build/
+
diff --git a/xmake/templates/c++/static_library/project/.gitignore b/xmake/templates/c++/static_library/project/.gitignore
index 08ffbbd04..e4ede4aa6 100644
--- a/xmake/templates/c++/static_library/project/.gitignore
+++ b/xmake/templates/c++/static_library/project/.gitignore
@@ -1,22 +1,5 @@
-*.a
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-.svn
-.DS_Store
-.xmake
-*.gch
-*.gch.d
-gmon.out
-build
+# xmake temp files
+.xmake/
+# build result files
+build/
+
diff --git a/xmake/templates/c++/static_library_qt/project/.gitignore b/xmake/templates/c++/static_library_qt/project/.gitignore
index 08ffbbd04..e4ede4aa6 100644
--- a/xmake/templates/c++/static_library_qt/project/.gitignore
+++ b/xmake/templates/c++/static_library_qt/project/.gitignore
@@ -1,22 +1,5 @@
-*.a
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-.svn
-.DS_Store
-.xmake
-*.gch
-*.gch.d
-gmon.out
-build
+# xmake temp files
+.xmake/
+# build result files
+build/
+
diff --git a/xmake/templates/c++/static_library_tbox/project/.gitignore b/xmake/templates/c++/static_library_tbox/project/.gitignore
index 08ffbbd04..e4ede4aa6 100644
--- a/xmake/templates/c++/static_library_tbox/project/.gitignore
+++ b/xmake/templates/c++/static_library_tbox/project/.gitignore
@@ -1,22 +1,5 @@
-*.a
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-.svn
-.DS_Store
-.xmake
-*.gch
-*.gch.d
-gmon.out
-build
+# xmake temp files
+.xmake/
+# build result files
+build/
+
diff --git a/xmake/templates/c/console/project/.gitignore b/xmake/templates/c/console/project/.gitignore
index 08ffbbd04..e4ede4aa6 100644
--- a/xmake/templates/c/console/project/.gitignore
+++ b/xmake/templates/c/console/project/.gitignore
@@ -1,22 +1,5 @@
-*.a
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-.svn
-.DS_Store
-.xmake
-*.gch
-*.gch.d
-gmon.out
-build
+# xmake temp files
+.xmake/
+# build result files
+build/
+
diff --git a/xmake/templates/c/console_tbox/.gitignore b/xmake/templates/c/console_tbox/.gitignore
index 08ffbbd04..e4ede4aa6 100644
--- a/xmake/templates/c/console_tbox/.gitignore
+++ b/xmake/templates/c/console_tbox/.gitignore
@@ -1,22 +1,5 @@
-*.a
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-.svn
-.DS_Store
-.xmake
-*.gch
-*.gch.d
-gmon.out
-build
+# xmake temp files
+.xmake/
+# build result files
+build/
+
diff --git a/xmake/templates/c/shared_library/project/.gitignore b/xmake/templates/c/shared_library/project/.gitignore
index 08ffbbd04..e4ede4aa6 100644
--- a/xmake/templates/c/shared_library/project/.gitignore
+++ b/xmake/templates/c/shared_library/project/.gitignore
@@ -1,22 +1,5 @@
-*.a
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-.svn
-.DS_Store
-.xmake
-*.gch
-*.gch.d
-gmon.out
-build
+# xmake temp files
+.xmake/
+# build result files
+build/
+
diff --git a/xmake/templates/c/shared_library_tbox/project/.gitignore b/xmake/templates/c/shared_library_tbox/project/.gitignore
index 08ffbbd04..e4ede4aa6 100644
--- a/xmake/templates/c/shared_library_tbox/project/.gitignore
+++ b/xmake/templates/c/shared_library_tbox/project/.gitignore
@@ -1,22 +1,5 @@
-*.a
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-.svn
-.DS_Store
-.xmake
-*.gch
-*.gch.d
-gmon.out
-build
+# xmake temp files
+.xmake/
+# build result files
+build/
+
diff --git a/xmake/templates/c/static_library/project/.gitignore b/xmake/templates/c/static_library/project/.gitignore
index 08ffbbd04..e4ede4aa6 100644
--- a/xmake/templates/c/static_library/project/.gitignore
+++ b/xmake/templates/c/static_library/project/.gitignore
@@ -1,22 +1,5 @@
-*.a
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-.svn
-.DS_Store
-.xmake
-*.gch
-*.gch.d
-gmon.out
-build
+# xmake temp files
+.xmake/
+# build result files
+build/
+
diff --git a/xmake/templates/c/static_library_tbox/project/.gitignore b/xmake/templates/c/static_library_tbox/project/.gitignore
index 08ffbbd04..e4ede4aa6 100644
--- a/xmake/templates/c/static_library_tbox/project/.gitignore
+++ b/xmake/templates/c/static_library_tbox/project/.gitignore
@@ -1,22 +1,5 @@
-*.a
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-.svn
-.DS_Store
-.xmake
-*.gch
-*.gch.d
-gmon.out
-build
+# xmake temp files
+.xmake/
+# build result files
+build/
+
diff --git a/xmake/templates/cuda/console/project/.gitignore b/xmake/templates/cuda/console/project/.gitignore
index 08ffbbd04..e4ede4aa6 100644
--- a/xmake/templates/cuda/console/project/.gitignore
+++ b/xmake/templates/cuda/console/project/.gitignore
@@ -1,22 +1,5 @@
-*.a
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-.svn
-.DS_Store
-.xmake
-*.gch
-*.gch.d
-gmon.out
-build
+# xmake temp files
+.xmake/
+# build result files
+build/
+
diff --git a/xmake/templates/dlang/console/project/.gitignore b/xmake/templates/dlang/console/project/.gitignore
index 08ffbbd04..e4ede4aa6 100644
--- a/xmake/templates/dlang/console/project/.gitignore
+++ b/xmake/templates/dlang/console/project/.gitignore
@@ -1,22 +1,5 @@
-*.a
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-.svn
-.DS_Store
-.xmake
-*.gch
-*.gch.d
-gmon.out
-build
+# xmake temp files
+.xmake/
+# build result files
+build/
+
diff --git a/xmake/templates/dlang/shared_library/project/.gitignore b/xmake/templates/dlang/shared_library/project/.gitignore
index 08ffbbd04..e4ede4aa6 100644
--- a/xmake/templates/dlang/shared_library/project/.gitignore
+++ b/xmake/templates/dlang/shared_library/project/.gitignore
@@ -1,22 +1,5 @@
-*.a
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-.svn
-.DS_Store
-.xmake
-*.gch
-*.gch.d
-gmon.out
-build
+# xmake temp files
+.xmake/
+# build result files
+build/
+
diff --git a/xmake/templates/dlang/static_library/project/.gitignore b/xmake/templates/dlang/static_library/project/.gitignore
index 08ffbbd04..e4ede4aa6 100644
--- a/xmake/templates/dlang/static_library/project/.gitignore
+++ b/xmake/templates/dlang/static_library/project/.gitignore
@@ -1,22 +1,5 @@
-*.a
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-.svn
-.DS_Store
-.xmake
-*.gch
-*.gch.d
-gmon.out
-build
+# xmake temp files
+.xmake/
+# build result files
+build/
+
diff --git a/xmake/templates/go/console/project/.gitignore b/xmake/templates/go/console/project/.gitignore
index 08ffbbd04..e4ede4aa6 100644
--- a/xmake/templates/go/console/project/.gitignore
+++ b/xmake/templates/go/console/project/.gitignore
@@ -1,22 +1,5 @@
-*.a
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-.svn
-.DS_Store
-.xmake
-*.gch
-*.gch.d
-gmon.out
-build
+# xmake temp files
+.xmake/
+# build result files
+build/
+
diff --git a/xmake/templates/go/static_library/project/.gitignore b/xmake/templates/go/static_library/project/.gitignore
index 08ffbbd04..e4ede4aa6 100644
--- a/xmake/templates/go/static_library/project/.gitignore
+++ b/xmake/templates/go/static_library/project/.gitignore
@@ -1,22 +1,5 @@
-*.a
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-.svn
-.DS_Store
-.xmake
-*.gch
-*.gch.d
-gmon.out
-build
+# xmake temp files
+.xmake/
+# build result files
+build/
+
diff --git a/xmake/templates/objc++/console/project/.gitignore b/xmake/templates/objc++/console/project/.gitignore
index 08ffbbd04..e4ede4aa6 100644
--- a/xmake/templates/objc++/console/project/.gitignore
+++ b/xmake/templates/objc++/console/project/.gitignore
@@ -1,22 +1,5 @@
-*.a
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-.svn
-.DS_Store
-.xmake
-*.gch
-*.gch.d
-gmon.out
-build
+# xmake temp files
+.xmake/
+# build result files
+build/
+
diff --git a/xmake/templates/objc/console/project/.gitignore b/xmake/templates/objc/console/project/.gitignore
index 08ffbbd04..e4ede4aa6 100644
--- a/xmake/templates/objc/console/project/.gitignore
+++ b/xmake/templates/objc/console/project/.gitignore
@@ -1,22 +1,5 @@
-*.a
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-.svn
-.DS_Store
-.xmake
-*.gch
-*.gch.d
-gmon.out
-build
+# xmake temp files
+.xmake/
+# build result files
+build/
+
diff --git a/xmake/templates/rust/console/project/.gitignore b/xmake/templates/rust/console/project/.gitignore
index 08ffbbd04..e4ede4aa6 100644
--- a/xmake/templates/rust/console/project/.gitignore
+++ b/xmake/templates/rust/console/project/.gitignore
@@ -1,22 +1,5 @@
-*.a
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-.svn
-.DS_Store
-.xmake
-*.gch
-*.gch.d
-gmon.out
-build
+# xmake temp files
+.xmake/
+# build result files
+build/
+
diff --git a/xmake/templates/rust/static_library/project/.gitignore b/xmake/templates/rust/static_library/project/.gitignore
index 08ffbbd04..e4ede4aa6 100644
--- a/xmake/templates/rust/static_library/project/.gitignore
+++ b/xmake/templates/rust/static_library/project/.gitignore
@@ -1,22 +1,5 @@
-*.a
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-.svn
-.DS_Store
-.xmake
-*.gch
-*.gch.d
-gmon.out
-build
+# xmake temp files
+.xmake/
+# build result files
+build/
+
diff --git a/xmake/templates/swift/console/project/.gitignore b/xmake/templates/swift/console/project/.gitignore
index 08ffbbd04..e4ede4aa6 100644
--- a/xmake/templates/swift/console/project/.gitignore
+++ b/xmake/templates/swift/console/project/.gitignore
@@ -1,22 +1,5 @@
-*.a
-*.o
-*.exe
-*.obj
-*.dll
-*.lib
-*.out
-*.suo
-*~
-*.swp
-*.swo
-*.bak
-*.orig
-*.pdb
-*.idb
-.svn
-.DS_Store
-.xmake
-*.gch
-*.gch.d
-gmon.out
-build
+# xmake temp files
+.xmake/
+# build result files
+build/
+