fix copy empty directory bug

6 files changed, 28 insertions, 19 deletions

diff --git a/core/pkg/tbox.pkg/inc/macosx/tbox.config.h b/core/pkg/tbox.pkg/inc/macosx/tbox.config.h
index 624f8cbfa..0fa89b373 100644
--- a/core/pkg/tbox.pkg/inc/macosx/tbox.config.h
+++ b/core/pkg/tbox.pkg/inc/macosx/tbox.config.h
@@ -6,7 +6,7 @@
 #define TB_CONFIG_VERSION_MAJOR 1
 #define TB_CONFIG_VERSION_MINOR 6
 #define TB_CONFIG_VERSION_ALTER 2
-#define TB_CONFIG_VERSION_BUILD 201703291743
+#define TB_CONFIG_VERSION_BUILD 201705202248
 
 // defines
 #define TB_CONFIG_OS_MACOSX 1
diff --git a/core/pkg/tbox.pkg/inc/tbox/platform/socket.h b/core/pkg/tbox.pkg/inc/tbox/platform/socket.h
index d2c954c4f..8fc8ec2f0 100644
--- a/core/pkg/tbox.pkg/inc/tbox/platform/socket.h
+++ b/core/pkg/tbox.pkg/inc/tbox/platform/socket.h
@@ -44,9 +44,31 @@ __tb_extern_c_enter__
 /// the socket type enum
 typedef enum __tb_socket_type_e
 {
-    TB_SOCKET_TYPE_NUL                  = 0
-,   TB_SOCKET_TYPE_TCP                  = 1
-,   TB_SOCKET_TYPE_UDP                  = 2
+    TB_SOCKET_TYPE_NONE                 = 0
+
+    // socket types
+,   TB_SOCKET_TYPE_SOCK_STREAM          = 1 << 8
+,   TB_SOCKET_TYPE_SOCK_DGRAM           = 2 << 8
+,   TB_SOCKET_TYPE_SOCK_RAW             = 3 << 8
+
+    // socket ip protocol
+,   TB_SOCKET_TYPE_IPPROTO_TCP          = 1
+,   TB_SOCKET_TYPE_IPPROTO_UDP          = 2
+,   TB_SOCKET_TYPE_IPPROTO_ICMP         = 3
+
+    // socket for tcp 
+,   TB_SOCKET_TYPE_TCP                  = TB_SOCKET_TYPE_SOCK_STREAM | TB_SOCKET_TYPE_IPPROTO_TCP
+
+    // socket for udp
+,   TB_SOCKET_TYPE_UDP                  = TB_SOCKET_TYPE_SOCK_DGRAM  | TB_SOCKET_TYPE_IPPROTO_UDP
+
+#ifdef TB_CONFIG_OS_MACOSX
+    // socket for icmp, only need user permission on macOS
+,   TB_SOCKET_TYPE_ICMP                 = TB_SOCKET_TYPE_SOCK_DGRAM  | TB_SOCKET_TYPE_IPPROTO_ICMP
+#else
+    // socket for icmp, need root permission on linux/macOS
+,   TB_SOCKET_TYPE_ICMP                 = TB_SOCKET_TYPE_SOCK_RAW    | TB_SOCKET_TYPE_IPPROTO_ICMP
+#endif
 
 }tb_socket_type_e;
 
diff --git a/core/pkg/tbox.pkg/inc/tbox/prefix/arm64/prefix.S b/core/pkg/tbox.pkg/inc/tbox/prefix/arm64/prefix.S
index b2dd79425..bcd65c0ae 100644
--- a/core/pkg/tbox.pkg/inc/tbox/prefix/arm64/prefix.S
+++ b/core/pkg/tbox.pkg/inc/tbox/prefix/arm64/prefix.S
@@ -30,7 +30,7 @@
 #   define ELF
 #   define EXTERN_ASM
 #else
-#   define ELF          #
+#   define ELF          //
 #   define EXTERN_ASM   _
 #endif
 
diff --git a/core/pkg/tbox.pkg/inc/windows/tbox.config.h b/core/pkg/tbox.pkg/inc/windows/tbox.config.h
index d9f19f03c..9e0d50ad5 100644
--- a/core/pkg/tbox.pkg/inc/windows/tbox.config.h
+++ b/core/pkg/tbox.pkg/inc/windows/tbox.config.h
@@ -6,7 +6,7 @@
 #define TB_CONFIG_VERSION_MAJOR 1

 #define TB_CONFIG_VERSION_MINOR 6

 #define TB_CONFIG_VERSION_ALTER 2

-#define TB_CONFIG_VERSION_BUILD 201703301429

+#define TB_CONFIG_VERSION_BUILD 201705202255

 

 // defines

 #define TB_CONFIG_OS_WINDOWS 1

@@ -46,29 +46,16 @@
 #define TB_CONFIG_LIBC_HAVE_SETJMP 1

 #define TB_CONFIG_LIBC_HAVE_SETLOCALE 1

 #define TB_CONFIG_LIBC_HAVE_FPUTS 1

-#define TB_CONFIG_LIBM_HAVE_LOG2 1

-#define TB_CONFIG_LIBM_HAVE_LOG2F 1

 #define TB_CONFIG_LIBM_HAVE_SQRT 1

-#define TB_CONFIG_LIBM_HAVE_SQRTF 1

 #define TB_CONFIG_LIBM_HAVE_ACOS 1

-#define TB_CONFIG_LIBM_HAVE_ACOSF 1

 #define TB_CONFIG_LIBM_HAVE_ASIN 1

-#define TB_CONFIG_LIBM_HAVE_ASINF 1

 #define TB_CONFIG_LIBM_HAVE_POW 1

-#define TB_CONFIG_LIBM_HAVE_POWF 1

 #define TB_CONFIG_LIBM_HAVE_FMOD 1

-#define TB_CONFIG_LIBM_HAVE_FMODF 1

 #define TB_CONFIG_LIBM_HAVE_TAN 1

-#define TB_CONFIG_LIBM_HAVE_TANF 1

 #define TB_CONFIG_LIBM_HAVE_ATAN 1

-#define TB_CONFIG_LIBM_HAVE_ATANF 1

 #define TB_CONFIG_LIBM_HAVE_ATAN2 1

-#define TB_CONFIG_LIBM_HAVE_ATAN2F 1

 #define TB_CONFIG_LIBM_HAVE_COS 1

-#define TB_CONFIG_LIBM_HAVE_COSF 1

 #define TB_CONFIG_LIBM_HAVE_SIN 1

-#define TB_CONFIG_LIBM_HAVE_SINF 1

 #define TB_CONFIG_LIBM_HAVE_EXP 1

-#define TB_CONFIG_LIBM_HAVE_EXPF 1

 

 #endif

diff --git a/core/pkg/tbox.pkg/lib/release/macosx/x86_64/libtbox.a b/core/pkg/tbox.pkg/lib/release/macosx/x86_64/libtbox.a
index c35e270ef..0b48963e9 100644
--- a/core/pkg/tbox.pkg/lib/release/macosx/x86_64/libtbox.a
+++ b/core/pkg/tbox.pkg/lib/release/macosx/x86_64/libtbox.a
diff --git a/core/pkg/tbox.pkg/lib/release/windows/x86/tbox.lib b/core/pkg/tbox.pkg/lib/release/windows/x86/tbox.lib
index 63318aa9f..12cda197d 100644
--- a/core/pkg/tbox.pkg/lib/release/windows/x86/tbox.lib
+++ b/core/pkg/tbox.pkg/lib/release/windows/x86/tbox.lib