From 62d31684e30e5eb04a7fb6b62c05774d2cc202ec Mon Sep 17 00:00:00 2001 From: MarilynDafa Date: Mon, 14 Sep 2020 13:07:13 +0800 Subject: [PATCH] cleanyup --- code/main.c | 1 + modules/redis/redis-win32.vcxproj | 12 ++++++------ modules/redis/redis-win32.vcxproj.filters | 4 ++-- proj/libijjs-win32.vcxproj | 12 ++++++------ proj/libijjs-win32.vcxproj.filters | 4 ++-- proj/qjsc.vcxproj | 10 +++++----- 6 files changed, 22 insertions(+), 21 deletions(-) diff --git a/code/main.c b/code/main.c index c269bae..5b9fb3e 100644 --- a/code/main.c +++ b/code/main.c @@ -398,6 +398,7 @@ static void init_project() { chmod("ij_modules/redis/redis", S_IRWXU); #elif defined(linux) || defined(__linux) || defined(__linux__) fp = fopen("ij_modules/redis/redis", "wb"); + chmod("ij_modules/redis/redis", S_IRWXU); #endif fwrite(buf, 1, sz, fp); fclose(fp); diff --git a/modules/redis/redis-win32.vcxproj b/modules/redis/redis-win32.vcxproj index daaf637..855d96c 100644 --- a/modules/redis/redis-win32.vcxproj +++ b/modules/redis/redis-win32.vcxproj @@ -92,7 +92,7 @@ true USE_JEMALLOC;_REENTRANT;DLLEXPORT;JEMALLOC_NO_PRIVATE_NAMESPACE;JEMALLOC_NO_RENAME;JEMALLOC_NO_DEMANGLE;USE_PTHREAD_ID2;PTW32_CONFIG_H;PTW32_STATIC_LIB;WIN32;_SSIZE_T_;_OFF_T_DEFINED;PSAPI_VERSION=1;LACKS_STDLIB_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;INCL_WINSOCK_API_PROTOTYPES=0;_WIN32_WINNT=0x0502;_off_t=long;_WINDOWS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\code\externals\jemalloc;..\..\code\externals\pthread;..\..\code\externals\jemalloc\include;.\lua;.\redis;.\Win32_Interop;%(AdditionalIncludeDirectories) + ..\..\code\externals\jemalloc;..\..\code\externals\wpthread;..\..\code\externals\jemalloc\include;.\lua;.\redis;.\Win32_Interop;%(AdditionalIncludeDirectories) Default -Wno-unused-parameter -Wno-ignored-pragma-optimize -Wno-incompatible-pointer-types -Wno-pointer-sign -Wno-int-conversion -Wno-microsoft-enum-forward-reference -Wno-unused-const-variable -Wno-unused-function -Wno-unused-variable -Wno-deprecated-declarations -Wno-macro-redefined -Wno-ignored-attributes -Wno-sometimes-uninitialized -Wno-missing-braces -Wno-comment -Wno-unused-value -Wno-nonportable-include-path -Wno-extra-tokens -Wno-format -Wno-absolute-value -Wno-expansion-to-defined -Wno-microsoft-cast %(AdditionalOptions) @@ -110,7 +110,7 @@ true USE_JEMALLOC;_REENTRANT;DLLEXPORT;JEMALLOC_NO_PRIVATE_NAMESPACE;JEMALLOC_NO_RENAME;JEMALLOC_NO_DEMANGLE;USE_PTHREAD_ID2;PTW32_CONFIG_H;PTW32_STATIC_LIB;WIN32;_SSIZE_T_;_OFF_T_DEFINED;PSAPI_VERSION=1;LACKS_STDLIB_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;INCL_WINSOCK_API_PROTOTYPES=0;_WIN32_WINNT=0x0502;_off_t=long;_WINDOWS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\code\externals\jemalloc;..\..\code\externals\pthread;..\..\code\externals\jemalloc\include;.\lua;.\redis;.\Win32_Interop;%(AdditionalIncludeDirectories) + ..\..\code\externals\jemalloc;..\..\code\externals\wpthread;..\..\code\externals\jemalloc\include;.\lua;.\redis;.\Win32_Interop;%(AdditionalIncludeDirectories) Default -Wno-unused-parameter -Wno-ignored-pragma-optimize -Wno-incompatible-pointer-types -Wno-pointer-sign -Wno-int-conversion -Wno-microsoft-enum-forward-reference -Wno-unused-const-variable -Wno-unused-function -Wno-unused-variable -Wno-deprecated-declarations -Wno-macro-redefined -Wno-ignored-attributes -Wno-sometimes-uninitialized -Wno-missing-braces -Wno-comment -Wno-unused-value -Wno-nonportable-include-path -Wno-extra-tokens -Wno-format -Wno-absolute-value -Wno-expansion-to-defined -Wno-microsoft-cast %(AdditionalOptions) @@ -130,7 +130,7 @@ true USE_JEMALLOC;_REENTRANT;DLLEXPORT;JEMALLOC_NO_PRIVATE_NAMESPACE;JEMALLOC_NO_RENAME;JEMALLOC_NO_DEMANGLE;USE_PTHREAD_ID2;PTW32_CONFIG_H;PTW32_STATIC_LIB;WIN32;_SSIZE_T_;_OFF_T_DEFINED;PSAPI_VERSION=1;LACKS_STDLIB_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;INCL_WINSOCK_API_PROTOTYPES=0;_WIN32_WINNT=0x0502;_off_t=long;_WINDOWS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\code\externals\jemalloc;..\..\code\externals\pthread;..\..\code\externals\jemalloc\include;.\lua;.\redis;.\Win32_Interop;%(AdditionalIncludeDirectories) + ..\..\code\externals\jemalloc;..\..\code\externals\wpthread;..\..\code\externals\jemalloc\include;.\lua;.\redis;.\Win32_Interop;%(AdditionalIncludeDirectories) Default -Wno-unused-parameter -Wno-ignored-pragma-optimize -Wno-incompatible-pointer-types -Wno-pointer-sign -Wno-int-conversion -Wno-microsoft-enum-forward-reference -Wno-unused-const-variable -Wno-unused-function -Wno-unused-variable -Wno-deprecated-declarations -Wno-macro-redefined -Wno-ignored-attributes -Wno-sometimes-uninitialized -Wno-missing-braces -Wno-comment -Wno-unused-value -Wno-nonportable-include-path -Wno-extra-tokens -Wno-format -Wno-absolute-value -Wno-expansion-to-defined -Wno-microsoft-cast %(AdditionalOptions) @@ -152,7 +152,7 @@ true USE_JEMALLOC;_REENTRANT;DLLEXPORT;JEMALLOC_NO_PRIVATE_NAMESPACE;JEMALLOC_NO_RENAME;JEMALLOC_NO_DEMANGLE;USE_PTHREAD_ID2;PTW32_CONFIG_H;PTW32_STATIC_LIB;WIN32;_SSIZE_T_;_OFF_T_DEFINED;PSAPI_VERSION=1;LACKS_STDLIB_H;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;INCL_WINSOCK_API_PROTOTYPES=0;_WIN32_WINNT=0x0502;_off_t=long;_WINDOWS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\code\externals\jemalloc;..\..\code\externals\pthread;..\..\code\externals\jemalloc\include;.\lua;.\redis;.\Win32_Interop;%(AdditionalIncludeDirectories) + ..\..\code\externals\jemalloc;..\..\code\externals\wpthread;..\..\code\externals\jemalloc\include;.\lua;.\redis;.\Win32_Interop;%(AdditionalIncludeDirectories) Default -Wno-unused-parameter -Wno-ignored-pragma-optimize -Wno-incompatible-pointer-types -Wno-pointer-sign -Wno-int-conversion -Wno-microsoft-enum-forward-reference -Wno-unused-const-variable -Wno-unused-function -Wno-unused-variable -Wno-deprecated-declarations -Wno-macro-redefined -Wno-ignored-attributes -Wno-sometimes-uninitialized -Wno-missing-braces -Wno-comment -Wno-unused-value -Wno-nonportable-include-path -Wno-extra-tokens -Wno-format -Wno-absolute-value -Wno-expansion-to-defined -Wno-microsoft-cast %(AdditionalOptions) @@ -169,7 +169,7 @@ - + @@ -238,7 +238,7 @@ - + diff --git a/modules/redis/redis-win32.vcxproj.filters b/modules/redis/redis-win32.vcxproj.filters index d979ec8..87b0a0a 100644 --- a/modules/redis/redis-win32.vcxproj.filters +++ b/modules/redis/redis-win32.vcxproj.filters @@ -114,7 +114,7 @@ jemalloc - + Win32_Interop @@ -287,7 +287,7 @@ jemalloc - + Win32_Interop diff --git a/proj/libijjs-win32.vcxproj b/proj/libijjs-win32.vcxproj index dc2ce11..1f88dd8 100644 --- a/proj/libijjs-win32.vcxproj +++ b/proj/libijjs-win32.vcxproj @@ -94,7 +94,7 @@ Level3 Disabled DLLEXPORT;_REENTRANT;JEMALLOC_NO_PRIVATE_NAMESPACE;JEMALLOC_NO_RENAME;JEMALLOC_NO_DEMANGLE;QJS_VERSION_STR="20200705";IJ_EXPORT;d_m3HasWASI;USE_PTHREAD_ID;__CLEANUP_SEH;CONFIG_BIGNUM;CONFIG_QJSDEBUG;HAVE_CONFIG_H;PTW32_CONFIG_H;PTW32_BUILD;BUILDING_LIBCURL;BUILDING_UV_SHARED;CURL_ENABLE_MQTT;CURL_HIDDEN_SYMBOLS;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;CLOCK_REALTIME=0;CLOCK_MONOTONIC=1;CLOCK_PROCESS_CPUTIME_ID=2;CLOCK_THREAD_CPUTIME_ID=3;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ..\code\externals\wasm;..\code\externals\quickjs;..\code\externals\curl;..\code\externals;..\code\externals\jemalloc\include;..\code\externals\uv\include;..\code\externals\uv\src;..\code\externals\pthread;..\code\headers;..\code\externals\cwin;%(AdditionalIncludeDirectories) + ..\code\externals\wasm;..\code\externals\quickjs;..\code\externals\curl;..\code\externals;..\code\externals\jemalloc\include;..\code\externals\uv\include;..\code\externals\uv\src;..\code\externals\wpthread;..\code\headers;..\code\externals\cwin;%(AdditionalIncludeDirectories) -Wno-unused-parameter -Wno-ignored-pragma-optimize -Wno-incompatible-pointer-types -Wno-pointer-sign -Wno-int-conversion -Wno-microsoft-enum-forward-reference -Wno-unused-const-variable -Wno-unused-function -Wno-unused-variable -Wno-deprecated-declarations -Wno-macro-redefined -Wno-ignored-attributes -Wno-sometimes-uninitialized -Wno-missing-braces %(AdditionalOptions) @@ -116,7 +116,7 @@ Level3 Disabled DLLEXPORT;_REENTRANT;JEMALLOC_NO_PRIVATE_NAMESPACE;JEMALLOC_NO_RENAME;JEMALLOC_NO_DEMANGLE;QJS_VERSION_STR="20200705";IJ_EXPORT;d_m3HasWASI;USE_PTHREAD_ID;__CLEANUP_SEH;CONFIG_BIGNUM;CONFIG_QJSDEBUG;HAVE_CONFIG_H;PTW32_CONFIG_H;PTW32_BUILD;BUILDING_LIBCURL;BUILDING_UV_SHARED;CURL_ENABLE_MQTT;USE_WIN32_CRYPTO;CURL_HIDDEN_SYMBOLS;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;CLOCK_REALTIME=0;CLOCK_MONOTONIC=1;CLOCK_PROCESS_CPUTIME_ID=2;CLOCK_THREAD_CPUTIME_ID=3;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ..\code\externals\wasm;..\code\externals\quickjs;..\code\externals\curl;..\code\externals;..\code\externals\jemalloc\include;..\code\externals\uv\include;..\code\externals\uv\src;..\code\externals\pthread;..\code\headers;..\code\externals\cwin;%(AdditionalIncludeDirectories) + ..\code\externals\wasm;..\code\externals\quickjs;..\code\externals\curl;..\code\externals;..\code\externals\jemalloc\include;..\code\externals\uv\include;..\code\externals\uv\src;..\code\externals\wpthread;..\code\headers;..\code\externals\cwin;%(AdditionalIncludeDirectories) -Wno-unused-parameter -Wno-ignored-pragma-optimize -Wno-incompatible-pointer-types -Wno-pointer-sign -Wno-int-conversion -Wno-microsoft-enum-forward-reference -Wno-unused-const-variable -Wno-unused-function -Wno-unused-variable -Wno-deprecated-declarations -Wno-macro-redefined -Wno-ignored-attributes -Wno-sometimes-uninitialized -Wno-missing-braces %(AdditionalOptions) @@ -140,7 +140,7 @@ true true DLLEXPORT;_REENTRANT;JEMALLOC_NO_PRIVATE_NAMESPACE;JEMALLOC_NO_RENAME;JEMALLOC_NO_DEMANGLE;QJS_VERSION_STR="20200705";IJ_EXPORT;d_m3HasWASI;USE_PTHREAD_ID;__CLEANUP_SEH;CONFIG_BIGNUM;CONFIG_QJSDEBUG;HAVE_CONFIG_H;PTW32_CONFIG_H;PTW32_BUILD;BUILDING_LIBCURL;BUILDING_UV_SHARED;CURL_ENABLE_MQTT;CURL_HIDDEN_SYMBOLS;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;CLOCK_REALTIME=0;CLOCK_MONOTONIC=1;CLOCK_PROCESS_CPUTIME_ID=2;CLOCK_THREAD_CPUTIME_ID=3;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ..\code\externals\wasm;..\code\externals\quickjs;..\code\externals\curl;..\code\externals;..\code\externals\jemalloc\include;..\code\externals\uv\include;..\code\externals\uv\src;..\code\externals\pthread;..\code\headers;..\code\externals\cwin;%(AdditionalIncludeDirectories) + ..\code\externals\wasm;..\code\externals\quickjs;..\code\externals\curl;..\code\externals;..\code\externals\jemalloc\include;..\code\externals\uv\include;..\code\externals\uv\src;..\code\externals\wpthread;..\code\headers;..\code\externals\cwin;%(AdditionalIncludeDirectories) -Wno-unused-parameter -Wno-ignored-pragma-optimize -Wno-incompatible-pointer-types -Wno-pointer-sign -Wno-int-conversion -Wno-microsoft-enum-forward-reference -Wno-unused-const-variable -Wno-unused-function -Wno-unused-variable -Wno-deprecated-declarations -Wno-macro-redefined -Wno-ignored-attributes -Wno-sometimes-uninitialized -Wno-missing-braces %(AdditionalOptions) @@ -167,7 +167,7 @@ true true DLLEXPORT;_REENTRANT;JEMALLOC_NO_PRIVATE_NAMESPACE;JEMALLOC_NO_RENAME;JEMALLOC_NO_DEMANGLE;QJS_VERSION_STR="20200705";IJ_EXPORT;d_m3HasWASI;USE_PTHREAD_ID;__CLEANUP_SEH;CONFIG_BIGNUM;CONFIG_QJSDEBUG;HAVE_CONFIG_H;PTW32_CONFIG_H;PTW32_BUILD;BUILDING_LIBCURL;BUILDING_UV_SHARED;CURL_ENABLE_MQTT;CURL_HIDDEN_SYMBOLS;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;CLOCK_REALTIME=0;CLOCK_MONOTONIC=1;CLOCK_PROCESS_CPUTIME_ID=2;CLOCK_THREAD_CPUTIME_ID=3;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ..\code\externals\wasm;..\code\externals\quickjs;..\code\externals\curl;..\code\externals;..\code\externals\jemalloc\include;..\code\externals\uv\include;..\code\externals\uv\src;..\code\externals\pthread;..\code\headers;..\code\externals\cwin;%(AdditionalIncludeDirectories) + ..\code\externals\wasm;..\code\externals\quickjs;..\code\externals\curl;..\code\externals;..\code\externals\jemalloc\include;..\code\externals\uv\include;..\code\externals\uv\src;..\code\externals\wpthread;..\code\headers;..\code\externals\cwin;%(AdditionalIncludeDirectories) -Wno-unused-parameter -Wno-ignored-pragma-optimize -Wno-incompatible-pointer-types -Wno-pointer-sign -Wno-int-conversion -Wno-microsoft-enum-forward-reference -Wno-unused-const-variable -Wno-unused-function -Wno-unused-variable -Wno-deprecated-declarations -Wno-macro-redefined -Wno-ignored-attributes -Wno-sometimes-uninitialized -Wno-missing-braces %(AdditionalOptions) @@ -192,7 +192,6 @@ - @@ -201,6 +200,7 @@ + @@ -208,7 +208,6 @@ - @@ -234,6 +233,7 @@ + diff --git a/proj/libijjs-win32.vcxproj.filters b/proj/libijjs-win32.vcxproj.filters index 54cf92b..9a623f2 100644 --- a/proj/libijjs-win32.vcxproj.filters +++ b/proj/libijjs-win32.vcxproj.filters @@ -55,7 +55,7 @@ cwin - + cwin @@ -156,7 +156,7 @@ cwin - + cwin diff --git a/proj/qjsc.vcxproj b/proj/qjsc.vcxproj index 9b33ad8..084b08d 100644 --- a/proj/qjsc.vcxproj +++ b/proj/qjsc.vcxproj @@ -21,12 +21,12 @@ - + @@ -112,7 +112,7 @@ true QJS_VERSION_STR="2020-4-12";USE_STD_ALLOC;DISQJSD;IJ_EXPORT;PTW32_CONFIG_H;PTW32_STATIC_LIB;_CRT_SECURE_NO_WARNINGS;WIN32;HAVE_CONFIG_H;CONFIG_BIGNUM;USE_PTHREAD_ID;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\code\externals\quickjs;..\code\externals\cwin;..\code\externals\pthread;%(AdditionalIncludeDirectories) + ..\code\externals\quickjs;..\code\externals\cwin;..\code\externals\wpthread;%(AdditionalIncludeDirectories) Console @@ -127,7 +127,7 @@ true QJS_VERSION_STR="2020-4-12";USE_STD_ALLOC;DISQJSD;IJ_EXPORT;PTW32_CONFIG_H;PTW32_STATIC_LIB;_CRT_SECURE_NO_WARNINGS;WIN32;HAVE_CONFIG_H;CONFIG_BIGNUM;USE_PTHREAD_ID;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\code\externals\quickjs;..\code\externals\cwin;..\code\externals\pthread;%(AdditionalIncludeDirectories) + ..\code\externals\quickjs;..\code\externals\cwin;..\code\externals\wpthread;%(AdditionalIncludeDirectories) Console @@ -142,7 +142,7 @@ true QJS_VERSION_STR="2020-4-12";USE_STD_ALLOC;DISQJSD;IJ_EXPORT;PTW32_CONFIG_H;PTW32_STATIC_LIB;_CRT_SECURE_NO_WARNINGS;WIN32;HAVE_CONFIG_H;CONFIG_BIGNUM;USE_PTHREAD_ID;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\code\externals\quickjs;..\code\externals\cwin;..\code\externals\pthread;%(AdditionalIncludeDirectories) + ..\code\externals\quickjs;..\code\externals\cwin;..\code\externals\wpthread;%(AdditionalIncludeDirectories) Console @@ -157,7 +157,7 @@ true QJS_VERSION_STR="2020-4-12";USE_STD_ALLOC;DISQJSD;IJ_EXPORT;PTW32_CONFIG_H;PTW32_STATIC_LIB;_CRT_SECURE_NO_WARNINGS;WIN32;HAVE_CONFIG_H;CONFIG_BIGNUM;USE_PTHREAD_ID;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\code\externals\quickjs;..\code\externals\cwin;..\code\externals\pthread;%(AdditionalIncludeDirectories) + ..\code\externals\quickjs;..\code\externals\cwin;..\code\externals\wpthread;%(AdditionalIncludeDirectories) Console