From 84a5dfb452cf206a449cc6e66fab8af915cf4e6c Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 20 May 2016 09:53:20 +0800 Subject: fix multi-task build bug --- core/pkg/tbox.pkg/inc/mac/x64/tbox.config.h | 161 +++++++++++++-------------- core/pkg/tbox.pkg/inc/msvc/x86/tbox.config.h | 98 ++++++++-------- xmake/core/base/os.lua | 9 +- 3 files changed, 135 insertions(+), 133 deletions(-) diff --git a/core/pkg/tbox.pkg/inc/mac/x64/tbox.config.h b/core/pkg/tbox.pkg/inc/mac/x64/tbox.config.h index 2b1bad84e..2b4fb39c8 100755 --- a/core/pkg/tbox.pkg/inc/mac/x64/tbox.config.h +++ b/core/pkg/tbox.pkg/inc/mac/x64/tbox.config.h @@ -6,103 +6,102 @@ #define TB_CONFIG_VERSION_MAJOR 1 #define TB_CONFIG_VERSION_MINOR 5 #define TB_CONFIG_VERSION_ALTER 1 -#define TB_CONFIG_VERSION_BUILD 201605182101 +#define TB_CONFIG_VERSION_BUILD 201605200949 // defines #define TB_CONFIG_OS_MACOSX 1 -#define TB_CONFIG_INFO_HAVE_VERSION 1 #define TB_CONFIG_TYPE_HAVE_FLOAT 1 -#define TB_CONFIG_MODULE_HAVE_REGEX 1 -#define TB_CONFIG_MODULE_HAVE_THREAD 1 -#define TB_CONFIG_MODULE_HAVE_NETWORK 1 -#define TB_CONFIG_LIBC_HAVE_MEMCPY 1 -#define TB_CONFIG_LIBC_HAVE_MEMSET 1 -#define TB_CONFIG_LIBC_HAVE_MEMMOVE 1 -#define TB_CONFIG_LIBC_HAVE_MEMCMP 1 -#define TB_CONFIG_LIBC_HAVE_MEMMEM 1 +#define TB_CONFIG_POSIX_HAVE_POSIX_SPAWNP 1 +#define TB_CONFIG_LIBC_HAVE_MKTIME 1 +#define TB_CONFIG_LIBM_HAVE_ACOS 1 +#define TB_CONFIG_POSIX_HAVE_SOCKET 1 +#define TB_CONFIG_POSIX_HAVE_POLL 1 +#define TB_CONFIG_LIBC_HAVE_KILL 1 +#define TB_CONFIG_LIBM_HAVE_ATAN2 1 +#define TB_CONFIG_POSIX_HAVE_SCHED_YIELD 1 +#define TB_CONFIG_LIBC_HAVE_WCSLEN 1 +#define TB_CONFIG_LIBC_HAVE_WCSCMP 1 +#define TB_CONFIG_LIBC_HAVE_WCSNCAT 1 +#define TB_CONFIG_POSIX_HAVE_EXECVP 1 +#define TB_CONFIG_POSIX_HAVE_FORK 1 +#define TB_CONFIG_POSIX_HAVE_GETIFADDRS 1 +#define TB_CONFIG_POSIX_HAVE_DLOPEN 1 +#define TB_CONFIG_POSIX_HAVE_REGEXEC 1 +#define TB_CONFIG_POSIX_HAVE_VFORK 1 #define TB_CONFIG_LIBC_HAVE_STRCAT 1 -#define TB_CONFIG_LIBC_HAVE_STRNCAT 1 -#define TB_CONFIG_LIBC_HAVE_STRCPY 1 -#define TB_CONFIG_LIBC_HAVE_STRNCPY 1 -#define TB_CONFIG_LIBC_HAVE_STRLCPY 1 -#define TB_CONFIG_LIBC_HAVE_STRLEN 1 +#define TB_CONFIG_LIBC_HAVE_WCSSTR 1 +#define TB_CONFIG_LIBC_HAVE_WCSCAT 1 +#define TB_CONFIG_LIBM_HAVE_POW 1 +#define TB_CONFIG_LIBC_HAVE_MEMCPY 1 +#define TB_CONFIG_LIBM_HAVE_SQRTF 1 +#define TB_CONFIG_LIBC_HAVE_WCSNLEN 1 +#define TB_CONFIG_LIBM_HAVE_ACOSF 1 +#define TB_CONFIG_POSIX_HAVE_OPEN 1 #define TB_CONFIG_LIBC_HAVE_STRNLEN 1 -#define TB_CONFIG_LIBC_HAVE_STRSTR 1 -#define TB_CONFIG_LIBC_HAVE_STRCASESTR 1 -#define TB_CONFIG_LIBC_HAVE_STRCMP 1 -#define TB_CONFIG_LIBC_HAVE_STRCASECMP 1 +#define TB_CONFIG_LIBM_HAVE_ATANF 1 +#define TB_CONFIG_LIBC_HAVE_STRNCAT 1 +#define TB_CONFIG_LIBC_HAVE_WCSNCPY 1 +#define TB_CONFIG_LIBC_HAVE_GMTIME 1 +#define TB_CONFIG_LIBM_HAVE_TAN 1 +#define TB_CONFIG_LIBC_HAVE_SIGSETJMP 1 +#define TB_CONFIG_LIBM_HAVE_SINF 1 +#define TB_CONFIG_LIBM_HAVE_ATAN 1 #define TB_CONFIG_LIBC_HAVE_STRNCMP 1 +#define TB_CONFIG_LIBC_HAVE_MEMMOVE 1 #define TB_CONFIG_LIBC_HAVE_STRNCASECMP 1 -#define TB_CONFIG_LIBC_HAVE_WCSCAT 1 -#define TB_CONFIG_LIBC_HAVE_WCSNCAT 1 +#define TB_CONFIG_LIBC_HAVE_STRLCPY 1 #define TB_CONFIG_LIBC_HAVE_WCSCPY 1 -#define TB_CONFIG_LIBC_HAVE_WCSNCPY 1 +#define TB_CONFIG_LIBM_HAVE_SQRT 1 +#define TB_CONFIG_LIBC_HAVE_STRCMP 1 +#define TB_CONFIG_LIBC_HAVE_STRCASECMP 1 +#define TB_CONFIG_LIBC_HAVE_MEMSET 1 +#define TB_CONFIG_LIBM_HAVE_TANF 1 +#define TB_CONFIG_LIBC_HAVE_STRNCPY 1 +#define TB_CONFIG_LIBC_HAVE_LOCALTIME 1 +#define TB_CONFIG_INFO_HAVE_VERSION 1 +#define TB_CONFIG_LIBC_HAVE_STRCPY 1 #define TB_CONFIG_LIBC_HAVE_WCSLCPY 1 -#define TB_CONFIG_LIBC_HAVE_WCSLEN 1 -#define TB_CONFIG_LIBC_HAVE_WCSNLEN 1 -#define TB_CONFIG_LIBC_HAVE_WCSSTR 1 -#define TB_CONFIG_LIBC_HAVE_WCSCMP 1 -#define TB_CONFIG_LIBC_HAVE_WCSCASECMP 1 +#define TB_CONFIG_SYSTEMV_HAVE_SEMGET 1 +#define TB_CONFIG_POSIX_HAVE_WAITPID 1 +#define TB_CONFIG_POSIX_HAVE_WRITEV 1 +#define TB_CONFIG_LIBC_HAVE_GETTIMEOFDAY 1 +#define TB_CONFIG_LIBM_HAVE_ATAN2F 1 +#define TB_CONFIG_LIBC_HAVE_STRSTR 1 +#define TB_CONFIG_POSIX_HAVE_READV 1 #define TB_CONFIG_LIBC_HAVE_WCSNCMP 1 -#define TB_CONFIG_LIBC_HAVE_WCSNCASECMP 1 +#define TB_CONFIG_POSIX_HAVE_REGCOMP 1 +#define TB_CONFIG_LIBM_HAVE_LOG2 1 +#define TB_CONFIG_LIBM_HAVE_COS 1 +#define TB_CONFIG_POSIX_HAVE_SYSCONF 1 +#define TB_CONFIG_POSIX_HAVE_PTHREAD_MUTEX_INIT 1 +#define TB_CONFIG_LIBM_HAVE_FMODF 1 +#define TB_CONFIG_POSIX_HAVE_GETPAGESIZE 1 #define TB_CONFIG_LIBC_HAVE_WCSTOMBS 1 +#define TB_CONFIG_LIBM_HAVE_FMOD 1 +#define TB_CONFIG_LIBC_HAVE_MEMCMP 1 +#define TB_CONFIG_POSIX_HAVE_SEM_INIT 1 +#define TB_CONFIG_POSIX_HAVE_GETHOSTNAME 1 +#define TB_CONFIG_POSIX_HAVE_OPENDIR 1 +#define TB_CONFIG_LIBC_HAVE_STRLEN 1 +#define TB_CONFIG_MODULE_HAVE_THREAD 1 +#define TB_CONFIG_LIBM_HAVE_EXP 1 +#define TB_CONFIG_LIBM_HAVE_SIN 1 +#define TB_CONFIG_LIBM_HAVE_COSF 1 +#define TB_CONFIG_POSIX_HAVE_PTHREAD_CREATE 1 +#define TB_CONFIG_LIBM_HAVE_ASIN 1 +#define TB_CONFIG_LIBM_HAVE_EXPF 1 +#define TB_CONFIG_MODULE_HAVE_NETWORK 1 +#define TB_CONFIG_LIBC_HAVE_MEMMEM 1 +#define TB_CONFIG_LIBC_HAVE_WCSCASECMP 1 +#define TB_CONFIG_LIBC_HAVE_WCSNCASECMP 1 #define TB_CONFIG_LIBC_HAVE_MBSTOWCS 1 -#define TB_CONFIG_LIBC_HAVE_GMTIME 1 -#define TB_CONFIG_LIBC_HAVE_MKTIME 1 -#define TB_CONFIG_LIBC_HAVE_LOCALTIME 1 -#define TB_CONFIG_LIBC_HAVE_GETTIMEOFDAY 1 +#define TB_CONFIG_LIBM_HAVE_POWF 1 +#define TB_CONFIG_LIBM_HAVE_LOG2F 1 +#define TB_CONFIG_LIBM_HAVE_ASINF 1 #define TB_CONFIG_LIBC_HAVE_SIGNAL 1 #define TB_CONFIG_LIBC_HAVE_SETJMP 1 -#define TB_CONFIG_LIBC_HAVE_SIGSETJMP 1 -#define TB_CONFIG_LIBC_HAVE_KILL 1 +#define TB_CONFIG_LIBC_HAVE_STRCASESTR 1 #define TB_CONFIG_LIBC_HAVE_BACKTRACE 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 -#define TB_CONFIG_POSIX_HAVE_POLL 1 -#define TB_CONFIG_POSIX_HAVE_PTHREAD_MUTEX_INIT 1 -#define TB_CONFIG_POSIX_HAVE_PTHREAD_CREATE 1 -#define TB_CONFIG_POSIX_HAVE_SOCKET 1 -#define TB_CONFIG_POSIX_HAVE_OPENDIR 1 -#define TB_CONFIG_POSIX_HAVE_DLOPEN 1 -#define TB_CONFIG_POSIX_HAVE_OPEN 1 -#define TB_CONFIG_POSIX_HAVE_GETHOSTNAME 1 -#define TB_CONFIG_POSIX_HAVE_GETIFADDRS 1 -#define TB_CONFIG_POSIX_HAVE_SEM_INIT 1 -#define TB_CONFIG_POSIX_HAVE_GETPAGESIZE 1 -#define TB_CONFIG_POSIX_HAVE_SYSCONF 1 -#define TB_CONFIG_POSIX_HAVE_SCHED_YIELD 1 -#define TB_CONFIG_POSIX_HAVE_REGCOMP 1 -#define TB_CONFIG_POSIX_HAVE_REGEXEC 1 -#define TB_CONFIG_POSIX_HAVE_READV 1 -#define TB_CONFIG_POSIX_HAVE_WRITEV 1 -#define TB_CONFIG_POSIX_HAVE_POSIX_SPAWNP 1 -#define TB_CONFIG_POSIX_HAVE_EXECVP 1 -#define TB_CONFIG_POSIX_HAVE_FORK 1 -#define TB_CONFIG_POSIX_HAVE_VFORK 1 -#define TB_CONFIG_POSIX_HAVE_WAITPID 1 -#define TB_CONFIG_SYSTEMV_HAVE_SEMGET 1 // undefines #undef TB_CONFIG_TRACE_INFO_ONLY diff --git a/core/pkg/tbox.pkg/inc/msvc/x86/tbox.config.h b/core/pkg/tbox.pkg/inc/msvc/x86/tbox.config.h index ddf975214..6e28760de 100644 --- a/core/pkg/tbox.pkg/inc/msvc/x86/tbox.config.h +++ b/core/pkg/tbox.pkg/inc/msvc/x86/tbox.config.h @@ -6,59 +6,55 @@ #define TB_CONFIG_VERSION_MAJOR 1 #define TB_CONFIG_VERSION_MINOR 5 #define TB_CONFIG_VERSION_ALTER 1 -#define TB_CONFIG_VERSION_BUILD 201512222157 +#define TB_CONFIG_VERSION_BUILD 201605192207 // defines -#define TB_CONFIG_OS_WINDOWS -#define TB_CONFIG_SMALL -#define TB_CONFIG_INFO_HAVE_VERSION -#define TB_CONFIG_TYPE_HAVE_FLOAT -#define TB_CONFIG_MODULE_HAVE_XML -#define TB_CONFIG_MODULE_HAVE_ASIO -#define TB_CONFIG_MODULE_HAVE_OBJECT -#define TB_CONFIG_MODULE_HAVE_THREAD -#define TB_CONFIG_MODULE_HAVE_NETWORK -#define TB_CONFIG_MODULE_HAVE_CHARSET -#define TB_CONFIG_LIBC_HAVE_MEMCPY -#define TB_CONFIG_LIBC_HAVE_MEMSET -#define TB_CONFIG_LIBC_HAVE_MEMMOVE -#define TB_CONFIG_LIBC_HAVE_MEMCMP -#define TB_CONFIG_LIBC_HAVE_STRCAT -#define TB_CONFIG_LIBC_HAVE_STRNCAT -#define TB_CONFIG_LIBC_HAVE_STRCPY -#define TB_CONFIG_LIBC_HAVE_STRNCPY -#define TB_CONFIG_LIBC_HAVE_STRLEN -#define TB_CONFIG_LIBC_HAVE_STRNLEN -#define TB_CONFIG_LIBC_HAVE_STRSTR -#define TB_CONFIG_LIBC_HAVE_STRCMP -#define TB_CONFIG_LIBC_HAVE_STRNCMP -#define TB_CONFIG_LIBC_HAVE_WCSCAT -#define TB_CONFIG_LIBC_HAVE_WCSNCAT -#define TB_CONFIG_LIBC_HAVE_WCSCPY -#define TB_CONFIG_LIBC_HAVE_WCSNCPY -#define TB_CONFIG_LIBC_HAVE_WCSLEN -#define TB_CONFIG_LIBC_HAVE_WCSNLEN -#define TB_CONFIG_LIBC_HAVE_WCSSTR -#define TB_CONFIG_LIBC_HAVE_WCSCMP -#define TB_CONFIG_LIBC_HAVE_WCSNCMP -#define TB_CONFIG_LIBC_HAVE_WCSTOMBS -#define TB_CONFIG_LIBC_HAVE_MBSTOWCS -#define TB_CONFIG_LIBC_HAVE_GMTIME -#define TB_CONFIG_LIBC_HAVE_MKTIME -#define TB_CONFIG_LIBC_HAVE_LOCALTIME -#define TB_CONFIG_LIBC_HAVE_SIGNAL -#define TB_CONFIG_LIBC_HAVE_SETJMP -#define TB_CONFIG_LIBC_HAVE_SYSTEM -#define TB_CONFIG_LIBM_HAVE_SQRT -#define TB_CONFIG_LIBM_HAVE_ACOS -#define TB_CONFIG_LIBM_HAVE_ASIN -#define TB_CONFIG_LIBM_HAVE_POW -#define TB_CONFIG_LIBM_HAVE_FMOD -#define TB_CONFIG_LIBM_HAVE_ATAN -#define TB_CONFIG_LIBM_HAVE_ATAN2 -#define TB_CONFIG_LIBM_HAVE_COS -#define TB_CONFIG_LIBM_HAVE_SIN -#define TB_CONFIG_LIBM_HAVE_EXP +#define TB_CONFIG_OS_WINDOWS 1 +#define TB_CONFIG_SMALL 1 +#define TB_CONFIG_INFO_HAVE_VERSION 1 +#define TB_CONFIG_TYPE_HAVE_FLOAT 1 +#define TB_CONFIG_MODULE_HAVE_THREAD 1 +#define TB_CONFIG_MODULE_HAVE_NETWORK 1 +#define TB_CONFIG_LIBC_HAVE_MEMCPY 1 +#define TB_CONFIG_LIBC_HAVE_MEMSET 1 +#define TB_CONFIG_LIBC_HAVE_MEMMOVE 1 +#define TB_CONFIG_LIBC_HAVE_MEMCMP 1 +#define TB_CONFIG_LIBC_HAVE_STRCAT 1 +#define TB_CONFIG_LIBC_HAVE_STRNCAT 1 +#define TB_CONFIG_LIBC_HAVE_STRCPY 1 +#define TB_CONFIG_LIBC_HAVE_STRNCPY 1 +#define TB_CONFIG_LIBC_HAVE_STRLEN 1 +#define TB_CONFIG_LIBC_HAVE_STRNLEN 1 +#define TB_CONFIG_LIBC_HAVE_STRSTR 1 +#define TB_CONFIG_LIBC_HAVE_STRCMP 1 +#define TB_CONFIG_LIBC_HAVE_STRNCMP 1 +#define TB_CONFIG_LIBC_HAVE_WCSCAT 1 +#define TB_CONFIG_LIBC_HAVE_WCSNCAT 1 +#define TB_CONFIG_LIBC_HAVE_WCSCPY 1 +#define TB_CONFIG_LIBC_HAVE_WCSNCPY 1 +#define TB_CONFIG_LIBC_HAVE_WCSLEN 1 +#define TB_CONFIG_LIBC_HAVE_WCSNLEN 1 +#define TB_CONFIG_LIBC_HAVE_WCSSTR 1 +#define TB_CONFIG_LIBC_HAVE_WCSCMP 1 +#define TB_CONFIG_LIBC_HAVE_WCSNCMP 1 +#define TB_CONFIG_LIBC_HAVE_WCSTOMBS 1 +#define TB_CONFIG_LIBC_HAVE_MBSTOWCS 1 +#define TB_CONFIG_LIBC_HAVE_GMTIME 1 +#define TB_CONFIG_LIBC_HAVE_MKTIME 1 +#define TB_CONFIG_LIBC_HAVE_LOCALTIME 1 +#define TB_CONFIG_LIBC_HAVE_SIGNAL 1 +#define TB_CONFIG_LIBC_HAVE_SETJMP 1 +#define TB_CONFIG_LIBM_HAVE_SQRT 1 +#define TB_CONFIG_LIBM_HAVE_ACOS 1 +#define TB_CONFIG_LIBM_HAVE_ASIN 1 +#define TB_CONFIG_LIBM_HAVE_POW 1 +#define TB_CONFIG_LIBM_HAVE_FMOD 1 +#define TB_CONFIG_LIBM_HAVE_TAN 1 +#define TB_CONFIG_LIBM_HAVE_ATAN 1 +#define TB_CONFIG_LIBM_HAVE_ATAN2 1 +#define TB_CONFIG_LIBM_HAVE_COS 1 +#define TB_CONFIG_LIBM_HAVE_SIN 1 +#define TB_CONFIG_LIBM_HAVE_EXP 1 // undefines #undef TB_CONFIG_TRACE_INFO_ONLY diff --git a/xmake/core/base/os.lua b/xmake/core/base/os.lua index c3e3b70cb..ab073e914 100644 --- a/xmake/core/base/os.lua +++ b/xmake/core/base/os.lua @@ -231,6 +231,13 @@ function os.cd(dir) return true end +-- generate the temporary file path +function os.tmpfile() + + -- make it + return path.join(os.tmpdir(), path.filename(os.tmpname())) +end + -- run shell function os.run(cmd) @@ -261,7 +268,7 @@ end function os.corun(cmd) -- make temporary log file - local log = os.tmpname() + local log = os.tmpfile() -- open command local p = process.open(cmd, log, log) -- cgit v1.3.1