From 35cfc8782c166bb1111472c4732f5c44d8939863 Mon Sep 17 00:00:00 2001
From: OpportunityLiu <opportunity@live.in>
Date: Tue, 11 Jun 2019 13:12:47 +0800
Subject: clean up git ignore; fix test xmake.lua

---
 xmake/scripts/gitignore | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

(limited to 'xmake/scripts/gitignore')

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/
+
-- 
cgit v1.3.1


From 9d72f08afa253d83f042c72a35cc5a555c61f44b Mon Sep 17 00:00:00 2001
From: OpportunityLiu <opportunity@live.in>
Date: Tue, 11 Jun 2019 13:53:26 +0800
Subject: fix

---
 xmake/scripts/gitignore                                    | 3 +++
 xmake/templates/c++/console/project/.gitignore             | 3 +++
 xmake/templates/c++/console_qt/project/.gitignore          | 3 +++
 xmake/templates/c++/console_tbox/project/.gitignore        | 3 +++
 xmake/templates/c++/shared_library/project/.gitignore      | 3 +++
 xmake/templates/c++/shared_library_qt/project/.gitignore   | 3 +++
 xmake/templates/c++/shared_library_tbox/project/.gitignore | 3 +++
 xmake/templates/c++/static_library/project/.gitignore      | 3 +++
 xmake/templates/c++/static_library_qt/project/.gitignore   | 3 +++
 xmake/templates/c++/static_library_tbox/project/.gitignore | 3 +++
 xmake/templates/c/console/project/.gitignore               | 3 +++
 xmake/templates/c/console_tbox/.gitignore                  | 3 +++
 xmake/templates/c/shared_library/project/.gitignore        | 3 +++
 xmake/templates/c/shared_library_tbox/project/.gitignore   | 3 +++
 xmake/templates/c/static_library/project/.gitignore        | 3 +++
 xmake/templates/c/static_library_tbox/project/.gitignore   | 3 +++
 xmake/templates/cuda/console/project/.gitignore            | 3 +++
 xmake/templates/dlang/console/project/.gitignore           | 3 +++
 xmake/templates/dlang/shared_library/project/.gitignore    | 3 +++
 xmake/templates/dlang/static_library/project/.gitignore    | 3 +++
 xmake/templates/go/console/project/.gitignore              | 3 +++
 xmake/templates/go/static_library/project/.gitignore       | 3 +++
 xmake/templates/objc++/console/project/.gitignore          | 3 +++
 xmake/templates/objc/console/project/.gitignore            | 3 +++
 xmake/templates/rust/console/project/.gitignore            | 3 +++
 xmake/templates/rust/static_library/project/.gitignore     | 3 +++
 xmake/templates/swift/console/project/.gitignore           | 3 +++
 27 files changed, 81 insertions(+)

(limited to 'xmake/scripts/gitignore')

diff --git a/xmake/scripts/gitignore b/xmake/scripts/gitignore
index e4ede4aa6..b849bb8f7 100644
--- a/xmake/scripts/gitignore
+++ b/xmake/scripts/gitignore
@@ -3,3 +3,6 @@
 # build result files
 build/
 
+.DS_Store/
+
+
diff --git a/xmake/templates/c++/console/project/.gitignore b/xmake/templates/c++/console/project/.gitignore
index e4ede4aa6..b849bb8f7 100644
--- a/xmake/templates/c++/console/project/.gitignore
+++ b/xmake/templates/c++/console/project/.gitignore
@@ -3,3 +3,6 @@
 # build result files
 build/
 
+.DS_Store/
+
+
diff --git a/xmake/templates/c++/console_qt/project/.gitignore b/xmake/templates/c++/console_qt/project/.gitignore
index e4ede4aa6..b849bb8f7 100644
--- a/xmake/templates/c++/console_qt/project/.gitignore
+++ b/xmake/templates/c++/console_qt/project/.gitignore
@@ -3,3 +3,6 @@
 # build result files
 build/
 
+.DS_Store/
+
+
diff --git a/xmake/templates/c++/console_tbox/project/.gitignore b/xmake/templates/c++/console_tbox/project/.gitignore
index e4ede4aa6..b849bb8f7 100644
--- a/xmake/templates/c++/console_tbox/project/.gitignore
+++ b/xmake/templates/c++/console_tbox/project/.gitignore
@@ -3,3 +3,6 @@
 # build result files
 build/
 
+.DS_Store/
+
+
diff --git a/xmake/templates/c++/shared_library/project/.gitignore b/xmake/templates/c++/shared_library/project/.gitignore
index e4ede4aa6..b849bb8f7 100644
--- a/xmake/templates/c++/shared_library/project/.gitignore
+++ b/xmake/templates/c++/shared_library/project/.gitignore
@@ -3,3 +3,6 @@
 # build result files
 build/
 
+.DS_Store/
+
+
diff --git a/xmake/templates/c++/shared_library_qt/project/.gitignore b/xmake/templates/c++/shared_library_qt/project/.gitignore
index e4ede4aa6..b849bb8f7 100644
--- a/xmake/templates/c++/shared_library_qt/project/.gitignore
+++ b/xmake/templates/c++/shared_library_qt/project/.gitignore
@@ -3,3 +3,6 @@
 # build result files
 build/
 
+.DS_Store/
+
+
diff --git a/xmake/templates/c++/shared_library_tbox/project/.gitignore b/xmake/templates/c++/shared_library_tbox/project/.gitignore
index e4ede4aa6..b849bb8f7 100644
--- a/xmake/templates/c++/shared_library_tbox/project/.gitignore
+++ b/xmake/templates/c++/shared_library_tbox/project/.gitignore
@@ -3,3 +3,6 @@
 # build result files
 build/
 
+.DS_Store/
+
+
diff --git a/xmake/templates/c++/static_library/project/.gitignore b/xmake/templates/c++/static_library/project/.gitignore
index e4ede4aa6..b849bb8f7 100644
--- a/xmake/templates/c++/static_library/project/.gitignore
+++ b/xmake/templates/c++/static_library/project/.gitignore
@@ -3,3 +3,6 @@
 # build result files
 build/
 
+.DS_Store/
+
+
diff --git a/xmake/templates/c++/static_library_qt/project/.gitignore b/xmake/templates/c++/static_library_qt/project/.gitignore
index e4ede4aa6..b849bb8f7 100644
--- a/xmake/templates/c++/static_library_qt/project/.gitignore
+++ b/xmake/templates/c++/static_library_qt/project/.gitignore
@@ -3,3 +3,6 @@
 # build result files
 build/
 
+.DS_Store/
+
+
diff --git a/xmake/templates/c++/static_library_tbox/project/.gitignore b/xmake/templates/c++/static_library_tbox/project/.gitignore
index e4ede4aa6..b849bb8f7 100644
--- a/xmake/templates/c++/static_library_tbox/project/.gitignore
+++ b/xmake/templates/c++/static_library_tbox/project/.gitignore
@@ -3,3 +3,6 @@
 # build result files
 build/
 
+.DS_Store/
+
+
diff --git a/xmake/templates/c/console/project/.gitignore b/xmake/templates/c/console/project/.gitignore
index e4ede4aa6..b849bb8f7 100644
--- a/xmake/templates/c/console/project/.gitignore
+++ b/xmake/templates/c/console/project/.gitignore
@@ -3,3 +3,6 @@
 # build result files
 build/
 
+.DS_Store/
+
+
diff --git a/xmake/templates/c/console_tbox/.gitignore b/xmake/templates/c/console_tbox/.gitignore
index e4ede4aa6..b849bb8f7 100644
--- a/xmake/templates/c/console_tbox/.gitignore
+++ b/xmake/templates/c/console_tbox/.gitignore
@@ -3,3 +3,6 @@
 # build result files
 build/
 
+.DS_Store/
+
+
diff --git a/xmake/templates/c/shared_library/project/.gitignore b/xmake/templates/c/shared_library/project/.gitignore
index e4ede4aa6..b849bb8f7 100644
--- a/xmake/templates/c/shared_library/project/.gitignore
+++ b/xmake/templates/c/shared_library/project/.gitignore
@@ -3,3 +3,6 @@
 # build result files
 build/
 
+.DS_Store/
+
+
diff --git a/xmake/templates/c/shared_library_tbox/project/.gitignore b/xmake/templates/c/shared_library_tbox/project/.gitignore
index e4ede4aa6..b849bb8f7 100644
--- a/xmake/templates/c/shared_library_tbox/project/.gitignore
+++ b/xmake/templates/c/shared_library_tbox/project/.gitignore
@@ -3,3 +3,6 @@
 # build result files
 build/
 
+.DS_Store/
+
+
diff --git a/xmake/templates/c/static_library/project/.gitignore b/xmake/templates/c/static_library/project/.gitignore
index e4ede4aa6..b849bb8f7 100644
--- a/xmake/templates/c/static_library/project/.gitignore
+++ b/xmake/templates/c/static_library/project/.gitignore
@@ -3,3 +3,6 @@
 # build result files
 build/
 
+.DS_Store/
+
+
diff --git a/xmake/templates/c/static_library_tbox/project/.gitignore b/xmake/templates/c/static_library_tbox/project/.gitignore
index e4ede4aa6..b849bb8f7 100644
--- a/xmake/templates/c/static_library_tbox/project/.gitignore
+++ b/xmake/templates/c/static_library_tbox/project/.gitignore
@@ -3,3 +3,6 @@
 # build result files
 build/
 
+.DS_Store/
+
+
diff --git a/xmake/templates/cuda/console/project/.gitignore b/xmake/templates/cuda/console/project/.gitignore
index e4ede4aa6..b849bb8f7 100644
--- a/xmake/templates/cuda/console/project/.gitignore
+++ b/xmake/templates/cuda/console/project/.gitignore
@@ -3,3 +3,6 @@
 # build result files
 build/
 
+.DS_Store/
+
+
diff --git a/xmake/templates/dlang/console/project/.gitignore b/xmake/templates/dlang/console/project/.gitignore
index e4ede4aa6..b849bb8f7 100644
--- a/xmake/templates/dlang/console/project/.gitignore
+++ b/xmake/templates/dlang/console/project/.gitignore
@@ -3,3 +3,6 @@
 # build result files
 build/
 
+.DS_Store/
+
+
diff --git a/xmake/templates/dlang/shared_library/project/.gitignore b/xmake/templates/dlang/shared_library/project/.gitignore
index e4ede4aa6..b849bb8f7 100644
--- a/xmake/templates/dlang/shared_library/project/.gitignore
+++ b/xmake/templates/dlang/shared_library/project/.gitignore
@@ -3,3 +3,6 @@
 # build result files
 build/
 
+.DS_Store/
+
+
diff --git a/xmake/templates/dlang/static_library/project/.gitignore b/xmake/templates/dlang/static_library/project/.gitignore
index e4ede4aa6..b849bb8f7 100644
--- a/xmake/templates/dlang/static_library/project/.gitignore
+++ b/xmake/templates/dlang/static_library/project/.gitignore
@@ -3,3 +3,6 @@
 # build result files
 build/
 
+.DS_Store/
+
+
diff --git a/xmake/templates/go/console/project/.gitignore b/xmake/templates/go/console/project/.gitignore
index e4ede4aa6..b849bb8f7 100644
--- a/xmake/templates/go/console/project/.gitignore
+++ b/xmake/templates/go/console/project/.gitignore
@@ -3,3 +3,6 @@
 # build result files
 build/
 
+.DS_Store/
+
+
diff --git a/xmake/templates/go/static_library/project/.gitignore b/xmake/templates/go/static_library/project/.gitignore
index e4ede4aa6..b849bb8f7 100644
--- a/xmake/templates/go/static_library/project/.gitignore
+++ b/xmake/templates/go/static_library/project/.gitignore
@@ -3,3 +3,6 @@
 # build result files
 build/
 
+.DS_Store/
+
+
diff --git a/xmake/templates/objc++/console/project/.gitignore b/xmake/templates/objc++/console/project/.gitignore
index e4ede4aa6..b849bb8f7 100644
--- a/xmake/templates/objc++/console/project/.gitignore
+++ b/xmake/templates/objc++/console/project/.gitignore
@@ -3,3 +3,6 @@
 # build result files
 build/
 
+.DS_Store/
+
+
diff --git a/xmake/templates/objc/console/project/.gitignore b/xmake/templates/objc/console/project/.gitignore
index e4ede4aa6..b849bb8f7 100644
--- a/xmake/templates/objc/console/project/.gitignore
+++ b/xmake/templates/objc/console/project/.gitignore
@@ -3,3 +3,6 @@
 # build result files
 build/
 
+.DS_Store/
+
+
diff --git a/xmake/templates/rust/console/project/.gitignore b/xmake/templates/rust/console/project/.gitignore
index e4ede4aa6..b849bb8f7 100644
--- a/xmake/templates/rust/console/project/.gitignore
+++ b/xmake/templates/rust/console/project/.gitignore
@@ -3,3 +3,6 @@
 # build result files
 build/
 
+.DS_Store/
+
+
diff --git a/xmake/templates/rust/static_library/project/.gitignore b/xmake/templates/rust/static_library/project/.gitignore
index e4ede4aa6..b849bb8f7 100644
--- a/xmake/templates/rust/static_library/project/.gitignore
+++ b/xmake/templates/rust/static_library/project/.gitignore
@@ -3,3 +3,6 @@
 # build result files
 build/
 
+.DS_Store/
+
+
diff --git a/xmake/templates/swift/console/project/.gitignore b/xmake/templates/swift/console/project/.gitignore
index e4ede4aa6..b849bb8f7 100644
--- a/xmake/templates/swift/console/project/.gitignore
+++ b/xmake/templates/swift/console/project/.gitignore
@@ -3,3 +3,6 @@
 # build result files
 build/
 
+.DS_Store/
+
+
-- 
cgit v1.3.1