summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2020-06-22 21:02:18 +0800
committerruki <[email protected]>2020-06-22 00:13:50 +0800
commit1a057c00e03904c200c618eec6befbf2a470a25a (patch)
treefd561ea95a613af608dd53773bd60c64f2ca815c
parentfd33951f2148c781b3a923e09a5580b62f385f10 (diff)
update tbox
m---------core/src/tbox/tbox0
-rwxr-xr-xtests/projects/other/too-long-path/src/main.cc11
-rwxr-xr-xtests/projects/other/too-long-path/src/verylongnamefiledeep1/add1.cc1
-rwxr-xr-xtests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/add2.cc1
-rwxr-xr-xtests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/verylongnamefiledeep3/add3.cc1
-rwxr-xr-xtests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/verylongnamefiledeep3/verylongnamefiledeep4/add4.cc1
-rwxr-xr-xtests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/verylongnamefiledeep3/verylongnamefiledeep4/verylongnamefiledeep5/add5.cc1
-rwxr-xr-xtests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/verylongnamefiledeep3/verylongnamefiledeep4/verylongnamefiledeep5/verylongnamefiledeep6/add6.cc1
-rwxr-xr-xtests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/verylongnamefiledeep3/verylongnamefiledeep4/verylongnamefiledeep5/verylongnamefiledeep6/verylongnamefiledeep7/add7.cc1
-rwxr-xr-xtests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/verylongnamefiledeep3/verylongnamefiledeep4/verylongnamefiledeep5/verylongnamefiledeep6/verylongnamefiledeep7/verylongnamefiledeep8/add8.cc1
-rwxr-xr-xtests/projects/other/too-long-path/xmake.lua3
-rw-r--r--xmake/actions/require/impl/action/download.lua1
12 files changed, 23 insertions, 0 deletions
diff --git a/core/src/tbox/tbox b/core/src/tbox/tbox
-Subproject 015ae373ddefaad1762567575034aa3ca9d459b
+Subproject 3c88337d6c4a80a3890a9a92f8d84cba4d2878f
diff --git a/tests/projects/other/too-long-path/src/main.cc b/tests/projects/other/too-long-path/src/main.cc
new file mode 100755
index 000000000..1c9e87977
--- /dev/null
+++ b/tests/projects/other/too-long-path/src/main.cc
@@ -0,0 +1,11 @@
+#include <iostream>
+
+int add(int,int);
+
+int main(){
+
+ std::cout << add(123, 321) << std::endl;
+
+
+ return 0;
+} \ No newline at end of file
diff --git a/tests/projects/other/too-long-path/src/verylongnamefiledeep1/add1.cc b/tests/projects/other/too-long-path/src/verylongnamefiledeep1/add1.cc
new file mode 100755
index 000000000..289f33224
--- /dev/null
+++ b/tests/projects/other/too-long-path/src/verylongnamefiledeep1/add1.cc
@@ -0,0 +1 @@
+int add(int a,int b) { return a + b; } \ No newline at end of file
diff --git a/tests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/add2.cc b/tests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/add2.cc
new file mode 100755
index 000000000..c9d3bf4f2
--- /dev/null
+++ b/tests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/add2.cc
@@ -0,0 +1 @@
+int add2(int a,int b) { return a + b; } \ No newline at end of file
diff --git a/tests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/verylongnamefiledeep3/add3.cc b/tests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/verylongnamefiledeep3/add3.cc
new file mode 100755
index 000000000..a18f1c94b
--- /dev/null
+++ b/tests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/verylongnamefiledeep3/add3.cc
@@ -0,0 +1 @@
+int add3(int a,int b) { return a + b; } \ No newline at end of file
diff --git a/tests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/verylongnamefiledeep3/verylongnamefiledeep4/add4.cc b/tests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/verylongnamefiledeep3/verylongnamefiledeep4/add4.cc
new file mode 100755
index 000000000..c62d37da8
--- /dev/null
+++ b/tests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/verylongnamefiledeep3/verylongnamefiledeep4/add4.cc
@@ -0,0 +1 @@
+int add4(int a,int b) { return a + b; } \ No newline at end of file
diff --git a/tests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/verylongnamefiledeep3/verylongnamefiledeep4/verylongnamefiledeep5/add5.cc b/tests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/verylongnamefiledeep3/verylongnamefiledeep4/verylongnamefiledeep5/add5.cc
new file mode 100755
index 000000000..07514c220
--- /dev/null
+++ b/tests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/verylongnamefiledeep3/verylongnamefiledeep4/verylongnamefiledeep5/add5.cc
@@ -0,0 +1 @@
+int add5(int a,int b) { return a + b; } \ No newline at end of file
diff --git a/tests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/verylongnamefiledeep3/verylongnamefiledeep4/verylongnamefiledeep5/verylongnamefiledeep6/add6.cc b/tests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/verylongnamefiledeep3/verylongnamefiledeep4/verylongnamefiledeep5/verylongnamefiledeep6/add6.cc
new file mode 100755
index 000000000..2e2b68d40
--- /dev/null
+++ b/tests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/verylongnamefiledeep3/verylongnamefiledeep4/verylongnamefiledeep5/verylongnamefiledeep6/add6.cc
@@ -0,0 +1 @@
+int add6(int a,int b) { return a + b; } \ No newline at end of file
diff --git a/tests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/verylongnamefiledeep3/verylongnamefiledeep4/verylongnamefiledeep5/verylongnamefiledeep6/verylongnamefiledeep7/add7.cc b/tests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/verylongnamefiledeep3/verylongnamefiledeep4/verylongnamefiledeep5/verylongnamefiledeep6/verylongnamefiledeep7/add7.cc
new file mode 100755
index 000000000..9bd158c68
--- /dev/null
+++ b/tests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/verylongnamefiledeep3/verylongnamefiledeep4/verylongnamefiledeep5/verylongnamefiledeep6/verylongnamefiledeep7/add7.cc
@@ -0,0 +1 @@
+int add7(int a,int b) { return a + b; } \ No newline at end of file
diff --git a/tests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/verylongnamefiledeep3/verylongnamefiledeep4/verylongnamefiledeep5/verylongnamefiledeep6/verylongnamefiledeep7/verylongnamefiledeep8/add8.cc b/tests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/verylongnamefiledeep3/verylongnamefiledeep4/verylongnamefiledeep5/verylongnamefiledeep6/verylongnamefiledeep7/verylongnamefiledeep8/add8.cc
new file mode 100755
index 000000000..a7d678daf
--- /dev/null
+++ b/tests/projects/other/too-long-path/src/verylongnamefiledeep1/verylongnamefiledeep2/verylongnamefiledeep3/verylongnamefiledeep4/verylongnamefiledeep5/verylongnamefiledeep6/verylongnamefiledeep7/verylongnamefiledeep8/add8.cc
@@ -0,0 +1 @@
+int add8(int a,int b) { return a + b; } \ No newline at end of file
diff --git a/tests/projects/other/too-long-path/xmake.lua b/tests/projects/other/too-long-path/xmake.lua
new file mode 100755
index 000000000..17544f240
--- /dev/null
+++ b/tests/projects/other/too-long-path/xmake.lua
@@ -0,0 +1,3 @@
+target("test")
+ set_kind("binary")
+ add_files("src/**.cc")
diff --git a/xmake/actions/require/impl/action/download.lua b/xmake/actions/require/impl/action/download.lua
index 82bd1aaab..c958180a3 100644
--- a/xmake/actions/require/impl/action/download.lua
+++ b/xmake/actions/require/impl/action/download.lua
@@ -107,6 +107,7 @@ function _download(package, url, sourcedir, url_alias, url_excludes)
end
end
+ print(os.curdir(), os.isdir(sourcedir .. ".tmp"))
-- extract package file
os.rm(sourcedir .. ".tmp")
if archive.extract(packagefile, sourcedir .. ".tmp", {excludes = url_excludes}) then